Merge pull request #2267 from kjbranch/max-spring

osse101 · web-flow · commit 45aad68d32a3 · 2025-08-30T00:42:47.000-05:00
Refine flash suits and max height spring ball
diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json
@@ -917,9 +917,19 @@
           {"and": [
             "h_maxHeightSpringBallJump",
             "canNeutralDamageBoost"
+          ]},
+          {"and": [
+            {"spikeHits": 1},
+            "canTrickySpringBallJump",
+            "canTrickyJump",
+            "canNeutralDamageBoost"
           ]}
         ]},
         {"spikeHits": 1}
+      ],
+      "note": [
+        "Crouch jump and Spring Balll near the peak of the jump to hit the side of the spikes and boost up onto them.",
+        "This is also possible with a springwall, or from standing on the spikes to avoid the crouch jump."
       ]
     },
     {
diff --git a/region/crateria/east/East Ocean.json b/region/crateria/east/East Ocean.json
@@ -1277,9 +1277,10 @@
       "requires": [
         "canSuitlessMaridia",
         "canUseFrozenEnemies",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         "SpaceJump"
       ],
+      "flashSuitChecked": true,
       "note": [
         "In the center of the room, freeze the Skultera at the highest point in its cycle.",
         "Then use a max height springball jump to escape the water and land on the above platform.",
diff --git a/region/maridia/inner-green/East Pants Room.json b/region/maridia/inner-green/East Pants Room.json
@@ -210,7 +210,7 @@
       "name": "Max Height SpringBall Jump",
       "requires": [
         "canSuitlessMaridia",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         {"or": [
           "can4HighMidAirMorph",
           "canStationaryLateralMidAirMorph",
diff --git a/region/maridia/inner-green/East Sand Hall.json b/region/maridia/inner-green/East Sand Hall.json
@@ -1708,7 +1708,7 @@
         "canSuitlessMaridia",
         "canTrickyUseFrozenEnemies",
         "canPlayInSand",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         "canStationaryLateralMidAirMorph"
       ],
       "note": [
diff --git a/region/maridia/inner-green/Oasis.json b/region/maridia/inner-green/Oasis.json
@@ -2376,7 +2376,7 @@
               "canConsecutiveWalljump"
             ]}
           ]},
-          "h_maxHeightSpringBallJump"
+          "h_underwaterMaxHeightSpringBallJump"
         ]}
       ]
     },
