Merge pull request #2262 from blkerby/more-flash-suit-helpers

A couple more helpers for flash suits

Author: blkerby

helpers.json

@@ -757,6 +757,24 @@
             "canDownGrab"
           ]
         },
+        {
+          "name": "h_complexToCarryFlashSuit",
+          "requires": [
+            {"or": [
+              {"noFlashSuit": {}},
+              "canComplexCarryFlashSuit"
+            ]}
+          ]
+        },
+        {
+          "name": "h_trickyToCarryFlashSuit",
+          "requires": [
+            {"or": [
+              {"noFlashSuit": {}},
+              "canTrickyCarryFlashSuit"
+            ]}
+          ]
+        },
         {
           "name": "h_PlasmaHitbox",
           "requires": [

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -873,11 +873,7 @@
       "name": "Bomb Boost Water Escape Into IBJ",
       "requires": [
         "canBombJumpWaterEscape",
-        "canJumpIntoIBJ",
-        {"or": [
-          "canTrickyCarryFlashSuit",
-          {"noFlashSuit": {}}
-        ]}
+        "canJumpIntoIBJ"
       ],
       "flashSuitChecked": true,
       "note": "When the water is high, jump and place a Bomb on the descent just above the water, then very quickly crouch jump to hit the Bomb and IBJ.",

region/maridia/outer/Crab Hole.json

@@ -1391,10 +1391,7 @@
               "HiJump",
               "Gravity"
             ]},
-            {"or": [
-              {"noFlashSuit": {}},
-              "canTrickyCarryFlashSuit"
-            ]}
+            "h_trickyToCarryFlashSuit"
           ]}
         ]}
       ],