fix: resolve bugs #118 #119 #120 #123 and refactor craftingStore init

src/lib/game/stores/craftingStore.ts

@@ -13,6 +13,7 @@ import { useUIStore } from './uiStore';
 import * as ApplicationActions from '../crafting-actions/application-actions';
 import * as PreparationActions from '../crafting-actions/preparation-actions';
 import * as CraftingEquipment from '../crafting-equipment';
+import { equipItem as equipItemAction, unequipItem as unequipItemAction } from '../crafting-actions/equipment-actions';
 import { ErrorCode } from '../utils/result';
 import { createSafeStorage } from '../utils/safe-persist';
 import type { Result } from '../utils/result';
@@ -376,6 +377,14 @@ export const useCraftingStore = create<CraftingStore>()(
             };
           });
         },
+
+        equipItem: (instanceId: string, slot: EquipmentSlot) => {
+          return equipItemAction(instanceId, slot, get, set);
+        },
+
+        unequipItem: (slot: EquipmentSlot) => {
+          unequipItemAction(slot, set);
+        },
       };
     },
     {

src/lib/game/stores/craftingStore.types.ts

@@ -8,6 +8,7 @@ import type {
   EquipmentInstance,
   DesignEffect,
 } from '../types';
+import type { EquipmentSlot } from '../types/equipmentSlot';
 
 export interface CraftingError {
   code: string;
@@ -57,6 +58,8 @@ export interface CraftingActions {
   cancelPreparation: () => void;
   deleteMaterial: (materialId: string, amount: number) => void;
   deleteEquipmentInstance: (instanceId: string) => void;
+  equipItem: (instanceId: string, slot: EquipmentSlot) => boolean;
+  unequipItem: (slot: EquipmentSlot) => void;
   startCraftingEquipment: (blueprintId: string) => boolean;
   cancelEquipmentCrafting: () => void;
   setSelectedEquipmentType: (type: string | null) => void;

src/lib/game/stores/discipline-slice.ts

@@ -52,19 +52,29 @@ export const useDisciplineStore = create<DisciplineStore>()(
         set((s) => {
           const def = DISCIPLINE_MAP[id];
           if (!def) return s;
-          if (s.activeIds.includes(id)) return s;
+
+          // Allow re-activation if discipline exists but is paused
+          const existing = s.disciplines[id];
+          if (s.activeIds.includes(id)) {
+            // If already active and paused, un-pause it
+            if (existing?.paused) {
+              return {
+                disciplines: { ...s.disciplines, [id]: { ...existing, paused: false } },
+              };
+            }
+            return s;
+          }
 
           const nonPaused = s.activeIds.filter((aid) => {
             const d = s.disciplines[aid];
             return d && !d.paused;
           }).length;
           if (nonPaused >= s.concurrentLimit) return s;
-          const discState = s.disciplines[id];
-          if (!canProceedDiscipline(def, discState, gameState)) return s;
+          if (!canProceedDiscipline(def, existing, gameState)) return s;
 
-          const existing = s.disciplines[id] || { id, xp: 0, paused: false };
+          const discState = existing || { id, xp: 0, paused: false };
           return {
-            disciplines: { ...s.disciplines, [id]: { ...existing, paused: false } },
+            disciplines: { ...s.disciplines, [id]: { ...discState, paused: false } },
             activeIds: [...s.activeIds, id],
           };
         });
@@ -73,6 +83,9 @@ export const useDisciplineStore = create<DisciplineStore>()(
       deactivate(id) {
         set((s) => ({
           activeIds: s.activeIds.filter((aid) => aid !== id),
+          disciplines: s.disciplines[id]
+            ? { ...s.disciplines, [id]: { ...s.disciplines[id], paused: true } }
+            : s.disciplines,
         }));
       },