Skip to content

Simplify underwater crouch jump helpers #2261

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 3 commits into from
Aug 26, 2025
Merged

Simplify underwater crouch jump helpers #2261

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8a6fa1
Simplify underwater crouch jump helpers
blkerby Aug 25, 2025
a27616c
update devNote
blkerby Aug 25, 2025
497c314
second pass at updating devNote
blkerby Aug 25, 2025
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
15 changes: 11 additions & 4 deletions helpers.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,23 +697,30 @@
]
},
{
"name": "h_underwaterCrouchJumpWithFlashSuit",
"name": "h_underwaterCrouchJump",
"requires": [
{"tech": "canCrouchJump"}
Copy link
Copy Markdown
Contributor

@osse101 osse101 Aug 25, 2025

Choose a reason for hiding this comment

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

I don't like how it looks like no tech is involved, when we can slot canCarryFlashSuit in here.
The note and purpose are based on flash suit, but the important parts of the helper do not reference flash suits. The value is in the lack of NoFlashSuit which you look somewhere else to see.

So I suggest adding OR:[ NoFlashSuit, canCarryFlashSuit]

Copy link
Copy Markdown
Contributor Author

@blkerby blkerby Aug 25, 2025

Choose a reason for hiding this comment

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

The way I look at it is that essentially canCarryFlashSuit is implicitly required on every strat that carries a flash suit, so it would be redundant to add it as a requirement here. Although, since it would be inefficient to check for the canCarryFlashSuit tech on every strat, more specifically the way it's working is that we're checking it at the time the flash suit is gained: every method of gaining a flash suit will come with a canCarryFlashSuit requirement. This means that in any scenario where you could possibly have a flash suit, the canCarryFlashSuit tech will already be satisfied, so we should not need to add it as a requirement anywhere except as a dependency on the tech for gaining a flash suit.

I made an attempt at updating the dev note; does this resolve the problem?

],
"devNote": [
"It is possible to crouch jump under water without losing a flash suit.",
"Hold shoot to prevent using a flash suit while still getting the increased height of the crouch jump.",
"Alternatively, it is possible to crouch, jump, then quickly press down to prevent the use of the flash suit."
"Alternatively, it is possible to crouch, jump, then quickly press down (or have down already buffered) to prevent the use of the flash suit."
]
},
{
"name": "h_underwaterMaxHeightSpringBallJumpWithFlashSuit",
Copy link
Copy Markdown
Contributor

@kjbranch kjbranch Aug 25, 2025

Choose a reason for hiding this comment

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

It's a shame to see this one go. It was such a great name. lol

"name": "h_underwaterMaxHeightSpringBallJump",
"requires": [
"h_underwaterCrouchJumpWithFlashSuit",
"h_underwaterCrouchJump",
"canTrickySpringBallJump"
]
},
{
"name": "h_underwaterCrouchJumpDownGrab",
"requires": [
"h_underwaterCrouchJump",
"canDownGrab"
]
},
{
"name": "h_PlasmaHitbox",
"requires": [
Expand Down
16 changes: 2 additions & 14 deletions region/crateria/east/East Ocean.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1472,13 +1472,7 @@
"canSuitlessMaridia",
"canTrickyJump",
"canNeutralDamageBoost",
{"or": [
"h_crouchJumpDownGrab",
{"and": [
"h_underwaterCrouchJumpWithFlashSuit",
"canDownGrab"
]}
]},
"h_underwaterCrouchJumpDownGrab",
{"enemyDamage": {"enemy": "Skultera", "type": "contact", "hits": 1}}
],
"flashSuitChecked": true,
Expand All @@ -1495,13 +1489,7 @@
"name": "Use Flash Suit",
"requires": [
"canSuitlessMaridia",
{"or": [
"h_crouchJumpDownGrab",
{"and": [
"h_underwaterCrouchJumpWithFlashSuit",
"canDownGrab"
]}
]},
"h_underwaterCrouchJumpDownGrab",
{"useFlashSuit": {}},
{"shinespark": {"frames": 9, "excessFrames": 4}}
],
Expand Down
5 changes: 1 addition & 4 deletions region/maridia/inner-green/West Sand Hall.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1162,10 +1162,7 @@
"canSuitlessMaridia",
"canPlayInSand",
"canInsaneJump",
{"or": [
"canCrouchJump",
"h_underwaterCrouchJumpWithFlashSuit"
]},
"h_underwaterCrouchJump",
"canNeutralDamageBoost",
{"or": [
{"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}},
Expand Down
22 changes: 3 additions & 19 deletions region/maridia/inner-pink/Botwoon Hallway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,11 +415,7 @@
"HiJump",
"canSpringBallJumpMidAir",
"Gravity",
"h_crouchJumpDownGrab",
{"and": [
"h_underwaterCrouchJumpWithFlashSuit",
"canDownGrab"
]}
"h_underwaterCrouchJumpDownGrab"
]},
{"useFlashSuit": {}},
{"or": [
Expand Down Expand Up @@ -528,13 +524,7 @@
"canCeilingClip",
"canUseFrozenEnemies",
"canMorphTurnaround",
{"or": [
"h_crouchJumpDownGrab",
{"and": [
"h_underwaterCrouchJumpWithFlashSuit",
"canDownGrab"
]}
]},
"h_underwaterCrouchJumpDownGrab",
{"or": [
"canTrickyJump",
{"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 1}}
Expand All @@ -560,13 +550,7 @@
"canCeilingClip",
"canUseFrozenEnemies",
"canTrickyJump",
{"or": [
"h_crouchJumpDownGrab",
{"and": [
"h_underwaterCrouchJumpWithFlashSuit",
"canDownGrab"
]}
]}
"h_underwaterCrouchJumpDownGrab"
],
"note": [
"Use the middle section of pipes as a platform to reach the top level, above the Mochtroid.",
Expand Down
10 changes: 2 additions & 8 deletions region/maridia/inner-pink/Crab Shaft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1936,10 +1936,7 @@
"name": "Crouch Jump",
"requires": [
"canSuitlessMaridia",
{"or": [
"canCrouchJump",
"h_underwaterCrouchJumpWithFlashSuit"
]}
"h_underwaterCrouchJump"
],
"flashSuitChecked": true
},
Expand Down Expand Up @@ -2008,10 +2005,7 @@
"name": "Sciser Farm (1 Sciser, Fast Cycle)",
"requires": [
{"resetRoom": {"nodes": [3]}},
{"or": [
"canCrouchJump",
"h_underwaterCrouchJumpWithFlashSuit"
]},
"h_underwaterCrouchJump",
"canTrickyJump",
{"or": [
{"and": [
Expand Down
5 changes: 1 addition & 4 deletions region/maridia/inner-pink/East Sand Pit.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,10 +557,7 @@
"link": [1, 5],
"name": "Use Flash Suit",
"requires": [
{"or": [
"canCrouchJump",
"h_underwaterCrouchJumpWithFlashSuit"
]},
"h_underwaterCrouchJump",
{"useFlashSuit": {}},
{"or": [
{"shinespark": {"frames": 13, "excessFrames": 3}},
Expand Down