diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs index 4fe4b5e3..9d5f6a45 100644 --- a/module/applications/sheets/actors/character.mjs +++ b/module/applications/sheets/actors/character.mjs @@ -517,9 +517,10 @@ export default class CharacterSheet extends DHBaseActorSheet { const item = getDocFromElement(event.currentTarget); if (!item) return; - const max = item.system.resource.max ? itemAbleRollParse(item.system.resource.max, this.document, item) : null; + const max = event.currentTarget.max ? Number(event.currentTarget.max) : null; const value = max ? Math.min(Number(event.currentTarget.value), max) : event.currentTarget.value; await item.update({ 'system.resource.value': value }); + this.render(); } async updateItemQuantity(event) { @@ -527,6 +528,7 @@ export default class CharacterSheet extends DHBaseActorSheet { if (!item) return; await item.update({ 'system.quantity': event.currentTarget.value }); + this.render(); } async updateArmorMarks(event) { diff --git a/module/data/fields/actorField.mjs b/module/data/fields/actorField.mjs index 0b1113fb..5fde9394 100644 --- a/module/data/fields/actorField.mjs +++ b/module/data/fields/actorField.mjs @@ -8,7 +8,7 @@ const attributeField = label => const resourceField = (max = 0, label, reverse = false) => new fields.SchemaField({ - value: new fields.NumberField({ initial: 0, integer: true, label }), + value: new fields.NumberField({ initial: 0, min: 0, integer: true, label }), max: new fields.NumberField({ initial: max, integer: true }), isReversed: new fields.BooleanField({ initial: reverse }) }); diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs index 0c919191..6d53fbd2 100644 --- a/module/helpers/handlebarsHelper.mjs +++ b/module/helpers/handlebarsHelper.mjs @@ -47,7 +47,7 @@ export default class RegisterHandlebarsHelpers { static rollParsed(value, actor, item, numerical) { const isNumerical = typeof numerical === 'boolean' ? numerical : false; - const result = itemAbleRollParse(value, actor, item); - return isNumerical && !result ? 0 : result; + const result = itemAbleRollParse(value, actor.getRollData(), item); + return isNumerical ? (!result ? 0 : Number(result)) : result; } } diff --git a/templates/sheets/actors/character/sidebar.hbs b/templates/sheets/actors/character/sidebar.hbs index 860f50cc..dc74d7ae 100644 --- a/templates/sheets/actors/character/sidebar.hbs +++ b/templates/sheets/actors/character/sidebar.hbs @@ -4,20 +4,19 @@ -
-

+

/

{{document.system.resources.hitPoints.max}}

{{localize "DAGGERHEART.GENERAL.HitPoints.short"}}

@@ -26,7 +25,7 @@
-

/

{{document.system.resources.stress.max}}

@@ -34,6 +33,7 @@
diff --git a/templates/sheets/global/partials/inventory-item-V2.hbs b/templates/sheets/global/partials/inventory-item-V2.hbs index 73ae5ae7..8e93ac9e 100644 --- a/templates/sheets/global/partials/inventory-item-V2.hbs +++ b/templates/sheets/global/partials/inventory-item-V2.hbs @@ -186,7 +186,7 @@ Parameters: {{/if}} {{#if (and (not hideResources) item.system.quantity)}}
- +
{{/if}} diff --git a/templates/sheets/global/partials/item-resource.hbs b/templates/sheets/global/partials/item-resource.hbs index d90f0b3f..b29c818e 100644 --- a/templates/sheets/global/partials/item-resource.hbs +++ b/templates/sheets/global/partials/item-resource.hbs @@ -1,7 +1,7 @@ {{#if (eq item.system.resource.type 'simple')}}
- +
{{else}}