Merge pull request #2624 from aquanight/gsi-ln-croc-speedway

Crocomire Speedway G-Mode Spark Interrupt

Author: osse101

region/norfair/west/Crocomire Speedway.json

@@ -96,7 +96,7 @@
     },
     {
       "id": 7,
-      "name": "G-Mode Morph, Bottom Right (Started at Right)",
+      "name": "G-Mode, Bottom Right (Started at Right)",
       "nodeType": "junction",
       "nodeSubType": "g-mode",
       "mapTileMask": [
@@ -108,7 +108,7 @@
     },
     {
       "id": 8,
-      "name": "G-Mode Morph, Bottom Right (Started at Left)",
+      "name": "G-Mode, Bottom Right (Started at Left)",
       "nodeType": "junction",
       "nodeSubType": "g-mode",
       "mapTileMask": [
@@ -129,6 +129,18 @@
         [0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 2, 1, 1]
       ],
       "note": "Represents being in the speedway, on the left side of the right most speed blocks."
+    },
+    {
+      "id": 10,
+      "name": "Direct G-Mode, Bottom Right (Started at Right)",
+      "nodeType": "junction",
+      "nodeSubType": "g-mode",
+      "mapTileMask": [
+        [1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1],
+        [0, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 1],
+        [0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 2]
+      ],
+      "note": "Represents being at the bottom of the right shaft with Direct G-Mode and having entered the room from a door on the right shaft"
     }
   ],
   "obstacles": [
@@ -309,6 +321,22 @@
       "flashSuitChecked": true,
       "note": "Jump over the Cacatacs. Their projectiles remain inside of them and their hitbox is a bit smaller than it appears."
     },
+    {
+      "link": [1, 10],
+      "name": "Direct G-Mode",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"heatFrames": 0}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Jump over the Cacatacs. Their projectiles remain inside of them and their hitbox is a bit smaller than it appears."
+    },
     {
       "id": 5,
       "link": [2, 2],
@@ -1166,6 +1194,22 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 10],
+      "name": "Direct G-Mode",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        {"heatFrames": 0}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 16,
       "link": [4, 2],
@@ -1605,6 +1649,21 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [4, 10],
+      "name": "Direct G-Mode",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"heatFrames": 0}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 28,
       "link": [5, 1],
@@ -2400,6 +2459,22 @@
       "flashSuitChecked": true,
       "note": "Jump over the Cacatacs. Their projectiles remain inside of them and their hitbox is a bit smaller than it appears."
     },
+    {
+      "link": [5, 10],
+      "name": "Direct G-Mode",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"heatFrames": 0}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "Jump over the Cacatacs. Their projectiles remain inside of them and their hitbox is a bit smaller than it appears."
+    },
     {
       "id": 43,
       "link": [6, 2],
@@ -3380,6 +3455,36 @@
       ],
       "flashSuitChecked": true,
       "devNote": "FIXME: Could have separate strats with tighter heat frames for going down or right."
+    },
+    {
+      "link": [10, 2],
+      "name": "Direct G-Mode, Heatproof, Fix Camera, R-Mode Spark Interrupt",
+      "requires": [
+        "canComplexGMode",
+        "h_heatProof",
+        {"disableEquipment": "ETank"},
+        "h_CrystalFlashForReserveEnergy",
+        {"canShineCharge": {"usedTiles": 28, "gentleUpTiles": 2, "openEnd": 0}},
+        {"autoReserveTrigger": {}},
+        "canRModeSparkInterrupt"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Stop before the crumble bridge, this is when the floor starts sloping up slightly. Activate X-Ray and hold until full width to exit G-Mode and remain in R-Mode.",
+        "Bring the first pirate on screen, then Crystal Flash to kill it. Back up against the speed barrier and run left over the crumble blocks and then through the remaining pirates.",
+        "Stop at the end, and leave the leftmost Multviola near the door, running right to trap it off-screen in that area. Use the other two Multviola - or the spikes - to damage down.",
+        "Run back to the door, shinecharge, and get hit by the Multiviola to interrupt."
+      ]
+    },
+    {
+      "link": [10, 7],
+      "name": "Base",
+      "requires": [
+        "canGMode"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     }
   ],
   "notables": [