Spot the link / entityClass error!

templates/items/backpack.html

@@ -14,7 +14,7 @@
 				<span class="item-status">{{itemStatus}}</span>
 			</div>
 
-			<ul class="summary">
+			<ul class="summary flexrow">
 				<li></li>
 				<li>
 					<input type="text" name="data.rarity" value="{{data.rarity}}" placeholder="{{ localize 'SW5E.Rarity' }}"/>

templates/items/classfeature.html

@@ -0,0 +1,73 @@
+<form class="{{cssClass}} flexcol" autocomplete="off">
+
+    {{!-- Item Sheet Header --}}
+    <header class="sheet-header flexrow">
+        <img class="profile" src="{{item.img}}" title="{{item.name}}" data-edit="img"/>
+
+        <div class="header-details flexrow">
+            <h1 class="charname">
+                <input name="name" type="text" value="{{item.name}}" placeholder="{{ localize 'SW5E.ItemName' }}"/>
+            </h1>
+
+            <div class="item-subtitle">
+                <h4 class="item-type">{{itemType}}</h4>
+                <span class="item-status">{{itemStatus}}</span>
+            </div>
+
+            <ul class="summary">
+                <li>
+                    {{labels.featType}}
+                </li>
+                <li>
+                    <input type="text" name="data.requirements" value="{{data.requirements}}" placeholder="{{ localize 'SW5E.Requirements' }}"/>
+                </li>
+                <li>
+                    <input type="text" name="data.source" value="{{data.source}}" placeholder="{{ localize 'SW5E.Source' }}"/>
+                </li>
+            </ul>
+        </div>
+    </header>
+
+    {{!-- Item Sheet Navigation --}}
+    <nav class="sheet-navigation tabs" data-group="primary">
+        <a class="item active" data-tab="description">{{ localize "SW5E.Description" }}</a>
+        <a class="item" data-tab="details">{{ localize "SW5E.Details" }}</a>
+    </nav>
+
+    {{!-- Item Sheet Body --}}
+    <section class="sheet-body">
+
+        {{!-- Description Tab --}}
+        {{> "systems/sw5e/templates/items/parts/item-description.html"}}
+
+        {{!-- Details Tab --}}
+        <div class="tab details" data-group="primary" data-tab="details">
+
+            <h3 class="form-header">{{ localize "SW5E.FeatureUsage" }}</h3>
+
+            {{!-- Item Activation Template --}}
+            {{> "systems/sw5e/templates/items/parts/item-activation.html"}}
+
+            {{!-- Recharge Requirement --}}
+            {{#if data.activation.type}}
+            <div class="form-group recharge">
+                <label>{{ localize "SW5E.FeatureActionRecharge" }}</label>
+                <div class="form-fields">
+                    <span>{{ localize "SW5E.FeatureRechargeOn" }}</span>
+                    <input type="text" name="data.recharge.value" value="{{data.recharge.value}}"
+                           data-dtype="Number" placeholder="{{ localize 'SW5E.FeatureRechargeResult' }}"/>
+                    <label class="checkbox">
+                        {{ localize "SW5E.Charged" }}
+                        <input type="checkbox" name="data.recharge.charged" {{checked data.recharge.charged}}/>
+                    </label>
+                </div>
+            </div>
+            {{/if}}
+
+            <h3 class="form-header">{{ localize "SW5E.FeatureAttack" }}</h3>
+
+            {{!-- Item Action Template --}}
+            {{> "systems/sw5e/templates/items/parts/item-action.html"}}
+        </div>
+    </section>
+</form>

templates/items/equipment.html

@@ -14,7 +14,7 @@
                 <span class="item-status">{{itemStatus}}</span>
             </div>
 
-            <ul class="summary">
+            <ul class="summary flexrow">
                 <li>
                     {{lookup config.equipmentTypes data.armor.type }}
                 </li>
@@ -57,6 +57,7 @@
                 </select>
             </div>
 
+            {{#unless isMountable}}
             {{!-- Equipment Status --}}
             <div class="form-group stacked">
                 <label>{{ localize "SW5E.ItemEquipmentStatus" }}</label>
@@ -73,33 +74,17 @@
                     <input type="checkbox" name="data.attuned" {{checked data.attuned}}/> {{ localize "SW5E.Attuned" }}
                 </label>
             </div>
-			
-{{#unless isWeapon }}
-{{!-- ArmorProperties Formula --}}
-<div class="form-group stacked weapon-properties">
-<h4 class="armorproperties-header">
-    {{#unless isWeapon }}{{ localize "SW5E.ArmorProperties" }}{{ else }}{{ localize "SW5E.ItemWeaponProperties" }}{{/unless}}
-    <a class="armorproperties-control add-armorproperties"><i class="fas fa-plus"></i></a>
-</h4>
-<ol class="armorproperties-parts form-group">
-    {{#each data.armorproperties.parts as |part i| }}
-    <li class="armorproperties-part flexrow" data-armorproperties-part="{{i}}">
-        
-        <select name="data.armorproperties.parts.{{i}}.1">
-            {{#select (lookup this "1") }}
-            <option value="">{{ localize "SW5E.None" }}</option>
-            {{#each ../config.armorpropertiesTypes as |name type|}}
-            <option value="{{type}}">{{name}}</option>
-            {{/each}}
-            {{/select}}
-        </select>
-		<input type="text" name="data.armorproperties.parts.{{i}}.0" value="{{lookup this "0"}}"/>
-        <a class="armorproperties-control delete-armorproperties"><i class="fas fa-minus"></i></a>
-    </li>
-    {{/each}}
-</ol>
-</div>
-{{/unless}}
+            {{/unless}}
+
+            {{!-- Armor Properties --}}
+            <div class="form-group stacked armor-properties">
+                <label>{{ localize "SW5E.ArmorProperties" }}</label>
+                {{#each config.armorPropertiesTypes as |name prop|}}
+                <label class="checkbox">
+                    <input type="checkbox" name="data.properties.{{prop}}" {{checked (lookup ../data.properties prop)}}/> {{ name }}
+                </label>
+                {{/each}}
+            </div>
 
             {{!-- Armor Class --}}
             <div class="form-group">
@@ -109,6 +94,7 @@
                 </div>
             </div>
 
+            {{#unless isMountable}}
             {{!-- Dexterity Modifier --}}
             <div class="form-group">
                 <label>{{ localize "SW5E.ItemEquipmentDexMod" }}</label>
@@ -130,6 +116,21 @@
                 <label>{{ localize "SW5E.ItemEquipmentStealthDisav" }}</label>
                 <input type="checkbox" name="data.stealth" value="1" {{checked data.stealth}}/>
             </div>
+            {{/unless}}
+
+            {{#if isMountable}}
+            {{> 'systems/sw5e/templates/items/parts/item-mountable.html'}}
+            <div class="form-group">
+                <label>{{localize 'SW5E.Speed'}}</label>
+                <div class="form-fields">
+                    <input type="text" name="data.speed.value" value="{{data.speed.value}}"
+                           placeholder="0" data-dtype="Number">
+                    <span class="sep">{{localize 'SW5E.FeetAbbr'}}</span>
+                    <input type="text" name="data.speed.conditions"
+                           value="{{data.speed.conditions}}">
+                </div>
+            </div>
+            {{/if}}
 
             <h3 class="form-header">{{ localize "SW5E.ItemEquipmentUsage" }}</h3>
 

templates/items/feat.html

@@ -14,7 +14,7 @@
                 <span class="item-status">{{itemStatus}}</span>
             </div>
 
-            <ul class="summary">
+            <ul class="summary flexrow">
                 <li>
                     {{labels.featType}}
                 </li>

templates/items/loot.html

@@ -14,7 +14,7 @@
                 <span class="item-status">{{itemStatus}}</span>
             </div>
 
-            <ul class="summary">
+            <ul class="summary flexrow">
                 <li>
                     <input type="text" name="data.rarity" value="{{data.rarity}}" placeholder="{{ localize 'SW5E.Rarity' }}"/>
                 </li>

templates/items/parts/item-activation.html

@@ -23,6 +23,21 @@
     </div>
 </div>
 
+{{#if isCrewed}}
+<div class="form-group">
+    <label>{{localize 'SW5E.Cover'}}</label>
+    <div class="form-fields">
+        <select name="data.cover" data-dtype="Number">
+            {{#select data.cover}}
+                <option value="">&mdash;</option>
+                {{#each config.cover as |v k|}}
+                    <option value="{{k}}">{{v}}</option>
+                {{/each}}
+            {{/select}}
+        </select>
+    </div>
+</div>
+{{/if}}
 
 {{!-- Ability Target --}}
 <div class="form-group input-select-select">
@@ -48,6 +63,16 @@
     </div>
 </div>
 
+{{!-- Ability Target Width --}}
+{{#if isLine}}
+<div class="form-group input-select-select">
+    <label>{{ localize "SW5E.TargetWidth" }}</label>
+    <div class="form-fields">
+        <input type="text" name="data.target.width" value="{{data.target.width}}" data-dtype="Number" placeholder="-"/>
+    </div>
+</div>
+{{/if}}
+
 {{!-- Ability Range --}}
 <div class="form-group input-select">
     <label>{{ localize "SW5E.Range" }}</label>
@@ -99,4 +124,28 @@
         </select>
     </div>
 </div>
-{{/if}}
+
+{{!-- Consumption --}}
+<div class="form-group uses-per">
+    <label>{{ localize "SW5E.ConsumeTitle" }}</label>
+    <div class="form-fields">
+        <select name="data.consume.type">
+            {{#select data.consume.type}}
+            <option value=""></option>
+            {{#each config.abilityConsumptionTypes as |name key|}}
+            <option value="{{key}}">{{name}}</option>
+            {{/each}}
+            {{/select}}
+        </select>
+        <select name="data.consume.target">
+            {{#select data.consume.target}}
+            <option value=""></option>
+            {{#each abilityConsumptionTargets as |name key|}}
+            <option value="{{key}}">{{name}}</option>
+            {{/each}}
+            {{/select}}
+        </select>
+        <input type="text" name="data.consume.amount" value="{{data.consume.amount}}" data-dtype="Number"/>
+    </div>
+</div>
+{{/if}}

templates/items/parts/item-mountable.html

@@ -0,0 +1,19 @@
+<div class="form-group">
+    <label>{{localize 'SW5E.Health'}}</label>
+    <div class="form-fields">
+        <input type="text" name="data.hp.value" value="{{data.hp.value}}"
+               placeholder="0" data-dtype="Number">
+        <span class="sep">&sol;</span>
+        <input type="text" name="data.hp.max" value="{{data.hp.max}}" placeholder="0"
+               data-dtype="Number">
+        <input type="text" name="data.hp.dt" value="{{data.hp.dt}}" data-dtype="Number"
+               placeholder="{{localize 'SW5E.Threshold'}}">
+    </div>
+</div>
+
+<div class="form-group">
+    <label>{{localize 'SW5E.HealthConditions'}}</label>
+    <div class="form-fields">
+        <input type="text" name="data.hp.conditions" value="{{data.hp.conditions}}">
+    </div>
+</div>

templates/items/power.html

@@ -14,7 +14,7 @@
                 <span class="item-status">{{itemStatus}}</span>
             </div>
 
-            <ul class="summary">
+            <ul class="summary flexrow">
                 <li>
                     {{labels.level}}
                 </li>
@@ -68,12 +68,29 @@
                 </select>
             </div>
 
+            {{!-- Preparation Mode --}}
+            <div class="form-group input-select">
+                <label>{{ localize "SW5E.PowerPreparationMode" }}</label>
+                <div class="form-fields">
+                    <label class="checkbox prepared">
+                        {{ localize "SW5E.PowerPrepared" }} <input type="checkbox" name="data.preparation.prepared" {{checked data.preparation.prepared}}/>
+                    </label>
+                    <select name="data.preparation.mode">
+                        {{#select data.preparation.mode}}
+                        <option value=""></option>
+                        {{#each config.powerPreparationModes as |name key|}}
+                        <option value="{{key}}">{{name}}</option>
+                        {{/each}}
+                        {{/select}}
+                    </select>
+                </div>
+            </div>
             {{!-- Concentration Mode --}}
             <div class="form-group input-select">
                 <label>{{ localize "SW5E.PowerConcentrationMode" }}</label>
                 <div class="form-fields">
-                    <label class="checkbox prepared">
-                        {{ localize "SW5E.Concentrated" }} <input type="checkbox" name="data.preparation.prepared" {{checked data.preparation.prepared}}/>
+                    <label class="checkbox">
+                        <input type="checkbox" name="data.components.concentration" {{checked data.components.concentration}}/> {{ localize "SW5E.Concentrated" }}
                     </label>
                 </div>
             </div>

templates/items/tool.html

@@ -14,7 +14,7 @@
                 <span class="item-status">{{itemStatus}}</span>
             </div>
 
-            <ul class="summary">
+            <ul class="summary flexrow">
                 <li>
                     <input type="text" name="data.rarity" value="{{data.rarity}}" placeholder="{{ localize 'SW5E.Rarity' }}"/>
                 </li>

templates/items/weapon.html

@@ -14,7 +14,7 @@
                 <span class="item-status">{{itemStatus}}</span>
             </div>
 
-            <ul class="summary">
+            <ul class="summary flexrow">
                 <li>
                     {{lookup config.weaponTypes data.weaponType }}
                 </li>
@@ -56,24 +56,27 @@
                 </select>
             </div>
 
+            {{#unless isMountable}}
             {{!-- Weapon Status --}}
             <div class="form-group stacked">
                 <label>{{ localize "SW5E.ItemWeaponStatus" }}</label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.proficient" {{checked data.proficient}}/> {{ localize "SW5E.Proficient" }}
-                </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.equipped" {{checked data.equipped}}/> {{ localize "SW5E.Equipped" }}
-                </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.identified" {{checked data.identified}}/> {{ localize "SW5E.Identified" }}
-                </label>
-                <label class="checkbox">
-                    <input type="checkbox" name="data.attuned" {{checked data.attuned}}/> {{ localize "SW5E.Attuned" }}
-                </label>
+                <div class="form-fields">
+                    <label class="checkbox">
+                        <input type="checkbox" name="data.proficient" {{checked data.proficient}}/> {{ localize "SW5E.Proficient" }}
+                    </label>
+                    <label class="checkbox">
+                        <input type="checkbox" name="data.equipped" {{checked data.equipped}}/> {{ localize "SW5E.Equipped" }}
+                    </label>
+                    <label class="checkbox">
+                        <input type="checkbox" name="data.identified" {{checked data.identified}}/> {{ localize "SW5E.Identified" }}
+                    </label>
+                    <label class="checkbox">
+                        <input type="checkbox" name="data.attuned" {{checked data.attuned}}/> {{ localize "SW5E.Attuned" }}
+                    </label>
+                </div>
             </div>
+            {{/unless}}
 
-			{{#if sss}}
             {{!-- Weapon Properties --}}
             <div class="form-group stacked weapon-properties">
                 <label>{{ localize "SW5E.ItemWeaponProperties" }}</label>
@@ -81,37 +84,21 @@
                 <label class="checkbox">
                     <input type="checkbox" name="data.properties.{{prop}}" {{checked (lookup ../data.properties prop)}}/> {{ name }}
                 </label>
+                <label class="text"> <input type="text" maxlength="2" name="wpNum"/></label>
                 {{/each}}
             </div>
-			{{/if}}
 
-{{#if isWeapon }}			
-<div class="form-group stacked weapon-properties">			
-{{!-- weaponproperties Formula --}}
-<h4 class="weaponproperties-header">
-    {{#unless isWeapon }}{{ localize "SW5E.ArmorProperties" }}{{ else }}{{ localize "SW5E.ItemWeaponProperties" }}{{/unless}}
-    <a class="weaponproperties-control add-weaponproperties"><i class="fas fa-plus"></i></a>
-</h4>
-<ol class="weaponproperties-parts form-group">
-    {{#each data.weaponproperties.parts as |part i| }}
-    <li class="weaponproperties-part flexrow" data-weaponproperties-part="{{i}}">
-        
-        <select name="data.weaponproperties.parts.{{i}}.1">
-            {{#select (lookup this "1") }}
-            <option value="">{{ localize "SW5E.None" }}</option>
-            {{#each ../config.weaponProperties as |name type|}}
-            <option value="{{type}}">{{name}}</option>
-            {{/each}}
-            {{/select}}
-        </select>
-		<input type="text" name="data.weaponproperties.parts.{{i}}.0" value="{{lookup this "0"}}"/>
-        <a class="weaponproperties-control delete-weaponproperties"><i class="fas fa-minus"></i></a>
-    </li>
-    {{/each}}
-</ol>
-{{/if}}
+            {{#if isMountable}}
+            <div class="form-group">
+                <label>{{localize 'SW5E.ArmorClass'}}</label>
+                <div class="form-fields">
+                    <input type="text" name="data.armor.value" value="{{data.armor.value}}"
+                           data-dtype="Number">
+                </div>
+            </div>
 
-</div>
+            {{> 'systems/sw5e/templates/items/parts/item-mountable.html'}}
+            {{/if}}
 
             <h3 class="form-header">{{ localize "SW5E.ItemWeaponUsage" }}</h3>