Pit, Parlor

Author: kjbranch

region/crateria/central/Crateria Super Room.json

@@ -1017,6 +1017,40 @@
       ],
       "clearsObstacles": ["A"]
     },
+    {
+      "link": [2, 2],
+      "name": "Direct G-Mode, CF, Shinespark, Return",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": true
+        }
+      },
+      "requires": [
+        "h_canArtificialMorphCrystalFlash",
+        {"or": [
+          {"and": [
+            "canTrivialUseFrozenEnemies",
+            "h_canShineChargeMaxRunway",
+            "canMidairShinespark",
+            {"shinespark": {"frames": 118, "excessFrames": 6}}
+          ]},
+          {"and": [
+            "canShinechargeMovementComplex",
+            {"canShineCharge": {"usedTiles": 34, "openEnd": 0}},
+            {"shinespark": {"frames": 128, "excessFrames": 6}}
+          ]}
+        ]},
+        {"autoReserveTrigger": {"minReserveEnergy": 1}}
+      ],
+      "collectsItems": [3],
+      "flashSuitChecked": true,
+      "note": [
+        "Crystal Flash then Shinespark up to the item, touch it, and return through the speed block that is now air.",
+        "Use the Boyons and acid to reserve trigger to exit G-mode below to collect the item."
+      ],
+      "devNote": "These shinespark frames could be reduced with more items or tech, but in direct G-mode, Samus will need to CF and reserve trigger to collect the item."
+    },
     {
       "id": 35,
       "link": [2, 3],
@@ -1301,6 +1335,35 @@
       ],
       "devNote": "It's not really insane jump difficult, but that is where you think about needing to avoid the damage.  And failing the jump is still very punishing due to falling into the acid."
     },
+    {
+      "link": [2, 5],
+      "name": "Direct G-Mode, Shinespark, Return",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "direct",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"or": [
+          {"and": [
+            "canTrivialUseFrozenEnemies",
+            "h_canShineChargeMaxRunway",
+            "canMidairShinespark",
+            {"shinespark": {"frames": 118, "excessFrames": 6}}
+          ]},
+          {"and": [
+            "canShinechargeMovementComplex",
+            {"canShineCharge": {"usedTiles": 34, "openEnd": 0}},
+            {"shinespark": {"frames": 128, "excessFrames": 6}}
+          ]}
+        ]}
+      ],
+      "collectsItems": [3],
+      "flashSuitChecked": true,
+      "note": "Shinespark up to the item, touch it, and return through the speed block that is now air. Exit G-mode below to collect the item.",
+      "devNote": "These shinespark frames could be reduced with more items or tech, but in direct G-mode, Samus will be at low Energy and need an energy free shinespark."
+    },
     {
       "id": 48,
       "link": [3, 4],

region/crateria/central/Landing Site.json

@@ -471,6 +471,55 @@
       "clearsObstacles": ["A"],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "G-Mode through Bomb Blocks, Ship Refill",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]},
+        {"or": [
+          "SpaceJump",
+          {"and": [
+            "HiJump",
+            "canSpringBallJumpMidAir"
+          ]},
+          "canDelayedWalljump",
+          {"and": [
+            "SpeedBooster",
+            "HiJump"
+          ]},
+          {"and": [
+            "SpeedBooster",
+            {"or": [
+              "HiJump",
+              "canSpringBallJumpMidAir",
+              "canWalljump"
+            ]}
+          ]},
+          {"and": [
+            "h_canShineChargeMaxRunway",
+            "canMidairShinespark",
+            {"or": [
+              {"shinespark": {"frames": 29, "excessFrames": 1}},
+              {"and": [
+                "canShinechargeMovementComplex",
+                {"shinespark": {"frames": 22, "excessFrames": 1}}
+              ]}
+            ]}
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Overload the scroll PLMs which are one tile to the left of the bomb blocks, then pass through them.",
+        "Refill at the ship, then return."
+      ]
+    },
     {
       "id": 11,
       "link": [1, 4],
@@ -496,14 +545,15 @@
           "morphed": false
         }
       },
-      "requires": [],
+      "requires": [
+        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
+      ],
       "flashSuitChecked": true,
       "note": [
         "Overload the scroll PLMs which are one tile to the left of the bomb blocks leading to Gauntlet.",
         "Then pass through the bomb blocks (which will have become air).",
-        "If needed, continue on through the next set of bomb blocks (which will also be air) to reach the bottom right door."
-      ],
-      "devNote": "FIXME: It is possible to refill at the Ship on the way."
+        "If needed, refill at the ship and/or continue on through the next set of bomb blocks to reach the bottom right door."
+      ]
     },
     {
       "id": 89,
@@ -1557,7 +1607,8 @@
       "name": "Refill",
       "requires": [
         {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
-      ]
+      ],
+      "devNote": "If the ship refill is somehow altered or removed, this needs to be updated here and on the G-mode strat from 1->4."
     },
     {
       "id": 73,