Skip to content

Commit 484def9

Browse files
authored
Merge pull request #2135 from blkerby/long-xray-climb
Add canLongXRayClimb tech
2 parents b9cf4dd + 21313b8 commit 484def9

54 files changed

Lines changed: 397 additions & 183 deletions

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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1262,7 +1262,7 @@
12621262
{"notable": "Geemer Ice Stuck XRay Climb"},
12631263
"h_ZebesIsAwake",
12641264
"canWallIceClip",
1265-
"canXRayClimb",
1265+
"canLongXRayClimb",
12661266
"Grapple",
12671267
{"ammo": {"type": "Super", "count": 1}},
12681268
{"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2364,7 +2364,7 @@
23642364
}
23652365
},
23662366
"requires": [
2367-
"canXRayClimb"
2367+
"canLongXRayClimb"
23682368
],
23692369
"bypassesDoorShell": true,
23702370
"flashSuitChecked": true,
@@ -3043,7 +3043,7 @@
30433043
}
30443044
},
30453045
"requires": [
3046-
"canXRayClimb"
3046+
"canLongXRayClimb"
30473047
],
30483048
"bypassesDoorShell": true,
30493049
"flashSuitChecked": true,
@@ -3615,7 +3615,7 @@
36153615
}
36163616
},
36173617
"requires": [
3618-
"canXRayClimb",
3618+
"canLongXRayClimb",
36193619
"canBePatient"
36203620
],
36213621
"bypassesDoorShell": true,
@@ -3907,7 +3907,7 @@
39073907
{
39083908
"id": 167,
39093909
"link": [7, 12],
3910-
"name": "Right-Side X-Ray Climb",
3910+
"name": "X-Ray Climb",
39113911
"entranceCondition": {
39123912
"comeInWithDoorStuckSetup": {}
39133913
},
@@ -3953,7 +3953,7 @@
39533953
}
39543954
},
39553955
"requires": [
3956-
"canXRayClimb",
3956+
"canLongXRayClimb",
39573957
"canBeVeryPatient"
39583958
],
39593959
"bypassesDoorShell": true,
@@ -4018,7 +4018,7 @@
40184018
}
40194019
},
40204020
"requires": [
4021-
"canXRayClimb",
4021+
"canLongXRayClimb",
40224022
"canBeVeryPatient"
40234023
],
40244024
"bypassesDoorShell": true,
@@ -4061,7 +4061,7 @@
40614061
}
40624062
},
40634063
"requires": [
4064-
"canXRayClimb",
4064+
"canLongXRayClimb",
40654065
"canBePatient"
40664066
],
40674067
"bypassesDoorShell": true,
@@ -4275,7 +4275,7 @@
42754275
"comeInWithDoorStuckSetup": {}
42764276
},
42774277
"requires": [
4278-
"canXRayClimb",
4278+
"canLongXRayClimb",
42794279
"canBePatient"
42804280
],
42814281
"flashSuitChecked": true,

