Fixed a class sheet details tab error. (#774)

Fixed max prepared spells data pull.
kgar · Sep 20, 2024 · 4397ed7 · 4397ed7
1 parent a0d6449
commit 4397ed7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 30 deletions.
diff --git a/src/applications/max-prepared-spells-config/MaxPreparedSpellsConfigFormApplication.ts b/src/applications/max-prepared-spells-config/MaxPreparedSpellsConfigFormApplication.ts
@@ -6,7 +6,6 @@ import type { Item5e } from 'src/types/item.types';
 import { get, writable, type Writable } from 'svelte/store';
 import { FoundryAdapter } from 'src/foundry/foundry-adapter';
 import { getMaxPreparedSpellsSampleFormulas } from 'src/utils/formula';
-import { TidyFlags } from 'src/foundry/TidyFlags';
 
 export type MaxPreparedSpellsConfigContext = {
   maxPreparedSpells: string;
@@ -17,6 +16,7 @@ export type MaxPreparedSpellsConfigContext = {
 export class MaxPreparedSpellsConfigFormApplication extends SvelteFormApplicationBase {
   context: Writable<MaxPreparedSpellsConfigContext>;
   actor: Actor5e;
+  classToUpdate: Item5e;
 
   constructor(actor: Actor5e, classToUpdate: Item5e, ...args: any[]) {
     super(...args);
@@ -44,7 +44,8 @@ export class MaxPreparedSpellsConfigFormApplication extends SvelteFormApplicatio
 
   getData(): MaxPreparedSpellsConfigContext {
     return {
-      maxPreparedSpells: TidyFlags.maxPreparedSpells.get(this.actor) ?? '',
+      maxPreparedSpells:
+        this.classToUpdate?.system?.spellcasting?.preparation?.formula ?? '',
       formulas: getMaxPreparedSpellsSampleFormulas(),
       actor: this.actor,
     };

diff --git a/src/foundry/TidyFlags.ts b/src/foundry/TidyFlags.ts
@@ -330,33 +330,6 @@ export class TidyFlags {
     },
   };
 
-  /**
-   * A formula that determines the maximum number of
-   * prepared spells an actor can have.
-   */
-  static maxPreparedSpells = {
-    key: 'maxPreparedSpells' as const,
-    prop: TidyFlags.getFlagPropertyPath('maxPreparedSpells'),
-    /** Gets the actor's maximum number of prepared spells. */
-    get(actor: Actor5e): string | undefined {
-      // Legacy values of this flag can be of type `number`, so it is put to string, just in case.
-      return (
-        TidyFlags.tryGetFlag<string>(
-          actor,
-          TidyFlags.maxPreparedSpells.key
-        )?.toString() ?? undefined
-      );
-    },
-    /** Sets the actor's maximum number of prepared spells. */
-    set(actor: Actor5e, value: string): Promise<void> {
-      return TidyFlags.setFlag(actor, TidyFlags.maxPreparedSpells.key, value);
-    },
-    /** Clears the actor's maximum number of prepared spells. */
-    unset(actor: Actor5e) {
-      return TidyFlags.unsetFlag(actor, TidyFlags.maxPreparedSpells.key);
-    },
-  };
-
   /**
    * Denotes whether a vehicle is moving.
    */

diff --git a/src/sheets/item/tabs/ItemClassDetailsTab.svelte b/src/sheets/item/tabs/ItemClassDetailsTab.svelte
@@ -98,7 +98,7 @@
       labelCssClass="checkbox"
       document={$context.item}
       field="system.primaryAbility.value"
-      checked={$context.source.primaryAbility.value.has(key)}
+      checked={$context.system.primaryAbility.value.has(key)}
       value={key}
       disabled={!$context.editable}
       onDataPreparing={(ev) => mapMulticlassingAbilitiesToSave($context, ev)}