Merge pull request #2192 from blkerby/supersink

osse101 · web-flow · commit 097fbf2406be · 2025-08-05T12:37:39.000-05:00
Super sinks
diff --git a/region/brinstar/green/Green Brinstar Main Shaft.json b/region/brinstar/green/Green Brinstar Main Shaft.json
@@ -3571,6 +3571,17 @@
       ],
       "note": ["Land in the right side of the third Samus Eater on the floor of Hellway."]
     },
+    {
+      "link": [6, 13],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, and hold left, to clip down past the Power Bomb blocks."
+      ]
+    },
     {
       "id": 258,
       "link": [6, 16],
diff --git a/region/brinstar/green/Spore Spawn Room.json b/region/brinstar/green/Spore Spawn Room.json
@@ -161,6 +161,17 @@
         "FIXME: A different exact fall speed value changes the movements needed for the clip."
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, in order to clip down into the fight arena."
+      ]
+    },
     {
       "id": 9,
       "link": [2, 1],
diff --git a/region/brinstar/pink/Mission Impossible Room.json b/region/brinstar/pink/Mission Impossible Room.json
@@ -104,6 +104,7 @@
       "from": 1,
       "to": [
         {"id": 1},
+        {"id": 2},
         {"id": 4}
       ]
     },
@@ -422,6 +423,17 @@
       "bypassesDoorShell": "free",
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, in order to clip down to the door below."
+      ]
+    },
     {
       "id": 13,
       "link": [1, 4],
diff --git a/region/brinstar/red/Below Spazer.json b/region/brinstar/red/Below Spazer.json
@@ -900,6 +900,17 @@
       "requires": [],
       "note": "Moondance clip near the door to fall two tiles into the ground, then Moonfall again to continue clipping all the way to the area below."
     },
+    {
+      "link": [3, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, in order to clip down through the floor."
+      ]
+    },
     {
       "id": 38,
       "link": [3, 3],
diff --git a/region/brinstar/red/Beta Power Bomb Room.json b/region/brinstar/red/Beta Power Bomb Room.json
@@ -522,6 +522,22 @@
         "It can be helpful to use a Super to kill the first Yapping Maw."
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [
+        "h_useSpringBall",
+        {"thornHits": 3},
+        {"samusEaterFrames": 160}
+      ],
+      "note": [
+        "Enter the room with a super sink, and hold left, in order to clip down through the Power Bomb blocks.",
+        "Use Spring Ball to navigate the thorns and Samus Eaters with limited damage."
+      ]
+    },
     {
       "id": 19,
       "link": [2, 1],
diff --git a/region/crateria/central/Climb.json b/region/crateria/central/Climb.json
@@ -1139,6 +1139,17 @@
       ],
       "devNote": "PBs cannot be used, as they will solidify the bomb blocks."
     },
+    {
+      "link": [3, 4],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, in order to clip down through several screens and reach the door below."
+      ]
+    },
     {
       "id": 46,
       "link": [3, 6],
diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json
@@ -937,6 +937,17 @@
         "Pose changing can send Samus inside of the walkway, where the right door connects to the WS main entrance door, and the left door connects to the Moat door."
       ]
     },
+    {
+      "link": [3, 5],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, in order to clip down several screens to the bottom part of the room."
+      ]
+    },
     {
       "id": 26,
       "link": [3, 8],
diff --git a/region/lowernorfair/west/Acid Statue Room.json b/region/lowernorfair/west/Acid Statue Room.json
@@ -107,6 +107,7 @@
       "from": 1,
       "to": [
         {"id": 1},
+        {"id": 2},
         {"id": 3},
         {"id": 4},
         {"id": 5}
@@ -172,6 +173,58 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [
+        "canOffScreenMovement",
+        {"heatFrames": 360},
+        {"acidFrames": 345},
+        {"enemyDamage": {"enemy": "Magdollite", "type": "contact", "hits": 1}}
+      ],
+      "exitCondition": {
+        "leaveNormally": {}
+      },
+      "unlocksDoors": [
+        {
+          "types": ["missiles"], 
+          "requires": [
+            {"acidFrames": 75},
+            {"heatFrames": 75}
+          ]
+        },
+        {
+          "types": ["super"],
+          "requires": [
+            {"acidFrames": 25},
+            {"heatFrames": 25}
+          ]
+        },
+        {
+          "types": ["powerbomb"],
+          "requires": [
+            {"acidFrames": 90},
+            {"heatFrames": 90}
+          ]
+        }
+      ],
+      "note": [
+        "Enter the room with a super sink, in order to clip down to the bottom part of the room.",
+        "Blindly traverse to the right door.",
+        "It is recommended to open the door using Grapple if possible,",
+        "since it can reach the door from a distance even while off-camera whereas beams cannot."
+      ],
+      "devNote": [
+        "FIXME: With better off-camera movement, this can be done with significantly less damage",
+        "(and with Gravity the Magdollite hit can also be avoided);",
+        "but after the supersink setup it's not clear if it's reasonable to assume any more than this.",
+        "FIXME: If the acid is already drained, then the requirements here could be reduced",
+        "(though in that case there's not as much reason to do this strat)."
+      ]
+    },
     {
       "id": 3,
       "link": [1, 3],
diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json
@@ -2400,6 +2400,19 @@
         {"types": ["missiles", "powerbomb"], "requires": ["never"]}
       ]
     },
