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

[Fix] 1325 - Weapon Tooltip Damage Formula (#1355)

Browse source 
* Fixed so the damage calculation is correct. Fixed so the right tooltip is shown for attacks

* Moved the damageFormula function to damageAction
This commit is contained in:
WBHarry 2025-12-06 15:16:34 +01:00 • committed by GitHub
parent b57e98071f
commit 6d8d773a26
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 45 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

13
module/data/action/damageAction.mjs
View file

@ -2,4 +2,17 @@ import DHBaseAction from './baseAction.mjs';
export default class DHDamageAction extends DHBaseAction {
static extraSchemas = [...super.extraSchemas, 'damage', 'target', 'effects'];
/**
* Return a display ready damage formula string
* @returns Formula string
*/
getDamageFormula() {
const strings = [];
for (const { value } of this.damage.parts) {
strings.push(Roll.replaceFormulaData(value.getFormula(), this.actor?.getRollData() ?? {}));
}
return strings.join(' + ');
}
}

10
module/helpers/handlebarsHelper.mjs
View file

@ -35,14 +35,8 @@ export default class RegisterHandlebarsHelpers {
return accum;
}
static damageFormula(attack, actor) {
const traitTotal = actor.system.traits?.[attack.roll.trait]?.value;
const instances = [
attack.damage.parts.map(x => Roll.replaceFormulaData(x.value.getFormula(), actor)).join(' + '),
traitTotal
].filter(x => x);
return instances.join(traitTotal > 0 ? ' + ' : ' - ');
static damageFormula(attack) {
return attack.getDamageFormula();
}
static formulaValue(formula, item) {

6
templates/sheets/actors/adversary/sidebar.hbs
View file

@ -64,9 +64,9 @@
</div>
<ul class="items-sidebar-list">
{{> 'daggerheart.inventory-item-compact'
item=document.system.attack
type='action'
noCompendiumEdit=true
item=document.system.attack
type='attack'
noCompendiumEdit=true
}}
</ul>
</div>

10
templates/sheets/actors/character/sidebar.hbs
View file

@ -104,16 +104,16 @@
</div>
<ul class="items-sidebar-list">
{{#if document.system.usedUnarmed}}
{{> 'daggerheart.inventory-item-compact'
{{> 'daggerheart.inventory-item-compact'
item=document.system.usedUnarmed
type='action'
}}
type='attack'
}}
{{/if}}
{{#each document.items as |item|}}
{{#if item.system.equipped}}
{{> 'daggerheart.inventory-item-compact'
item=item
type=item.type
item=item
type=item.type
}}
{{/if}}
{{/each}}

2
templates/sheets/actors/companion/details.hbs
View file

@ -28,7 +28,7 @@
<ul class="items-list">
{{> 'daggerheart.inventory-item-compact'
item=document.system.attack
type='action'
type='attack'
hideTooltip=true
}}
</ul>

2
templates/ui/tooltip/adversary.hbs
View file

@ -44,7 +44,7 @@
</div>
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
<div>{{damageFormula item.system.attack item}}</div>
<div>{{damageFormula item.system.attack}}</div>
</div>
</div>

32
templates/ui/tooltip/attack.hbs
View file

@ -4,22 +4,28 @@
<div class="tooltip-description">{{{description}}}</div>
<div class="tooltip-information-section spaced">
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
{{#with (lookup config.ACTOR.abilities attack.roll.trait) as | trait |}}
<div>{{localize trait.label}}</div>
{{/with}}
</div>
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
{{#with (lookup config.GENERAL.range attack.range) as | range |}}
<div>{{localize range.label}}</div>
{{/with}}
</div>
{{#if (lookup config.ACTOR.abilities attack.roll.trait)}}
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.Trait.single"}}</label>
{{#with (lookup config.ACTOR.abilities attack.roll.trait) as | trait |}}
<div>{{localize trait.label}}</div>
{{/with}}
</div>
{{/if}}
{{#if (lookup config.GENERAL.range attack.range)}}
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.range"}}</label>
{{#with (lookup config.GENERAL.range attack.range) as | range |}}
<div>{{localize range.label}}</div>
{{/with}}
</div>
{{/if}}
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
<div>{{{damageFormula attack parent}}}</div>
<div>{{{damageFormula attack}}}</div>
</div>
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>

2
templates/ui/tooltip/weapon.hbs
View file

@ -30,7 +30,7 @@
</div>
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.damage"}}</label>
<div>{{{damageFormula item.system.attack item.parent}}}</div>
<div>{{{damageFormula item.system.attack}}}</div>
</div>
<div class="tooltip-information">
<label>{{localize "DAGGERHEART.GENERAL.damageType"}}</label>