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

Improved TagTeamDialog Results section

Browse source
This commit is contained in:
WBHarry 2026-07-19 22:59:45 +02:00
parent bbf27e5b4d
commit 76aabb235d
5 changed files with 11 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

11
module/applications/dialogs/tagTeamDialog.mjs
View file

@ -236,11 +236,11 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
} }
} }
const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
const critSelected = !selectedRoll ? undefined : (selectedRoll?.roll?.isCritical ?? false);
const isCritical = critSelected || (critSelected === undefined && data.roll?.isCritical);
if (data.damageRollData.main) { if (data.damageRollData.main) {
const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected); data.damageRollData.main.options.isCritical = isCritical;
const critSelected = !selectedRoll ? undefined : (selectedRoll?.roll?.isCritical ?? false);
const useCritDamage = critSelected || (critSelected === undefined && data.roll?.isCritical);
data.damageRollData.main.options.isCritical = useCritDamage;
} }
return { return {
@ -253,8 +253,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
rollOptions, rollOptions,
damageRollOptions, damageRollOptions,
damage: data.damageRollData, damage: data.damageRollData,
critDamage: this.getCriticalDamage(data.damageRollData), isCritical
useCritDamage: false
}; };
} }

7
styles/less/dialog/tag-team-dialog/sheet.less
View file

@ -252,11 +252,8 @@
width: 100%; width: 100%;
text-align: center; text-align: center;
.result-info { .damage-info {
display: flex; text-decoration: underline;
gap: 4px;
align-items: center;
justify-content: center;
} }
} }
} }

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

@ -1,5 +1,5 @@
{{#if damage.main}} {{#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}} {{/if}}
{{#each damage.resources as |roll key|}} {{#each damage.resources as |roll key|}}

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

@ -6,18 +6,9 @@
{{#if hintText}} {{#if hintText}}
<div class="hint">{{localize hintText}}</div> <div class="hint">{{localize hintText}}</div>
{{else}} {{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}} {{#if joinedRoll.damageRollData}}
<div class="result-container"> <div class="result-container">
<span class="result-section-label">{{localize "DAGGERHEART.GENERAL.damage"}}</span> <div class="damage-info">{{joinedRoll.rollData.total}} {{localize "DAGGERHEART.GENERAL.withThing" thing=joinedRoll.roll.totalLabel}}</div>
{{#if joinedRoll.damageRollData.main}} {{#if joinedRoll.damageRollData.main}}
{{> damageSummary roll=joinedRoll.damageRollData.main label=(localize "DAGGERHEART.GENERAL.damage")}} {{> damageSummary roll=joinedRoll.damageRollData.main label=(localize "DAGGERHEART.GENERAL.damage")}}
{{/if}} {{/if}}
@ -41,8 +32,5 @@
</section> </section>
{{#*inline "damageSummary"}} {{#*inline "damageSummary"}}
<div class="result-info"> <div>{{label}} {{roll.total}}</div>
<div>{{label}}</div>
<div class="damage-info">{{roll.total}}</div>
</div>
{{/inline}} {{/inline}}

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

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