use casting ability with best modifier if multiple available

Muttley · Nov 2, 2024 · 0f1343d · 0f1343d
1 parent 4aeade9
commit 0f1343d
Showing 1 changed file with 21 additions and 2 deletions.
diff --git a/system/src/documents/ActorSD.mjs b/system/src/documents/ActorSD.mjs
@@ -892,9 +892,28 @@ export default class ActorSD extends Actor {
 
 
 	async getSpellcastingAbility() {
-		const characterClass = await this.getClass();
+		const spellcasterClasses = await this.getSpellcasterClasses();
+
+		let chosenAbility = "";
+		let chosenAbilityModifier = 0;
+
+		for (const casterClass of spellcasterClasses) {
+			const ability = casterClass?.system?.spellcasting?.ability ?? "";
+
+			if (chosenAbility === "") {
+				chosenAbility = ability;
+				chosenAbilityModifier = this.abilityModifier(ability);
+			}
+			else {
+				const modifier = this.abilityModifier(ability);
+				if (modifier > chosenAbilityModifier) {
+					chosenAbility = ability;
+					chosenAbilityModifier = modifier;
+				}
+			}
+		}
 
-		return characterClass?.system?.spellcasting?.ability ?? "";
+		return chosenAbility;
 	}
 
 	async getTitle() {