Merge remote-tracking branch 'upstream/master' into crateria-west-flash-suit

Author: blkerby

helpers.json

@@ -638,15 +638,40 @@
             "canGateGlitch",
             {"or": [
               {"noFlashSuit": {}},
-              "h_useSpringBall",
               {"and": [
-                "Morph",
-                "canInsaneJump",
+                "h_useSpringBall",
+                "canComplexCarryFlashSuit"
+              ]},
+              {"and": [
+                "canInsaneMidAirMorph",
                 "canTrickyCarryFlashSuit"
               ]}
             ]}
           ]
         },
+        {
+          "name": "h_underwaterGateGlitch",
+          "requires": [
+            "canGateGlitch",
+            {"or": [
+              {"noFlashSuit": {}},
+              {"and": [
+                "canComplexCarryFlashSuit",
+                {"or": [
+                  {"and": [
+                    {"disableEquipment": "Gravity"},
+                    "canMidAirMorph"
+                  ]},
+                  "h_useSpringBall"
+                ]}
+              ]},
+              {"and": [
+                "canTrickyCarryFlashSuit",
+                "canInsaneMidAirMorph"
+              ]}
+            ]}
+          ]
+        },
         {
           "name": "h_blueGateGlitch",
           "requires": [
@@ -666,6 +691,14 @@
             "h_greenGateGlitchLeniency"
           ]
         },
+        {
+          "name": "h_underwaterGreenGateGlitch",
+          "requires": [
+            "h_underwaterGateGlitch",
+            {"ammo": {"type": "Super", "count": 1}},
+            "h_greenGateGlitchLeniency"
+          ]
+        },
         {
           "name": "h_heatedBlueGateGlitch",
           "requires": [ 
@@ -697,23 +730,51 @@
           ]
         },
         {
-          "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_complexToCarryFlashSuit",
+          "requires": [
+            {"or": [
+              {"noFlashSuit": {}},
+              "canComplexCarryFlashSuit"
+            ]}
+          ]
+        },
+        {
+          "name": "h_trickyToCarryFlashSuit",
+          "requires": [
+            {"or": [
+              {"noFlashSuit": {}},
+              "canTrickyCarryFlashSuit"
+            ]}
+          ]
+        },
         {
           "name": "h_PlasmaHitbox",
           "requires": [
@@ -1081,7 +1142,10 @@
           "requires": [
             {"or": [
               {"noFlashSuit": {}},
-              "Morph"
+              {"and": [
+                "Morph",
+                "canComplexCarryFlashSuit"
+              ]}
             ]}
           ]
         },

logicalRequirements.md

@@ -516,7 +516,7 @@ __Example:__
 
 __Additional considerations__
 
-* A `canShineCharge` object implicitly requires the Speed Booster. Energy requirements for the shinespark (if applicable) are specified separately using a `shinespark` object.
+* A `canShineCharge` object implicitly requires the Speed Booster. Energy requirements for the shinespark (if applicable) are specified separately using a `shinespark` object. A `canShineCharge` requirement causes a flash suit to be lost.
 
 #### getBlueSpeed object
 

region/brinstar/blue/Billy Mays Room.json

@@ -79,7 +79,8 @@
           "length": 2,
           "openEnd": 1
         }
-      }
+      },
+      "flashSuitChecked": true
     },
     {
       "id": 2,
@@ -94,25 +95,29 @@
       "id": 3,
       "link": [1, 2],
       "name": "Base",
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 4,
       "link": [2, 1],
       "name": "Base",
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 5,
       "link": [2, 3],
       "name": "Base",
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 6,
       "link": [3, 2],
       "name": "Base",
-      "requires": []
+      "requires": [],
+      "flashSuitChecked": true
     }
   ],
   "notables": [],