Redefine h_UnderwaterCrouchJumpWithFlashSuit

Author: kjbranch

helpers.json

@@ -614,9 +614,8 @@
           ]
         },
         {
-          "name": "h_canUnderwaterCrouchJump",
+          "name": "h_UnderwaterCrouchJumpWithFlashSuit",
           "requires": [
-            "canSuitlessMaridia",
             {"tech": "canCrouchJump"}
           ],
           "devNote": [
@@ -626,10 +625,10 @@
           ]
         },
         {
-          "name": "h_canUnderwaterCrouchJumpDownGrab",
+          "name": "h_UnderwaterMaxHeightSpringBallJumpWithFlashSuit",
           "requires": [
-            "h_canUnderwaterCrouchJump",
-            "canDownGrab"
+            "h_UnderwaterCrouchJumpWithFlashSuit",
+            "canTrickySpringBallJump"
           ]
         },
         {

region/crateria/east/East Ocean.json

@@ -1368,7 +1368,13 @@
         "canSuitlessMaridia",
         "canTrickyJump",
         "canNeutralDamageBoost",
-        "h_canUnderwaterCrouchJumpDownGrab",
+        {"or": [
+          "h_canCrouchJumpDownGrab",
+          {"and": [
+            "h_UnderwaterCrouchJumpWithFlashSuit",
+            "canDownGrab"
+          ]}
+        ]},
         {"enemyDamage": {
           "enemy": "Skultera",
           "hits": 1,
@@ -1389,7 +1395,13 @@
       "name": "Use Flash Suit",
       "requires": [
         "canSuitlessMaridia",
-        "h_canUnderwaterCrouchJumpDownGrab",
+        {"or": [
+          "h_canCrouchJumpDownGrab",
+          {"and": [
+            "h_UnderwaterCrouchJumpWithFlashSuit",
+            "canDownGrab"
+          ]}
+        ]},
         {"useFlashSuit": {}},
         {"shinespark": {"frames": 9, "excessFrames": 4}}
       ],

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

@@ -1058,7 +1058,10 @@
         "canSuitlessMaridia",
         "canPlayInSand",
         "canInsaneJump",
-        "h_canUnderwaterCrouchJump",
+        {"or": [
+          "canCrouchJump",
+          "h_UnderwaterCrouchJumpWithFlashSuit"
+        ]},
         "canNeutralDamageBoost",
         {"or": [
           {"enemyDamage": {

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

@@ -350,7 +350,11 @@
           "HiJump",
           "canSpringBallJumpMidAir",
           "Gravity",
-          "h_canUnderwaterCrouchJumpDownGrab"
+          "h_canCrouchJumpDownGrab",
+          {"and": [
+            "h_UnderwaterCrouchJumpWithFlashSuit",
+            "canDownGrab"
+          ]}
         ]},
         {"useFlashSuit": {}},
         {"or": [
@@ -458,7 +462,13 @@
         {"notable": "Mochtroid Ice Clip"},
         "canCeilingClip",
         "canUseFrozenEnemies",
-        "h_canUnderwaterCrouchJumpDownGrab",
+        {"or": [
+          "h_canCrouchJumpDownGrab",
+          {"and": [
+            "h_UnderwaterCrouchJumpWithFlashSuit",
+            "canDownGrab"
+          ]}
+        ]},
         {"or": [
           "canTrickyJump",
           "canMorphTurnaround"

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

@@ -515,7 +515,10 @@
       "link": [1, 5],
       "name": "Use Flash Suit",
       "requires": [
-        "h_canUnderwaterCrouchJump",
+        {"or": [
+          "canCrouchJump",
+          "h_UnderwaterCrouchJumpWithFlashSuit"
+        ]},
         {"useFlashSuit": {}},
         {"or": [
           {"shinespark": {"frames": 13, "excessFrames": 3}},