Disallow only optional win conditions.

GitOrigin-RevId: 2f1e2d8b10b038a567799fa14b990cf92022a642
nkzw-tech · Jun 2, 2024 · 5771fcb · 5771fcb
1 parent 0bf5c28
commit 5771fcb
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 261 deletions.
diff --git a/athena/WinConditions.tsx b/athena/WinConditions.tsx
@@ -759,17 +759,30 @@ export function validateWinCondition(map: MapData, condition: WinCondition) {
 
 export function validateWinConditions(map: MapData) {
   const { winConditions } = map.config;
-  if (Array.isArray(winConditions) && winConditions.length <= 32) {
-    if (
-      winConditions.filter(({ type }) => type === WinCriteria.Default).length >
-      1
-    ) {
-      return false;
-    }
-    return winConditions.every(validateWinCondition.bind(null, map));
+  if (
+    !Array.isArray(winConditions) ||
+    winConditions.length > 32 ||
+    winConditions.filter(({ type }) => type === WinCriteria.Default).length > 1
+  ) {
+    return false;
   }
 
-  return false;
+  if (
+    winConditions.filter(({ type }) => type === WinCriteria.Default).length > 1
+  ) {
+    return false;
+  }
+
+  if (
+    winConditions.every(
+      (condition) =>
+        condition.type !== WinCriteria.Default && condition.optional,
+    )
+  ) {
+    return false;
+  }
+
+  return winConditions.every(validateWinCondition.bind(null, map));
 }
 
 export function resetWinConditions(