diff --git a/helpers.json b/helpers.json index 1da8dab42..098bda44f 100644 --- a/helpers.json +++ b/helpers.json @@ -1106,14 +1106,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." ] }, { @@ -1137,7 +1150,8 @@ "canInsaneMidAirMorph" ]} ]} - ] + ], + "devNote": "Methods requiring Gravity would use Gravity+h_gateGlitch." }, { "name": "h_blueGateGlitch", diff --git a/region/tourian/main/Metroid Room 4.json b/region/tourian/main/Metroid Room 4.json index 05d09121f..9790610f1 100644 --- a/region/tourian/main/Metroid Room 4.json +++ b/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}} ]} ],