Merge pull request #2100 from kjbranch/upward-indirect

osse101 · web-flow · commit 328628ea5f37 · 2025-07-04T07:36:37.000-05:00
Indirect upward G-mode, more Everest strats
diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
@@ -502,12 +502,15 @@
       "link": [1, 1],
       "name": "G-Mode Regain Mobility",
       "requires": [
-        "never"
+        {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}}
       ],
       "gModeRegainMobility": {},
       "flashSuitChecked": true,
-      "note": "Start on the right side and carefully land on the right edge. If in artificial morph, use spring ball or quickly bomb or bomb over the crab to avoid a second hit.",
-      "devNote": "FIXME: It may be possible to get hit on the left side, but it would be dependent on the strats coming in, sometimes you're immobilized too high to get hit."
+      "note": [
+        "Start on the far right or left side to get hit by the crab.",
+        "If on the right side, carefully land on the right edge; if in artificial morph, use Spring Ball or quickly bomb to kill or boost over the crab to avoid a second hit."
+      ],
+      "devNote": "Using artificial morph in-room will already require some sort of movement, so it is not included here to avoid a second hit."
     },
     {
       "id": 152,
diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json
@@ -250,13 +250,7 @@
           "note": "Shinespark direct link"
         },
         {"id": 5},
-        {
-          "id": 9,
-          "devNote": [
-            "FIXME It is possible to spark 4->9 with precise positioning and a downgrab on the grapple blocks.",
-            "It is also possible to have a precise amount of energy to fall onto the blocks."
-          ]
-        },
+        {"id": 9},
         {"id": 11},
         {"id": 12}
       ]
@@ -304,7 +298,8 @@
         {
           "id": 10,
           "note": "One-way link for shinesparking and cross-room jumps."
-        }
+        },
+        {"id": 12}
       ]
     },
     {
@@ -891,7 +886,8 @@
       "note": "Crouch on the lowest stair, then shinespark horizontally to bonk at the top corner of the grapple block. Down grab to get onto it.",
       "devNote": [
         "This is only done suitless, as with Gravity, you can gravity jump up there.",
-        "A similar strat can be done from the top right door, but it doesn't have a nice setup and has to be done midair."
+        "A similar strat can be done from the top right door, but it doesn't have a nice setup and has to be done midair.",
+        "FIXME: Add a variant with canControlShinesparkEnd."
       ]
     },
     {
@@ -965,13 +961,15 @@
         "canTrickyJump",
         {"or": [
           "h_EverestMorphTunnelExpanded",
+          "h_artificialMorphPowerBomb",
           {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}}
         ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Bounce from the right peak into the morph tunnel.",
-        "Samus can't bounce twice in a single fall, so start from the right ground, not the raised scaffolding by the door."
+        "Samus can't bounce twice in a single fall, so start from the right ground, not the raised scaffolding by the door.",
+        "A Power Bomb can be placed on the descent to kill the Crab."
       ]
     },
     {
@@ -1051,8 +1049,7 @@
       "requires": [
         "h_artificialMorphDoubleSpringBallJump"
       ],
-      "flashSuitChecked": true,
-      "devNote": "FIXME: Strats like this could be added to 3, but it would require indirect, requiring a vertical doorlock bypass in the room below."
+      "flashSuitChecked": true
     },
     {
       "id": 27,
@@ -1855,6 +1852,50 @@
       "flashSuitChecked": true,
       "note": "Jumping from the raised tile to the right of the door can save 1 Energy."
     },
