Skip to content

Commit 65f1666

Browse files
authored
Merge pull request #2867 from blkerby/fix-double-xmode-bluesuit
Require shinespark after double x-mode blue suit helpers
2 parents 49b1636 + 9c7d1ab commit 65f1666

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1431,7 +1431,8 @@
14311431
}}
14321432
]}
14331433
]}
1434-
]}
1434+
]},
1435+
{"shinespark": {"frames": 0, "excessFrames": 0}}
14351436
],
14361437
"flashSuitChecked": true,
14371438
"blueSuitChecked": true,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,8 @@
378378
"link": [1, 1],
379379
"name": "Gain Blue Suit (Double X-Mode)",
380380
"requires": [
381-
"h_thornDoubleXModeBlueSuitWithoutLenience"
381+
"h_thornDoubleXModeBlueSuitWithoutLenience",
382+
{"shinespark": {"frames": 0, "excessFrames": 0}}
382383
],
383384
"flashSuitChecked": true,
384385
"blueSuitChecked": true

region/maridia/inner-pink/East Cactus Alley.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,8 @@
17651765
"link": [4, 4],
17661766
"name": "Gain Blue Suit (Double X-Mode)",
17671767
"requires": [
1768-
"h_spikeDoubleXModeBlueSuit"
1768+
"h_spikeDoubleXModeBlueSuit",
1769+
{"shinespark": {"frames": 0, "excessFrames": 0}}
17691770
],
17701771
"flashSuitChecked": true,
17711772
"blueSuitChecked": true

tests/asserts/keywords.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ def process_req_speed_state(req, states, err_fn):
513513
states = {"preshinespark"}
514514
elif req in ["canDoubleXModeBlueSuit", "h_spikeDoubleXModeBlueSuit", "h_thornDoubleXModeBlueSuit",
515515
"h_thornDoubleXModeBlueSuitWithoutLenience"]:
516-
states = {"shinespark"}
516+
states = {"preshinespark"}
517517

518518
elif isinstance(req, dict):
519519
if "canShineCharge" in req:

0 commit comments

Comments
 (0)