From 9c7d1abec375e3c35bca334304b069381fcd4af6 Mon Sep 17 00:00:00 2001
From: Brent Kerby <blkerby@gmail.com>
Date: Sun, 3 May 2026 07:59:14 -0600
Subject: [PATCH] Require shinespark after double x-mode blue suit helpers

---
 region/brinstar/green/Etecoon Energy Tank Room.json | 3 ++-
 region/brinstar/kraid/Kraid Eye Door Room.json      | 3 ++-
 region/maridia/inner-pink/East Cactus Alley.json    | 3 ++-
 tests/asserts/keywords.py                           | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json
index ee6c8acca..20c10806e 100644
--- a/region/brinstar/green/Etecoon Energy Tank Room.json	
+++ b/region/brinstar/green/Etecoon Energy Tank Room.json	
@@ -1248,7 +1248,8 @@
               }}
             ]}
           ]}
-        ]}
+        ]},
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
diff --git a/region/brinstar/kraid/Kraid Eye Door Room.json b/region/brinstar/kraid/Kraid Eye Door Room.json
index 5cdb5dbb4..e31fc5fc6 100644
--- a/region/brinstar/kraid/Kraid Eye Door Room.json	
+++ b/region/brinstar/kraid/Kraid Eye Door Room.json	
@@ -378,7 +378,8 @@
       "link": [1, 1],
       "name": "Gain Blue Suit (Double X-Mode)",
       "requires": [
-        "h_thornDoubleXModeBlueSuitWithoutLenience"
+        "h_thornDoubleXModeBlueSuitWithoutLenience",
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json
index 60ea9cd9f..a540f887b 100644
--- a/region/maridia/inner-pink/East Cactus Alley.json	
+++ b/region/maridia/inner-pink/East Cactus Alley.json	
@@ -1765,7 +1765,8 @@
       "link": [4, 4],
       "name": "Gain Blue Suit (Double X-Mode)",
       "requires": [
-        "h_spikeDoubleXModeBlueSuit"
+        "h_spikeDoubleXModeBlueSuit",
+        {"shinespark": {"frames": 0, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
diff --git a/tests/asserts/keywords.py b/tests/asserts/keywords.py
index b01bba05a..fb10e5370 100644
--- a/tests/asserts/keywords.py
+++ b/tests/asserts/keywords.py
@@ -513,7 +513,7 @@ def process_req_speed_state(req, states, err_fn):
             states = {"preshinespark"}
         elif req in ["canDoubleXModeBlueSuit", "h_spikeDoubleXModeBlueSuit", "h_thornDoubleXModeBlueSuit",
                      "h_thornDoubleXModeBlueSuitWithoutLenience"]:
-            states = {"shinespark"}
+            states = {"preshinespark"}
 
     elif isinstance(req, dict):
         if "canShineCharge" in req: