improve checking logics in checkOptionalObjectiveAmountWinCondition

nkzw-tech · Jun 17, 2024 · 84b2ad6 · 84b2ad6
1 parent 2b94409
commit 84b2ad6
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/apollo/lib/checkWinCondition.tsx b/apollo/lib/checkWinCondition.tsx
@@ -331,6 +331,9 @@ function checkOptionalObjectiveAmountWinCondition(
     for (const condition of winConditions) {
       if (
         condition.type === WinCriteria.OptionalObjectiveAmount &&
+        (!condition.players ||
+          condition.players.length === 0 ||
+          condition.players.includes(actionResponse.toPlayer)) &&
         completedObjectiveCount >= condition.amount
       ) {
         return condition;
@@ -339,7 +342,7 @@ function checkOptionalObjectiveAmountWinCondition(
   } else if (
     actionResponse.type === 'DeniedOptionalObjective' &&
     actionResponse.condition.type !== WinCriteria.Default &&
-    actionResponse.condition.failed
+    actionResponse.condition.failed?.size
   ) {
     for (const deniedPlayer of actionResponse.condition.failed) {
       const viableObjectiveCount = winConditions.filter(