more validation

monkeytypegame · Nov 10, 2024 · bcd4759 · bcd4759
1 parent 8d01885
commit bcd4759
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/frontend/src/ts/test/funbox/funbox-list.ts b/frontend/src/ts/test/funbox/funbox-list.ts
@@ -25,13 +25,13 @@ const list: FunboxMetadata[] = [
   {
     name: "mirror",
     info: "Everything is mirrored!",
-    properties: ["changesTextOrientation"],
+    properties: ["mirror"],
     hasCSS: true,
   },
   {
     name: "upside_down",
     info: "Everything is upside down!",
-    properties: ["changesTextOrientation"],
+    properties: ["changesTextOrientation", "conflictsWithMirror"],
     hasCSS: true,
   },
   {
@@ -94,6 +94,7 @@ const list: FunboxMetadata[] = [
   {
     name: "space_balls",
     info: "In a galaxy far far away.",
+    properties: ["changesBackground"],
     hasCSS: true,
   },
   {
@@ -268,7 +269,7 @@ const list: FunboxMetadata[] = [
   {
     name: "crt",
     info: "Go back to the 1980s",
-    properties: ["noLigatures"],
+    properties: ["noLigatures", "changesBackground"],
   },
   {
     name: "backwards",

diff --git a/frontend/src/ts/test/funbox/funbox-validation.ts b/frontend/src/ts/test/funbox/funbox-validation.ts
@@ -314,6 +314,16 @@ export function areFunboxesCompatible(
     funboxesToCheck.filter((f) =>
       f.properties?.find((fp) => fp === "changesTextOrientation")
     ).length <= 1;
+  const oneChangesBackground =
+    funboxesToCheck.filter((f) =>
+      f.properties?.find((fp) => fp === "changesBackground")
+    ).length <= 1;
+  const noConflictsWithMirror =
+    funboxesToCheck.filter((f) =>
+      f.properties?.find((fp) => fp === "conflictsWithMirror")
+    ).length === 0 ||
+    funboxesToCheck.filter((f) => f.properties?.find((fp) => fp === "mirror"))
+      .length === 0;
   const allowedConfig = {} as FunboxForcedConfig;
   let noConfigConflicts = true;
   for (const f of funboxesToCheck) {
@@ -357,6 +367,8 @@ export function areFunboxesCompatible(
     oneMovesCharacters &&
     oneRotatesText &&
     oneChangesTextOrientation &&
+    oneChangesBackground &&
+    noConflictsWithMirror &&
     noConfigConflicts
   );
 }
diff --git a/frontend/src/ts/utils/json-data.ts b/frontend/src/ts/utils/json-data.ts
@@ -344,7 +344,10 @@ type FunboxProperty =
   | "movesText"
   | "movesCharacters"
   | "rotatesText"
-  | "changesTextOrientation";
+  | "changesTextOrientation"
+  | "mirror"
+  | "conflictsWithMirror"
+  | "changesBackground";
 
 export type FunboxForcedConfig = Record<string, ConfigValue[]>;