Fix crash on existing saves missing researchQueue by merging persisted state with defaults

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
2026-04-26 08:41:54 -04:00
parent cc606ae523
commit 1f50f6c86c
1 changed files with 12 additions and 5 deletions
@@ -1481,12 +1481,19 @@ export const useGameStore = create<Store>()(
            infraNav: { level: 'clusters' },
          } as unknown as Store;
        }
-        const s = _persisted as Record<string, unknown>;
-        const research = s.research as Record<string, unknown>;
-        if (!research.researchQueue) {
-          s.research = { ...research, researchQueue: [] };
+        return _persisted as Store;
+      },
+      merge: (persisted, current) => {
+        const p = persisted as Record<string, unknown>;
+        const c = current as unknown as Record<string, unknown>;
+        const merged = { ...c, ...p };
+        for (const key of Object.keys(c)) {
+          if (p[key] != null && typeof p[key] === 'object' && !Array.isArray(p[key])
+            && typeof c[key] === 'object' && !Array.isArray(c[key])) {
+            merged[key] = { ...c[key] as Record<string, unknown>, ...p[key] as Record<string, unknown> };
+          }
        }
-        return s as unknown as Store;
+        return merged as unknown as Store;
      },
    },
  ),