Merge pull request #2168 from kjbranch/g-croc

Croc's Lair G-Mode: Second Pass

Author: osse101

region/norfair/crocomire/Cosine Room.json

@@ -35,13 +35,7 @@
       ]
     }
   ],
-  "obstacles": [
-    {
-      "id": "A",
-      "name": "G-Mode Morph - Remote Acquire the item",
-      "obstacleType": "abstract"
-    }
-  ],
+  "obstacles": [],
   "enemies": [
     {
       "id": "e1",
@@ -134,38 +128,12 @@
       "requires": [
         {"resetRoom": {"nodes": [1]}},
         "ScrewAttack",
-        {"cycleFrames": 255},
-        {"obstaclesNotCleared": ["A"]}
+        {"cycleFrames": 255}
       ],
-      "resetsObstacles": ["A"],
       "farmCycleDrops": [{"enemy": "Metaree", "count": 2}]
-    },
-    {
-      "id": 3,
-      "link": [1, 2],
-      "name": "Base",
-      "requires": [
-        "Morph"
-      ]
-    },
-    {
-      "id": 4,
-      "link": [1, 2],
-      "name": "G-Mode Morph",
-      "entranceCondition": {
-        "comeInWithGMode": {
-          "mode": "any",
-          "morphed": true
-        }
-      },
-      "requires": [],
-      "flashSuitChecked": true,
-      "note": "Wait for the acid to lower then quickly roll part way forward to trigger the Metarees and return. Then go again without any difficulty.",
-      "devNote": "This is only useful if the item is Morph."
-    },
-    {
+    },{
       "id": 5,
-      "link": [1, 2],
+      "link": [1, 1],
       "name": "G-Mode Morph Remote Acquire",
       "entranceCondition": {
         "comeInWithGMode": {
@@ -191,7 +159,7 @@
           ]}
         ]}
       ],
-      "clearsObstacles": ["A"],
+      "collectsItems": [2],
       "flashSuitChecked": true,
       "note": [
         "Wait for the acid to lower then quickly roll part way forward to trigger the Metarees and return. Then go again without any difficulty.",
@@ -204,7 +172,7 @@
     },
     {
       "id": 10,
-      "link": [1, 2],
+      "link": [1, 1],
       "name": "G-Mode Morph Remote Acquire, Power Bomb Boosts",
       "entranceCondition": {
         "comeInWithGMode": {
@@ -220,7 +188,7 @@
           {"acidFrames": 212}
         ]}
       ],
-      "clearsObstacles": ["A"],
+      "collectsItems": [2],
       "flashSuitChecked": true,
       "note": [
         "Wait for the acid to lower then quickly roll part way forward to trigger the Metarees and return. Then go again without any difficulty.",
@@ -240,22 +208,35 @@
       ]
     },
     {
-      "id": 6,
-      "link": [2, 1],
+      "id": 3,
+      "link": [1, 2],
       "name": "Base",
       "requires": [
         "Morph"
       ]
     },
     {
-      "id": 7,
+      "id": 4,
+      "link": [1, 2],
+      "name": "G-Mode Morph",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": true
+        }
+      },
+      "requires": [],
+      "flashSuitChecked": true,
+      "note": "Wait for the acid to lower then quickly roll part way forward to trigger the Metarees and return. Then go again without any difficulty.",
+      "devNote": "This is only useful if the item is Morph."
+    },
+    {
+      "id": 6,
       "link": [2, 1],
-      "name": "G-mode Morph Remote Acquire",
+      "name": "Base",
       "requires": [
-        "canEnterGMode",
-        {"obstaclesCleared": ["A"]}
-      ],
-      "flashSuitChecked": true
+        "Morph"
+      ]
     },
     {
       "id": 8,
@@ -273,8 +254,7 @@
             {"simpleCycleFrames": 100},
             {"cycleFrames": 35}
           ]}
-        ]},
-        {"obstaclesNotCleared": ["A"]}
+        ]}
       ],
       "farmCycleDrops": [{"enemy": "Gamet", "count": 5}]
     }

region/norfair/crocomire/Grapple Tutorial Room 3.json

@@ -862,6 +862,7 @@
       "link": [3, 3],
       "name": "Exit G-Mode to Open Gate",
       "requires": [
+        "canEnterGMode",
         {"obstaclesCleared": ["B"]}
       ],
       "clearsObstacles": ["A"],

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

@@ -488,16 +488,22 @@
     {
       "id": 17,
       "link": [2, 6],
-      "name": "G-Mode Morph",
+      "name": "Indirect G-Mode Morph",
       "entranceCondition": {
         "comeInWithGMode": {
-          "mode": "any",
+          "mode": "indirect",
           "morphed": true
         },
-        "comesThroughToilet": "no"
+        "comesThroughToilet": "any"
       },
-      "requires": [],
-      "flashSuitChecked": true
+      "requires": [
+        "h_artificialMorphMovement"
+      ],
+      "flashSuitChecked": true,
+      "devNote": [
+        "It is possible to do this with direct G-mode, but it requires entering the room at the very edge of the transition, which isn't modeled.",
+        "it could be possible to get to wherever 6 is defined with Power Bombs, but there is nothing useful to do at 6, except maybe unlock door 3, which isn't modeled."
+      ]
     },
     {
       "id": 52,
@@ -948,7 +954,8 @@
       ],
       "note": [
         "Crouch jump then down grab starting from the moving platform. A very fast crouch jump is necessary in order to not have lowered the platform too low."
-      ]
+      ],
+      "devNote": "This is possible even with a blue suit, by crouching and quickly using X-ray, waiting for the shinecharge frames to end, and then jumping and down grabbing."
     },
     {
       "id": 70,
@@ -1566,19 +1573,6 @@
         ]}
       ],
       "flashSuitChecked": true
-    },
-    {
-      "id": 76,
-      "link": [6, 4],
-      "name": "G-Mode Morph Spring Ball Bomb Jump",
-      "requires": [
-        "canEnterGMode",
-        "canTrickyJump",
-        "h_artificialMorphSpringBallBombJump"
-      ],
-      "flashSuitChecked": true,
-      "note": "It is possible to perform a Spring Ball Bomb Jump from the Kamer, but it is rarely useful.",
-      "devNote": "The Spring Ball Bomb Jump is likely only useful for avoiding a crouch jump to preserve a blue suit."
     }
   ],
   "notables": [