Merge pull request #2846 from osse101/GGGFlashBomb

GateGlitch options and Metroids4

Author: osse101

helpers.json

@@ -1128,14 +1128,27 @@
             {"or": [
               {"noFlashSuit": {}},
               {"and": [
-                "h_useSpringBall",
-                "canComplexCarryFlashSuit"
+                "canComplexCarryFlashSuit",
+                {"or": [
+                  "h_useSpringBall",
+                  "h_useMorphBombs",
+                  "canWallJumpInstantMorph"
+                ]}
               ]},
               {"and": [
                 "canInsaneMidAirMorph",
+                {"or": [
+                  {"disableEquipment": "HiJump"},
+                  "canBeVeryLucky"
+                ]},
                 "canTrickyCarryFlashSuit"
               ]}
             ]}
+          ],
+          "devNote": [
+            "FIXME: Flashsuit options should effect the expected number of tries on the gate glitch.",
+            "FIXME: Flashsuit options do not scale with heat.",
+            "FIXME: PowerBombs work as an alternative to Bombs."
           ]
         },
         {
@@ -1159,7 +1172,8 @@
                 "canInsaneMidAirMorph"
               ]}
             ]}
-          ]
+          ],
+          "devNote": "Methods requiring Gravity would use Gravity+h_gateGlitch."
         },
         {
           "name": "h_blueGateGlitch",

region/tourian/main/Metroid Room 4.json

@@ -529,15 +529,13 @@
       "link": [2, 1],
       "name": "Easy Evade",
       "requires": [
+        "canDodgeWhileShooting",
         {"or": [
           "Ice",
-          {"and": [
-            "ScrewAttack",
-            "canDodgeWhileShooting"
-          ]}
+          "ScrewAttack"
         ]},
         {"or": [
-          "canCarefulJump",
+          "canTrickyJump",
           {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}
         ]}
       ],