cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-12 11:41:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix healing bonuses (#650)

Browse source
This commit is contained in:
Dapoulp 2025-08-06 17:25:01 +02:00 • committed by GitHub
parent 2554803741
commit dd585a5e93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
module/applications/dialogs/damageDialog.mjs
View file

@ -38,7 +38,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
}; };
get title() { 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) { async _prepareContext(_options) {
@ -46,7 +46,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
context.config = CONFIG.DH; context.config = CONFIG.DH;
context.title = this.config.title ?? this.title; context.title = this.config.title ?? this.title;
context.formula = this.roll.constructFormula(this.config); context.formula = this.roll.constructFormula(this.config);
context.isHealing = this.config.isHealing; context.hasHealing = this.config.hasHealing;
context.directDamage = this.config.directDamage; context.directDamage = this.config.directDamage;
context.selectedRollMode = this.config.selectedRollMode; context.selectedRollMode = this.config.selectedRollMode;
context.rollModes = Object.entries(CONFIG.Dice.rollModes).map(([action, { label, icon }]) => ({ context.rollModes = Object.entries(CONFIG.Dice.rollModes).map(([action, { label, icon }]) => ({

4
module/dice/damageRoll.mjs
View file

@ -84,11 +84,11 @@ export default class DamageRoll extends DHRoll {
applyBaseBonus(part) { applyBaseBonus(part) {
const modifiers = [], const modifiers = [],
type = this.options.messageType ?? (this.options.isHealing ? 'healing' : 'damage'), type = this.options.messageType ?? (this.options.hasHealing ? 'healing' : 'damage'),
options = part ?? this.options; options = part ?? this.options;
modifiers.push(...this.getBonus(`${type}`, `${type.capitalize()} Bonus`)); modifiers.push(...this.getBonus(`${type}`, `${type.capitalize()} Bonus`));
if (!this.options.isHealing) { if (!this.options.hasHealing) {
options.damageTypes?.forEach(t => { options.damageTypes?.forEach(t => {
modifiers.push(...this.getBonus(`${type}.${t}`, `${t.capitalize()} ${type.capitalize()} Bonus`)); modifiers.push(...this.getBonus(`${type}.${t}`, `${t.capitalize()} ${type.capitalize()} Bonus`));
}); });

2
templates/dialogs/dice-roll/damageSelection.hbs
View file

@ -9,7 +9,7 @@
{{#with (lookup @root.config.GENERAL.healingTypes applyTo)}} {{#with (lookup @root.config.GENERAL.healingTypes applyTo)}}
{{localize label}} {{localize label}}
{{/with}} {{/with}}
{{#unless @root.isHealing}} {{#unless @root.hasHealing}}
{{#if damageTypes}} {{#if damageTypes}}
{{#each damageTypes as | type | }} {{#each damageTypes as | type | }}
{{#with (lookup @root.config.GENERAL.damageTypes type)}} {{#with (lookup @root.config.GENERAL.damageTypes type)}}