Merge pull request #2261 from blkerby/underwater-crouch-jump

Simplify underwater crouch jump helpers

Author: osse101

helpers.json

@@ -730,23 +730,33 @@
           ]
         },
         {
-          "name": "h_underwaterCrouchJumpWithFlashSuit",
+          "name": "h_underwaterCrouchJump",
           "requires": [
             {"tech": "canCrouchJump"}
           ],
           "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."
+            "Normally the tech 'canCrouchJump' comes with a requirement to not have a flash suit,",
+            "because a crouch jump would activate a shinespark, consuming the flash suit.",
+            "However, underwater it is possible to crouch jump without losing a flash suit (by holding shoot or down);",
+            "therefore this helper circumvents the `noFlashSuit` requirement of `canCrouchJump`.",
+            "The knowledge of how to crouch jump underwater with a flash suit is part of the `canCarryFlashSuit` tech,",
+            "which is required as a tech dependency of all methods of gaining a flash suit."
           ]
         },
         {
-          "name": "h_underwaterMaxHeightSpringBallJumpWithFlashSuit",
+          "name": "h_underwaterMaxHeightSpringBallJump",
           "requires": [
-            "h_underwaterCrouchJumpWithFlashSuit",
+            "h_underwaterCrouchJump",
             "canTrickySpringBallJump"
           ]
         },
+        {
+          "name": "h_underwaterCrouchJumpDownGrab",
+          "requires": [
+            "h_underwaterCrouchJump",
+            "canDownGrab"
+          ]
+        },
         {
           "name": "h_PlasmaHitbox",
           "requires": [

region/crateria/east/East Ocean.json

@@ -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,
@@ -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}}
       ],

region/maridia/inner-green/West Sand Hall.json

@@ -1162,10 +1162,7 @@
         "canSuitlessMaridia",
         "canPlayInSand",
         "canInsaneJump",
-        {"or": [
-          "canCrouchJump",
-          "h_underwaterCrouchJumpWithFlashSuit"
-        ]},
+        "h_underwaterCrouchJump",
         "canNeutralDamageBoost",
         {"or": [
           {"enemyDamage": {"enemy": "Evir", "type": "particle", "hits": 1}},

region/maridia/inner-pink/Botwoon Hallway.json

@@ -415,11 +415,7 @@
           "HiJump",
           "canSpringBallJumpMidAir",
           "Gravity",
-          "h_crouchJumpDownGrab",
-          {"and": [
-            "h_underwaterCrouchJumpWithFlashSuit",
-            "canDownGrab"
-          ]}
+          "h_underwaterCrouchJumpDownGrab"
         ]},
         {"useFlashSuit": {}},
         {"or": [
@@ -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}}
@@ -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.",

region/maridia/inner-pink/Crab Shaft.json

@@ -1936,10 +1936,7 @@
       "name": "Crouch Jump",
       "requires": [
         "canSuitlessMaridia",
-        {"or": [
-          "canCrouchJump",
-          "h_underwaterCrouchJumpWithFlashSuit"
-        ]}
+        "h_underwaterCrouchJump"
       ],
       "flashSuitChecked": true
     },
@@ -2008,10 +2005,7 @@
       "name": "Sciser Farm (1 Sciser, Fast Cycle)",
       "requires": [
         {"resetRoom": {"nodes": [3]}},
-        {"or": [
-          "canCrouchJump",
-          "h_underwaterCrouchJumpWithFlashSuit"
-        ]},
+        "h_underwaterCrouchJump",
         "canTrickyJump",
         {"or": [
           {"and": [

region/maridia/inner-pink/East Sand Pit.json

@@ -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}},