fixup! hepteractCrafts optional properties

Pseudo-Corp · Jun 24, 2024 · e4c4a64 · e4c4a64
1 parent 8eaff97
commit e4c4a64
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 19 deletions.
diff --git a/Sample_Saves/Synergism2.5 - (1) c10 completed.txt b/Sample_Saves/Synergism2.5 - (1) c10 completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (10) Omega completed.txt b/Sample_Saves/Synergism2.5 - (10) Omega completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (11) Ready for first singularity.txt b/Sample_Saves/Synergism2.5 - (11) Ready for first singularity.txt
diff --git a/Sample_Saves/Synergism2.5 - (2) c11 completed.txt b/Sample_Saves/Synergism2.5 - (2) c11 completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (3)c14 completed.txt b/Sample_Saves/Synergism2.5 - (3)c14 completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (4) w5x10 completed.txt b/Sample_Saves/Synergism2.5 - (4) w5x10 completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (5) Alpha completed.txt b/Sample_Saves/Synergism2.5 - (5) Alpha completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (6) p2x1 completed.txt b/Sample_Saves/Synergism2.5 - (6) p2x1 completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (7) p3x1 completed.txt b/Sample_Saves/Synergism2.5 - (7) p3x1 completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (8) Beta completed.txt b/Sample_Saves/Synergism2.5 - (8) Beta completed.txt
diff --git a/Sample_Saves/Synergism2.5 - (9) 1e15 c15 expo.txt b/Sample_Saves/Synergism2.5 - (9) 1e15 c15 expo.txt
diff --git a/src/saves/PlayerSchema.ts b/src/saves/PlayerSchema.ts
@@ -57,17 +57,18 @@ const toggleSchema = z.record(z.string(), z.boolean()).transform((record) => {
 const decimalStringSchema = z.string().regex(/^|-?\d+(\.\d{1,2})?$/)
 const integerStringSchema = z.string().regex(/^\d+$/)
 
-const hepteractCraftSchema = z.object({
-  AUTO: z.boolean(),
-  BAL: z.number(),
-  BASE_CAP: z.number(),
-  CAP: z.number(),
-  DISCOUNT: z.number(),
-  HEPTERACT_CONVERSION: z.number(),
-  HTML_STRING: z.string(),
-  OTHER_CONVERSIONS: z.record(z.string(), z.number()),
-  UNLOCKED: z.boolean()
-})
+const hepteractCraftSchema = (k: keyof Player['hepteractCrafts']) =>
+  z.object({
+    AUTO: z.boolean().default(() => blankSave.hepteractCrafts[k].AUTO),
+    BAL: z.number().default(() => blankSave.hepteractCrafts[k].BAL),
+    BASE_CAP: z.number(),
+    CAP: z.number().default(() => blankSave.hepteractCrafts[k].CAP),
+    DISCOUNT: z.number().default(() => blankSave.hepteractCrafts[k].DISCOUNT),
+    HEPTERACT_CONVERSION: z.number(),
+    HTML_STRING: z.string().default(() => blankSave.hepteractCrafts[k].HTML_STRING),
+    OTHER_CONVERSIONS: z.record(z.string(), z.number()),
+    UNLOCKED: z.boolean().default(() => blankSave.hepteractCrafts[k].UNLOCKED)
+  })
 
 export const playerSchema = z.object({
   firstPlayed: z.string().datetime().optional().default(() => new Date().toISOString()),
@@ -467,14 +468,14 @@ export const playerSchema = z.object({
   platonicBlessings: z.record(z.string(), z.number()).default(() => ({ ...blankSave.platonicBlessings })),
 
   hepteractCrafts: z.object({
-    chronos: hepteractCraftSchema,
-    hyperrealism: hepteractCraftSchema,
-    quark: hepteractCraftSchema,
-    challenge: hepteractCraftSchema,
-    abyss: hepteractCraftSchema,
-    accelerator: hepteractCraftSchema,
-    acceleratorBoost: hepteractCraftSchema,
-    multiplier: hepteractCraftSchema
+    chronos: hepteractCraftSchema('chronos'),
+    hyperrealism: hepteractCraftSchema('hyperrealism'),
+    quark: hepteractCraftSchema('quark'),
+    challenge: hepteractCraftSchema('challenge'),
+    abyss: hepteractCraftSchema('abyss'),
+    accelerator: hepteractCraftSchema('accelerator'),
+    acceleratorBoost: hepteractCraftSchema('acceleratorBoost'),
+    multiplier: hepteractCraftSchema('multiplier')
   }).transform((crafts) => {
     return Object.fromEntries(
       Object.entries(blankSave.hepteractCrafts).map(([key, value]) => {