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

Merge branch 'main' into feature/chat-message-styles

Browse source
This commit is contained in:
Dapoolp 2025-08-02 05:17:36 +02:00
commit b2fbb6ff50
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,9 +72,13 @@ export class DHActionRollData extends foundry.abstract.DataModel {
if (!this.parent?.actor) return modifiers;
switch (this.parent.actor.type) {
case 'character':
const spellcastingTrait =
this.type === 'spellcast'
? (this.parent.actor?.system?.spellcastModifierTrait?.key ?? 'agility')
: null;
const trait =
this.useDefault || !this.trait
? (this.parent.item.system.attack.roll.trait ?? 'agility')
? (spellcastingTrait ?? this.parent.item.system.attack.roll.trait ?? 'agility')
: this.trait;
if (
this.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||