From 73d1edb0a1119eabe3e3d6840d4c3c5a9b560fcc Mon Sep 17 00:00:00 2001 From: WBHarry Date: Sat, 26 Jul 2025 21:14:47 +0200 Subject: [PATCH] Corrected rules.attack.roll.trait --- module/data/actor/character.mjs | 5 ++++- module/documents/activeEffect.mjs | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index bedb0155..5cd63e84 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -253,7 +253,9 @@ export default class DhCharacter extends BaseDataActor { roll: new fields.SchemaField({ trait: new fields.StringField({ required: true, - initial: CONFIG.DH.ACTOR.abilities.strength.id, + choices: CONFIG.DH.ACTOR.abilities, + nullable: true, + initial: null, label: 'DAGGERHEART.GENERAL.Rules.attack.roll.trait.label' }) }) @@ -544,6 +546,7 @@ export default class DhCharacter extends BaseDataActor { prepareDerivedData() { const baseHope = this.resources.hope.value + (this.companion?.system?.resources?.hope ?? 0); this.resources.hope.value = Math.min(baseHope, this.resources.hope.max); + this.attack.roll.trait = this.rules.attack.roll.trait ?? this.attack.roll.trait; } getRollData() { diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs index 6c4545b1..3c45929b 100644 --- a/module/documents/activeEffect.mjs +++ b/module/documents/activeEffect.mjs @@ -55,7 +55,8 @@ export default class DhActiveEffect extends ActiveEffect { } static applyField(model, change, field) { - change.value = this.effectSafeEval(itemAbleRollParse(change.value, model, change.effect.parent)); + const evalValue = this.effectSafeEval(itemAbleRollParse(change.value, model, change.effect.parent)); + change.value = evalValue ?? change.value; super.applyField(model, change, field); }