Merge pull request #2836 from blkerby/x-mode-blue-shinespark

Fix missing shinespark requirements on X-mode blue suit strats

Author: osse101

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -1221,7 +1221,8 @@
               }}
             ]}
           ]}
-        ]}
+        ]},
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -2222,7 +2223,8 @@
               }}
             ]}
           ]}
-        ]}
+        ]},
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true

region/brinstar/kraid/Kraid Eye Door Room.json

@@ -350,7 +350,8 @@
       },
       "requires": [
         {"shineChargeFrames": 95},
-        "h_thornXModeBlueSuitWithoutLenience"
+        "h_thornXModeBlueSuitWithoutLenience",
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -366,7 +367,8 @@
         }
       },
       "requires": [
-        "h_thornXModeBlueSuitWithoutLenience"
+        "h_thornXModeBlueSuitWithoutLenience",
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1403,7 +1405,8 @@
       },
       "requires": [
         {"shineChargeFrames": 95},
-        "h_thornXModeBlueSuitWithoutLenience"
+        "h_thornXModeBlueSuitWithoutLenience",
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1419,7 +1422,8 @@
         }
       },
       "requires": [
-        "h_thornXModeBlueSuitWithoutLenience"
+        "h_thornXModeBlueSuitWithoutLenience",
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true

region/wreckedship/main/Bowling Alley.json

@@ -2035,7 +2035,8 @@
           {"canShineCharge": {"usedTiles": 14, "openEnd": 1}}
         ]},
         {"spikeHits": 1},
-        "h_spikeXModeBlueSuit"
+        "h_spikeXModeBlueSuit",
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true

tests/asserts/keywords.py

@@ -510,7 +510,7 @@ def process_req_speed_state(req, states, err_fn):
                      "h_thornXModeBlueSuit", "h_thornXModeBlueSuitWithoutLenience"]:
             if not states.issubset(["shinecharging", "shinecharged", "preshinespark"]):
                 err_fn(f"{req} while not in shinecharging/shinecharged/preshinespark")
-            states = {"shinespark"}
+            states = {"preshinespark"}
         elif req in ["canDoubleXModeBlueSuit", "h_spikeDoubleXModeBlueSuit", "h_thornDoubleXModeBlueSuit",
                      "h_thornDoubleXModeBlueSuitWithoutLenience"]:
             states = {"shinespark"}