Aqueduct G-Mode: Second Pass

kjbranch · kjbranch · commit c2a67769c9c1 · 2025-07-17T01:12:02.000-06:00
diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json
@@ -158,6 +158,18 @@
         [2, 1, 1, 1, 1, 1]
       ],
       "note": "Represents being at the bottom left door with G-Mode and PLMs overloaded."
+    },
+    {
+      "id": 12,
+      "name": "G-Mode Junction (By Bottom Left Door)",
+      "nodeType": "junction",
+      "nodeSubType": "g-mode",
+      "mapTileMask": [
+        [1, 1, 1, 1, 1, 1],
+        [1, 1, 1, 1, 1, 1],
+        [2, 1, 1, 1, 1, 1]
+      ],
+      "note": "Represents being at the bottom left door with G-Mode."
     }
   ],
   "obstacles": [
@@ -215,7 +227,8 @@
         {"id": 7},
         {"id": 9},
         {"id": 10},
-        {"id": 11}
+        {"id": 11},
+        {"id": 12}
       ]
     },
     {
@@ -240,7 +253,8 @@
         {"id": 8},
         {"id": 9},
         {"id": 10},
-        {"id": 11}
+        {"id": 11},
+        {"id": 12}
       ]
     },
     {
@@ -252,7 +266,8 @@
         {"id": 7},
         {"id": 9},
         {"id": 10},
-        {"id": 11}
+        {"id": 11},
+        {"id": 12}
       ]
     },
     {
@@ -296,6 +311,14 @@
         {"id": 1},
         {"id": 7}
       ]
+    },
+    {
+      "from": 12,
+      "to": [
+        {"id": 3},
+        {"id": 4},
+        {"id": 11}
+      ]
     }
   ],
   "strats": [
@@ -475,7 +498,8 @@
         ]}
       ],
       "flashSuitChecked": true,
-      "note": "Bomb the Power Bomb blocks below to overload PLMs, then go up through the crumble blocks to escape."
+      "note": "Bomb the Power Bomb blocks below to overload PLMs, then go up through the crumble blocks to escape.",
+      "devNote": "FIXME: Eventually a CF doorlock bypass should be added from this 1 or from 12 with a 1->12 option."
     },
     {
       "id": 10,
@@ -1786,21 +1810,16 @@
       "flashSuitChecked": true
     },
     {
-      "id": 55,
-      "link": [2, 11],
-      "name": "G-Mode Overload PLMs with Grapple",
+      "link": [2, 12],
+      "name": "G-Mode",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
           "morphed": false
         }
       },
-      "requires": [
-        "Grapple",
-        "h_navigateUnderwater"
-      ],
-      "flashSuitChecked": true,
-      "note": "Overload PLMs using the Grapple Blocks."
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 58,
@@ -2690,21 +2709,47 @@
       "flashSuitChecked": true
     },
     {
-      "id": 96,
       "link": [5, 11],
-      "name": "G-Mode Overload PLMs with Grapple",
+      "name": "G-Mode Morph Overload PLMs - Power Bomb the Items",
       "entranceCondition": {
         "comeInWithGMode": {
-          "mode": "any",
-          "morphed": false
+          "mode": "direct",
+          "morphed": true
         }
       },
       "requires": [
-        "Grapple",
-        "h_navigateUnderwater"
+        {"notable": "G-Mode Overload PLMs - Power Bomb the Items"},
+        "canRiskPermanentLossOfAccess",
+        {"or": [
+          {"itemNotCollectedAtNode": 7},
+          {"itemNotCollectedAtNode": 8}
+        ]},
+        "h_artificialMorphSpringBall",
+        "h_artificialMorphPowerBomb",
+        "h_artificialMorphPowerBomb"
       ],
       "flashSuitChecked": true,
-      "note": "Overload PLMs using the Grapple Blocks."
+      "note": [
+        "PLMs can be overloaded in direct G-Mode with a single Power Bomb if both items are still there and 2 PBs if only one item is.",
+        "There is a row of tiles that works, just above and to the left of the right door.",
+        "The row is one tile higher than the horizontal pipe that is part of the door frame, spanning from the left to one tile away from the right wall."
+      ],
+      "devNote": [
+        "This canRiskPermanentLossOfAccess variant is only added from this door, as the only other place to use overloaded PLMs would be the top left bomb block,",
+        "and if you can get here artificially morphed, you can get to the top left and instead use the bomb on the block."
+      ]
+    },
+    {
+      "link": [5, 12],
+      "name": "G-Mode",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 97,
@@ -3125,22 +3170,17 @@
       "flashSuitChecked": true
     },
     {
-      "id": 113,
-      "link": [6, 11],
-      "name": "G-Mode Overload PLMs with Grapple",
+      "link": [6, 12],
+      "name": "G-Mode",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "any",
           "morphed": false
         },
         "comesThroughToilet": "any"
       },
-      "requires": [
-        "Grapple",
-        "h_navigateUnderwater"
-      ],
-      "flashSuitChecked": true,
-      "note": "Overload PLMs using the Grapple Blocks."
+      "requires": [],
+      "flashSuitChecked": true
     },
     {
       "id": 114,
@@ -3190,11 +3230,12 @@
       ],
       "note": [
         "Use two snails to perform an 'Enemy Stuck Moonfall' to bypass the bomb blocks above the middle left door.",
-        "Position one snail on the above door shell, and the second above the corner of pipe below",
+        "Position one snail on the above door shell, and the second above the corner of pipe below.",
         "Samus will clip through the lower snail, taking damage, then continue through a segment of pipe where the crumble blocks can be reached.",
-        "Facing both snails during the moonfall while positioning Samus for the clip can be precise",
+        "Facing both snails during the moonfall while positioning Samus for the clip can be precise.",
         "Depending on the exact heights of the snails, it may be necessary to pose change while clipping."
-      ]
+      ],
+      "devNote": "FIXME: This may be possible damageless by shooting the snail at a precise time."
     },
     {
       "id": 120,
@@ -3347,35 +3388,55 @@
           "h_artificialMorphJumpIntoIBJ"
         ]}
       ],
-      "flashSuitChecked": true,
-      "devNote": "FIXME: This is not a long IBJ if starting from door 5."
+      "flashSuitChecked": true
     },
     {
-      "id": 132,
-      "link": [10, 2],
-      "name": "Break the Power Bomb Blocks",
+      "link": [10, 1],
+      "name": "G-Mode Bomb the Block - Morphed Suitless Snail Climb",
       "requires": [
         "canEnterGMode",
-        "h_artificialMorphPowerBomb"
+        "h_artificialMorphBombThings",
+        "h_artificialMorphSpringBall",
+        "canSnailClimb",
+        {"or": [
+          "HiJump",
+          "Gravity"
+        ]}
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [10, 1],
+      "name": "G-Mode Bomb the Block - Morphed Suitless Snail Climb, No Jump Assist",
+      "requires": [
+        "canEnterGMode",
+        "h_artificialMorphBombThings",
+        "h_artificialMorphSpringBall",
+        "canSnailClimb",
+        "canTrickyJump"
       ],
-      "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "note": "Place a Power Bomb, then exit G-Mode to break the blocks."
+      "note": [
+        "It is barely possible to start a snail climb with just Spring Ball.",
+        "Get a snail positioned such that it is on the bottom of an overhang above, and sticking out a bit to be usable as a platform.",
+        "Use Spring Ball to jump and press against the snail for the maximum possible duration, in order to gain enough height to get onto it."
+      ]
     },
     {
-      "id": 133,
-      "link": [10, 7],
-      "name": "Overload PLMs - Bomb the Speed Blocks, To the Top Right Items",
+      "id": 132,
+      "link": [10, 2],
+      "name": "Break the Power Bomb Blocks",
       "requires": [
         "canEnterGMode",
-        "Gravity",
-        {"or": [
-          "h_artificialMorphLongIBJ",
-          "h_artificialMorphJumpIntoIBJ"
-        ]}
+        "h_artificialMorphPowerBomb"
       ],
+      "clearsObstacles": ["A"],
       "flashSuitChecked": true,
-      "devNote": "FIXME: This is not a long IBJ if starting from door 5."
+      "note": "Place a Power Bomb, then exit G-Mode to break the blocks.",
+      "devNote": [
+        "FIXME: It would be possible to Power Bomb the blocks before PLMs are overloaded, then overload them and get to the top items,",
+        "and the blocks will break as Samus exit's G-mode. This would be very difficult to model."
+      ]
     },
     {
       "id": 134,
@@ -3389,8 +3450,7 @@
           "h_artificialMorphJumpIntoIBJ"
         ]}
       ],
