Merged with main

This commit is contained in:
WBHarry 2026-03-15 11:45:21 +01:00
commit e77b927a75
4 changed files with 27 additions and 12 deletions

View file

@ -82,6 +82,24 @@ class ResourcesField extends fields.TypedObjectField {
} }
return data; 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 }; export { attributeField, ResourcesField, stressDamageReductionRule, bonusField };

View file

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

View file

@ -40,7 +40,6 @@ Parameters:
{{!-- Name & Tags --}} {{!-- Name & Tags --}}
<div class="item-label" draggable="true"> <div class="item-label" draggable="true">
{{!-- Item Name --}} {{!-- 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> <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>
@ -48,14 +47,12 @@ Parameters:
{{#if (not ../hideTags)}} {{#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"> <div class="tag feature-form">
<span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span> <span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/if}}
{{/if}}
{{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}} {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}}
{{/if}} {{/if}}

View file

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