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

fix conflict

Browse source
This commit is contained in:
Dapoolp 2025-07-11 18:14:10 +02:00
commit 2bb90c9053
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -181,7 +181,7 @@ export default class DHBaseAction extends foundry.abstract.DataModel {
// Remove when included directly in Actor getRollData // Remove when included directly in Actor getRollData
actorData.prof = actorData.proficiency?.total ?? 1; actorData.prof = actorData.proficiency?.total ?? 1;
actorData.cast = actorData.spellcast?.value ?? 1; actorData.cast = actorData.spellcast?.total ?? 1;
actorData.result = data.roll?.total ?? 1; actorData.result = data.roll?.total ?? 1;
/* actorData.scale = data.costs?.length /* actorData.scale = data.costs?.length
? data.costs.reduce((a, c) => { ? data.costs.reduce((a, c) => {