Skip to content

Commit

Permalink
Merge pull request #1908 from blkerby/samus-eater-teleport
Browse files Browse the repository at this point in the history
Samus eater teleport
  • Loading branch information
osse101 authored Jan 23, 2025
2 parents 92c7735 + 4fbdbed commit 4919766
Show file tree
Hide file tree
Showing 14 changed files with 626 additions and 1 deletion.
32 changes: 32 additions & 0 deletions region/brinstar/green/Green Brinstar Main Shaft.json
Original file line number Diff line number Diff line change
Expand Up @@ -2910,6 +2910,22 @@
},
"requires": []
},
{
"link": [5, 13],
"name": "Samus Eater Teleport",
"entranceCondition": {
"comeInWithSamusEaterTeleport": {
"floorPositions": [[12, 13], [14, 13], [15, 13]],
"ceilingPositions": []
}
},
"requires": [
"Morph"
],
"note": [
"Land in the last Samus Eater of Alpha Power Bomb Room, or the second Samus Eater from the right of Hellway."
]
},
{
"id": 121,
"link": [6, 2],
Expand Down Expand Up @@ -3477,6 +3493,22 @@
},
"requires": []
},
{
"link": [6, 13],
"name": "Samus Eater Teleport",
"entranceCondition": {
"comeInWithSamusEaterTeleport": {
"floorPositions": [[15, 13], [1, 13]],
"ceilingPositions": []
}
},
"requires": [
"Morph"
],
"note": [
"Land in the right side of the third Samus Eater on the floor of Hellway."
]
},
{
"id": 152,
"link": [7, 2],
Expand Down
139 changes: 139 additions & 0 deletions region/brinstar/pink/Big Pink.json
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@
{
"from": 3,
"to": [
{"id": 1},
{"id": 3},
{"id": 4},
{"id": 10},
Expand All @@ -418,6 +419,7 @@
{
"from": 4,
"to": [
{"id": 1},
{"id": 4},
{"id": 10},
{"id": 13}
Expand All @@ -426,6 +428,7 @@
{
"from": 5,
"to": [
{"id": 1},
{"id": 4},
{"id": 5},
{"id": 13}
Expand Down Expand Up @@ -463,6 +466,7 @@
{"id": 2},
{"id": 4},
{"id": 6},
{"id": 7},
{"id": 8},
{"id": 11},
{"id": 12},
Expand Down Expand Up @@ -957,6 +961,27 @@
"flashSuitChecked": true,
"note": "Avoiding the hoppers can be tricky."
},
{
"link": [3, 1],
"name": "Samus Eater Teleport, X-Ray Climb",
"entranceCondition": {
"comeInWithSamusEaterTeleport": {
"floorPositions": [[1, 13], [2, 13]],
"ceilingPositions": []
}
},
"requires": [
"canXRayClimb"
],
"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.",
"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": 23,
"link": [3, 3],
Expand Down Expand Up @@ -1038,6 +1063,28 @@
"requires": [],
"flashSuitChecked": true
},
{
"link": [4, 1],
"name": "Samus Eater Teleport, X-Ray Climb",
"entranceCondition": {
"comeInWithSamusEaterTeleport": {
"floorPositions": [[1, 13], [2, 13]],
"ceilingPositions": []
}
},
"requires": [
"canXRayClimb",
"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.",
"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": 136,
"link": [4, 4],
Expand Down Expand Up @@ -1273,6 +1320,28 @@
"A Power Bomb also works, but will clear B, Samus can just go 4->10->13."
]
},
{
"link": [5, 1],
"name": "Samus Eater Teleport, X-Ray Climb",
"entranceCondition": {
"comeInWithSamusEaterTeleport": {
"floorPositions": [[1, 13], [2, 13]],
"ceilingPositions": []
}
},
"requires": [
"canXRayClimb",
"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.",
"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],
Expand Down Expand Up @@ -1832,6 +1901,29 @@
"Climb up 2 screens, and perform a turnaround buffered spin-jump away from the door to trigger the transition, bypassing any lock on the door."
]
},
{
"link": [8, 7],
"name": "Samus Eater Teleport, X-Ray Climb",
"entranceCondition": {
"comeInWithSamusEaterTeleport": {
"floorPositions": [],
"ceilingPositions": [[10, 3]]
}
},
"requires": [
"canXRayClimb",
"canBePatient"
],
"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.",
"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."
],
"devNote": [
"Other Samus Eaters can also probably work."
]
},
{
"id": 72,
"link": [8, 8],
Expand All @@ -1844,6 +1936,25 @@
}
}
},
{
"link": [8, 8],
"name": "G-Mode Setup - Get Hit By Reo",
"requires": [
"Morph"
],
"exitCondition": {
"leaveWithGModeSetup": {}
},
"flashSuitChecked": true,
"note": [
"To manipulate the Reo into a suitable position, lure it to the left and crouch at the edge of the platform;",
"jump as needed to bring it back on camera when it goes off;",
"it should perform 4 big swoops down to the left, 2 small swoops (hitting the overhang above), then 5 more big swoops,",
"after which it will enter a slow hover moving directly towards Samus.",
"Then lure it down and to the right, making it pass through the morph tunnel.",
"Samus' vertical position must stay below that of the Reo, in order to keep the Reo in its hover state."
]
},
{
"id": 73,
"link": [8, 11],
Expand Down Expand Up @@ -2578,6 +2689,34 @@
"Refreeze it below the crumble blocks, perform a very precise ledge grab onto it, then jump through the crumble block to reach the door, all while carefully avoiding losing the flash suit."
]
},
{
"link": [13, 5],
"name": "G-Mode Setup - Get Hit By Reo",
"requires": [
"h_canPreciseIceClip",
{"notable": "Reo Ice Clip Without Morph and X-Ray"}
],
"exitCondition": {
"leaveWithGModeSetup": {}
},
"unlocksDoors": [{"types": ["ammo"], "requires": []}],
"flashSuitChecked": true,
"note": [
"Lure the Reo (Bee) to the left to use it as a platform for ice clipping up through the crumbles.",
"Watch the Reo bounce against the left wall until it does a slow hover towards Samus.",
"There is a very small timing of when its right claw is above the small pale spore next to the big red spore, when Samus should jump to be above the Reo.",
"Crouching with Samus' front toe beneath this spore (facing left) will cause the bee to fly with the correct timing after Samus takes knockback damage, with a 3 pixel window.",
"This will cause it to fly left and into the two tile gap below the crumble blocks.",
"Freeze it once to get above it, and then again for the ice clip.",
"After clipping up, stand hanging slightly off the edge of the door frame to continue breaking the crumble blocks,",
"allowing the Reo to pass up through them when it thaws.",
"When the Reo is about to come up, after breaking the crumbles for the final time, move slightly left to the safety of the door frame,",
"and crouch for a moment before pressing left to enter the door transition."
],
"devNote": [
"Morph could help with this trick, but we use the morphless notable for difficulty placement."
]
},
{
"id": 106,
"link": [13, 6],
Expand Down
18 changes: 18 additions & 0 deletions region/brinstar/red/Alpha Power Bomb Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,24 @@
],
"flashSuitChecked": true
},
{
"link": [1, 1],
"name": "Leave with Samus Eater Teleport",
"entranceCondition": {
"comeInWithGMode": {
"mode": "direct",
"morphed": false
}
},
"requires": [],
"exitCondition": {
"leaveWithSamusEaterTeleport": {
"floorPositions": [[12, 13], [2, 13], [8, 13]],
"ceilingPositions": []
}
},
"bypassesDoorShell": true
},
{
"id": 10,
"link": [1, 2],
Expand Down
34 changes: 34 additions & 0 deletions region/brinstar/red/Beta Power Bomb Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,40 @@
"Other weapon combinations are possible, but not reliable due to movement being limited."
]
},
{
"link": [1, 2],
"name": "Samus Eater Teleport",
"entranceCondition": {
"comeInWithSamusEaterTeleport": {
"floorPositions": [[15, 13], [1, 13]],
"ceilingPositions": []
}
},
"requires": [
{"or": [
{"and": [
{"ammo": {"type": "Super", "count": 1}},
"h_canUseSpringBall",
{"thornHits": 4}
]},
{"and": [
"h_canUseMorphBombs",
{"thornHits": 3},
{"samusEaterFrames": 320}
]}
]},
{"or": [
"canInsaneJump",
{"thornHits": 1}
]}
],
"note": [
"Land in the right side of the third Samus Eater on the floor of Hellway.",
"The Samus Eater teleport will result in Samus being placed below the Power Bombs blocks, below the door.",
"Use Spring Ball or Bombs to navigate past the thorns, Samus Eaters, and Yapping Maws.",
"It can be helpful to use a Super to kill the first Yapping Maw."
]
},
{
"id": 19,
"link": [2, 1],
Expand Down
36 changes: 36 additions & 0 deletions region/brinstar/red/Hellway.json
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,24 @@
"flashSuitChecked": true,
"note": "Shoot a Super towards the door while the Zeela is on the side of its platform to knock it off."
},
{
"link": [1, 1],
"name": "Leave with Samus Eater Teleport",
"entranceCondition": {
"comeInWithGMode": {
"mode": "direct",
"morphed": false
}
},
"requires": [],
"exitCondition": {
"leaveWithSamusEaterTeleport": {
"floorPositions": [[7, 13], [11, 13], [15, 13], [10, 13], [14, 13], [1, 13]],
"ceilingPositions": [[6, 3], [10, 3]]
}
},
"bypassesDoorShell": true
},
{
"id": 12,
"link": [1, 2],
Expand Down Expand Up @@ -463,6 +481,24 @@
"leaveWithGModeSetup": {}
},
"flashSuitChecked": true
},
{
"link": [2, 2],
"name": "Leave with Samus Eater Teleport",
"entranceCondition": {
"comeInWithGMode": {
"mode": "direct",
"morphed": false
}
},
"requires": [],
"exitCondition": {
"leaveWithSamusEaterTeleport": {
"floorPositions": [[7, 13], [11, 13], [15, 13], [10, 13], [14, 13], [1, 13]],
"ceilingPositions": [[6, 3], [10, 3]]
}
},
"bypassesDoorShell": true
}
],
"notables": [
Expand Down
Loading

0 comments on commit 4919766

Please sign in to comment.