+    {
+      "link": [2, 12],
+      "name": "G-Mode",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "Morph",
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"or": [
+              "HiJump",
+              "canWalljump",
+              "SpeedBooster",
+              "SpaceJump",
+              "canSpringBallJumpMidAir",
+              "canSpringBallBombJump",
+              "canGravityJump",
+              {"and": [
+                "h_crouchJumpDownGrab",
+                "canTrickyJump"
+              ]}
+            ]}
+          ]},
+          {"and": [
+            "canSuitlessMaridia",
+            {"or": [
+              "canTrickyUseFrozenEnemies",
+              {"and": [
+                "HiJump",
+                "canSpringBallJumpMidAir"
+              ]},
+              "canUnderwaterWalljump"
+            ]}
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 65,
       "link": [2, 12],
@@ -1869,10 +1910,7 @@
       "requires": [
         "Gravity",
         {"or": [
-          {"and": [
-            "h_artificialMorphIBJ",
-            "h_artificialMorphBombHorizontally"
-          ]},
+          "h_artificialMorphIBJ",
           {"and": [
             "h_artificialMorphSpringBall",
             {"or": [
@@ -1887,10 +1925,7 @@
         ]}
       ],
       "flashSuitChecked": true,
-      "devNote": [
-        "FIXME: Add strats to get here with Morph.",
-        "A long IBJ could be added if the door is closed, but a horizontal boost is easy enough."
-      ]
+      "devNote": "It is assumed that the door is open."
     },
     {
       "id": 245,
@@ -2408,6 +2443,61 @@
         "This strat is applicable in Crocomire's Room and the Post Crocomire Jump Room (with Power Bomb blocks broken)."
       ]
     },
+    {
+      "link": [3, 12],
+      "name": "Indirect G-Mode, To the Tunnel",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "Morph",
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"or": [
+              "HiJump",
+              "canWalljump",
+              "SpaceJump",
+              "canIBJ",
+              "canSpringBallJumpMidAir",
+              "canSpringBallBombJump",
+              "canGravityJump"
+            ]}
+          ]},
+          {"and": [
+            "canSuitlessMaridia",
+            {"or": [
+              {"and": [
+                "HiJump",
+                "canSpringBallJumpMidAir"
+              ]},
+              "canUnderwaterWalljump"
+            ]}
+          ]},
+          {"and": [
+            "h_navigateUnderwater",
+            "canTrickyUseFrozenEnemies",
+            {"ammo": {"type": "Super", "count": 1}},
+            {"or": [
+              "canInsaneJump",
+              "Spazer",
+              "Wave",
+              "Plasma",
+              {"ammo": {"type": "Super", "count": 1}}
+            ]}
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "devNote": [
+        "Direct G-mode will have an open door and Samus will fall. Indirect will require a doorlock bypass in the room below.",
+        "FIXME: A direct G-mode regain mobility and fall through the door would be possible if entering on the right side of the door, but there is not a way to represent that yet."
+      ]
+    },
     {
       "id": 91,
       "link": [4, 1],
@@ -2950,6 +3040,42 @@
       ],
       "devNote": "With enough energy, this goes all the way to 1, but with less it stops prematurely at 11."
     },
+    {
+      "link": [4, 12],
+      "name": "G-Mode",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "any",
+          "morphed": false
+        }
+      },
+      "requires": [
+        "Morph",
+        "h_navigateUnderwater",
+        {"or": [
+          "Gravity",
+          "HiJump",
+          {"and": [
+            "Grapple",
+            "canUseEnemies"
+          ]},
+          {"and": [
+            "canSpringBallJumpMidAir",
+            {"or": [
+              "canTrickyJump",
+              "canSpringFling",
+              "canStationaryLateralMidAirMorph",
+              "canTrickyUseFrozenEnemies"
+            ]}
+          ]},
+          {"and": [
+            "canTrickyUseFrozenEnemies",
+            "canTrickyJump"
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 117,
       "link": [4, 12],
@@ -2963,7 +3089,6 @@
       "requires": [
         "Gravity",
         {"or": [
-          "Morph",
           {"and": [
             "h_artificialMorphSpringBall",
             {"or": [
@@ -2979,8 +3104,7 @@
           "h_artificialMorphSpringBallBombJump"
         ]}
       ],
-      "flashSuitChecked": true,
-      "devNote": "FIXME: Add strats to get here with Morph, suitless."
+      "flashSuitChecked": true
     },
     {
       "id": 118,
@@ -3168,7 +3292,7 @@
       "devNote": [
         "It isn't possible to get the crab frozen at the high pixel position here,",
         "nor is it possible to clip without Morph and X-Ray.",
-        "FIXME: suitless variations would be possible with HiJump in combination with Spring Ball or Grapple."
+        "FIXME: suitless variations would be possible with HiJump in combination with Spring Ball or Grapple and patience."
       ]
     },
     {
@@ -3349,16 +3473,27 @@
       "requires": [
         "canSuitlessMaridia",
         "canTrickyJump",
-        {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}},
         {"or": [
-          "h_EverestMorphTunnelExpanded",
-          {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}}
+          "h_artificialMorphPowerBomb",
+          {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 2}},
+          {"and": [
+            "h_EverestMorphTunnelExpanded",
+            {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}}
+          ]},
+          {"and": [
+            "h_EverestMorphTunnelExpanded",
+            "canInsaneJump",
+            {"enemyDamage": {"enemy": "Powamp", "type": "contact", "hits": 1}}
+          ]}
         ]}
       ],
       "flashSuitChecked": true,
       "note": [
         "Bounce from the right peak into the morph tunnel.",
-        "Samus can't bounce twice in a single fall, so come to a stop on the top platform or avoid it completely."
+        "Samus can't bounce twice in a single fall, so come to a stop on the top platform or avoid it completely.",
+        "A Power Bomb can be placed on the descent to kill the Crab, as long as Samus lands near the top of the peak, to give the bomb enough time before she gets there.",
+        "If the morph tunnel is expanded, it is also possible to slow Samus' descent enough to avoid the crab by hitting the Powamp,",
+        "falling near the top of the peak, then bouncing into the edge of the tunnel. This will save a small amount of Energy."
       ]
     },
     {
@@ -4316,8 +4451,7 @@
           "SpaceJump",
           "canIBJ"
         ]}
-      ],
-      "devNote": "FIXME: It's possible to clip through the door with morph, xray, a super and a way to lure the crab, but its a precise and unforgiving freeze."
+      ]
     },
     {
       "id": 181,
@@ -5148,7 +5282,6 @@
   "nextStratId": 256,
   "nextNotableId": 11,
   "devNote": [
-    "FIXME: This room could have strats for using Ice to bypass the top door.",
     "FIXME: A 4->6 grapple teleport is possible, but the wrong-side transition will usually put Samus out-of-bounds. "
   ]
 }
diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
@@ -2516,6 +2516,10 @@
       "note": [
         "The blocks are breakable with 4 Power Bombs.",
         "Horizontally bomb over the vertical door then up two ledges before placing a Power Bomb that can reach the blocks above."
+      ],
+      "devNote": [
+        "FIXME: It is possible to enter 5 in indirect, and shoot the door at 4 if it has ever been locked,",
+        "or 5 if its still locked to overload PLMs and go through the bomb maze."
       ]
     },
     {
diff --git a/region/tourian/main/Tourian Escape Room 1.json b/region/tourian/main/Tourian Escape Room 1.json
@@ -115,6 +115,29 @@
       "name": "Base",
       "requires": []
     },
