[1, 2] needs frozen RInkas. CF paths require cleared room.

Author: aquanight

region/tourian/main/Metroid Room 4.json

@@ -440,25 +440,24 @@
         "comeInWithRMode": {}
       },
       "requires": [
+        "Ice",
         {"or": [
-          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_CrystalFlashForReserveEnergy",
+            "f_KilledMetroidRoom4"
+          ]},
           {"and": [
             {"not": "f_KilledMetroidRoom4"},
             "canRiskPermanentLossOfAccess",
             "h_RModeCanRefillReserves",
-            "Ice",
             {"enemyKill": {"enemies": [["Metroid"], ["Metroid"]], "explicitWeapons": ["Missile", "Super"]}},
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+            {"or": [
+              "Morph",
+              "canMetroidAvoid"
+            ]}
           ]}
         ]},
-        {"or": [
-          "f_KilledMetroidRoom4",
-          {"and": [
-            "Ice",
-            "Morph"
-          ]},
-          "canMetroidAvoid"
-        ]},
         {"canShineCharge": {"usedTiles": 12, "openEnd": 0}},
         {"autoReserveTrigger": {"maxReserveEnergy": 95}},
         "canRModeSparkInterrupt"
@@ -686,40 +685,19 @@
         "comesThroughToilet": "no"
       },
       "requires": [
+        "Ice",
         {"or": [
           {"and": [
-            "h_CrystalFlashForReserveEnergy",
-            "Ice"
+            "f_KilledMetroidRoom4",
+            "h_CrystalFlashForReserveEnergy"
           ]},
           {"and": [
             {"not": "f_KilledMetroidRoom4"},
             "canRiskPermanentLossOfAccess",
             "h_RModeCanRefillReserves",
-            "Ice",
             {"enemyKill": {"enemies": [["Metroid"], ["Metroid"]], "explicitWeapons": ["Missile", "Super"]}},
-            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
-          ]}
-        ]},
-        {"or": [
-          "f_KilledMetroidRoom4",
-          {"and": [
-            "Ice",
-            "Morph"
-          ]},
-          {"and": [
-            "canCarefulJump",
-            {"or": [
-              "Ice",
-              {"and": [
-                "ScrewAttack",
-                "canDodgeWhileShooting"
-              ]},
-              {"and": [
-                "canMetroidAvoid",
-                {"notable": "Bottom Metroid Avoid"},
-                "canDodgeWhileShooting"
-              ]}
-            ]}
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+            "canCarefulJump"
           ]}
         ]},
         {"canShineCharge": {"usedTiles": 12, "openEnd": 0}},