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

21
module/applications/dialogs/damageDialog.mjs
View file

@ -6,6 +6,11 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
this.roll = roll;
this.config = config;
/** The original isCritical state before any alterations in the dialog.
* Used for checking if the state has been altered
*/
this.originalIsCritical = config.isCritical;
this.selectedEffects = this.config.bonusEffects;
}
@ -121,6 +126,22 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
}
static async submitRoll() {
/* Sideeffect occuring in constructFormulas that sets this.config.isCritical to the false value. Can remove the below if it can be prevented */
const sideEffectSafeIsCritical = this.config.isCritical;
const { damageFormula, resourceFormulas } = this.roll.constructFormulas({ ...this.config, isCritical: false });
this.config.isCritical = sideEffectSafeIsCritical;
/* If the isCritical state has been altered in the dialog, we update the roll options */
if (this.config.isCritical !== this.originalIsCritical) {
damageFormula.roll.options.isCritical = this.config.isCritical;
for (const formula of resourceFormulas)
formula.roll.optionsisCritical = this.config.isCritical;
}
this.config.damageFormula = damageFormula;
this.config.resourceFormulas = resourceFormulas;
await this.close({ submitted: true });
}