Merge pull request #2053 from kjbranch/g-pink

Refine G-Mode: Pink Brinstar

Author: osse101

region/brinstar/pink/Pink Brinstar Hopper Room.json

@@ -255,7 +255,8 @@
         {"enemyKill": {
           "enemies": [["Sidehopper", "Sm. Sidehopper", "Sm. Sidehopper"]],
           "explicitWeapons": ["Missile", "Super", "PowerBomb", "ScrewAttack", "Plasma"]
-        }}
+        }},
+        {"obstaclesNotCleared": ["C"]}
       ],
       "clearsObstacles": ["A"]
     },
@@ -376,6 +377,25 @@
       ],
       "devNote": "This is significantly easier than a typical canUnmorphBombBoost, so it is instead modeled with canJumpIntoIBJ and canResetFallSpeed."
     },
+    {
+      "link": [1, 1],
+      "name": "Indirect G-Mode Damageless Kill",
+      "requires": [
+        "canEnterGMode",
+        {"obstaclesCleared": ["C"]},
+        "canInsaneJump",
+        {"or": [
+          "ScrewAttack",
+          "Plasma"
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "note": [
+        "If coming from a water room, Samus' jump height will be much lower. With Screw Attack, it is important to turnaround before touching the hoppers.",
+        "It can help to hold left through the transition and then buffer a right spin jump while landing."
+      ],
+      "devNote": "FIXME: Assumes worst case scenario of it being a water connection. Add a way to check if this is an air connection."
+    },
     {
       "id": 10,
       "link": [1, 1],
@@ -470,6 +490,7 @@
       "requires": [
         {"notable": "Reverse Gate Glitch"},
         {"obstaclesCleared": ["A"]},
+        {"obstaclesNotCleared": ["C"]},
         {"doorUnlockedAtNode": 1},
         "canTrickyJump",
         "canOffScreenSuperShot"
@@ -485,7 +506,7 @@
       ],
       "devNote": [
         "The reverse gate glitch pretty much requires killing the enemies first, so it's required here.",
-        "FIXME: direct GMode would have a usable door frame."
+        "Direct GMode would have a usable door frame, but the gate can't be opened."
       ]
     },
     {

region/brinstar/pink/Pink Brinstar Power Bomb Room.json

@@ -530,6 +530,7 @@
         }
       },
       "requires": [
+        "canTrickyDodgeEnemies",
         "h_artificialMorphPowerBomb",
         {"or": [
           {"and": [

region/brinstar/pink/Spore Spawn Super Room.json

@@ -209,6 +209,113 @@
         "This is possible with an IBJ, but it's still about 3 minutes, and you can't remotely acquire the item because it's in a Chozo Ball."
       ]
     },
+    {
+      "link": [2, 1],
+      "name": "G-Mode Overload PLMS with Camera Scroll Blocks, Shinespark",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
+        "canShinechargeMovement",
+        {"shinespark": {"frames": 399, "excessFrames": 0}},
+        {"shinespark": {"frames": 138, "excessFrames": 6}}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Shinespark multiple times up the shaft and overload PLMs with the camera scroll blocks which are against the crumble blocks.",
+        "To overload PLMs in as few as 3 Shinesparks, spark diagonally in the shaft and hold backwards when hitting the top, then spark again to get up."
+      ]
+    },
+    {
+      "link": [2, 1],
+      "name": "Direct G-Mode Morph, Overload PLMS with Camera Scroll Blocks, CF, Shinespark",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_artificialMorphCrystalFlash",
+        {"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
+        "canShinechargeMovement",
+        {"shinespark": {"frames": 399, "excessFrames": 0}},
+        {"shinespark": {"frames": 138, "excessFrames": 6}},
+        {"or": [
+          "h_usePowerBomb",
+          {"and": [
+            "canBeVeryPatient",
+            {"autoReserveTrigger": {}}
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Shinespark multiple times up the shaft and overload PLMs with the camera scroll blocks which are against the crumble blocks.",
+        "To overload PLMs in as few as 3 Shinesparks, spark diagonally in the shaft and hold backwards when hitting the top, then spark again to get up.",
+        "Afterwards, exit G-mode by using another Power Bomb to enable X-Ray again, or use the bugs to trigger Reserves."
+      ],
+      "devNote": [
+        "Depending on the number of tanks, the Reserve trigger may or may not take very long. This is a worst-case scenario.",
+        "Samus is not able to Crystal Flash twice in this room in Direct G-mode."
+      ]
+    },
+    {
+      "link": [2, 1],
+      "name": "Indirect G-Mode Morph, Overload PLMS with Camera Scroll Blocks, CF, Shinespark",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_artificialMorphCrystalFlash",
+        {"canShineCharge": {"usedTiles": 16, "openEnd": 1}},
+        "canShinechargeMovement",
+        {"shinespark": {"frames": 399, "excessFrames": 0}},
+        {"shinespark": {"frames": 138, "excessFrames": 6}}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Shinespark multiple times up the shaft and overload PLMs with the camera scroll blocks which are against the crumble blocks.",
+        "To overload PLMs in as few as 3 Shinesparks, spark diagonally in the shaft and hold backwards when hitting the top, then spark again to get up."
+      ],
+      "devNote": "Samus is not able to CF twice in this room in Indirect G-mode."
+    },
+    {
+      "link": [2, 1],
+      "name": "G-Mode Overload PLMS with Chozo Ball, Shinespark",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"itemNotCollectedAtNode": 3},
+        "canRiskPermanentLossOfAccess",
+        {"canShineCharge": {"usedTiles": 16, "openEnd": 2}},
+        "canShinechargeMovement",
+        {"or": [
+          {"shinespark": {"frames": 138, "excessFrames": 6}},
+          {"and": [
+            "h_artificialMorphCrystalFlash",
+            {"or":[
+              "Morph",
+              "canArtificialMorph"
+            ]},
+            {"shinespark": {"frames": 138, "excessFrames": 6}}
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": "Shoot the Chozo Ball multiple times to overload PLMs then Shinespark to get up."
+    },
     {
       "id": 8,
       "link": [2, 1],