fix useFlashSuit and blueSuitShinecharge to lose both flash and blue

Author: blkerby

rust/maprando/src/traverse.rs

@@ -2139,7 +2139,7 @@ fn apply_requirement_simple(
                 return SimpleResult::Failure;
             }
             if cx.reverse {
-                if local.flash_suit > 0 {
+                if local.flash_suit > 0 || local.blue_suit > 0 {
                     return SimpleResult::Failure;
                 }
                 local.flash_suit = 1;
@@ -2149,6 +2149,7 @@ fn apply_requirement_simple(
                 SimpleResult::Failure
             } else {
                 local.flash_suit = 0;
+                local.blue_suit = 0;
                 // Set shinecharge frames remaining to the max, to allow `comeInShinecharged`
                 // strats to be satisfied by a flash suit.
                 // (And at least 1 shinecharge frame is required in order to satisfy a `shinespark` requirement.)
@@ -2210,7 +2211,7 @@ fn apply_requirement_simple(
                 return SimpleResult::Failure;
             }
             if cx.reverse {
-                if local.blue_suit != 0 {
+                if local.blue_suit > 0 || local.flash_suit > 0 {
                     return SimpleResult::Failure;
                 }
                 local.blue_suit = 1;
@@ -2220,6 +2221,7 @@ fn apply_requirement_simple(
                 SimpleResult::Failure
             } else {
                 local.blue_suit = 0;
+                local.flash_suit = 0;
                 // Set shinecharge frames remaining to the max, to allow `comeInShinecharged`
                 // strats to be satisfied by a blue suit.
                 local.shinecharge_frames_remaining =

rust/maprando/tests/scenarios/blue-suit-shinecharge/scenarios.json

@@ -21,6 +21,52 @@
       "endRoomId": 0,
       "endNodeId": 2,
       "fail": true
+    },
+    {
+      "name": "Cannot Keep Blue Suit",
+      "startRoomId": 0,
+      "startNodeId": 1,
+      "startState": {
+        "blueSuit": 1
+      },
+      "endRoomId": 0,
+      "endNodeId": 2,
+      "endState": {
+        "blueSuit": 1
+      },
+      "fail": true
+    },
+    {
+      "name": "Lose Flash Suit",
+      "startRoomId": 0,
+      "startNodeId": 1,
+      "startState": {
+        "flashSuit": 1,
+        "blueSuit": 1
+      },
+      "endRoomId": 0,
+      "endNodeId": 2,
+      "endState": {
+        "flashSuit": 0,
+        "blueSuit": 0
+      },
+      "reverse": "weak"
+    },
+    {
+      "name": "Cannot Keep Flash Suit",
+      "startRoomId": 0,
+      "startNodeId": 1,
+      "startState": {
+        "flashSuit": 1,
+        "blueSuit": 1
+      },
+      "endRoomId": 0,
+      "endNodeId": 2,
+      "endState": {
+        "flashSuit": 1,
+        "blueSuit": 0
+      },
+      "fail": true
     }
   ]
 }

rust/maprando/tests/scenarios/flash-suit-use/scenarios.json

@@ -15,12 +15,58 @@
       }
     },
     {
-      "name": "Missing Flash Suit",
+      "name": "Fail: Missing Flash Suit",
       "startRoomId": 0,
       "startNodeId": 1,
       "endRoomId": 0,
       "endNodeId": 2,
       "fail": true
+    },
+    {
+      "name": "Fail: Cannot Keep Flash Suit",
+      "startRoomId": 0,
+      "startNodeId": 1,
+      "startState": {
+        "flashSuit": 1
+      },
+      "endRoomId": 0,
+      "endNodeId": 2,
+      "endState": {
+        "flashSuit": 1
+      },
+      "fail": true
+    },
+    {
+      "name": "Lose Blue Suit",
+      "startRoomId": 0,
+      "startNodeId": 1,
+      "startState": {
+        "flashSuit": 1,
+        "blueSuit": 1
+      },
+      "endRoomId": 0,
+      "endNodeId": 2,
+      "endState": {
+        "flashSuit": 0,
+        "blueSuit": 0
+      },
+      "reverse": "weak"
+    },
+    {
+      "name": "Fail: Cannot Keep Blue Suit",
+      "startRoomId": 0,
+      "startNodeId": 1,
+      "startState": {
+        "flashSuit": 1,
+        "blueSuit": 1
+      },
+      "endRoomId": 0,
+      "endNodeId": 2,
+      "endState": {
+        "flashSuit": 0,
+        "blueSuit": 1
+      },
+      "fail": true
     }
   ]
 }