cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-12 03:31:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Critical Damage formula (#258)

Browse source
This commit is contained in:
Dapoulp 2025-07-04 13:18:48 +02:00 • committed by GitHub
parent 064011fffa
commit 099a4576da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
module/applications/roll.mjs
View file

@ -1,4 +1,3 @@
import DHDamageRoll from '../data/chat-message/damageRoll.mjs';
import D20RollDialog from '../dialogs/d20RollDialog.mjs'; import D20RollDialog from '../dialogs/d20RollDialog.mjs';
import DamageDialog from '../dialogs/damageDialog.mjs'; import DamageDialog from '../dialogs/damageDialog.mjs';
import { setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs'; import { setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs';
@ -124,16 +123,17 @@ export class DHRoll extends Roll {
return (this._formula = this.constructor.getFormula(this.terms)); return (this._formula = this.constructor.getFormula(this.terms));
} }
static calculateTotalModifiers(roll, config) { static calculateTotalModifiers(roll) {
config.roll.modifierTotal = 0; let modifierTotal = 0;
for (let i = 0; i < roll.terms.length; i++) { for (let i = 0; i < roll.terms.length; i++) {
if ( if (
roll.terms[i] instanceof foundry.dice.terms.NumericTerm && roll.terms[i] instanceof foundry.dice.terms.NumericTerm &&
!!roll.terms[i - 1] && !!roll.terms[i - 1] &&
roll.terms[i - 1] instanceof foundry.dice.terms.OperatorTerm roll.terms[i - 1] instanceof foundry.dice.terms.OperatorTerm
) )
config.roll.modifierTotal += Number(`${roll.terms[i - 1].operator}${roll.terms[i].total}`); modifierTotal += Number(`${roll.terms[i - 1].operator}${roll.terms[i].total}`);
} }
return modifierTotal;
} }
} }
@ -302,6 +302,7 @@ export class D20Roll extends DHRoll {
dice: roll.dAdvantage?.denomination, dice: roll.dAdvantage?.denomination,
value: roll.dAdvantage?.total value: roll.dAdvantage?.total
}; };
config.roll.isCritical = roll.isCritical;
config.roll.extra = roll.dice config.roll.extra = roll.dice
.filter(d => !roll.baseTerms.includes(d)) .filter(d => !roll.baseTerms.includes(d))
.map(d => { .map(d => {
@ -310,8 +311,7 @@ export class D20Roll extends DHRoll {
value: d.total value: d.total
}; };
}); });
config.roll.modifierTotal = this.calculateTotalModifiers(roll);
this.calculateTotalModifiers(roll, config);
} }
resetFormula() { resetFormula() {
@ -472,10 +472,20 @@ export class DamageRoll extends DHRoll {
static async postEvaluate(roll, config = {}) { static async postEvaluate(roll, config = {}) {
super.postEvaluate(roll, config); super.postEvaluate(roll, config);
config.roll.type = config.type; config.roll.type = config.type;
this.calculateTotalModifiers(roll, config); config.roll.modifierTotal = this.calculateTotalModifiers(roll);
if (config.source?.message) { if (config.source?.message) {
const chatMessage = ui.chat.collection.get(config.source.message); const chatMessage = ui.chat.collection.get(config.source.message);
chatMessage.update({ 'system.damage': config }); chatMessage.update({ 'system.damage': config });
} }
} }
constructFormula(config) {
super.constructFormula(config);
if(config.isCritical) {
const tmpRoll = new Roll(this._formula)._evaluateSync({maximize: true}),
criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll);
this.terms.push(...this.formatModifier(criticalBonus));
}
return (this._formula = this.constructor.getFormula(this.terms));
}
} }

1
module/data/action/action.mjs
View file

@ -599,6 +599,7 @@ export class DHDamageAction extends DHBaseAction {
roll: { formula }, roll: { formula },
targets: data.system?.targets.filter(t => t.hit) ?? data.targets, targets: data.system?.targets.filter(t => t.hit) ?? data.targets,
hasSave: this.hasSave, hasSave: this.hasSave,
isCritical: data.system?.roll?.isCritical ?? false,
source: data.system?.source, source: data.system?.source,
event event
}; };