cleanup

Author: kjbranch

region/norfair/west/Crocomire Escape.json

@@ -267,14 +267,22 @@
           "SpaceJump",
           "Charge",
           "Ice",
+          "Plasma",
           {"ammo": {"type": "Missile", "count": 2}},
           {"ammo": {"type": "Super", "count": 2}},
           {"ammo": {"type": "PowerBomb","count": 2}},
           {"enemyDamage": {
             "enemy": "Dragon",
             "type": "fireball",
             "hits": 5
-          }}
+          }},
+          {"and": [
+            "h_lavaProof",
+            {"and": [
+              "ScrewAttack",
+              "h_canBombThings"
+            ]}
+          ]}
         ]},
         {"or": [
           "SpaceJump",
@@ -287,6 +295,10 @@
             "HiJump",
             "canSpringBallJumpMidAir"
           ]},
+          {"and": [
+            "canBeVeryPatient",
+            "canJumpIntoIBJ"
+          ]},
           {"and": [
             "canBeVeryPatient",
             "Grapple",
@@ -315,40 +327,6 @@
       "note": "Lure the Geruta to the left door. This may require many jumps to get it to swoop up onto the ledge and not get stuck.",
       "devNote": "It's possible to avoid the item, but the Geruta will get stuck on it and usually require many swoops to get past it."
     },
-    {
-      "link": [2, 1],
-      "name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Frozen Geruta Platform",
-      "requires": [
-        "h_heatProof",
-        "canBeVeryPatient",
-        "canCameraManip",
-        "canTrickyUseFrozenEnemies",
-        {"or": [
-          "HiJump",
-          "canSpringBallJumpMidAir"
-        ]},
-        {"or": [
-          {"ammo": {"type": "Super", "count": 1}},
-          {"obstaclesCleared": ["A"]}
-        ]}
-      ],
-      "exitCondition": {
-        "leaveWithGModeSetup": {}
-      },
-      "collectsItems": [3],
-      "unlocksDoors": [
-        {
-          "types": ["ammo"],
-          "requires": []
-        }
-      ],
-      "flashSuitChecked": true,
-      "note": [
-        "Use the Geruta to get up to the top left ledge while also getting it to swoop into the top left region.",
-        "This requires many jumps to get it to swoop up onto the ledge and not get stuck."
-      ],
-      "devNote": "It's possible to avoid the item, but the Geruta will get stuck on it and usually require many swoops to get past it."
-    },
     {
       "link": [2, 1],
       "name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Morphless",
@@ -380,13 +358,18 @@
           "SpaceJump",
           "Charge",
           "Ice",
+          "Plasma",
           {"ammo": {"type": "Missile", "count": 2}},
           {"ammo": {"type": "Super", "count": 2}},
           {"enemyDamage": {
             "enemy": "Dragon",
             "type": "fireball",
             "hits": 5
-          }}
+          }},
+          {"and": [
+            "h_lavaProof",
+            "ScrewAttack"
+          ]}
         ]},
         {"or": [
           "SpaceJump",
@@ -417,18 +400,24 @@
         }
       ],
       "flashSuitChecked": true,
-      "note": "Lure the Geruta to the left door. This may require many jumps to get it to swoop up onto the ledge and not get stuck.",
+      "note": [
+        "Lure the Geruta to the left door. This may require many jumps to get it to swoop up onto the ledge and not get stuck.",
+        "To safely pass the Geruta without a hit, jump left below it, to get it to swoop left before going up."
+      ],
       "devNote": "It's possible to avoid the item, but the Geruta will get stuck on it and usually require many swoops to get past it."
     },
     {
       "link": [2, 1],
-      "name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Frozen Geruta Platform, Morphless",
+      "name": "G-Mode Setup - Get Hit By Geruta, Heatproof, Frozen Geruta Platform",
       "requires": [
         "h_heatProof",
         "canBeVeryPatient",
         "canCameraManip",
         "canTrickyUseFrozenEnemies",
-        "HiJump",
+        {"or": [
+          "HiJump",
+          "canSpringBallJumpMidAir"
+        ]},
         {"or": [
           {"ammo": {"type": "Super", "count": 1}},
           {"obstaclesCleared": ["A"]}