+    {
+      "link": [3, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [
+        {"heatFrames": 115}
+      ],
+      "note": [
+        "Enter the room with a super sink, in order to clip down to the door below."
+      ]
+    },
     {
       "id": 40,
       "link": [3, 3],
diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json
@@ -2422,7 +2422,22 @@
       "bypassesDoorShell": true,
       "note": [
         "Land in the right side of the third Samus Eater on the floor of Hellway.",
-        "This allows Samus to get inside the air pocket below door.",
+        "This allows Samus to get inside the air pocket below the door.",
+        "From there use Grapple to clip inside the wall and down into the transition, bypassing the door lock below."
+      ]
+    },
+    {
+      "link": [3, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [
+        "canGrappleClip"
+      ],
+      "bypassesDoorShell": true,
+      "note": [
+        "Enter the room with a super sink, and hold right, to clip down into the air pocket below the door.",
         "From there use Grapple to clip inside the wall and down into the transition, bypassing the door lock below."
       ]
     },
diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
@@ -365,6 +365,7 @@
       "from": 4,
       "to": [
         {"id": 4},
+        {"id": 5},
         {"id": 6},
         {"id": 9},
         {"id": 10},
@@ -374,6 +375,7 @@
     {
       "from": 5,
       "to": [
+        {"id": 3},
         {"id": 5},
         {"id": 7}
       ]
@@ -3965,6 +3967,18 @@
       "gModeRegainMobility": {},
       "flashSuitChecked": true
     },
+    {
+      "link": [4, 5],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, and move a couple tiles away from the door,",
+        "to clip down into the tunnel two screens below."
+      ]
+    },
     {
       "id": 107,
       "link": [4, 6],
@@ -4157,6 +4171,17 @@
       "flashSuitChecked": true,
       "note": "Place bombs against the speed blocks until they are overloaded."
     },
+    {
+      "link": [5, 3],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, to clip down many screens to the bottom of the room."
+      ]
+    },
     {
       "id": 112,
       "link": [5, 5],
diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json
@@ -2482,6 +2482,17 @@
         "canMoonfall"
       ]
     },
+    {
+      "link": [3, 2],
+      "name": "Super Sink",
+      "entranceCondition": {
+        "comeInWithSuperSink": {}
+      },
+      "requires": [],
+      "note": [
+        "Enter the room with a super sink, to clip down to the bottom of the room."
+      ]
+    },
     {
       "id": 50,
       "link": [3, 3],
diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json
@@ -366,6 +366,7 @@
       "from": 8,
       "to": [
         {"id": 1},
+        {"id": 2},
         {"id": 6},
         {"id": 7},
         {"id": 9},
@@ -4064,6 +4065,28 @@
         }
       ]
     },
+    {
+      "link": [7, 3],
+      "name": "Super Sink Door Lock Skip",
+      "requires": [
+        "canSuperSink",
+        "SpringBall"
+      ],
+      "bypassesDoorShell": true,
+      "note": [
+        "Swing clock-wise around the two Grapple blocks at the top of the room,",
+        "and release when Samus has high speed and is as far right as possible.",
+        "Quickly morph, pause frame-perfectly so that the pause hits just as Samus would land,",
+        "Equip or unequip Spring Ball in order to land on the door shell without bouncing.",
+        "If successful, Samus will continue to gain fall speed while resting on the door shell,",
+        "clipping through it after a few seconds."
+      ],
+      "detailNote": [
+        "If Spring Ball is unequipped after bouncing, it will cause the game to crash after landing from the bounce.",
+        "To avoid this, do not unequip Spring Ball if the bouncing sound is heard before or while entering the pause menu.",
+        "Alternatively, equip rather than unequip Spring Ball."
+      ]
+    },
     {
       "id": 231,
       "link": [7, 4],
@@ -4677,6 +4700,33 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [8, 2],
+      "name": "Super Sink Door Lock Skip",
+      "requires": [
+        "canSuperSink",
+        "SpringBall"
+      ],
+      "bypassesDoorShell": true,
+      "note": [
+        "Swing counter-clockwise around the floating Grapple blocks on the right side of the room,",
+        "and release when Samus has high speed and is as far left as possible.",
+        "Quickly morph, pause frame-perfectly so that the pause hits just as Samus would land.",
+        "Equip or unequip Spring Ball in order to land without bouncing.",
+        "Hold left to roll over to the door.",
+        "If successful, Samus will continue to gain fall speed,",
+        "and will clip through the door soon after reaching it."
+      ],
+      "detailNote": [
+        "If Spring Ball is unequipped after bouncing, it will cause the game to crash after landing from the bounce.",
+        "To avoid this, do not unequip Spring Ball if the bouncing sound is heard before or while entering the pause menu.",
+        "Alternatively, equip rather than unequip Spring Ball."
+      ],
+      "devNote": [
+        "It is also an option to swing counter-clockwise around the Powamp above the door;",
+        "but this may be less consistent since the vertical position of the Powamp can vary."
+      ]
+    },
     {
       "id": 170,
       "link": [8, 6],
diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json
diff --git a/region/tourian/main/Tourian Escape Room 3.json b/region/tourian/main/Tourian Escape Room 3.json
diff --git a/schema/m3-room.schema.json b/schema/m3-room.schema.json
diff --git a/strats.md b/strats.md
diff --git a/tech.json b/tech.json
