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

Fixed so that DamageRolls are actually stored with class='DamageRoll' in the chatMessage so they don't get instantiated as BaseRoll

Browse source
This commit is contained in:
WBHarry 2026-07-19 16:52:23 +02:00
parent 863b5116f7
commit 14edc7f4ca
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,7 +203,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
const oldRoll = damageData.parts[0]?.roll; const oldRoll = damageData.parts[0]?.roll;
return oldRoll ? JSON.stringify({ return oldRoll ? JSON.stringify({
...oldRoll, ...oldRoll,
class: 'BaseRoll', class: 'DamageRoll',
options: { options: {
...oldRoll.options, ...oldRoll.options,
damageTypes: damageData.parts[0].damageTypes ?? [] damageTypes: damageData.parts[0].damageTypes ?? []

2
module/data/chat-message/chatDamageData.mjs
View file

@ -28,7 +28,7 @@ export class ChatDamageData extends foundry.abstract.DataModel {
} }
_prepareRolls() { _prepareRolls() {
this.main &&= Roll.fromData({ ...this.main, class: 'DamageRoll' }); // Temp overriding to DamageRoll. Should be properly saved on creation instead this.main &&= Roll.fromData(this.main);
for (const key of Object.keys(this.resources)) { for (const key of Object.keys(this.resources)) {
this.resources[key] = Roll.fromData(this.resources[key]); this.resources[key] = Roll.fromData(this.resources[key]);
} }

2
module/dice/damageRoll.mjs
View file

@ -156,7 +156,7 @@ export default class DamageRoll extends DHRoll {
if (!formulaData) return null; if (!formulaData) return null;
this.options.isCritical = config.isCritical; this.options.isCritical = config.isCritical;
formulaData.roll = new Roll(Roll.replaceFormulaData(formulaData.formula, config.data)); formulaData.roll = new this.constructor(Roll.replaceFormulaData(formulaData.formula, config.data));
formulaData.roll.terms = Roll.parse(formulaData.roll.formula, config.data); formulaData.roll.terms = Roll.parse(formulaData.roll.formula, config.data);
if (formulaData.extraFormula) { if (formulaData.extraFormula) {