Skip to content

Add canLongXRayClimb tech #2135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blkerby merged 1 commit into from
Jul 18, 2025
Merged

Add canLongXRayClimb tech #2135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion region/brinstar/blue/Blue Brinstar Energy Tank Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1262,7 +1262,7 @@
{"notable": "Geemer Ice Stuck XRay Climb"},
"h_ZebesIsAwake",
"canWallIceClip",
"canXRayClimb",
"canLongXRayClimb",
"Grapple",
{"ammo": {"type": "Super", "count": 1}},
{"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}
Expand Down
16 changes: 8 additions & 8 deletions region/brinstar/green/Green Brinstar Main Shaft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2364,7 +2364,7 @@
}
},
"requires": [
"canXRayClimb"
"canLongXRayClimb"
],
"bypassesDoorShell": true,
"flashSuitChecked": true,
Expand Down Expand Up @@ -3043,7 +3043,7 @@
}
},
"requires": [
"canXRayClimb"
"canLongXRayClimb"
],
"bypassesDoorShell": true,
"flashSuitChecked": true,
Expand Down Expand Up @@ -3615,7 +3615,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBePatient"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -3907,7 +3907,7 @@
{
"id": 167,
"link": [7, 12],
"name": "Right-Side X-Ray Climb",
"name": "X-Ray Climb",
"entranceCondition": {
"comeInWithDoorStuckSetup": {}
},
Expand Down Expand Up @@ -3953,7 +3953,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBeVeryPatient"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -4018,7 +4018,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBeVeryPatient"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -4061,7 +4061,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBePatient"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -4275,7 +4275,7 @@
"comeInWithDoorStuckSetup": {}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBePatient"
],
"flashSuitChecked": true,
Expand Down
50 changes: 45 additions & 5 deletions region/brinstar/green/Green Hill Zone.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -922,10 +922,10 @@
{
"id": 38,
"link": [2, 1],
"name": "Grapple Teleport X-Ray Climb",
"name": "Grapple Teleport X-Ray Climb (1 Screen)",
"entranceCondition": {
"comeInWithGrappleTeleport": {
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29], [2, 34]]
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
}
},
"requires": [
Expand All @@ -936,7 +936,27 @@
"note": [
"Exit the previous room with Samus in a standing pose (while grappled).",
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
"Then X-ray climb to get up to the door transition, without needing to open the door.",
"Then X-ray climb 1 screen to get up to the door transition, without needing to open the door.",
"Samus will not be visible during the climb."
]
},
{
"link": [2, 1],
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
"entranceCondition": {
"comeInWithGrappleTeleport": {
"blockPositions": [[2, 34]]
}
},
"requires": [
"canLongXRayClimb"
],
"bypassesDoorShell": true,
"flashSuitChecked": true,
"note": [
"Exit the previous room with Samus in a standing pose (while grappled).",
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
"Then X-ray climb 2 screens to get up to the door transition, without needing to open the door.",
"Samus will not be visible during the climb."
]
},
Expand Down Expand Up @@ -1252,7 +1272,7 @@
{
"id": 54,
"link": [3, 1],
"name": "Grapple Teleport X-Ray Climb",
"name": "Grapple Teleport X-Ray Climb (1 Screen)",
"entranceCondition": {
"comeInWithGrappleTeleport": {
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
Expand All @@ -1266,7 +1286,27 @@
"note": [
"Exit the previous room with Samus in a standing pose (while grappled).",
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
"Then X-ray climb to get up to the door transition, without needing to open the door.",
"Then X-ray climb 1 screen to get up to the door transition, without needing to open the door.",
"Samus will not be visible during the climb."
]
},
{
"link": [3, 1],
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
"entranceCondition": {
"comeInWithGrappleTeleport": {
"blockPositions": [[2, 34]]
}
},
"requires": [
"canLongXRayClimb"
],
"bypassesDoorShell": true,
"flashSuitChecked": true,
"note": [
"Exit the previous room with Samus in a standing pose (while grappled).",
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
"Then X-ray climb 2 screens to get up to the door transition, without needing to open the door.",
"Samus will not be visible during the climb."
]
},
Expand Down
36 changes: 20 additions & 16 deletions region/brinstar/pink/Big Pink.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1098,11 +1098,12 @@
}
},
"requires": [
"canXRayClimb"
"canLongXRayClimb"
],
"note": [
"Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
"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.",
"After teleporting and passing through the transition, X-Ray climb (about 2 screens) to reach the space above,",
"to the left of the morph tunnel and bomb block.",
"Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
],
"devNote": ["Other Samus Eaters can also probably work."]
Expand Down Expand Up @@ -1281,12 +1282,13 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBePatient"
],
"note": [
"Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
"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.",
"After teleporting and passing through the transition, X-Ray climb (about 3 screens) to reach the space above,",
"to the left of the morph tunnel and bomb block.",
"Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
],
"devNote": ["Other Samus Eaters can also probably work."]
Expand Down Expand Up @@ -1624,20 +1626,21 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBePatient"
],
"note": [
"Fall into the first Samus Eater in Hellway or the second Samus Eater of Alpha Power Bomb Room.",
"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.",
"After teleporting and passing through the transition, X-Ray climb (about 4 screens) to reach the space above,",
"to the left of the morph tunnel and bomb block.",
"Samus will be off-camera, but the slopes at the top will push the camera up, indicating when the climb is done."
],
"devNote": ["Other Samus Eaters can also probably work."]
},
{
"id": 40,
"link": [5, 4],
"name": "Left-Side X-Ray Climb",
"name": "X-Ray Climb",
"entranceCondition": {
"comeInWithDoorStuckSetup": {}
},
Expand Down Expand Up @@ -1733,7 +1736,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBePatient"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -2298,7 +2301,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBeVeryPatient"
],
"bypassesDoorShell": true,
Expand All @@ -2319,7 +2322,7 @@
}
},
"requires": [
"canXRayClimb"
"canLongXRayClimb"
],
"bypassesDoorShell": true,
"flashSuitChecked": true,
Expand All @@ -2339,12 +2342,12 @@
}
},
"requires": [
"canXRayClimb",
"canBePatient"
"canXRayClimb"
],
"note": [
"Jump into the second Samus Eater in the ceiling of Hellway.",
"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.",
"After teleporting and passing through the transition, X-Ray climb 1 screen to reach the space above,",
"to the right of the morph tunnel and Super block.",
"Samus will be off-camera, so it may be hard to tell when the climb is done;",
"moving left and right is a safe way to test, as it will cause the camera to scroll if Samus is at the top."
],
Expand Down Expand Up @@ -2463,15 +2466,15 @@
{
"id": 77,
"link": [8, 13],
"name": "Right-Side X-Ray Climb",
"name": "X-Ray Climb",
"entranceCondition": {
"comeInWithDoorStuckSetup": {}
},
"requires": [
"canXRayClimb"
],
"flashSuitChecked": true,
"note": "Climb up 1 screen."
"note": "Climb up 1 screen (or 2 tiles less than a screen)."
},
{
"id": 69,
Expand Down Expand Up @@ -3119,7 +3122,8 @@
"Likewise, with the Reo knockback method either 2 or 4 pixels can work, though it is more reliable in the 2-pixel position;",
"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.",
"The trick can work with Samus facing either toward or away from the wall when taking knockback;",
"facing away makes it easier to quickly kill the Reo afterward to avoid taking a second hit."
"facing away makes it easier to quickly kill the Reo afterward to avoid taking a second hit.",
"FIXME: describe how to do this by freezing the Zeb higher, above node 5."
]
},
{
Expand Down
29 changes: 24 additions & 5 deletions region/brinstar/pink/Dachora Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@
"comeInWithDoorStuckSetup": {}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBeVeryPatient"
],
"flashSuitChecked": true,
Expand All @@ -549,7 +549,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBeVeryPatient"
],
"bypassesDoorShell": true,
Expand Down Expand Up @@ -971,10 +971,10 @@
{
"id": 48,
"link": [3, 1],
"name": "Grapple Teleport X-Ray Climb",
"name": "Grapple Teleport X-Ray Climb (1 Screen)",
"entranceCondition": {
"comeInWithGrappleTeleport": {
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29], [2, 34]]
"blockPositions": [[2, 18], [2, 19], [2, 28], [2, 29]]
}
},
"requires": [
Expand All @@ -985,7 +985,26 @@
"note": [
"Exit the previous room with Samus in a standing pose (while grappled).",
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
"Then X-ray climb to get up to the door transition, without needing to open the door."
"Then X-ray climb 1 screen to get up to the door transition, without needing to open the door."
]
},
{
"link": [3, 1],
"name": "Grapple Teleport X-Ray Climb (2 Screens)",
"entranceCondition": {
"comeInWithGrappleTeleport": {
"blockPositions": [[2, 34]]
}
},
"requires": [
"canLongXRayClimb"
],
"bypassesDoorShell": true,
"flashSuitChecked": true,
"note": [
"Exit the previous room with Samus in a standing pose (while grappled).",
"After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).",
"Then X-ray climb 2 screens to get up to the door transition, without needing to open the door."
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions region/brinstar/pink/Spore Spawn Super Room.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"comeInWithDoorStuckSetup": {}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBeVeryPatient"
],
"flashSuitChecked": true,
Expand All @@ -179,7 +179,7 @@
}
},
"requires": [
"canXRayClimb",
"canLongXRayClimb",
"canBeVeryPatient"
],
"bypassesDoorShell": true,
Expand Down
Loading