Skip to content

Amphitheatre CF strats and a few other refinements #2203

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
osse101 merged 1 commit into from
Aug 8, 2025
Merged

Amphitheatre CF strats and a few other refinements #2203

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
118 changes: 102 additions & 16 deletions region/lowernorfair/east/Amphitheatre.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@
"from": 3,
"to": [
{"id": 1},
{"id": 3},
{"id": 4},
{"id": 5}
]
Expand All @@ -189,7 +190,8 @@
"to": [
{"id": 1},
{"id": 2},
{"id": 3}
{"id": 3},
{"id": 4}
]
},
{
Expand Down Expand Up @@ -652,22 +654,17 @@
"canCarefulJump"
]}
]},
{"heatFrames": 140},
{"or": [
"canResetFallSpeed",
"canPreciseWalljump",
{"and": [
{"heatFrames": 60},
{"acidFrames": 60}
]}
]},
{"heatFrames": 330},
{"acidFrames": 330}
{"heatFrames": 320},
{"acidFrames": 195}
],
"note": [
"Dive into the acid to the left of the first floating platform to quickly sink to the bottom of the room.",
"It is possible to jump directly over the pirate at the bottom of the ramp directly to the gap between platforms.",
"Falling in this way will land between platforms at the bottom of the room unless Samus slows or catches herself on the way down."
"Falling in this way will land between the platforms at the bottom of the room."
],
"devNote": [
"It is faster to fall all the way to the bottom and then jump onto the platform to the left,",
"than to morph/unmorph to reset fall speed to reach it directly."
]
},
{
Expand Down Expand Up @@ -817,6 +814,31 @@
],
"devNote": ["This strat is only used to avoid walljumping."]
},
{
"link": [3, 3],
"name": "Crystal Flash (In Acid)",
"requires": [
{"obstaclesNotCleared": ["A"]},
{"heatFrames": 170},
{"acidFrames": 170},
"canHeatedCrystalFlash",
"h_heatedAcidCrystalFlashRefill",
{"heatFrames": 20},
{"acidFrames": 20},
{"or": [
"Gravity",
{"and": [
{"heatFrames": 5},
{"acidFrames": 5}
]}
]}
],
"devNote": [
"We list the requirements explicitly rather than using the helper `h_heatedAcidCrystalFlash`",
"to reflect that it's possible to save some heat/acid frames with a soft morph while landing;",
"this makes the difference in being able to make the CF with 3 tanks with Gravity."
]
},
{
"id": 45,
"link": [3, 4],
Expand Down Expand Up @@ -897,8 +919,8 @@
{"or": [
{"and": [
"Gravity",
{"heatFrames": 120},
{"acidFrames": 120}
{"heatFrames": 105},
{"acidFrames": 105}
]},
{"and": [
{"heatFrames": 170},
Expand All @@ -908,6 +930,50 @@
],
"note": "Avoid the pirate while moving through the acid to get closer to the wall."
},
{
"link": [3, 5],
"name": "Kill Pirate and Crystal Flash",
"requires": [
{"notable": "Reverse Acid Dive"},
{"obstaclesNotCleared": ["A"]},
"canSuitlessLavaDive",
{"or": [
{"and": [
"canTrickyDodgeEnemies",
{"enemyKill": {
"enemies": [["Yellow Space Pirate (standing)"]],
"explicitWeapons": ["Super", "Charge+Plasma"]
}}
]},
{"enemyKill": {
"enemies": [["Yellow Space Pirate (standing)"]],
"explicitWeapons": ["Charge+Ice+Wave+Plasma"]
}},
{"and": [
"Gravity",
{"enemyKill": {
"enemies": [["Yellow Space Pirate (standing)"]],
"explicitWeapons": ["ScrewAttack"]
}}
]}
]},
{"or": [
{"and": [
"Gravity",
{"heatFrames": 80},
{"acidFrames": 80}
]},
{"and": [
{"heatFrames": 130},
{"acidFrames": 130}
]}
]},
"h_heatedAcidCrystalFlash",
{"heatFrames": 35},
{"acidFrames": 35}
],
"note": "Kill the Pirate and perform a Crystal Flash."
},
{
"id": 26,
"link": [4, 1],
Expand All @@ -928,7 +994,11 @@
"Land on the fourth platform from the top and build some speed to spacejump across straight to the door.",
"The optimal platform can be hit by simpily holding right when entering the acid."
],
"devNote": "Includes a little bit extra frame count to drop down two platforms first."
"devNote": [
"Includes a little bit extra frame count to drop down two platforms first.",
"FIXME: this lower platform could be modeled more cleanly as a separate junction node;",
"it would be useful as another place to Crystal Flash when traversing the room left-to-right."
]
},
{
"id": 27,
Expand Down Expand Up @@ -1043,6 +1113,22 @@
],
"note": "Jump off the platform to the left with low horizontal speed and hold left to avoid landing on any pirates."
},
{
"link": [4, 4],
"name": "Crystal Flash (Acidless)",
"requires": [
{"obstaclesCleared": ["A"]},
"h_heatedCrystalFlash"
],
"devNote": [
"This requires acting quickly enough that the acid does not catch Samus,",
"but this is not difficult to do.",
"A Crystal Flash could also be performed in acid here, while traversing the room right-to-left,",
"but it would have no benefit compared to Crystal Flashing on room entry and taking the 2->3 path.",
"FIXME: add another Crystal Flash strat at a junction two platforms lower,",
"which has a more significant movement requirement to avoid getting caught by the acid."
]
},
{
"id": 31,
"link": [5, 1],
Expand Down
3 changes: 2 additions & 1 deletion tests/asserts/keywords.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,8 @@ def check_shinecharge_req(req):

def check_heat_req(req):
if isinstance(req, str):
if req in ["h_heatProof", "h_heatedCrystalFlash", "h_heatedLavaCrystalFlash", "h_LowerNorfairElevatorDownwardFrames",
if req in ["h_heatProof", "h_heatedCrystalFlash", "h_heatedLavaCrystalFlash", "h_heatedAcidCrystalFlash",
"h_LowerNorfairElevatorDownwardFrames",
"h_LowerNorfairElevatorUpwardFrames", "h_MainHallElevatorFrames", "h_heatedGreenGateGlitch",
"h_heatedDirectGModeLeaveSameDoor", "h_heatedIndirectGModeOpenSameDoor",
"h_heatedGModeOpenDifferentDoor", "h_heatedGModeOffCameraDoor", "h_heatedGModePauseAbuse"]:
Expand Down