diff --git a/.husky/scripts/check-file-size.js b/.husky/scripts/check-file-size.js
index 56a7f63..ba20b69 100644
--- a/.husky/scripts/check-file-size.js
+++ b/.husky/scripts/check-file-size.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
 const fs = require('fs');
 const path = require('path');
 const MAX_LINES = 400;
diff --git a/.husky/scripts/generate-project-tree.js b/.husky/scripts/generate-project-tree.js
index 5236e84..6b31bf4 100644
--- a/.husky/scripts/generate-project-tree.js
+++ b/.husky/scripts/generate-project-tree.js
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-require-imports */
 const fs = require('fs');
 const path = require('path');
 const { execSync } = require('node:child_process');
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 77a4608..3b8f02d 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -11,6 +11,7 @@ import {
   useSkillStore,
   useCombatStore,
   usePrestigeStore,
+  useCraftingStore,
   fmt,
   computeMaxMana,
   computeRegen,
@@ -147,9 +148,9 @@ export default function ManaLoopGame() {
 
   const gameOver = useUIStore((s) => s.gameOver);
 
-  // Get equipment state from store
-  const equippedInstances = useGameStore((s) => s.equippedInstances);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
+  // Get equipment state from crafting store
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
 
   // Derived state
   const upgradeEffects = getUnifiedEffects({
diff --git a/src/components/game/crafting/EnchantmentApplier.tsx b/src/components/game/crafting/EnchantmentApplier.tsx
index 66156cb..552e852 100644
--- a/src/components/game/crafting/EnchantmentApplier.tsx
+++ b/src/components/game/crafting/EnchantmentApplier.tsx
@@ -12,7 +12,7 @@ import { ENCHANTMENT_EFFECTS } from '@/lib/game/data/enchantment-effects';
 import type { EquipmentInstance, EnchantmentDesign, AppliedEnchantment, LootInventory, EquipmentCraftingProgress, EquipmentSlot } from '@/lib/game/types';
 import { fmt } from '@/lib/game/stores';
 import { CheckCircle, Sparkles } from 'lucide-react';
-import { useGameStore } from '@/lib/game/stores';
+import { useGameStore, useCraftingStore, useManaStore } from '@/lib/game/stores';
 
 export interface EnchantmentApplierProps {
   selectedEquipmentInstance: string | null;
@@ -31,15 +31,15 @@ export function EnchantmentApplier({
   onEnchantmentApplied,
   onCapacityExceeded,
 }: EnchantmentApplierProps) {
-  const equippedInstances = useGameStore((s) => s.equippedInstances);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
-  const enchantmentDesigns = useGameStore((s) => s.enchantmentDesigns);
-  const applicationProgress = useGameStore((s) => s.applicationProgress);
-  const rawMana = useGameStore((s) => s.rawMana);
-  const startApplying = useGameStore((s) => s.startApplying);
-  const pauseApplication = useGameStore((s) => s.pauseApplication);
-  const resumeApplication = useGameStore((s) => s.resumeApplication);
-  const cancelApplication = useGameStore((s) => s.cancelApplication);
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
+  const enchantmentDesigns = useCraftingStore((s) => s.enchantmentDesigns);
+  const applicationProgress = useCraftingStore((s) => s.applicationProgress);
+  const rawMana = useManaStore((s) => s.rawMana);
+  const startApplying = useCraftingStore((s) => s.startApplying);
+  const pauseApplication = useCraftingStore((s) => s.pauseApplication);
+  const resumeApplication = useCraftingStore((s) => s.resumeApplication);
+  const cancelApplication = useCraftingStore((s) => s.cancelApplication);
 
   // Get equipped items as array - ONLY show items tagged 'Ready for Enchantment' (requirement cr5)
   const equippedItems = Object.entries(equippedInstances)
diff --git a/src/components/game/crafting/EnchantmentDesigner.tsx b/src/components/game/crafting/EnchantmentDesigner.tsx
index 7fd5c55..86bccf0 100644
--- a/src/components/game/crafting/EnchantmentDesigner.tsx
+++ b/src/components/game/crafting/EnchantmentDesigner.tsx
@@ -22,7 +22,8 @@ import {
   addEffectToDesign,
   removeEffectFromDesign,
 } from './EnchantmentDesigner/utils';
-import { useGameStore } from '@/lib/game/stores';
+import { useCraftingStore } from '@/lib/game/stores';
+import { useSkillStore } from '@/lib/game/stores';
 
 export function EnchantmentDesigner({
   selectedEquipmentType,
@@ -34,16 +35,21 @@ export function EnchantmentDesigner({
   selectedDesign,
   setSelectedDesign,
 }: EnchantmentDesignerProps) {
-  const enchantmentDesigns = useGameStore((s) => s.enchantmentDesigns);
-  const designProgress = useGameStore((s) => s.designProgress);
-  const startDesigningEnchantment = useGameStore((s) => s.startDesigningEnchantment);
-  const cancelDesign = useGameStore((s) => s.cancelDesign);
-  const deleteDesign = useGameStore((s) => s.deleteDesign);
-  const unlockedEffects = useGameStore((s) => s.unlockedEffects);
-  const skills = useGameStore((s) => s.skills);
+  // Crafting store selectors
+  const enchantmentDesigns = useCraftingStore((s) => s.enchantmentDesigns);
+  const designProgress = useCraftingStore((s) => s.designProgress);
+  const startDesigningEnchantment = useCraftingStore((s) => s.startDesigningEnchantment);
+  const cancelDesign = useCraftingStore((s) => s.cancelDesign);
+  const deleteDesign = useCraftingStore((s) => s.deleteDesign);
+  const unlockedEffects = useCraftingStore((s) => s.unlockedEffects);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
 
-  const enchantingLevel = skills.enchanting || 0;
-  const efficiencyBonus = (skills.efficientEnchant || 0) * 0.05;
+  // Skill store selectors
+  const skills = useSkillStore((s) => s.skills);
+  const skillUpgrades = useSkillStore((s) => s.skillUpgrades);
+
+  const enchantingLevel = skills?.enchanting || 0;
+  const efficiencyBonus = (skillUpgrades?.['efficientEnchant'] || []).length * 0.05 || 0;
 
   // Calculate total capacity cost for current design
   const designCapacityCost = calculateDesignCapacityCost(selectedEffects, efficiencyBonus);
@@ -84,7 +90,7 @@ export function EnchantmentDesigner({
   const incompatibleEffects = getIncompatibleEffects(selectedEquipmentType, unlockedEffects);
 
   // Get equipment types that the player actually owns (has instances of)
-  const ownedEquipmentTypes = getOwnedEquipmentTypes(useGameStore.getState());
+  const ownedEquipmentTypes = getOwnedEquipmentTypes(equipmentInstances);
 
   // Get the reason why an effect is incompatible
   const getIncompatibilityReasonWrapper = (effect: { id: string; name: string; description: string; allowedEquipmentCategories: any[] }) => {
diff --git a/src/components/game/crafting/EnchantmentDesigner/types.ts b/src/components/game/crafting/EnchantmentDesigner/types.ts
index 05a6466..05fd616 100644
--- a/src/components/game/crafting/EnchantmentDesigner/types.ts
+++ b/src/components/game/crafting/EnchantmentDesigner/types.ts
@@ -1,8 +1,6 @@
 import type { EquipmentInstance, EnchantmentDesign, DesignEffect, EquipmentCraftingProgress, EquipmentCategory } from '@/lib/game/types';
-import type { GameStore } from '@/lib/game/stores';
 
 export interface EnchantmentDesignerProps {
-  store: GameStore;
   selectedEquipmentType: string | null;
   setSelectedEquipmentType: (type: string | null) => void;
   selectedEffects: DesignEffect[];
diff --git a/src/components/game/crafting/EnchantmentDesigner/utils.ts b/src/components/game/crafting/EnchantmentDesigner/utils.ts
index fd79da3..9699733 100644
--- a/src/components/game/crafting/EnchantmentDesigner/utils.ts
+++ b/src/components/game/crafting/EnchantmentDesigner/utils.ts
@@ -1,7 +1,6 @@
 import { EQUIPMENT_TYPES } from '@/lib/game/data/equipment';
 import { ENCHANTMENT_EFFECTS, calculateEffectCapacityCost } from '@/lib/game/data/enchantment-effects';
-import type { DesignEffect, EquipmentCategory } from '@/lib/game/types';
-import type { GameStore } from '@/lib/game/stores';
+import type { DesignEffect, EquipmentInstance, EquipmentCategory } from '@/lib/game/types';
 
 /**
  * Get available effects for selected equipment type (only unlocked ones)
@@ -44,12 +43,12 @@ export function getIncompatibleEffects(
  * Get equipment types that the player actually owns (has instances of)
  * This ensures enchantment compatibility is based on owned items, not just blueprints
  */
-export function getOwnedEquipmentTypes(store: GameStore) {
+export function getOwnedEquipmentTypes(equipmentInstances: Record<string, EquipmentInstance>) {
   // Get all unique equipment type IDs from owned instances
   const ownedEquipmentTypeIds = new Set<string>();
 
   // Check all equipment instances the player owns
-  for (const instance of Object.values(store.equipmentInstances || {})) {
+  for (const instance of Object.values(equipmentInstances || {})) {
     ownedEquipmentTypeIds.add(instance.typeId);
   }
 
diff --git a/src/components/game/crafting/EnchantmentPreparer.tsx b/src/components/game/crafting/EnchantmentPreparer.tsx
index 2a6c366..e08abc0 100644
--- a/src/components/game/crafting/EnchantmentPreparer.tsx
+++ b/src/components/game/crafting/EnchantmentPreparer.tsx
@@ -13,7 +13,7 @@ import { Trash2, CheckCircle, AlertTriangle } from 'lucide-react';
 import { EQUIPMENT_TYPES } from '@/lib/game/data/equipment';
 import type { EquipmentInstance, AppliedEnchantment, LootInventory, EquipmentCraftingProgress, EquipmentSlot } from '@/lib/game/types';
 import { fmt } from '@/lib/game/stores';
-import { useGameStore } from '@/lib/game/stores';
+import { useGameStore, useCraftingStore, useManaStore, useSkillStore } from '@/lib/game/stores';
 import { useGameToast } from '@/components/game/GameToast';
 
 export interface EnchantmentPreparerProps {
@@ -26,13 +26,13 @@ export function EnchantmentPreparer({
   setSelectedEquipmentInstance,
 }: EnchantmentPreparerProps) {
   const showToast = useGameToast();
-  const equippedInstances = useGameStore((s) => s.equippedInstances);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
-  const preparationProgress = useGameStore((s) => s.preparationProgress);
-  const rawMana = useGameStore((s) => s.rawMana);
-  const skills = useGameStore((s) => s.skills);
-  const startPreparing = useGameStore((s) => s.startPreparing);
-  const cancelPreparation = useGameStore((s) => s.cancelPreparation);
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
+  const preparationProgress = useCraftingStore((s) => s.preparationProgress);
+  const rawMana = useManaStore((s) => s.rawMana);
+  const skills = useSkillStore((s) => s.skills);
+  const startPreparing = useCraftingStore((s) => s.startPreparing);
+  const cancelPreparation = useCraftingStore((s) => s.cancelPreparation);
 
   // Get equipped items as array
   const equippedItems = Object.entries(equippedInstances)
diff --git a/src/components/game/tabs/LootTab.tsx b/src/components/game/tabs/LootTab.tsx
index 2efaf43..06f7fe8 100755
--- a/src/components/game/tabs/LootTab.tsx
+++ b/src/components/game/tabs/LootTab.tsx
@@ -1,12 +1,12 @@
 'use client';
 
-import { useGameStore } from '@/lib/game/stores';
+import { useGameStore, useCraftingStore } from '@/lib/game/stores';
 import { LootInventoryDisplay } from '@/components/game/LootInventory';
 
 export function LootTab() {
   const lootInventory = useGameStore((s) => s.lootInventory);
   const elements = useGameStore((s) => s.elements);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
   const deleteMaterial = useGameStore((s) => s.deleteMaterial);
   const deleteEquipmentInstance = useGameStore((s) => s.deleteEquipmentInstance);
 
diff --git a/src/components/game/tabs/SpireTab.tsx b/src/components/game/tabs/SpireTab.tsx
index f063be1..2f0161c 100755
--- a/src/components/game/tabs/SpireTab.tsx
+++ b/src/components/game/tabs/SpireTab.tsx
@@ -12,7 +12,7 @@ import { getActiveEquipmentSpells, getTotalDPS } from '@/lib/game/computed-stats
 import { getUnifiedEffects } from '@/lib/game/effects';
 import { formatSpellCost, getSpellCostColor } from '@/lib/game/formatting';
 import { canAffordSpellCost, getFloorElement } from '@/lib/game/stores';
-import { useGameStore, useManaStore, useSkillStore, useCombatStore, usePrestigeStore } from '@/lib/game/stores';
+import { useGameStore, useManaStore, useSkillStore, useCombatStore, usePrestigeStore, useCraftingStore } from '@/lib/game/stores';
 import { GOLEMS_DEF, getGolemDamage, getGolemAttackSpeed } from '@/lib/game/data/golems';
 
 // Extracted components
@@ -68,11 +68,11 @@ export function SpireTab({ simpleMode = false }: SpireTabProps) {
   const skillTiers = useSkillStore((s) => s.skillTiers);
   const rawMana = useManaStore((s) => s.rawMana);
   const elements = useManaStore((s) => s.elements);
-  const equippedInstances = useGameStore((s) => s.equippedInstances);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
-  const designProgress = useGameStore((s) => s.designProgress);
-  const designProgress2 = useGameStore((s) => s.designProgress2);
-  const preparationProgress = useGameStore((s) => s.preparationProgress);
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
+  const designProgress = useCraftingStore((s) => s.designProgress);
+  const designProgress2 = useCraftingStore((s) => s.designProgress2);
+  const preparationProgress = useCraftingStore((s) => s.preparationProgress);
   const applicationProgress = useGameStore((s) => s.applicationProgress);
   const equipmentCraftingProgress = useGameStore((s) => s.equipmentCraftingProgress);
 
diff --git a/src/lib/game/crafting-apply.ts b/src/lib/game/crafting-apply.ts
index 1e85ec8..f391d11 100644
--- a/src/lib/game/crafting-apply.ts
+++ b/src/lib/game/crafting-apply.ts
@@ -184,7 +184,7 @@ export function updateEnchanterAttunement(
   let newXP = enchanterState.experience + xpGained;
   let newLevel = enchanterState.level;
 
-  const { getAttunementXPForLevel, MAX_ATTUNEMENT_LEVEL } = require('./data/attunements');
+  import { getAttunementXPForLevel, MAX_ATTUNEMENT_LEVEL } from './data/attunements.js';
 
   while (newLevel < MAX_ATTUNEMENT_LEVEL) {
     const xpNeeded = getAttunementXPForLevel(newLevel + 1);
diff --git a/src/lib/game/stores/__tests__/index-tests/combat-calculations.test.ts b/src/lib/game/stores/__tests__/index-tests/combat-calculations.test.ts
index 2e91701..ab8823f 100644
--- a/src/lib/game/stores/__tests__/index-tests/combat-calculations.test.ts
+++ b/src/lib/game/stores/__tests__/index-tests/combat-calculations.test.ts
@@ -112,7 +112,7 @@ describe('Combat Calculations', () => {
   describe('getFloorMaxHP', () => {
     it('should return guardian HP for guardian floors', () => {
       // Import GUARDIANS from constants
-      const { GUARDIANS } = require('../../constants');
+      import { GUARDIANS } from '../../constants';
       expect(getFloorMaxHP(10)).toBe(GUARDIANS[10].hp);
       expect(getFloorMaxHP(100)).toBe(GUARDIANS[100].hp);
     });
diff --git a/src/lib/game/stores/craftingStore.ts b/src/lib/game/stores/craftingStore.ts
index 17e3dc2..dc5b80d 100644
--- a/src/lib/game/stores/craftingStore.ts
+++ b/src/lib/game/stores/craftingStore.ts
@@ -4,7 +4,22 @@
 
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
-import type { DesignProgress, PreparationProgress, ApplicationProgress, EquipmentCraftingProgress } from '../types';
+import type { DesignProgress, PreparationProgress, ApplicationProgress, EquipmentCraftingProgress, EnchantmentDesign, EquipmentInstance, DesignEffect } from '../types';
+
+// Import crafting modules for action logic
+import * as CraftingUtils from '../crafting-utils';
+import * as CraftingDesign from '../crafting-design';
+import { computeEffects } from '../upgrade-effects';
+import { hasSpecial, SPECIAL_EFFECTS } from '../special-effects';
+
+// Import other stores to access required state
+import { useSkillStore } from './skillStore';
+import { useGameStore } from './gameStore';
+
+// Import action modules
+import * as ApplicationActions from '../crafting-actions/application-actions';
+import * as CraftingApply from '../crafting-apply';
+import * as PreparationActions from '../crafting-actions/preparation-actions';
 
 export interface CraftingState {
   // Crafting progress
@@ -13,6 +28,15 @@ export interface CraftingState {
   preparationProgress: PreparationProgress | null;
   applicationProgress: ApplicationProgress | null;
   equipmentCraftingProgress: EquipmentCraftingProgress | null;
+
+  // Enchantment designs
+  enchantmentDesigns: EnchantmentDesign[];
+  // Unlocked enchantment effects
+  unlockedEffects: string[];
+  // Equipment instances (instanceId -> instance)
+  equipmentInstances: Record<string, EquipmentInstance>;
+  // Equipped instances (slot -> instanceId or null)
+  equippedInstances: Record<string, string | null>;
 }
 
 export interface CraftingActions {
@@ -28,19 +52,39 @@ export interface CraftingActions {
   
   // Actions for equipment crafting progress
   setEquipmentCraftingProgress: (progress: EquipmentCraftingProgress | null) => void;
+
+  // Enchantment design actions
+  startDesigningEnchantment: (name: string, equipmentTypeId: string, effects: DesignEffect[]) => boolean;
+  cancelDesign: () => void;
+  saveDesign: (design: EnchantmentDesign) => void;
+  deleteDesign: (designId: string) => void;
+
+  // Enchantment application actions
+  startApplying: (equipmentInstanceId: string, designId: string) => boolean;
+  pauseApplication: () => void;
+  resumeApplication: () => void;
+  cancelApplication: () => void;
+
+  // Enchantment preparation actions
+  startPreparing: (equipmentInstanceId: string) => boolean;
+  cancelPreparation: () => void;
 }
 
 export type CraftingStore = CraftingState & CraftingActions;
 
 export const useCraftingStore = create<CraftingStore>()(
   persist(
-    (set) => ({
+    (set, get) => ({
       // Initial state
       designProgress: null,
       designProgress2: null,
       preparationProgress: null,
       applicationProgress: null,
       equipmentCraftingProgress: null,
+      enchantmentDesigns: [],
+      unlockedEffects: [],
+      equipmentInstances: {},
+      equippedInstances: {},
       
       // Actions
       setDesignProgress: (progress) => set({ designProgress: progress }),
@@ -48,6 +92,135 @@ export const useCraftingStore = create<CraftingStore>()(
       setPreparationProgress: (progress) => set({ preparationProgress: progress }),
       setApplicationProgress: (progress) => set({ applicationProgress: progress }),
       setEquipmentCraftingProgress: (progress) => set({ equipmentCraftingProgress: progress }),
+
+      // Enchantment design actions
+      startDesigningEnchantment: (name, equipmentTypeId, effects) => {
+        // Get state from other stores
+        const skillState = useSkillStore.getState();
+        const state = get(); // crafting state
+
+        const enchantingLevel = skillState.skills?.enchanting || 0;
+        const validation = CraftingDesign.validateDesignEffects(effects, equipmentTypeId, enchantingLevel);
+        if (!validation.valid) return false;
+
+        const equipType = CraftingUtils.getEquipmentType(equipmentTypeId);
+        if (!equipType) return false;
+
+        const efficiencyBonus = (skillState.skillUpgrades?.['efficientEnchant'] || []).length * 0.05 || 0;
+        const totalCapacityCost = CraftingDesign.calculateDesignCapacityCost(effects, efficiencyBonus);
+
+        if (totalCapacityCost > equipType.baseCapacity) return false;
+
+        const computedEffects = computeEffects(skillState.skillUpgrades || {}, skillState.skillTiers || {});
+        const hasEnchantMastery = hasSpecial(computedEffects, SPECIAL_EFFECTS.ENCHANT_MASTERY);
+
+        let updates: Partial<CraftingState> = {};
+
+        if (!state.designProgress) {
+          updates = {
+            designProgress: {
+              designId: CraftingUtils.generateDesignId(),
+              progress: 0,
+              required: CraftingDesign.calculateDesignTime(effects),
+              name,
+              equipmentType: equipmentTypeId,
+              effects,
+            },
+          };
+          // Update currentAction in gameStore
+          useGameStore.setState({ currentAction: 'design' });
+        } else if (hasEnchantMastery && !state.designProgress2) {
+          updates = {
+            designProgress2: {
+              designId: CraftingUtils.generateDesignId(),
+              progress: 0,
+              required: CraftingDesign.calculateDesignTime(effects),
+              name,
+              equipmentType: equipmentTypeId,
+              effects,
+            },
+          };
+        } else {
+          return false;
+        }
+
+        set(updates);
+        return true;
+      },
+
+      cancelDesign: () => {
+        const state = get();
+        if (state.designProgress2 && !state.designProgress) {
+          set({ designProgress2: null });
+        } else {
+          set({ designProgress: null });
+          useGameStore.setState({ currentAction: 'meditate' });
+        }
+      },
+
+      deleteDesign: (designId) => {
+        set((state) => ({
+          enchantmentDesigns: state.enchantmentDesigns.filter(d => d.id !== designId),
+        }));
+      },
+
+      // Enchantment design save
+      saveDesign: (design) => {
+        const state = get();
+        if (state.designProgress2 && state.designProgress2.designId === design.id) {
+          set((s) => ({
+            enchantmentDesigns: [...s.enchantmentDesigns, design],
+            designProgress2: null,
+          }));
+        } else {
+          set((s) => ({
+            enchantmentDesigns: [...s.enchantmentDesigns, design],
+            designProgress: null,
+            currentAction: 'meditate' as const,
+          }));
+        }
+      },
+
+      // Enchantment application actions
+      startApplying: (equipmentInstanceId, designId) => {
+        return ApplicationActions.startApplying(
+          equipmentInstanceId,
+          designId,
+          get,
+          set
+        );
+      },
+
+      pauseApplication: () => {
+        ApplicationActions.pauseApplication(get, set);
+      },
+
+      resumeApplication: () => {
+        ApplicationActions.resumeApplication(get, set);
+      },
+
+      cancelApplication: () => {
+        ApplicationActions.cancelApplication(set);
+        useGameStore.setState({ currentAction: 'meditate' });
+      },
+
+      // Preparation actions
+      startPreparing: (equipmentInstanceId) => {
+        // Get rawMana from manaStore
+        const rawMana = useManaStore.getState().rawMana;
+        // Temporary state to pass to preparation action
+        const tempState = { ...get(), rawMana } as any;
+        return PreparationActions.startPreparing(
+          equipmentInstanceId,
+          () => tempState,
+          set
+        );
+      },
+
+      cancelPreparation: () => {
+        PreparationActions.cancelPreparation(set);
+        useGameStore.setState({ currentAction: 'meditate' });
+      },
     }),
     {
       name: 'mana-loop-crafting',
@@ -57,6 +230,10 @@ export const useCraftingStore = create<CraftingStore>()(
         preparationProgress: state.preparationProgress,
         applicationProgress: state.applicationProgress,
         equipmentCraftingProgress: state.equipmentCraftingProgress,
+        enchantmentDesigns: state.enchantmentDesigns,
+        unlockedEffects: state.unlockedEffects,
+        equipmentInstances: state.equipmentInstances,
+        equippedInstances: state.equippedInstances,
       }),
     }
   )
diff --git a/src/lib/game/stores/gameHooks.ts b/src/lib/game/stores/gameHooks.ts
index fedb6f0..6e0c62f 100644
--- a/src/lib/game/stores/gameHooks.ts
+++ b/src/lib/game/stores/gameHooks.ts
@@ -5,6 +5,7 @@ import { useSkillStore } from './skillStore';
 import { usePrestigeStore } from './prestigeStore';
 import { useCombatStore } from './combatStore';
 import { useUIStore } from './uiStore';
+import { useCraftingStore } from './craftingStore';
 import { getUnifiedEffects } from '../effects';
 import {
   computeMaxMana,
@@ -32,8 +33,8 @@ export function useGameLoop() {
 export function useUnifiedEffects() {
   const skillUpgrades = useSkillStore((s) => s.skillUpgrades);
   const skillTiers = useSkillStore((s) => s.skillTiers);
-  const equippedInstances = useGameStore((s) => s.equippedInstances);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
 
   return getUnifiedEffects({
     skillUpgrades,
@@ -54,12 +55,14 @@ export function useManaStats() {
   const meditateTicks = useManaStore((s) => s.meditateTicks);
   const day = useGameStore((s) => s.day);
   const hour = useGameStore((s) => s.hour);
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
 
   const upgradeEffects = getUnifiedEffects({
     skillUpgrades,
     skillTiers,
-    equippedInstances: {},
-    equipmentInstances: {},
+    equippedInstances,
+    equipmentInstances,
   });
 
   const maxMana = computeMaxMana(
@@ -85,12 +88,12 @@ export function useManaStats() {
 
   // Mana Cascade bonus
   const manaCascadeBonus = upgradeEffects.specials.has('mana_cascade')
-    ? Math.floor(maxMana / 100) * 0.1
+    ? Math.floor(maxMana /100) * 0.1
     : 0;
 
   // Mana Waterfall bonus
   const manaWaterfallBonus = upgradeEffects.specials.has('mana_waterfall')
-    ? Math.floor(maxMana / 100) * 0.25
+    ? Math.floor(maxMana /100) * 0.25
     : 0;
 
   const effectiveRegen = (effectiveRegenWithSpecials + manaCascadeBonus + manaWaterfallBonus) * meditationMultiplier;
@@ -114,8 +117,8 @@ export function useManaStats() {
 export function useCombatStats() {
   const skills = useSkillStore((s) => s.skills);
   const signedPacts = usePrestigeStore((s) => s.signedPacts);
-  const equippedInstances = useGameStore((s) => s.equippedInstances);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
   const skillUpgrades = useSkillStore((s) => s.skillUpgrades);
   const skillTiers = useSkillStore((s) => s.skillTiers);
 
@@ -139,8 +142,8 @@ export function useCombatStats() {
  * Get equipment-related derived state
  */
 export function useEquipmentState() {
-  const equippedInstances = useGameStore((s) => s.equippedInstances);
-  const equipmentInstances = useGameStore((s) => s.equipmentInstances);
+  const equippedInstances = useCraftingStore((s) => s.equippedInstances);
+  const equipmentInstances = useCraftingStore((s) => s.equipmentInstances);
   const elements = useManaStore((s) => s.elements);
 
   return {