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

Fixed so that spellcast attacks use that modifier (#509)

Browse source
This commit is contained in:
WBHarry 2025-08-02 04:43:54 +02:00 • committed by GitHub
parent c2de25693f
commit 90faf48b05
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
module/data/actor/character.mjs
View file

@ -323,9 +323,16 @@ export default class DhCharacter extends BaseDataActor {
return !(this.class.value || this.class.subclass || this.ancestry || this.community); return !(this.class.value || this.class.subclass || this.ancestry || this.community);
} }
get spellcastModifier() { get spellcastModifierTrait() {
const subClasses = this.parent.items.filter(x => x.type === 'subclass') ?? []; const subClasses = this.parent.items.filter(x => x.type === 'subclass') ?? [];
return Math.max(subClasses?.map(sc => this.traits[sc.system.spellcastingTrait]?.value)); const modifiers = subClasses
?.map(sc => ({ ...this.traits[sc.system.spellcastingTrait], key: sc.system.spellcastingTrait }))
.filter(x => x);
return modifiers.sort((a, b) => a.value - b.value)[0];
}
get spellcastModifier() {
return this.spellcastModifierTrait?.value ?? 0;
} }
get spellcastingModifiers() { get spellcastingModifiers() {

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; if (!this.parent?.actor) return modifiers;
switch (this.parent.actor.type) { switch (this.parent.actor.type) {
case 'character': case 'character':
const spellcastingTrait =
this.type === 'spellcast'
? (this.parent.actor?.system?.spellcastModifierTrait?.key ?? 'agility')
: null;
const trait = const trait =
this.useDefault || !this.trait this.useDefault || !this.trait
? (this.parent.item.system.attack.roll.trait ?? 'agility') ? (spellcastingTrait ?? this.parent.item.system.attack.roll.trait ?? 'agility')
: this.trait; : this.trait;
if ( if (
this.type === CONFIG.DH.GENERAL.rollTypes.attack.id || this.type === CONFIG.DH.GENERAL.rollTypes.attack.id ||