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

dmg type fallback

Browse source
This commit is contained in:
Dapoolp 2025-07-12 12:35:20 +02:00
parent 2bb90c9053
commit 9d0b9183ee
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
module/data/action/actionDice.mjs
View file

@ -114,7 +114,8 @@ export class DHDamageData extends foundry.abstract.DataModel {
required: true required: true
}), }),
{ {
label: 'Type' label: 'Type',
initial: 'physical',
} }
), ),
resultBased: new fields.BooleanField({ resultBased: new fields.BooleanField({

11
module/data/action/baseAction.mjs
View file

@ -179,16 +179,9 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
getRollData(data = {}) { getRollData(data = {}) {
const actorData = this.actor.getRollData(false); const actorData = this.actor.getRollData(false);
// Remove when included directly in Actor getRollData // Add Roll results to RollDatas
actorData.prof = actorData.proficiency?.total ?? 1;
actorData.cast = actorData.spellcast?.total ?? 1;
actorData.result = data.roll?.total ?? 1; actorData.result = data.roll?.total ?? 1;
/* actorData.scale = data.costs?.length
? data.costs.reduce((a, c) => {
a[c.type] = c.value;
return a;
}, {})
: 1; */
actorData.scale = data.costs?.length // Right now only return the first scalable cost. actorData.scale = data.costs?.length // Right now only return the first scalable cost.
? (data.costs.find(c => c.scalable)?.total ?? 1) ? (data.costs.find(c => c.scalable)?.total ?? 1)
: 1; : 1;

2
module/data/action/damageAction.mjs
View file

@ -13,6 +13,8 @@ export default class DHDamageAction extends DHBaseAction {
let formula = this.damage.parts.map(p => this.getFormulaValue(p, data).getFormula(this.actor)).join(' + '), let formula = this.damage.parts.map(p => this.getFormulaValue(p, data).getFormula(this.actor)).join(' + '),
damageTypes = [...new Set(this.damage.parts.reduce((a,c) => a.concat([...c.type]), []))]; damageTypes = [...new Set(this.damage.parts.reduce((a,c) => a.concat([...c.type]), []))];
damageTypes = !damageTypes.length ? ['physical'] : damageTypes;
if (!formula || formula == '') return; if (!formula || formula == '') return;
let roll = { formula: formula, total: formula }, let roll = { formula: formula, total: formula },
bonusDamage = []; bonusDamage = [];