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

Removed some remaining types.<>.roll references

Browse source
This commit is contained in:
WBHarry 2026-07-17 22:46:32 +02:00
parent e6dcb0f9a5
commit 3828337472
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -118,9 +118,9 @@ export default class DamageField extends fields.SchemaField {
const hpDamageMultiplier = config.actionActor?.system.rules?.attack?.damage?.hpDamageMultiplier ?? 1; const hpDamageMultiplier = config.actionActor?.system.rules?.attack?.damage?.hpDamageMultiplier ?? 1;
const hpDamageTakenMultiplier = actor.system.rules?.attack?.damage?.hpDamageTakenMultiplier; const hpDamageTakenMultiplier = actor.system.rules?.attack?.damage?.hpDamageTakenMultiplier;
if (configDamage.hitPoints) { if (configDamage.hitPoints) {
configDamage.hitPoints.roll = configDamage.hitPoints.roll.toJSON(); configDamage.hitPoints = configDamage.hitPoints.toJSON();
configDamage.hitPoints.roll.total = Math.ceil( configDamage.hitPoints.total = Math.ceil(
configDamage.hitPoints.roll.total * hpDamageMultiplier * hpDamageTakenMultiplier configDamage.hitPoints.total * hpDamageMultiplier * hpDamageTakenMultiplier
); );
} }

6
module/documents/actor.mjs
View file

@ -660,12 +660,12 @@ export default class DhpActor extends Actor {
Object.entries(damages).forEach(([key, damage]) => { Object.entries(damages).forEach(([key, damage]) => {
if (key === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) if (key === CONFIG.DH.GENERAL.healingTypes.hitPoints.id)
damage.roll.total = this.calculateDamage(damage.roll.total, damage.damageTypes); damage.total = this.calculateDamage(damage.total, damage.damageTypes);
const update = updates.find(u => u.key === key); const update = updates.find(u => u.key === key);
if (update) { if (update) {
update.value += damage.roll.total; update.value += damage.total;
update.damageTypes.add(...new Set(damage.damageTypes)); update.damageTypes.add(...new Set(damage.damageTypes));
} else updates.push({ value: damage.roll.total, key, damageTypes: new Set(damage.damageTypes) }); } else updates.push({ value: damage.total, key, damageTypes: new Set(damage.damageTypes) });
}); });
if (Hooks.call(`${CONFIG.DH.id}.postCalculateDamage`, this, damages) === false) return null; if (Hooks.call(`${CONFIG.DH.id}.postCalculateDamage`, this, damages) === false) return null;