From dd585a5e930c80d7e4fe9172b7b24920e7ee8880 Mon Sep 17 00:00:00 2001 From: Dapoulp <74197441+Dapoulp@users.noreply.github.com> Date: Wed, 6 Aug 2025 17:25:01 +0200 Subject: [PATCH] Fix healing bonuses (#650) --- module/applications/dialogs/damageDialog.mjs | 4 ++-- module/dice/damageRoll.mjs | 4 ++-- templates/dialogs/dice-roll/damageSelection.hbs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/applications/dialogs/damageDialog.mjs b/module/applications/dialogs/damageDialog.mjs index cffa6433..42fe10c5 100644 --- a/module/applications/dialogs/damageDialog.mjs +++ b/module/applications/dialogs/damageDialog.mjs @@ -38,7 +38,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application }; get title() { - return game.i18n.localize(`DAGGERHEART.EFFECTS.ApplyLocations.${this.config.isHealing ? 'healing' : 'damage'}Roll.name`); + return game.i18n.localize(`DAGGERHEART.EFFECTS.ApplyLocations.${this.config.hasHealing ? 'healing' : 'damage'}Roll.name`); } async _prepareContext(_options) { @@ -46,7 +46,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application context.config = CONFIG.DH; context.title = this.config.title ?? this.title; context.formula = this.roll.constructFormula(this.config); - context.isHealing = this.config.isHealing; + context.hasHealing = this.config.hasHealing; context.directDamage = this.config.directDamage; context.selectedRollMode = this.config.selectedRollMode; context.rollModes = Object.entries(CONFIG.Dice.rollModes).map(([action, { label, icon }]) => ({ diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs index be49d685..11d317aa 100644 --- a/module/dice/damageRoll.mjs +++ b/module/dice/damageRoll.mjs @@ -84,11 +84,11 @@ export default class DamageRoll extends DHRoll { applyBaseBonus(part) { const modifiers = [], - type = this.options.messageType ?? (this.options.isHealing ? 'healing' : 'damage'), + type = this.options.messageType ?? (this.options.hasHealing ? 'healing' : 'damage'), options = part ?? this.options; modifiers.push(...this.getBonus(`${type}`, `${type.capitalize()} Bonus`)); - if (!this.options.isHealing) { + if (!this.options.hasHealing) { options.damageTypes?.forEach(t => { modifiers.push(...this.getBonus(`${type}.${t}`, `${t.capitalize()} ${type.capitalize()} Bonus`)); }); diff --git a/templates/dialogs/dice-roll/damageSelection.hbs b/templates/dialogs/dice-roll/damageSelection.hbs index b5b316e7..2967b675 100644 --- a/templates/dialogs/dice-roll/damageSelection.hbs +++ b/templates/dialogs/dice-roll/damageSelection.hbs @@ -9,7 +9,7 @@ {{#with (lookup @root.config.GENERAL.healingTypes applyTo)}} {{localize label}} {{/with}} - {{#unless @root.isHealing}} + {{#unless @root.hasHealing}} {{#if damageTypes}} {{#each damageTypes as | type | }} {{#with (lookup @root.config.GENERAL.damageTypes type)}}