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

[Fix] 2094 - Critical Damage (#2096)
Some checks failed
Project CI / build (24.x) (push) Has been cancelled
Details

Browse source
This commit is contained in:
WBHarry 2026-07-24 01:36:55 +02:00 • committed by GitHub
parent 66ddb5c032
commit 7fd2a7f17e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 109 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs
View file

@ -1,5 +1,5 @@
{{#if damage.main}}
{{> damage roll=damage.main label=(localize "DAGGERHEART.GENERAL.damage") memberKey=key}}
{{> damage roll=damage.main label=(localize "DAGGERHEART.GENERAL.damage") memberKey=key isCritical=isCritical}}
{{/if}}
{{#each damage.resources as |roll key|}}

27
templates/dialogs/tagTeamDialog/result.hbs
View file

@ -6,23 +6,14 @@
{{#if hintText}}
<div class="hint">{{localize hintText}}</div>
{{else}}
{{#if joinedRoll.rollData}}
<div class="result-container">
<span class="result-section-label">{{localize "DAGGERHEART.GENERAL.dualityRoll"}}</span>
<div class="result-info">
<div class="damage-info">{{joinedRoll.rollData.total}}</div>
<div>{{localize "DAGGERHEART.GENERAL.withThing" thing=joinedRoll.roll.totalLabel}}</div>
</div>
</div>
{{/if}}
{{#if joinedRoll.damageRollData}}
<div class="result-container">
<span class="result-section-label">{{localize "DAGGERHEART.GENERAL.damage"}}</span>
{{#each joinedRoll.damageRollData.types as |damage key|}}
<div class="result-info">
<div>{{localize (concat "DAGGERHEART.CONFIG.HealingType." key ".name")}}</div>
<div class="damage-info">{{damage.total}}</div>
</div>
<div class="damage-info">{{joinedRoll.rollData.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=joinedRoll.roll.totalLabel}}</div>
{{#if joinedRoll.damageRollData.main}}
{{> damageSummary roll=joinedRoll.damageRollData.main label=(localize "DAGGERHEART.GENERAL.damage")}}
{{/if}}
{{#each joinedRoll.damageRollData.resources as |roll key|}}
{{> damageSummary roll=roll label=(localize (concat "DAGGERHEART.CONFIG.HealingType." key ".name"))}}
{{/each}}
</div>
{{/if}}
@ -38,4 +29,8 @@
</button>
</div>
</div>
</section>
</section>
{{#*inline "damageSummary"}}
<div>{{label}} {{roll.total}}</div>
{{/inline}}

6
templates/dialogs/tagTeamDialog/tagTeamMember.hbs
View file

@ -109,11 +109,7 @@
</div>
</span>
{{#if damage.active}}
{{#if useCritDamage}}
{{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=critDamage isCritical=true }}
{{else}}
{{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=damage }}
{{/if}}
{{> "systems/daggerheart/templates/dialogs/tagTeamDialog/parts/tagTeamDamageParts.hbs" damage=damage isCritical=isCritical }}
{{else}}
<span class="hint">{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.makeYourRoll"}}</span>
{{/if}}

2
templates/ui/chat/parts/damage-part.hbs
View file

@ -4,7 +4,7 @@
{{#if hasHealing}}
<span>{{localize "DAGGERHEART.ACTIONS.TYPES.healing.name"}}</span>
{{else}}
<span>{{localize (ifThen roll.isCritical "DAGGERHEART.ACTIONS.TYPES.damage.critical" "DAGGERHEART.ACTIONS.TYPES.damage.name")}}</span>
<span>{{localize (ifThen damage.main.isCritical "DAGGERHEART.ACTIONS.TYPES.damage.critical" "DAGGERHEART.ACTIONS.TYPES.damage.name")}}</span>
{{/if}}
</div>
</div>