cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-21 23:13:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix rolling critical damage after rerolling into a crit

Browse source
This commit is contained in:
Carlos Fernandez 2026-04-01 00:59:16 -04:00
parent 25264c26e9
commit 90d58a55ee
4 changed files with 48 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

1
module/data/chat-message/actorRoll.mjs
View file

@ -40,7 +40,6 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
hasSave: new fields.BooleanField({ initial: false }),
hasTarget: new fields.BooleanField({ initial: false }),
isDirect: new fields.BooleanField({ initial: false }),
isCritical: new fields.BooleanField({ initial: false }),
onSave: new fields.StringField(),
source: new fields.SchemaField({
actor: new fields.StringField(),

7
module/data/fields/action/damageField.mjs
View file

@ -49,11 +49,14 @@ export default class DamageField extends fields.SchemaField {
formulas = DamageField.formatFormulas.call(this, formulas, config);
messageId = config.message?._id ?? messageId;
const message = game.messages.get(messageId);
const damageConfig = {
dialog: {},
...config,
roll: formulas,
data: this.getRollData()
data: this.getRollData(),
isCritical: message?.system.roll.isCritical
};
delete damageConfig.evaluate;
@ -61,7 +64,7 @@ export default class DamageField extends fields.SchemaField {
damageConfig.dialog.configure = false;
if (config.hasSave) config.onSave = damageConfig.onSave = this.save.damageMod;
damageConfig.source.message = config.message?._id ?? messageId;
damageConfig.source.message = messageId;
damageConfig.directDamage = !!damageConfig.source?.message;
// if(damageConfig.source?.message && game.modules.get('dice-so-nice')?.active)

2
module/dice/d20Roll.mjs
View file

@ -207,7 +207,7 @@ export default class D20Roll extends DHRoll {
rerolls: dice.results.filter(x => x.rerolled)
}
}));
data.isCritical = config.isCritical = roll.isCritical;
data.isCritical = roll.isCritical;
data.extra = roll.dice
.filter(d => !roll.baseTerms.includes(d))
.map(d => {

13
module/dice/damageRoll.mjs
View file

@ -138,16 +138,9 @@ export default class DamageRoll extends DHRoll {
}
constructFormula(config) {
this.options.roll.forEach((part, index) => {
for (const [index, part] of this.options.roll.entries()) {
part.roll = new Roll(Roll.replaceFormulaData(part.formula, config.data));
this.constructFormulaPart(config, part, index);
});
return this.options.roll;
}
constructFormulaPart(config, part, index) {
part.roll.terms = Roll.parse(part.roll.formula, config.data);
if (part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
part.modifiers = this.applyBaseBonus(part);
this.addModifiers(part);
@ -186,7 +179,9 @@ export default class DamageRoll extends DHRoll {
}
}
return (part.roll._formula = this.constructor.getFormula(part.roll.terms));
part.roll._formula = this.constructor.getFormula(part.roll.terms);
}
return this.options.roll;
}
/* To Remove When Reaction System */