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

Critical damage fixes

Browse source
This commit is contained in:
WBHarry 2026-07-17 18:10:08 +02:00
parent ab1772264a
commit 0fe2865e79
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,7 +182,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected); const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
const critSelected = !selectedRoll const critSelected = !selectedRoll
? undefined ? undefined
: (selectedRoll?.rollData?.options?.roll?.isCritical ?? false); : (selectedRoll?.roll?.isCritical ?? false);
partContext.hintText = await this.getInfoTexts(this.party.system.tagTeam.members); partContext.hintText = await this.getInfoTexts(this.party.system.tagTeam.members);
partContext.joinedRoll = await this.getJoinedRoll({ partContext.joinedRoll = await this.getJoinedRoll({
@ -236,7 +236,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
} }
const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected); const selectedRoll = Object.values(this.party.system.tagTeam.members).find(member => member.selected);
const critSelected = !selectedRoll ? undefined : (selectedRoll?.rollData?.options?.roll?.isCritical ?? false); const critSelected = !selectedRoll ? undefined : (selectedRoll?.roll?.isCritical ?? false);
return { return {
...data, ...data,
@ -249,7 +249,7 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
damageRollOptions, damageRollOptions,
damage: data.damageRollData, damage: data.damageRollData,
critDamage: await this.getCriticalDamage(data.damageRollData), critDamage: await this.getCriticalDamage(data.damageRollData),
useCritDamage: critSelected || (critSelected === undefined && data.rollData?.options?.roll?.isCritical) useCritDamage: critSelected || (critSelected === undefined && data.roll?.isCritical)
}; };
} }
@ -629,9 +629,8 @@ export default class TagTeamDialog extends HandlebarsApplicationMixin(Applicatio
secondaryRoll.damageRollData = baseSecondaryRoll.damageRollData ? secondaryRoll.damageRollData = baseSecondaryRoll.damageRollData ?
ChatDamageData.fromJSON(JSON.stringify(baseSecondaryRoll.damageRollData)) : null; ChatDamageData.fromJSON(JSON.stringify(baseSecondaryRoll.damageRollData)) : null;
const systemData = mainRoll.rollData.options; const isCritical = overrideIsCritical ?? mainRoll.roll.isCritical;
const isCritical = overrideIsCritical ?? systemData.roll.isCritical; if (isCritical) mainRoll.damageRollData = await this.getCriticalDamage(mainRoll.damageRollData);
if (isCritical) mainRoll.damageRollData = await this.getCriticalDamage(systemData.damageRollData);
if (secondaryRoll.damageRollData) { if (secondaryRoll.damageRollData) {
const secondaryDamage = (displayVersion ? overrideIsCritical : isCritical) const secondaryDamage = (displayVersion ? overrideIsCritical : isCritical)