-      "flashSuitChecked": true,
-      "devNote": "FIXME: This is not a long IBJ if starting from door 5."
+      "flashSuitChecked": true
     },
     {
       "id": 135,
@@ -3483,14 +3543,113 @@
     },
     {
       "link": [11, 7],
-      "name": "Overloaded PLMs - Bootless UWJ",
+      "name": "G-Mode Overloaded PLMs - Bootless UWJ",
       "requires": [
         "canEnterGMode",
         "canSnailClimb",
         "canBootless2WideUWJ"
       ],
       "flashSuitChecked": true,
       "note": "After PLMs are overloaded, use a snail to climb to the right then bootless UWJ to the items."
+    },
+    {
+      "link": [12, 3],
+      "name": "Leave with G-Mode Snail Moonfall",
+      "requires": [
+        "canEnterGMode",
+        "h_navigateUnderwater",
+        "canEnemyStuckMoonfall",
+        {"or": [
+          "canInsaneJump",
+          {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 1}}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "Use two snails to moonfall down through the pipe to the section below.",
+        "The snails should be easy to align, with one on the floor and another on a ceiling 4 tiles higher.",
+        "Shoot the lower snail after Samus has enough fall speed in order to avoid taking a snail hit.",
+        "There is a small set of frames between these two, in which Samus will fall out of bounds.",
+        "With Gravity, there is approximately a 5 second fall, with a 15 frame window.",
+        "Suitless, there is approximately a 16 second fall, with almost a full second window - this is approximately 8 sets of bubbles out of Samus' arm."
+      ]
+    },
+    {
+      "link": [12, 4],
+      "name": "Leave with G-Mode Snail Moonfall",
+      "requires": [
+        "canEnterGMode",
+        "h_navigateUnderwater",
+        "canEnemyStuckMoonfall",
+        {"or": [
+          "canInsaneJump",
+          {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 1}}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "Use two snails to moonfall down through the pipe to the section below.",
+        "The snails should be easy to align, with one on the floor and another on a ceiling 4 tiles higher.",
+        "Slide off or shoot the lower snail after Samus has enough fall speed in order to avoid taking a snail hit.",
+        "There is a small set of frames between these two, in which Samus will fall out of bounds.",
+        "With Gravity, there is approximately a 5 second fall, with a 15 frame window.",
+        "Suitless, there is approximately a 16 second fall, with almost a full second window - this is approximately 8 sets of bubbles out of Samus' arm."
+      ]
+    },
+    {
+      "link": [12, 11],
+      "name": "G-Mode Overload PLMs with Grapple",
+      "requires": [
+        "canEnterGMode",
+        "Grapple",
+        "h_navigateUnderwater"
+      ],
+      "flashSuitChecked": true,
+      "note": "Overload PLMs using the Grapple Blocks."
+    },
+    {
+      "link": [12, 11],
+      "name": "G-Mode - Snail Moonfall, Touch the Sand, High Pixel Clip Return",
+      "requires": [
+        "canTrickyGMode",
+        "h_navigateUnderwater",
+        "canEnemyStuckMoonfall",
+        "canHighPixelCeilingClip",
+        {"or": [
+          "canBeVeryPatient",
+          "h_useSpringBall",
+          {"and": [
+            "Gravity",
+            "SpaceJump"
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Use two snails to moonfall down through the pipe to the section below.",
+        "The snails should be easy to align, with one on the floor and another on a ceiling 4 tiles higher.",
+        "Slide off or shoot the lower snail after Samus has enough fall speed in order to avoid taking a snail hit.",
+        "There is a small set of frames between these two, in which Samus will fall out of bounds.",
+        "With Gravity, there is approximately a 5 second fall, with a 15 frame window.",
+        "Suitless, there is approximately a 16 second fall, with almost a full second window - this is approximately 8 sets of bubbles out of Samus' arm.",
+        "Clip down on the right side of the room without luring the snail underneath, or clip down in the center of the room with Spring Ball or Gravity and Space Jump and carefully cross the sand.",
+        "Stand partially on the sand's edge to quickly overload PLMs, then go to the right and set up a pixel-precise high ceiling snail clip first try."
+      ],
+      "devNote": [
+        "It is possible to try multiple times with Gravity+Space+patience by moving the snail around the bottom of the room.",
+        "It is also possible to use the gentle slopes in the middle of the room for a larger window ceiling clip, but the snails behave unusually",
+        "on slopes and it ends up not really being easier."
+      ]
     }
   ],
   "notables": [
