Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 22 additions & 0 deletions helpers.json
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,15 @@
]}
]
},
{
"name": "h_carefullyDestroyBombWalls",
"requires": [
{"or": [
"h_bombThings",
"h_avoidScrewStuck"
]}
]
},
{
"name": "h_additionalBomb",
"requires": [
Expand Down Expand Up @@ -1034,6 +1043,19 @@
]}
]
},
{
"name": "h_avoidScrewStuck",
"requires": [
"ScrewAttack",
{"or": [
"Morph",
"canCarefulJump"
]}
],
"devNote": [
"ScrewAttack can create 2 tile high spaces with Samus in spinjump leading to a crouch, resulting in a potential softlock."
]
},
{
"name": "h_shinechargeMaxRunway",
"requires": [
Expand Down
6 changes: 3 additions & 3 deletions region/brinstar/pink/Dachora Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
]},
{"and": [
"canDash",
"ScrewAttack",
"h_avoidScrewStuck",
{"cycleFrames": 620}
]},
{"and": [
Expand Down Expand Up @@ -404,7 +404,7 @@
"requires": [
{"or": [
"h_getBlueSpeedMaxRunway",
"h_destroyBombWalls",
"h_carefullyDestroyBombWalls",
{"obstaclesCleared": ["A"]}
]}
],
Expand Down Expand Up @@ -1106,7 +1106,7 @@
"h_getBlueSpeedMaxRunway",
"canCarefulJump"
]},
"h_destroyBombWalls",
"h_carefullyDestroyBombWalls",
{"obstaclesCleared": ["A"]}
]}
],
Expand Down
16 changes: 8 additions & 8 deletions region/crateria/central/Landing Site.json
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@
"name": "Base",
"requires": [
{"or": [
"h_destroyBombWalls",
"h_carefullyDestroyBombWalls",
{"obstaclesCleared": ["A"]}
]}
],
Expand Down Expand Up @@ -822,7 +822,7 @@
"requires": [
"canSpeedyJump",
"canCarefulJump",
"ScrewAttack"
"h_avoidScrewStuck"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think having this include screw would be nicer for this one as well - because this strat already included a careful jump, so it feels a bit weird to have this helper which is technically just careful jump or morph

Copy link
Copy Markdown
Contributor

@kjbranch kjbranch Apr 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The careful jump should remain here, as it wouldnt be required if you have Morph.

Edit: (A little confused, the preview here shows it remains, but the Files Changed shows it removed)

],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
Expand Down Expand Up @@ -1699,7 +1699,7 @@
]}
]},
{"or": [
"h_destroyBombWalls",
"h_carefullyDestroyBombWalls",
{"obstaclesCleared": ["A"]}
]}
],
Expand Down Expand Up @@ -1746,7 +1746,7 @@
"h_storedSpark",
"canMidairShinespark",
{"shinespark": {"frames": 31, "excessFrames": 2}},
"h_destroyBombWalls"
"h_carefullyDestroyBombWalls"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
Expand Down Expand Up @@ -1951,7 +1951,7 @@
"canJumpIntoIBJ"
]},
{"or": [
"h_destroyBombWalls",
"h_carefullyDestroyBombWalls",
{"obstaclesCleared": ["A"]}
]}
],
Expand All @@ -1969,9 +1969,9 @@
{"obstaclesCleared": ["A"]},
"h_bombThings",
{"and": [
"ScrewAttack",
"h_avoidScrewStuck",
{"or": [
"canTwoTileSqueeze",
"canTunnelCrawl",
"canSpeedyJump",
{"and": [
"canXRayStandUp",
Expand Down Expand Up @@ -2008,7 +2008,7 @@
"requires": [
"h_storedSpark",
{"shinespark": {"frames": 7, "excessFrames": 2}},
"h_destroyBombWalls"
"h_carefullyDestroyBombWalls"
],
"clearsObstacles": ["A"],
"flashSuitChecked": true,
Expand Down
4 changes: 2 additions & 2 deletions region/crateria/west/Gauntlet Energy Tank Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@
{"acidFrames": 35}
]},
{"or": [
"ScrewAttack",
"h_avoidScrewStuck",
{"obstaclesCleared": ["A", "B"]}
]}
],
Expand Down Expand Up @@ -1334,7 +1334,7 @@
{"acidFrames": 35}
]},
{"or": [
"ScrewAttack",
"h_avoidScrewStuck",
{"and": [
{"obstaclesCleared": ["A"]},
{"obstaclesCleared": ["B"]}
Expand Down
4 changes: 2 additions & 2 deletions region/crateria/west/Gauntlet Entrance.json
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
"link": [1, 2],
"name": "Base",
"requires": [
"ScrewAttack",
"h_avoidScrewStuck",
{"or": [
"canCarefulJump",
{"acidFrames": 15}
Expand Down Expand Up @@ -797,7 +797,7 @@
"link": [2, 1],
"name": "Base",
"requires": [
"ScrewAttack",
"h_avoidScrewStuck",
{"or": [
"canCarefulJump",
{"acidFrames": 15}
Expand Down
7 changes: 6 additions & 1 deletion region/lowernorfair/east/Pillar Room.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,12 @@
"ScrewAttack",
{"or": [
"canCarefulJump",
{"heatFrames": 60}
{"and": [
"Morph",
"Gravity",
{"acidFrames": 20},
{"heatFrames": 60}
]}
]},
{"heatFrames": 480}
],
Expand Down
2 changes: 2 additions & 0 deletions schema/m3-string-requirements.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,11 @@
"h_usePowerBomb",
"h_bombThings",
"h_destroyBombWalls",
"h_carefullyDestroyBombWalls",
"h_additionalBomb",
"h_useSpringBall",
"h_hasBeamUpgrade",
"h_avoidScrewStuck",
"h_shinechargeMaxRunway",
"h_getBlueSpeedMaxRunway",
"h_shinechargeSlideTemporaryBlue",
Expand Down
Loading