Skip to content

Commit f3aecb9

Browse files
authored
Merge pull request #2784 from blkerby/underwater-flash-blue
Update h_underwaterCrouchJump to handle flash+blue suit
2 parents 8c8268d + fff72c2 commit f3aecb9

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

helpers.json

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,6 @@
718718
"because of being in a mid-air morphed state (same state as rolling off a ledge)."
719719
]
720720
}
721-
722721
]
723722
},
724723
{
@@ -1214,15 +1213,22 @@
12141213
{
12151214
"name": "h_underwaterCrouchJump",
12161215
"requires": [
1217-
{"tech": "canCrouchJump"}
1216+
{"tech": "canCrouchJump"},
1217+
{"or": [
1218+
{"noFlashSuit": {}},
1219+
{"noBlueSuit": {}},
1220+
"canMidAirMorph"
1221+
]}
12181222
],
12191223
"devNote": [
12201224
"Normally the tech 'canCrouchJump' comes with a requirement to not have a flash suit,",
12211225
"because a crouch jump would activate a shinespark, consuming the flash suit.",
12221226
"However, underwater it is possible to crouch jump without losing a flash suit (by holding shoot or down);",
12231227
"therefore this helper circumvents the `noFlashSuit` requirement of `canCrouchJump`.",
12241228
"The knowledge of how to crouch jump underwater with a flash suit is part of the `canCarryFlashSuit` tech,",
1225-
"which is required as a tech dependency of all methods of gaining a flash suit."
1229+
"which is required as a tech dependency of all methods of gaining a flash suit.",
1230+
"If simultaneously carrying a blue suit and a flash suit, a mid-air morph is needed,",
1231+
"in order to avoid losing the flash suit with a blue suit shinecharge."
12261232
]
12271233
},
12281234
{

0 commit comments

Comments
 (0)