region/brinstar/green/Green Hill Zone.json

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -938,10 +938,10 @@
938938
{
939939
"id": 38,
940940
"link": [2, 1],
941-
"name": "Grapple Teleport X-Ray Climb",
941+
"name": "Grapple Teleport X-Ray Climb (1 Screen)",
942942
"entranceCondition": {
943943
"comeInWithGrappleTeleport": {
944-
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29], [2, 34]]
944+
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
945945
}
946946
},
947947
"requires": [
@@ -952,7 +952,27 @@
952952
"note": [
953953
"Exit the previous room with Samus in a standing pose (while grappled).",
954954
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
955-
"Then X-ray climb to get up to the door transition, without needing to open the door.",
955+
"Then X-ray climb 1 screen to get up to the door transition, without needing to open the door.",
956+
"Samus will not be visible during the climb."
957+
]
958+
},
959+
{
960+
"link": [2, 1],
961+
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
962+
"entranceCondition": {
963+
"comeInWithGrappleTeleport": {
964+
"blockPositions": [[2, 34]]
965+
}
966+
},
967+
"requires": [
968+
"canLongXRayClimb"
969+
],
970+
"bypassesDoorShell": true,
971+
"flashSuitChecked": true,
972+
"note": [
973+
"Exit the previous room with Samus in a standing pose (while grappled).",
974+
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
975+
"Then X-ray climb 2 screens to get up to the door transition, without needing to open the door.",
956976
"Samus will not be visible during the climb."
957977
]
958978
},
@@ -1268,7 +1288,7 @@
12681288
{
12691289
"id": 54,
12701290
"link": [3, 1],
1271-
"name": "Grapple Teleport X-Ray Climb",
1291+
"name": "Grapple Teleport X-Ray Climb (1 Screen)",
12721292
"entranceCondition": {
12731293
"comeInWithGrappleTeleport": {
12741294
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
@@ -1282,7 +1302,27 @@
12821302
"note": [
12831303
"Exit the previous room with Samus in a standing pose (while grappled).",
12841304
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
1285-
"Then X-ray climb to get up to the door transition, without needing to open the door.",
1305+
"Then X-ray climb 1 screen to get up to the door transition, without needing to open the door.",
1306+
"Samus will not be visible during the climb."
1307+
]
1308+
},
1309+
{
1310+
"link": [3, 1],
1311+
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
1312+
"entranceCondition": {
1313+
"comeInWithGrappleTeleport": {
1314+
"blockPositions": [[2, 34]]
1315+
}
1316+
},
1317+
"requires": [
1318+
"canLongXRayClimb"
1319+
],
1320+
"bypassesDoorShell": true,
1321+
"flashSuitChecked": true,
1322+
"note": [
1323+
"Exit the previous room with Samus in a standing pose (while grappled).",
1324+
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
1325+
"Then X-ray climb 2 screens to get up to the door transition, without needing to open the door.",
12861326
"Samus will not be visible during the climb."
12871327
]
12881328
},

region/brinstar/pink/Big Pink.json

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,11 +1098,12 @@
10981098
}
10991099
},
11001100
"requires": [
1101-
"canXRayClimb"
1101+
"canLongXRayClimb"
11021102
],
11031103
"note": [
11041104
"Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
1105-
"After teleporting and passing through the transition, X-Ray climb to reach the space above, to the left of the morph tunnel and bomb block.",
1105+
"After teleporting and passing through the transition, X-Ray climb (about 2 screens) to reach the space above,",
1106+
"to the left of the morph tunnel and bomb block.",
11061107
"Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
11071108
],
11081109
"devNote": ["Other Samus Eaters can also probably work."]
@@ -1281,12 +1282,13 @@
12811282
}
12821283
},
12831284
"requires": [
1284-
"canXRayClimb",
1285+
"canLongXRayClimb",
12851286
"canBePatient"
12861287
],
12871288
"note": [
12881289
"Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
1289-
"After teleporting and passing through the transition, X-Ray climb to reach the space above, to the left of the morph tunnel and bomb block.",
1290+
"After teleporting and passing through the transition, X-Ray climb (about 3 screens) to reach the space above,",
1291+
"to the left of the morph tunnel and bomb block.",
12901292
"Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
12911293
],
12921294
"devNote": ["Other Samus Eaters can also probably work."]
@@ -1624,20 +1626,21 @@
16241626
}
16251627
},
16261628
"requires": [
1627-
"canXRayClimb",
1629+
"canLongXRayClimb",
16281630
"canBePatient"
16291631
],
16301632
"note": [
16311633
"Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
1632-
"After teleporting and passing through the transition, X-Ray climb to reach the space above, to the left of the morph tunnel and bomb block.",
1634+
"After teleporting and passing through the transition, X-Ray climb (about 4 screens) to reach the space above,",
1635+
"to the left of the morph tunnel and bomb block.",
16331636
"Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
16341637
],
16351638
"devNote": ["Other Samus Eaters can also probably work."]
16361639
},
16371640
{
16381641
"id": 40,
16391642
"link": [5, 4],
1640-
"name": "Left-Side X-Ray Climb",
1643+
"name": "X-Ray Climb",
16411644
"entranceCondition": {
16421645
"comeInWithDoorStuckSetup": {}
16431646
},
@@ -1733,7 +1736,7 @@
17331736
}
17341737
},
17351738
"requires": [
1736-
"canXRayClimb",
1739+
"canLongXRayClimb",
17371740
"canBePatient"
17381741
],
17391742
"bypassesDoorShell": true,
@@ -2298,7 +2301,7 @@
22982301
}
22992302
},
23002303
"requires": [
2301-
"canXRayClimb",
2304+
"canLongXRayClimb",
23022305
"canBeVeryPatient"
23032306
],
23042307
"bypassesDoorShell": true,
@@ -2319,7 +2322,7 @@
23192322
}
23202323
},
23212324
"requires": [
2322-
"canXRayClimb"
2325+
"canLongXRayClimb"
23232326
],
23242327
"bypassesDoorShell": true,
23252328
"flashSuitChecked": true,
@@ -2339,12 +2342,12 @@
23392342
}
23402343
},
23412344
"requires": [
2342-
"canXRayClimb",
2343-
"canBePatient"
2345+
"canXRayClimb"
23442346
],
23452347
"note": [
23462348
"Jump into the second Samus Eater in the ceiling of Hellway.",
2347-
"After teleporting and passing through the transition, X-Ray climb to reach the space above, to the right of the morph tunnel and Super block.",
2349+
"After teleporting and passing through the transition, X-Ray climb 1 screen to reach the space above,",
2350+
"to the right of the morph tunnel and Super block.",
23482351
"Samus will be off-camera, so it may be hard to tell when the climb is done;",
23492352
"moving left and right is a safe way to test, as it will cause the camera to scroll if Samus is at the top."
23502353
],
@@ -2463,15 +2466,15 @@
24632466
{
24642467
"id": 77,
24652468
"link": [8, 13],
2466-
"name": "Right-Side X-Ray Climb",
2469+
"name": "X-Ray Climb",
24672470
"entranceCondition": {
24682471
"comeInWithDoorStuckSetup": {}
24692472
},
24702473
"requires": [
24712474
"canXRayClimb"
24722475
],
24732476
"flashSuitChecked": true,
2474-
"note": "Climb up 1 screen."
2477+
"note": "Climb up 1 screen (or 2 tiles less than a screen)."
24752478
},
24762479
{
24772480
"id": 69,
@@ -3119,7 +3122,8 @@
31193122
"Likewise, with the Reo knockback method either 2 or 4 pixels can work, though it is more reliable in the 2-pixel position;",
31203123
"it helps to take the knockback a few pixels away from the wall, as it takes a few frames for the horizontal speed of the knockback to reach its maximum.",
31213124
"The trick can work with Samus facing either toward or away from the wall when taking knockback;",
3122-
"facing away makes it easier to quickly kill the Reo afterward to avoid taking a second hit."
3125+
"facing away makes it easier to quickly kill the Reo afterward to avoid taking a second hit.",
3126+
"FIXME: describe how to do this by freezing the Zeb higher, above node 5."
31233127
]
31243128
},
31253129
{

region/brinstar/pink/Dachora Room.json

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@
532532
"comeInWithDoorStuckSetup": {}
533533
},
534534
"requires": [
535-
"canXRayClimb",
535+
"canLongXRayClimb",
536536
"canBeVeryPatient"
537537
],
538538
"flashSuitChecked": true,
@@ -549,7 +549,7 @@
549549
}
550550
},
551551
"requires": [
552-
"canXRayClimb",
552+
"canLongXRayClimb",
553553
"canBeVeryPatient"
554554
],
555555
"bypassesDoorShell": true,
@@ -971,10 +971,10 @@
971971
{
972972
"id": 48,
973973
"link": [3, 1],
974-
"name": "Grapple Teleport X-Ray Climb",
974+
"name": "Grapple Teleport X-Ray Climb (1 Screen)",
975975
"entranceCondition": {
976976
"comeInWithGrappleTeleport": {
977-
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29], [2, 34]]
977+
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
978978
}
979979
},
980980
"requires": [
@@ -985,7 +985,26 @@
985985
"note": [
986986
"Exit the previous room with Samus in a standing pose (while grappled).",
987987
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
988-
"Then X-ray climb to get up to the door transition, without needing to open the door."
988+
"Then X-ray climb 1 screen to get up to the door transition, without needing to open the door."
989+
]
990+
},
991+
{
992+
"link": [3, 1],
993+
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
994+
"entranceCondition": {
995+
"comeInWithGrappleTeleport": {
996+
"blockPositions": [[2, 34]]
997+
}
998+
},
999+
"requires": [
1000+
"canLongXRayClimb"
1001+
],
1002+
"bypassesDoorShell": true,
1003+
"flashSuitChecked": true,
1004+
"note": [
1005+
"Exit the previous room with Samus in a standing pose (while grappled).",
1006+
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
1007+
"Then X-ray climb 2 screens to get up to the door transition, without needing to open the door."
9891008
]
9901009
},
9911010
{

region/brinstar/pink/Spore Spawn Super Room.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
"comeInWithDoorStuckSetup": {}
164164
},
165165
"requires": [
166-
"canXRayClimb",
166+
"canLongXRayClimb",
167167
"canBeVeryPatient"
168168
],
169169
"flashSuitChecked": true,
@@ -180,7 +180,7 @@
180180
}
181181
},
182182
"requires": [
183-
"canXRayClimb",
183+
"canLongXRayClimb",
184184
"canBeVeryPatient"
185185
],
186186
"bypassesDoorShell": true,

0 commit comments

Comments
 (0)