Add canComplexGMode to Crocomire and West Norfair

Author: kjbranch

region/norfair/crocomire/Cosine Room.json

@@ -143,6 +143,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           {"and": [
             "h_artificialMorphIBJ",
@@ -182,12 +183,9 @@
         }
       },
       "requires": [
+        "canTrickyGMode",
         "h_artificialMorphBombHorizontally",
-        {"ammo": {"type": "PowerBomb", "count": 6}},
-        {"or": [
-          "canTrickyGMode",
-          {"acidFrames": 212}
-        ]}
+        {"ammo": {"type": "PowerBomb", "count": 6}}
       ],
       "collectsItems": [2],
       "flashSuitChecked": true,
@@ -205,7 +203,8 @@
       "devNote": [
         "The requirements here are to get the item and return, as the item cannot be used during the return.",
         "It appears that there is virtually no risk in overloading PLMs - the left runway isn't close enough, and even placing two on each pillar will not overload PLMs.",
-        "FIXME: Getting extra horizontal distance from the bomb needs a tech."
+        "FIXME: Getting extra horizontal distance from the bomb needs a tech.",
+        "FIXME: It is possible to CF then boost across without worrying much about the acid, then reserve trigger to exit G-mode on the left side of the room (this takes 212 acid frames)."
       ]
     },
     {

region/norfair/crocomire/Crocomire's Room.json

@@ -440,8 +440,9 @@
     {
       "id": 20,
       "link": [3, 4],
-      "name": "G-mode Morph Ceiling Bomb Jump",
+      "name": "G-Mode Morph Ceiling Bomb Jump",
       "requires": [
+        "canEnterGMode",
         "h_artificialMorphLongCeilingBombJump",
         "canBeVeryPatient",
         {"obstaclesCleared": ["A"]}

region/norfair/crocomire/Grapple Beam Room.json

@@ -333,6 +333,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "bypassesDoorShell": true,

region/norfair/crocomire/Indiana Jones Room.json

@@ -1008,6 +1008,7 @@
         "comesThroughToilet": "any"
       },
       "requires": [
+        "canComplexGMode",
         "canManipulateMellas",
         {"or": [
           "h_preciseIceClip",
@@ -1652,7 +1653,7 @@
       "link": [6, 2],
       "name": "G-Mode Morph Mella Ice Clip, Door Lock Skip",
       "requires": [
-        "canEnterGMode",
+        "canComplexGMode",
         "canManipulateMellas",
         {"or": [
           "h_preciseIceClip",
@@ -1714,7 +1715,7 @@
       "link": [7, 1],
       "name": "G-Mode Morph Spring Ball, IBJ, Remote Acquire",
       "requires": [
-        "canEnterGMode",
+        "canComplexGMode",
         "h_artificialMorphLongIBJ",
         "h_artificialMorphJumpIntoIBJ"
       ],
@@ -1727,7 +1728,7 @@
       "link": [7, 1],
       "name": "G-Mode Morph Long Diagonal Bomb Jump, Remote Acquire",
       "requires": [
-        "canEnterGMode",
+        "canComplexGMode",
         {"notable": "G-Mode Morph Long Diagonal Bomb Jump"},
         "h_artificialMorphDiagonalBombJump",
         "h_artificialMorphLongIBJ"
@@ -1741,7 +1742,7 @@
       "link": [7, 2],
       "name": "G-Mode Morph, IBJ, Remote Acquire",
       "requires": [
-        "canEnterGMode",
+        "canComplexGMode",
         "h_artificialMorphLongIBJ"
       ],
       "collectsItems": [3],

region/norfair/crocomire/Post Crocomire Farming Room.json

@@ -1201,6 +1201,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "flashSuitChecked": true,
@@ -1217,6 +1218,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,

region/norfair/crocomire/Post Crocomire Power Bomb Room.json

@@ -84,6 +84,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatedDirectGModeLeaveSameDoor"
       ],
       "collectsItems": [2],

region/norfair/west/Business Center.json

@@ -782,6 +782,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -1554,6 +1555,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -1617,6 +1619,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -2195,7 +2198,8 @@
           "morphed": false
         }
       },
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "devNote": "FIXME: There could be a 4->7 variant with an ice clip or CF clip through the shot blocks."
     },
     {
       "id": 75,
@@ -2416,6 +2420,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canXRayClimb"
       ],
       "bypassesDoorShell": true,
@@ -2549,6 +2554,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb",
         "canBePatient"
       ],
@@ -3179,6 +3185,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canLongXRayClimb"
       ],
       "bypassesDoorShell": true,

region/norfair/west/Crocomire Escape.json

@@ -165,11 +165,18 @@
             "HiJump",
             "SpeedBooster"
           ]},
-          "h_lavaProof"
+          {"and": [
+            "canComplexGMode",
+            "h_lavaProof"
+          ]}
         ]},
         "h_heatedGModeOpenDifferentDoor"
       ],
       "flashSuitChecked": true,
+      "note": [
+        "Go over the plateau, or under it with lava protection.",
+        "To avoid the Dragon's fireballs, be sure to kill it quickly, overload the drops with the Dragons on the left first, or exit G-mode."
+      ],
       "devNote": "FIXME: Damage through the lava could work, or maybe a Geruta damage boost. (Energy from immobile or CF)"
     },
     {
@@ -740,6 +747,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "canTrickyUseFrozenEnemies",
         "canTrickyDodgeEnemies",
         {"or": [
@@ -763,6 +771,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "SpaceJump",
           {"and": [
@@ -815,6 +824,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         {"or": [
           "h_artificialMorphLongIBJ",
           "h_artificialMorphJumpIntoIBJ"

region/norfair/west/Crocomire Speedway.json

@@ -2200,7 +2200,7 @@
           "ScrewAttack",
           {"ammo": {"type": "Missile", "count": 3}},
           {"ammo": {"type": "Super", "count": 3}},
-          "canInsaneJump"
+          "canComplexGMode"
         ]}
       ],
       "flashSuitChecked": true,
@@ -2216,6 +2216,7 @@
       "link": [7, 2],
       "name": "G-Mode, Fix Camera, Speedy Exit",
       "requires": [
+        "canComplexGMode",
         "h_heatedGMode",
         "h_getBlueSpeedMaxRunway",
         {"heatFrames": 375}

region/norfair/west/Crumble Shaft.json

@@ -589,6 +589,7 @@
         }
       },
       "requires": [
+        "canComplexGMode",
         "h_heatProof",
         "canLongXRayClimb",
         "canBePatient"