diff --git a/region/maridia/inner-green/Pants Room.json b/region/maridia/inner-green/Pants Room.json
@@ -754,7 +754,7 @@
       "requires": [
         {"notable": "Bomb Jump Water Escape"},
         "HiJump",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         "canSpringFling",
         "canBombJumpWaterEscape",
         "canJumpIntoIBJ",
diff --git a/region/maridia/inner-green/West Sand Hall.json b/region/maridia/inner-green/West Sand Hall.json
@@ -1008,7 +1008,7 @@
         {"notable": "Suitless Bootless Spring Ball"},
         "canSuitlessMaridia",
         "canPlayInSand",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         "canStationaryLateralMidAirMorph",
         "canInsaneJump",
         {"or": [
@@ -1108,7 +1108,7 @@
         {"notable": "Suitless Bootless Spring Ball"},
         "canSuitlessMaridia",
         "canPlayInSand",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         {"or": [
           {"enemyKill": {
             "enemies": [["Evir"], ["Evir"]],
@@ -1276,7 +1276,7 @@
         {"notable": "Suitless Bootless Spring Ball"},
         "canSuitlessMaridia",
         "canPlayInSand",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         "canStationaryLateralMidAirMorph",
         "canInsaneJump"
       ],
diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json
@@ -3322,7 +3322,7 @@
         "canSnailClimb",
         {"or": [
           "Gravity",
-          "h_maxHeightSpringBallJump",
+          "h_underwaterMaxHeightSpringBallJump",
           {"and": [
             "HiJump",
             {"or": [
@@ -3471,7 +3471,7 @@
         "canSnailClimb",
         {"or": [
           "Gravity",
-          "h_maxHeightSpringBallJump",
+          "h_underwaterMaxHeightSpringBallJump",
           {"and": [
             "HiJump",
             {"or": [
diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json
@@ -1140,7 +1140,7 @@
       "requires": [
         {"notable": "Bomb Jump Water Escape"},
         "HiJump",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         "canSpringFling",
         "canBombJumpWaterEscape",
         "canJumpIntoIBJ"
@@ -2047,7 +2047,7 @@
           "canHorizontalDamageBoost",
           {"spikeHits": 1}
         ]},
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         {"or": [
           "canSpringFling",
           {"and": [
diff --git a/region/maridia/inner-pink/Crab Shaft.json b/region/maridia/inner-pink/Crab Shaft.json
@@ -1204,11 +1204,12 @@
         "canSuitlessMaridia",
         "canSpringBallJumpMidAir",
         {"or": [
-          "h_maxHeightSpringBallJump",
+          "h_underwaterMaxHeightSpringBallJump",
           "HiJump",
           "canUseFrozenEnemies"
         ]}
-      ]
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 34,
diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json
@@ -670,7 +670,7 @@
               ]},
               {"and": [
                 "HiJump",
-                "h_maxHeightSpringBallJump",
+                "h_underwaterMaxHeightSpringBallJump",
                 "canTrickyJump",
                 "canStationaryLateralMidAirMorph",
                 {"cycleFrames": 1070},
@@ -753,10 +753,22 @@
           {"and": [
             "h_maxHeightSpringBallJump",
             "canSpringFling"
+          ]},
+          {"and": [
+            "canTrickyJump",
+            "canLateralMidAirMorph",
+            "canTrickySpringBallJump",
+            "canSpringFling",
+            "h_complexToCarryFlashSuit"
           ]}
         ]}
       ],
-      "note": "There is just enough distance for a MidAir SpringBall jump to reach without HiJump."
+      "flashSuitChecked": true,
+      "note": [
+        "There is just enough distance for a MidAir SpringBall jump to reach without HiJump, with either a crouch jump or air ball.",
+        "To do this, pause and morph early in order to get a spring fling from equipping Spring Ball."
+      ],
+      "devNote": "The h_maxHeightSpringBallJump is not a h_underwaterMaxHeightSpringBallJump, because Gravity is required."
     },
     {
       "id": 21,
@@ -784,8 +796,7 @@
       "requires": [
         "canSuitlessMaridia",
         "HiJump",
-        "h_maxHeightSpringBallJump",
-        "canTrickyJump",
+        "h_underwaterMaxHeightSpringBallJump",
         {"or": [
           "canStationaryLateralMidAirMorph",
           {"and": [
@@ -799,7 +810,10 @@
         "To get enough horizontal distance, either use a Stationary Lateral Mid-Air Morph with a crouch jump for extra height, or spin jump out before morphing.",
         "Or SpringBall jump part of the way over and land on a Bomb explosion to cross the rest of the distance."
       ],
-      "devNote": "canStationaryLateralMidAirMorph is not strictly required but better describes the difficulty."
+      "devNote": [
+        "The canCrouchJump is not required but makes the strat easier",
+        "The canStationaryLateralMidAirMorph is not strictly required but better describes the difficulty."
+      ]
     },
     {
       "id": 23,
@@ -1529,7 +1543,7 @@
         {"notable": "HiJumpless Double SpringBall Jump and Bomb-Grapple-Jump"},
         "canBombGrappleJump",
         "canDoubleSpringBallJumpMidAir",
-        "h_maxHeightSpringBallJump"
+        "h_underwaterMaxHeightSpringBallJump"
       ],
       "note": [
         "1) Crouch jump and then SpringBall jump.",
@@ -1544,11 +1558,12 @@
       "requires": [
         {"notable": "Bomb Jump Water Escape"},
         "HiJump",
-        "h_maxHeightSpringBallJump",
+        "h_underwaterMaxHeightSpringBallJump",
         "canSpringFling",
         "canBombJumpWaterEscape",
         "canJumpIntoIBJ"
       ],
+      "flashSuitChecked": true,
       "note": [
         "Perform the spring ball jump near max height.",
         "Place the first bomb after the spring ball jump; just above the water line.",
diff --git a/region/maridia/inner-pink/East Sand Pit.json b/region/maridia/inner-pink/East Sand Pit.json
@@ -526,8 +526,9 @@
       "requires": [
         "canSuitlessMaridia",
         "canPlayInSand",
-        "h_maxHeightSpringBallJump"
+        "h_underwaterMaxHeightSpringBallJump"
       ],
+      "flashSuitChecked": true,
       "note": "It's possible to get out of the sand suitless and without HiJump after falling from the chute, by hugging the left side and moving quickly."
     },
     {
diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json
@@ -866,14 +866,20 @@
         "canSuitlessMaridia",
         "HiJump",
         "canTrickyJump",
-        "h_maxHeightSpringBallJump",
-        "canStationaryLateralMidAirMorph"
+        "canTrickySpringBallJump",
+        "canStationaryLateralMidAirMorph",
+        {"or": [
+          "h_underwaterCrouchJump",
+          "canInsaneJump"
+        ]}
       ],
+      "flashSuitChecked": true,
       "note": [
-        "SpringBall jump just as Samus exits the water to reach the distant ledge.",
-        "A Crouch jump makes the SpringBall jump easier, but at the cost of some horizontal movement."
+        "Stationary lateral midair morph into a SpringBall jump just as Samus exits the water to reach the distant ledge.",
+        "This can either be done from a crouch jump from the last pixel, giving an 8-frame window to jump while out of the water,",
+        "or from a spin jump, which gives a 2-frame window to jump while out of the water."
       ],
-      "devNote": "canStationaryLateralMidAirMorph is not strictly required but better describes the difficulty."
+      "detailNote": "Samus could also start from a standing position, requiring the last pixel and only giving a 2-frame window."
     },
     {
       "id": 24,
diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json
@@ -279,11 +279,13 @@
           "canPlayInSand"
         ]},
         "HiJump",
-        "h_maxHeightSpringBallJump"
+        "h_underwaterMaxHeightSpringBallJump"
       ],
+      "flashSuitChecked": true,
       "note": [
         "HiJump with a good jump from the sand can reach the Solid Rock Maze region.  Use the sandfall if Samus gets stuck in the sand.",
-        "Bouncing on the sand as springball can reach the above maze by altering Samus' fall height, like by bouncing under the solid ledge before trying to jump up."
+        "Bouncing on the sand as springball can reach the above maze by altering Samus' fall height, like by bouncing under the solid ledge before trying to jump up.",
+        "Perform a max height Spring Ball jump, starting from a crouch jump, in order to make it up onto the ledge."
       ],
       "devNote": [
         "Jumping through the sandfall is failable enough to require canPlayInSand",
@@ -468,7 +470,7 @@
             "HiJump",
             "h_underwaterCrouchJumpDownGrab"
           ]},
-          "h_maxHeightSpringBallJump"
+          "h_underwaterMaxHeightSpringBallJump"
         ]}
       ],
       "flashSuitChecked": true,
diff --git a/region/maridia/inner-yellow/Watering Hole.json b/region/maridia/inner-yellow/Watering Hole.json
@@ -289,8 +289,9 @@
       "name": "Suitless Springball Jump",
       "requires": [
         "canSuitlessMaridia",
-        "h_maxHeightSpringBallJump"
+        "h_underwaterMaxHeightSpringBallJump"
       ],
+      "flashSuitChecked": true,
       "note": "This is a max height springball jump.",
       "devNote": "FIXME add a slightly easier variant that damage boosts off of the Choot."
     },
diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json
@@ -719,7 +719,9 @@
             "canSpringBallJumpMidAir"
           ]}
         ]}
-      ]
+      ],
+      "flashSuitChecked": true,
+      "devNote": "The h_maxHeightSpringBallJump is not a h_underwaterMaxHeightSpringBallJump, because Gravity is required."
     },
     {
       "id": 109,
@@ -2461,7 +2463,8 @@
         }
       },
       "bypassesDoorShell": "free",
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "devNote": "The h_maxHeightSpringBallJump is not a h_underwaterMaxHeightSpringBallJump, because Gravity is required."
     },
     {
       "id": 50,
diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
diff --git a/region/maridia/outer/Mama Turtle Room.json b/region/maridia/outer/Mama Turtle Room.json
diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json
diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json
diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json
diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json

Original file line number	Diff line number	Diff line change
`@@ -2376,7 +2376,7 @@`
`2376`	`2376`	`"canConsecutiveWalljump"`
`2377`	`2377`	`]}`
`2378`	`2378`	`]},`
`2379`		`- "h_maxHeightSpringBallJump"`
	`2379`	`+ "h_underwaterMaxHeightSpringBallJump"`
`2380`	`2380`	`]}`
`2381`	`2381`	`]`
`2382`	`2382`	`},`