Merge pull request #1995 from kjbranch/g-crateria

G-Mode, Second Pass: Central Crateria

Author: kjbranch

region/crateria/central/Climb.json

@@ -692,6 +692,10 @@
       },
       "requires": [
         {"notable": "G-Mode Morph Blind Climb to the Top"},
+        {"or": [
+          "canTrickyGMode",
+          "Morph"
+        ]},
         "h_canArtificialMorphMovement",
         "canOffScreenMovement",
         {"or": [
@@ -810,7 +814,17 @@
       "requires": [
         "h_canArtificialMorphMovement",
         "canOffScreenMovement",
-        "h_ClimbWithoutLava"
+        {"or": [
+          "h_ClimbWithoutLava",
+          {"and": [
+            "h_lavaProof",
+            {"or": [
+              "h_canArtificialMorphSpringBall",
+              "Morph",
+              "Gravity"
+            ]}
+          ]}
+        ]}
       ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true,
@@ -1032,8 +1046,7 @@
       "requires": [
         {"or": [
           "h_ClimbWithoutLava",
-          "h_lavaProof",
-          {"obstaclesNotCleared": ["B"]}
+          "h_lavaProof"
         ]}
       ],
       "clearsObstacles": ["B"],
@@ -1310,20 +1323,40 @@
       },
       "requires": [
         {"or": [
-          "h_canArtificialMorphSpringBall",
-          "Morph"
+          {"and": [
+            "h_canArtificialMorphSpringBall",
+            {"or": [
+              "HiJump",
+              "canTrickyDodgeEnemies"
+            ]}
+          ]},
+          {"and": [
+            "Morph",
+            {"or": [
+              "h_canArtificialMorphSpringBall",
+              "h_canArtificialMorphBombs",
+              "h_canFourTileJumpMorph"
+            ]}
+          ]},
+          {"and": [
+            "h_ZebesNotAwake",
+            {"or": [
+              "h_canArtificialMorphSpringBall",
+              "h_canArtificialMorphBombs"
+            ]}
+          ]}
         ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Overload PLMs using the scroll block at the top of the stairs next to the bomb blocks.",
-        "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit or unmorphing."
+        "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit from a pirate or its stationary, invisible lasers."
       ]
     },
     {
       "id": 56,
       "link": [4, 3],
-      "name": "G-Mode Morph Insane IBJ to Top (from Crateria Supers Bottom)",
+      "name": "G-Mode Morph Insane IBJ to Top",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -1332,6 +1365,7 @@
       },
       "requires": [
         {"notable": "G-Mode Morph Insane IBJ to Top"},
+        "canTrickyGMode",
         "h_canArtificialMorphIBJ",
         "canBeExtremelyPatient"
       ],
@@ -1344,15 +1378,18 @@
     {
       "id": 57,
       "link": [4, 3],
-      "name": "G-Mode Morph IBJ with PBs",
+      "name": "G-Mode Morph with Power Bombs",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
           "morphed": true
         }
       },
       "requires": [
-        "h_canArtificialMorphIBJ",
+        {"or": [
+          "h_canArtificialMorphSpringBall",
+          "h_canArtificialMorphIBJ"
+        ]},
         {"ammo": {"type": "PowerBomb", "count": 7}}
       ],
       "flashSuitChecked": true,
@@ -1746,20 +1783,30 @@
       },
       "requires": [
         {"or": [
-          "h_canArtificialMorphSpringBall",
-          "Morph"
+          "Morph",
+          {"and": [
+            "h_canArtificialMorphSpringBall",
+            {"or": [
+              "HiJump",
+              "canTrickyDodgeEnemies"
+            ]}
+          ]},
+          {"and": [
+            "h_ZebesNotAwake",
+            "h_canArtificialMorphMovement"
+          ]}
         ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Overload PLMs using the scroll block next to any of the bomb blocks in the room, allowing passage through the bomb blocks at the top by making them become air.",
-        "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit or unmorphing."
+        "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit from the pirates or their stationary, invisible lasers."
       ]
     },
     {
       "id": 79,
       "link": [5, 3],
-      "name": "G-Mode Morph Insane IBJ to Top (from Pit Room)",
+      "name": "G-Mode Morph Insane IBJ to Top",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
@@ -1768,6 +1815,7 @@
       },
       "requires": [
         {"notable": "G-Mode Morph Insane IBJ to Top"},
+        "canTrickyGMode",
         "h_canArtificialMorphIBJ",
         "canBeExtremelyPatient"
       ],
@@ -1780,15 +1828,18 @@
     {
       "id": 80,
       "link": [5, 3],
-      "name": "G-Mode Morph IBJ with PBs",
+      "name": "G-Mode Morph with Power Bombs",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
           "morphed": true
         }
       },
       "requires": [
-        "h_canArtificialMorphIBJ",
+        {"or": [
+          "h_canArtificialMorphSpringBall",
+          "h_canArtificialMorphIBJ"
+        ]},
         {"ammo": {"type": "PowerBomb", "count": 8}}
       ],
       "flashSuitChecked": true,
@@ -1852,23 +1903,27 @@
             "h_canArtificialMorphSpringBall",
             {"or": [
               "HiJump",
-              "canCarefulJump"
+              "canTrickyDodgeEnemies"
             ]}
           ]},
           {"and": [
             "h_canArtificialMorphIBJ",
-            "canTrickyJump"
+            "canTrickyGMode"
           ]},
           {"and": [
             "h_canArtificialMorphMovement",
             "h_canArtificialMorphPowerBomb"
+          ]},
+          {"and": [
+            "h_ZebesNotAwake",
+            "h_canArtificialMorphMovement"
           ]}
         ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Overload PLMs using the scroll block next to the bottom right bomb blocks, allowing passage through them by making them become air.",
-        "If Morph is unavailable, then careful movement will be required to get past the Pirates without taking a hit.",
+        "If Morph is unavailable, then careful movement will be required to get past the Pirates without taking a hit from them or their stationary, invisible lasers.",
         "If using a PB to kill the pirates, overload the PLMs at the bottom. If the top bomb block is hit with a PB before PLMs are overloaded, they will remain solid."
       ]
     },