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

Internalised ChatDamageData.prepareRolls to its own constructor

Browse source
This commit is contained in:
WBHarry 2026-07-17 00:36:34 +02:00
parent f1599bf566
commit 124c4749db
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
module/data/actor/party.mjs
View file

@ -54,7 +54,6 @@ export default class DhParty extends BaseDataActor {
const member = this.tagTeam.members[memberKey]; const member = this.tagTeam.members[memberKey];
member.damageRollData = member.rollData?.options.damage ? member.damageRollData = member.rollData?.options.damage ?
ChatDamageData.fromJSON(JSON.stringify(member.rollData.options.damage)) : null; ChatDamageData.fromJSON(JSON.stringify(member.rollData.options.damage)) : null;
member.damageRollData?.prepareRolls();
} }
} }

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

@ -164,8 +164,6 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
} }
prepareDerivedData() { prepareDerivedData() {
this.damage.prepareRolls();
if (this.hasTarget) { if (this.hasTarget) {
this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0; this.hasHitTarget = this.targets.filter(t => t.hit === true).length > 0;
this.currentTargets = this.getTargetList(); this.currentTargets = this.getTargetList();

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

@ -1,6 +1,12 @@
import { triggerChatRollFx } from '../../helpers/utils.mjs'; import { triggerChatRollFx } from '../../helpers/utils.mjs';
export class ChatDamageData extends foundry.abstract.DataModel { export class ChatDamageData extends foundry.abstract.DataModel {
constructor(data = {}, options = {}) {
super(data, options);
this._prepareRolls();
}
static defineSchema() { static defineSchema() {
const fields = foundry.data.fields; const fields = foundry.data.fields;
@ -21,7 +27,7 @@ export class ChatDamageData extends foundry.abstract.DataModel {
if (!roll.evaluated) throw new Error('Roll objects added to ChatMessage documents must be evaluated'); if (!roll.evaluated) throw new Error('Roll objects added to ChatMessage documents must be evaluated');
} }
prepareRolls() { _prepareRolls() {
for (const key of Object.keys(this.types)) { for (const key of Object.keys(this.types)) {
const type = this.types[key]; const type = this.types[key];
try { try {