+    {
+      "link": [2, 1],
+      "name": "Indirect G-Mode, Carry G-Mode to the Right",
+      "entranceCondition": {
+        "comeInWithGMode": {
+          "mode": "indirect",
+          "morphed": false
+        },
+        "comesThroughToilet": "any"
+      },
+      "requires": [],
+      "exitCondition": {
+        "leaveWithGMode": {
+          "morphed": false
+        }
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": ["never"]}],
+      "flashSuitChecked": true,
+      "devNote": [
+        "Direct G-mode will have an open door and Samus will fall. Indirect will require a doorlock bypass in the room below.",
+        "If there is any type of door here, the strat won't work."
+      ]
+    },
     {
       "id": 6,
       "link": [2, 2],

Original file line number	Diff line number	Diff line change
`@@ -2516,6 +2516,10 @@`
`2516`	`2516`	`"note": [`
`2517`	`2517`	`"The blocks are breakable with 4 Power Bombs.",`
`2518`	`2518`	`"Horizontally bomb over the vertical door then up two ledges before placing a Power Bomb that can reach the blocks above."`
	`2519`	`+ ],`
	`2520`	`+ "devNote": [`
	`2521`	`+ "FIXME: It is possible to enter 5 in indirect, and shoot the door at 4 if it has ever been locked,",`
	`2522`	`+ "or 5 if its still locked to overload PLMs and go through the bomb maze."`
`2519`	`2523`	`]`
`2520`	`2524`	`},`
`2521`	`2525`	`{`