fix: fix crash loading saves with value-less loc variables

MichaelMakesGames · Aug 20, 2024 · ee3eeb2 · ee3eeb2
1 parent 24cd624
commit ee3eeb2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/renderer/src/lib/GameState.ts b/src/renderer/src/lib/GameState.ts
@@ -25,7 +25,7 @@ export interface LocalizedText {
 	key: string;
 	variables?: {
 		key: string;
-		value: LocalizedText;
+		value?: LocalizedText;
 	}[];
 }
 const localizedTextSchemaNoDefault: z.ZodType<LocalizedText> = z.object({
@@ -34,7 +34,7 @@ const localizedTextSchemaNoDefault: z.ZodType<LocalizedText> = z.object({
 		.array(
 			z.object({
 				key: z.coerce.string(),
-				value: z.lazy(() => localizedTextSchemaNoDefault),
+				value: z.lazy(() => localizedTextSchemaNoDefault.optional()),
 			}),
 		)
 		.optional(),

diff --git a/src/renderer/src/lib/map/data/locUtils.ts b/src/renderer/src/lib/map/data/locUtils.ts
@@ -26,7 +26,7 @@ export function localizeTextSync(
 	} else if (text.key === '%ADJ%') {
 		try {
 			const var0 = text.variables?.[0];
-			if (!var0 || !var0.value.variables) throw new Error();
+			if (!var0 || !var0.value?.variables) throw new Error();
 			const adj = loc[var0.value.key] ?? var0.value.key;
 			if (adj.includes('$1$')) {
 				return localizeTextSync(var0.value, loc);