Merge branch 'main' into release

module/data/fields/actorField.mjs

@@ -82,6 +82,24 @@ class ResourcesField extends fields.TypedObjectField {
         }
         return data;
     }
+
+    /** 
+     * Foundry bar attributes are unable to handle finding the schema field nor the label normally.
+     * This returns the element if its a valid resource key and overwrites the element's label for that retrieval.
+     */
+    _getField(path) {
+        if ( path.length === 0 ) return this;
+        const first = path.shift();
+        if (first === this.element.name) return this.element_getField(path);
+        
+        const resources = CONFIG.DH.RESOURCE[this.actorType].all;
+        if (first in resources) {
+            this.element.label = resources[first].label;
+            return this.element._getField(path);
+        }
+
+        return undefined;
+    }
 }
 
 export { attributeField, ResourcesField, stressDamageReductionRule, bonusField };

src/packs/items/weapons/weapon_Knuckle_Blades_U8gfyvxoHm024inM.json

@@ -33,7 +33,7 @@
     "tier": 2,
     "equipped": false,
     "secondary": false,
-    "burden": "oneHanded",
+    "burden": "twoHanded",
     "weaponFeatures": [
       {
         "value": "brutal",

system.json

@@ -2,7 +2,7 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.9.1",
+    "version": "1.9.2",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",

templates/sheets/global/partials/inventory-item-V2.hbs

@@ -40,23 +40,20 @@ Parameters:
 
     {{!-- Name & Tags --}}
     <div class="item-label" draggable="true">
+        {{!-- Item Name --}}
+        <span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
 
-      {{!-- Item Name --}}
+        {{!-- Tags Start --}}
-      <span class="item-name">{{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}<span class="expanded-icon"><i class="fa-solid fa-expand"></i></span>{{/unless}}</span>
-
-      {{!-- Tags Start --}}
         {{#if (not ../hideTags)}}
-          {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item  }}
+            {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item}}
-            {{#if (eq ../type 'feature')}}
+                {{#if (eq ../type 'feature')}}
-                {{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
+                    {{#if (and system.featureForm (or (eq @root.document.type "adversary") (eq @root.document.type "environment")))}}
-                    {{#if system.featureForm}}
                         <div class="tag feature-form">
                             <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
                         </div>
                     {{/if}}
                 {{/if}}
-            {{/if}}
+            {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}}
-          {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}}
         {{/if}}
 
       {{!--Tags End --}}

templates/sheets/global/partials/item-tags.hbs

@@ -4,5 +4,5 @@
             {{tag}}
         </div>
     {{/each}}
-    {{#if @partial-block}}{{> @partial-block}}{{/if}}
+    {{> @partial-block}}
 </div>