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/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json index 347f4e09..88ca68b5 100644 --- a/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json +++ b/src/packs/adversaries/adversary_Conscript_99TqczuQipBmaB8i.json @@ -60,6 +60,7 @@ }, "attack": { "name": "Spears", + "img": "icons/weapons/polearms/spear-flared-worn.webp", "range": "veryClose", "roll": { "bonus": 0, diff --git a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json index d8f2376b..1e94b256 100644 --- a/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json +++ b/src/packs/adversaries/adversary_Mortal_Hunter_mVV7a7KQAORoPMgZ.json @@ -74,6 +74,7 @@ "description": "
An undead figure wearing a heavy leather coat, with searching eyes and a casually cruel demeanor.
", "attack": { "name": "Tear at Flesh", + "img": "icons/skills/melee/strike-slashes-red.webp", "roll": { "bonus": 5, "type": "attack" diff --git a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json index 65344f5e..318c51a6 100644 --- a/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json +++ b/src/packs/adversaries/adversary_Spectral_Captain_65cSO3EQEh6ZH6Xk.json @@ -74,6 +74,7 @@ "motivesAndTactics": "Move through solid objects, rally troops, rehash old battles", "attack": { "name": "Longbow", + "img": "icons/weapons/bows/longbow-recurve-skull-brown.webp", "damage": { "parts": [ { diff --git a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json index 6c01352d..743ada61 100644 --- a/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json +++ b/src/packs/adversaries/adversary_Vault_Guardian_Sentinel_FVgYb28fhxlVcGwA.json @@ -68,6 +68,7 @@ "description": "A dust-covered golden construct with boxy limbs and a huge mace for a hand.
", "attack": { "name": "Charged Mace", + "img": "icons/weapons/maces/shortmace-ornate-gold.webp", "range": "veryClose", "roll": { "bonus": 3, 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)}}