fix: working item sheets

Author: anthonyronda

src/lang/en.json

@@ -216,8 +216,8 @@
   "OSE.items.Armors": "Armors",
   "OSE.items.Weight": "Wgt.",
   "OSE.items.WeightLong": "Weight",
-  "OSE.items.ItemBasedEncumberance": "Enc.",
-  "OSE.items.ItemBasedEncumberanceLong": "Item-Based Encumbrance",
+  "OSE.items.ItemBasedEncumbrance": "Enc.",
+  "OSE.items.ItemBasedEncumbranceLong": "Item-Based Encumbrance",
   "OSE.items.Qualities": "Qualities",
   "OSE.items.Notes": "Notes",
   "OSE.items.Cost": "Cost",

src/module/item/entity.js

@@ -31,6 +31,16 @@ export default class OseItem extends Item {
     if (source?.img === "" && source.type) {
       source.img = this.defaultIcons(source.type);
     }
+    if (source?.system?.itemslots === undefined) {
+      if (
+        source?.system?.tags.some((tag) => tag.value === "Two-handed") &&
+        source.type === "weapon"
+      )
+        source.system.itemslots = 2;
+      if (source?.system?.type === "heavy" && source.type === "armor")
+        source.system.itemslots = 2;
+    }
+
     return source;
   }
 

src/module/item/item-sheet.js

@@ -45,7 +45,10 @@ export default class OseItemSheet extends ItemSheet {
   async getData() {
     const { data } = super.getData();
     data.editable = this.document.sheet.isEditable;
-    data.config = CONFIG.OSE;
+    data.config = {
+      ...CONFIG.OSE,
+      encumbrance: game.settings.get(game.system.id, "encumbranceOption"),
+    };
     data.enriched = {
       description: await TextEditor.enrichHTML(
         this.item.system?.description || "",

src/templates/items/armor-sheet.html

@@ -74,8 +74,21 @@ <h1 class="charname">
             />
           </div>
         </div>
+        {{#unless (eq @root.config.encumbrance 'itembased')}}
         <div class="form-group">
-          <label>{{root.parent.system.encumbrance.variant}}{{#unless (eq @root.parent.system.encumbrance.variant 'itembased')}}{{localize 'OSE.items.Weight'}}{{else}}{{localize 'OSE.items.ItemBasedEncumbrance'}}{{/unless}}</label>
+          <label>{{localize 'OSE.items.Weight'}}</label>
+          <div class="form-fields">
+            <input
+              type="text"
+              name="system.weight"
+              value="{{system.weight}}"
+              data-dtype="Number"
+            />
+          </div>
+        </div>
+        {{else}}
+        <div class="form-group">
+          <label>{{localize 'OSE.items.ItemBasedEncumbrance'}}</label>
           <div class="form-fields">
             <input
               type="text"
@@ -85,6 +98,7 @@ <h1 class="charname">
             />
           </div>
         </div>
+        {{/unless}}
       </div>
       <div class="description">
         {{editor enriched.description target="system.description"

src/templates/items/container-sheet.html

@@ -21,8 +21,9 @@ <h1 class="charname">
             />
           </div>
         </div>
+        {{#unless (eq @root.config.encumbrance 'itembased')}}
         <div class="form-group">
-          <label>{{#unless (eq @root.system.encumbrance.variant 'itembased')}}{{localize 'OSE.items.Weight'}}{{else}}{{localize 'OSE.items.ItemBasedEncumbrance'}}{{/unless}}</label>
+          <label>{{localize 'OSE.items.Weight'}}</label>
           <div class="form-fields">
             <input
               type="text"
@@ -32,6 +33,19 @@ <h1 class="charname">
             />
           </div>
         </div>
+        {{else}}
+        <div class="form-group">
+          <label>{{localize 'OSE.items.ItemBasedEncumbrance'}}</label>
+          <div class="form-fields">
+            <input
+              type="text"
+              name="system.itemslots"
+              value="{{system.itemslots}}"
+              data-dtype="Number"
+            />
+          </div>
+        </div>
+        {{/unless}}
       </div>
       <div class="description weapon-editor">
         {{editor enriched.description

src/templates/items/item-sheet.html

@@ -68,8 +68,9 @@ <h1 class="charname">
             />
           </div>
         </div>
+        {{#unless (eq @root.config.encumbrance 'itembased')}}
         <div class="form-group">
-          <label>{{#unless (eq @root.system.encumbrance.variant 'itembased')}}{{localize 'OSE.items.Weight'}}{{else}}{{localize 'OSE.items.ItemBasedEncumbrance'}}{{/unless}}</label>
+          <label>{{localize 'OSE.items.Weight'}}</label>
           <div class="form-fields">
             <input
               type="text"
@@ -79,6 +80,19 @@ <h1 class="charname">
             />
           </div>
         </div>
+        {{else}}
+        <div class="form-group">
+          <label>{{localize 'OSE.items.ItemBasedEncumbrance'}}</label>
+          <div class="form-fields">
+            <input
+              type="text"
+              name="system.itemslots"
+              value="{{system.itemslots}}"
+              data-dtype="Number"
+            />
+          </div>
+        </div>
+        {{/unless}}
       </div>
       <div class="description weapon-editor">
         {{editor enriched.description

src/templates/items/weapon-sheet.html

@@ -20,8 +20,9 @@ <h1 class="charname">
               />
             </div>
           </div>
+          {{#unless (eq @root.config.encumbrance 'itembased')}}
           <div class="form-group">
-            <label title="{{#unless (eq @root.system.encumbrance.variant 'itembased')}}{{localize 'OSE.items.WeightLong'}}{{else}}{{localize 'OSE.items.ItemBasedEncumbranceLong'}}{{/unless}}"
+            <label title="{{localize 'OSE.items.WeightLong'}}"
               ><i class="fas fa-weight-hanging"></i
             ></label>
             <div class="form-fields">
@@ -33,6 +34,21 @@ <h1 class="charname">
               />
             </div>
           </div>
+          {{else}}
+          <div class="form-group">
+            <label title="{{localize 'OSE.items.ItemBasedEncumbranceLong'}}"
+              ><i class="fas fa-weight-hanging"></i
+            ></label>
+            <div class="form-fields">
+              <input
+                type="text"
+                name="system.itemslots"
+                value="{{system.itemslots}}"
+                data-dtype="Number"
+              />
+            </div>
+          </div>
+          {{/unless}}
         </div>
       </div>
       <ol class="tag-list">