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

Fix conflict

Browse source
This commit is contained in:
Dapoolp 2025-07-12 18:15:43 +02:00
commit d9ef062ce2
60 changed files with 879 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

8
module/data/actor/companion.mjs
View file

@ -70,7 +70,7 @@ export default class DhCompanion extends BaseDataActor {
type: ['physical'],
value: {
dice: 'd6',
multiplier: 'flat'
multiplier: 'prof'
}
}
]
@ -88,6 +88,12 @@ export default class DhCompanion extends BaseDataActor {
};
}
get proficiency() {
return {
total: this.partner?.system?.proficiency?.total ?? 1
};
}
prepareBaseData() {
const partnerSpellcastingModifier = this.partner?.system?.spellcastingModifiers?.main;
const spellcastingModifier = this.partner?.system?.traits?.[partnerSpellcastingModifier]?.total;