diff --git a/module/data/fields/actorField.mjs b/module/data/fields/actorField.mjs index 25e04317..69ba6bf1 100644 --- a/module/data/fields/actorField.mjs +++ b/module/data/fields/actorField.mjs @@ -82,24 +82,6 @@ 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 }; diff --git a/src/packs/items/weapons/weapon_Knuckle_Blades_U8gfyvxoHm024inM.json b/src/packs/items/weapons/weapon_Knuckle_Blades_U8gfyvxoHm024inM.json index ffe92071..56ff6d62 100644 --- a/src/packs/items/weapons/weapon_Knuckle_Blades_U8gfyvxoHm024inM.json +++ b/src/packs/items/weapons/weapon_Knuckle_Blades_U8gfyvxoHm024inM.json @@ -33,7 +33,7 @@ "tier": 2, "equipped": false, "secondary": false, - "burden": "twoHanded", + "burden": "oneHanded", "weaponFeatures": [ { "value": "brutal", diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs index a758a28f..86d2e2d3 100644 --- a/templates/sheets/global/partials/inventory-item-V2.hbs +++ b/templates/sheets/global/partials/inventory-item-V2.hbs @@ -40,20 +40,23 @@ Parameters: {{!-- Name & Tags --}}
- {{!-- Item Name --}} - {{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}{{/unless}} - {{!-- Tags Start --}} + {{!-- Item Name --}} + {{localize item.name}} {{#unless (or noExtensible (not item.system.description))}}{{/unless}} + + {{!-- Tags Start --}} {{#if (not ../hideTags)}} - {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item}} - {{#if (eq ../type 'feature')}} - {{#if (and system.featureForm (or (eq @root.document.type "adversary") (eq @root.document.type "environment")))}} + {{#> "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs" item }} + {{#if (eq ../type 'feature')}} + {{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}} + {{#if system.featureForm}}
{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}
{{/if}} {{/if}} - {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}} + {{/if}} + {{/ "systems/daggerheart/templates/sheets/global/partials/item-tags.hbs"}} {{/if}} {{!--Tags End --}} diff --git a/templates/sheets/global/partials/item-tags.hbs b/templates/sheets/global/partials/item-tags.hbs index 2edc1eac..b30fcbf2 100644 --- a/templates/sheets/global/partials/item-tags.hbs +++ b/templates/sheets/global/partials/item-tags.hbs @@ -4,5 +4,5 @@ {{tag}}
{{/each}} - {{> @partial-block}} + {{#if @partial-block}}{{> @partial-block}}{{/if}} \ No newline at end of file