Skip to content

Commit b382837

Browse files
authored
Merge pull request #1537 from kjbranch/xray-climb
Add flashSuitChecked to all strats that require canXRayClimb
2 parents eb32fa6 + 9ad0328 commit b382837

61 files changed

Lines changed: 116 additions & 0 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,6 +849,7 @@
849849
"hits": 1
850850
}}
851851
],
852+
"flashSuitChecked": true,
852853
"note": [
853854
"Keep the two Geemers on screen while moving to the right side of the room.",
854855
"Freeze the second Geemer as it exits the Morph Tunnel, with the Crumble block.",

region/brinstar/blue/Construction Zone.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@
300300
"canXRayClimb"
301301
],
302302
"bypassesDoorShell": true,
303+
"flashSuitChecked": true,
303304
"note": [
304305
"Exit the previous room with Samus in a standing pose (while grappled) with a horizontal position of 21 (as far right as possible).",
305306
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
@@ -551,6 +552,7 @@
551552
"requires": [
552553
"canXRayClimb"
553554
],
555+
"flashSuitChecked": true,
554556
"note": "This is a short climb of only a few tiles."
555557
},
556558
{

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@
380380
"canXRayClimb"
381381
],
382382
"bypassesDoorShell": true,
383+
"flashSuitChecked": true,
383384
"note": [
384385
"Exit the previous room with Samus in a standing pose (while grappled) with a horizontal position of 21 (as far right as possible).",
385386
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
@@ -910,6 +911,7 @@
910911
"canXRayClimb"
911912
],
912913
"bypassesDoorShell": true,
914+
"flashSuitChecked": true,
913915
"note": [
914916
"Exit the previous room with Samus in a standing pose (while grappled) with a horizontal position of 21 (as far right as possible).",
915917
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",

region/brinstar/green/Green Brinstar Main Shaft.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3379,6 +3379,7 @@
33793379
"requires": [
33803380
"canXRayClimb"
33813381
],
3382+
"flashSuitChecked": true,
33823383
"note": "Climb up 1 screen."
33833384
},
33843385
{
@@ -3565,6 +3566,7 @@
35653566
"canXRayClimb",
35663567
"canBePatient"
35673568
],
3569+
"flashSuitChecked": true,
35683570
"note": "Climb up 4 screens."
35693571
},
35703572
{
@@ -3901,6 +3903,7 @@
39013903
"canXRayClimb",
39023904
"h_canBombThings"
39033905
],
3906+
"flashSuitChecked": true,
39043907
"note": [
39053908
"Climb up 1 screen.",
39063909
"Once Samus appears one tile above the bottom of the door, you will be unable to climb higher, and it is safe to morph at this point."

region/brinstar/green/Green Hill Zone.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -593,6 +593,7 @@
593593
"canXRayClimb"
594594
],
595595
"bypassesDoorShell": true,
596+
"flashSuitChecked": true,
596597
"note": [
597598
"Exit the previous room with Samus in a standing pose (while grappled).",
598599
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
@@ -814,6 +815,7 @@
814815
"canXRayClimb"
815816
],
816817
"bypassesDoorShell": true,
818+
"flashSuitChecked": true,
817819
"note": [
818820
"Exit the previous room with Samus in a standing pose (while grappled).",
819821
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",

region/brinstar/kraid/Warehouse Kihunter Room.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@
392392
}}
393393
],
394394
"clearsObstacles": ["C"],
395+
"flashSuitChecked": true,
395396
"note": "Climb up 1 screen"
396397
},
397398
{

region/brinstar/pink/Big Pink.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,7 @@
992992
{"shinespark": {"frames": 2, "excessFrames": 2}},
993993
"canXRayClimb"
994994
],
995+
"flashSuitChecked": true,
995996
"note": [
996997
"Perform a horizontal shinespark through the door transition, from a horizontal position that triggers a deep transition in the door.",
997998
"Sparking from one or two pixels away from the door is an example position that works (if possible in the neighboring room).",
@@ -1014,6 +1015,7 @@
10141015
"canDeepTransition",
10151016
"canXRayClimb"
10161017
],
1018+
"flashSuitChecked": true,
10171019
"note": [
10181020
"Stand facing the door in the previous room, at a specific distance from the door, approximately a 3-pixel window at an effective distance of a 6-tile closed-end runway (taking into account how slopes can modify the effective distance).",
10191021
"Pause, then unpause while holding dash and right.",
@@ -1035,6 +1037,7 @@
10351037
"canDeepTransition",
10361038
"canXRayClimb"
10371039
],
1040+
"flashSuitChecked": true,
10381041
"note": [
10391042
"Stand facing away from the door in the previous room, at a specific distance from the door, approximately a 2-pixel window at an effective distance of 3.7 tiles (taking into account how slopes can modify the effective distance).",
10401043
"Pause, then unpause while holding dash and right.",
@@ -1059,6 +1062,7 @@
10591062
"requires": [
10601063
"canXRayClimb"
10611064
],
1065+
"flashSuitChecked": true,
10621066
"note": "Climb up 1 screen.",
10631067
"devNote": [
10641068
"Normally, an XRayClimb's resetRoom has mustStayPut true, but because node 5 is configured to spawn at 14, Samus will be expected to visit 14 before 5 when setting up.",
@@ -1537,6 +1541,7 @@
15371541
"requires": [
15381542
"canXRayClimb"
15391543
],
1544+
"flashSuitChecked": true,
15401545
"note": "Climb up 1 screen."
15411546
},
15421547
{

region/brinstar/pink/Dachora Room.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,7 @@
471471
"canXRayClimb",
472472
"canBeVeryPatient"
473473
],
474+
"flashSuitChecked": true,
474475
"note": "6 screen X-Ray climb, and global Zeelas are still active even off camera."
475476
},
476477
{
@@ -876,6 +877,7 @@
876877
"canXRayClimb"
877878
],
878879
"bypassesDoorShell": true,
880+
"flashSuitChecked": true,
879881
"note": [
880882
"Exit the previous room with Samus in a standing pose (while grappled).",
881883
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",

region/brinstar/pink/Pink Brinstar Hopper Room.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -786,6 +786,7 @@
786786
"hits": 2
787787
}}
788788
],
789+
"flashSuitChecked": true,
789790
"note": [
790791
"To minimize damage from the Hoppers, get stuck in the door relatively high and move quickly.",
791792
"Climb up somewhat less than 1 screen, until Samus' head appears between 1 and 3 tiles below the door.",
@@ -1150,6 +1151,7 @@
11501151
"canTrickySpringBallJump",
11511152
"canSpringFling"
11521153
],
1154+
"flashSuitChecked": true,
11531155
"note": [
11541156
"X-Ray climb until Samus is a little over halfway off screen; the position is not precise.",
11551157
"Face right, then do a turnaround buffer spin jump into a Spring Ball jump to reach the ledge.",
@@ -1170,6 +1172,7 @@
11701172
"canOffScreenMovement",
11711173
"canInsaneJump"
11721174
],
1175+
"flashSuitChecked": true,
11731176
"note": [
11741177
"Get stuck 3 pixels inside the door, and X-ray climb to a precise height:",
11751178
"after just one pixel of Samus' feet are visible while crouching facing left, perform exactly 7 more X-Ray stand-ups.",

region/brinstar/pink/Pink Brinstar Power Bomb Room.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@
429429
"requires": [
430430
"canXRayClimb"
431431
],
432+
"flashSuitChecked": true,
432433
"note": "Climb up 1 screen."
433434
},
434435
{

0 commit comments

Comments
 (0)