cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-22 02:19:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Moved DamageTypes to roll.options

Browse source
This commit is contained in:
WBHarry 2026-07-17 14:10:06 +02:00
parent 124c4749db
commit fbcb9e4572
6 changed files with 72 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

4
module/applications/ui/chatLog.mjs
View file

@ -258,9 +258,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
await message.system.damage.rerollDamageDie(damageType, dice, result);
await message.update({
'system.damage.types': {
[damageType]: {
roll: message.system.damage.types[damageType].roll.toJSON()
}
[damageType]: message.system.damage.types[damageType].toJSON()
}
});
} else {

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

@ -140,9 +140,9 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
const update = { system: { damage: { types: {} } } };
for (const key of Object.keys(this.damage.types)) {
const type = this.damage.types[key];
const reroll = await type.roll.reroll();
const reroll = await type.reroll();
rerolls.push(reroll);
update.system.damage.types[key] = { roll: reroll.toJSON() };
update.system.damage.types[key] = reroll.toJSON();
}
await triggerChatRollFx(rerolls);
@ -192,10 +192,15 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
source.damage = {
types: Object.keys(source.damage).reduce((acc, key) => {
const damageData = source.damage[key];
acc[key] = {
roll: damageData.parts[0]?.roll ?? null,
damageTypes: damageData.parts[0]?.damageTypes ?? []
};
const oldRoll = damageData.parts[0]?.roll;
acc[key] = oldRoll ? {
...oldRoll,
options: {
...oldRoll.options,
damageTypes: damageData.parts[0].damageTypes ?? []
}
} : null;
return acc;
}, {})
};

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

@ -11,10 +11,7 @@ export class ChatDamageData extends foundry.abstract.DataModel {
const fields = foundry.data.fields;
return {
types: new fields.TypedObjectField(new fields.SchemaField({
roll: new fields.JSONField({validate: ChatDamageData.#validateRoll}),
damageTypes: new fields.ArrayField(new fields.StringField({ choices: CONFIG.DH.GENERAL.damageTypes }))
}))
types: new fields.TypedObjectField(new fields.JSONField({validate: ChatDamageData.#validateRoll}))
};
}
@ -31,14 +28,14 @@ export class ChatDamageData extends foundry.abstract.DataModel {
for (const key of Object.keys(this.types)) {
const type = this.types[key];
try {
type.roll = Roll.fromData(type.roll);
type.roll.modifierTotal = CONFIG.Dice.daggerheart.DHRoll.calculateTotalModifiers(type.roll);
this.types[key] = Roll.fromData(type);
this.types[key].options.modifierTotal = CONFIG.Dice.daggerheart.DHRoll.calculateTotalModifiers(type);
} catch {}
}
}
async rerollDamageDie(damageType, dice, resultIndex) {
const reroll = this.types[damageType].roll;
const reroll = this.types[damageType];
const rerollDice = reroll.dice[dice];
await rerollDice.rerollResult(resultIndex);
await reroll._evaluate();

8
module/dice/damageRoll.mjs
View file

@ -19,12 +19,10 @@ export default class DamageRoll extends DHRoll {
for (const roll of config.roll) {
await roll.roll.evaluate();
roll.roll.options = { damageTypes: roll.damageTypes ?? [] };
if (!config.damage?.types) config.damage = { types: {} };
config.damage.types[roll.applyTo] = {
roll: roll.roll,
damageTypes: roll.damageTypes ?? []
};
config.damage.types[roll.applyTo] = roll.roll;
}
roll._evaluated = true;