From c72a9ed1078a9d48511f777223bf4c6148a56f1c Mon Sep 17 00:00:00 2001 From: kjbranch Date: Fri, 29 Aug 2025 12:20:03 -0600 Subject: [PATCH 1/2] Refine flash suits and max height spring ball --- .../red/Red Brinstar Fireflea Room.json | 10 +++++++ region/crateria/east/East Ocean.json | 3 +- .../maridia/inner-green/East Pants Room.json | 2 +- .../maridia/inner-green/East Sand Hall.json | 2 +- region/maridia/inner-green/Oasis.json | 2 +- region/maridia/inner-green/Pants Room.json | 2 +- .../maridia/inner-green/West Sand Hall.json | 6 ++-- region/maridia/inner-pink/Aqueduct.json | 4 +-- region/maridia/inner-pink/Colosseum.json | 4 +-- region/maridia/inner-pink/Crab Shaft.json | 5 ++-- .../maridia/inner-pink/East Cactus Alley.json | 29 ++++++++++++++----- region/maridia/inner-pink/East Sand Pit.json | 3 +- .../maridia/inner-pink/Halfie Climb Room.json | 10 ++++--- region/maridia/inner-pink/West Sand Pit.json | 8 +++-- .../maridia/inner-yellow/Watering Hole.json | 3 +- region/maridia/outer/Fish Tank.json | 7 +++-- region/maridia/outer/Main Street.json | 22 +++++++------- region/maridia/outer/Mama Turtle Room.json | 17 +++++++++-- region/maridia/outer/Maridia Tube.json | 2 +- region/maridia/outer/Mt. Everest.json | 3 +- .../crocomire/Grapple Tutorial Room 3.json | 3 +- region/norfair/east/Double Chamber.json | 4 +-- 22 files changed, 100 insertions(+), 51 deletions(-) diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json index 2c1972e06e..f217bbe763 100644 --- 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 index a36dc32de8..69f4356ee4 100644 --- a/region/crateria/east/East Ocean.json +++ b/region/crateria/east/East Ocean.json @@ -1233,9 +1233,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 index e6ff5b9c66..d42b26afd8 100644 --- a/region/maridia/inner-green/East Pants Room.json +++ b/region/maridia/inner-green/East Pants Room.json @@ -209,7 +209,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 index c9ac0881d7..920bca87f6 100644 --- 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 index e50f7b42c5..1a9e63d19d 100644 --- 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 index bcdbd699a4..4fc989ff84 100644 --- 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 index 42f2c0bdae..851c83a47f 100644 --- 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"]], @@ -1275,7 +1275,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 index 638c7ddfa6..c79de2b146 100644 --- 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 index eae98b9096..d07bc57b3d 100644 --- a/region/maridia/inner-pink/Colosseum.json +++ b/region/maridia/inner-pink/Colosseum.json @@ -1137,7 +1137,7 @@ "requires": [ {"notable": "Bomb Jump Water Escape"}, "HiJump", - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canSpringFling", "canBombJumpWaterEscape", "canJumpIntoIBJ" @@ -2044,7 +2044,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 index 83677de765..9bd4032821 100644 --- a/region/maridia/inner-pink/Crab Shaft.json +++ b/region/maridia/inner-pink/Crab Shaft.json @@ -1203,11 +1203,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 index f9639293fd..1da54b747f 100644 --- 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, @@ -1528,7 +1542,7 @@ {"notable": "HiJumpless Double SpringBall Jump and Bomb-Grapple-Jump"}, "canBombGrappleJump", "canDoubleSpringBallJumpMidAir", - "h_maxHeightSpringBallJump" + "h_underwaterMaxHeightSpringBallJump" ], "note": [ "1) Crouch jump and then SpringBall jump.", @@ -1543,11 +1557,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 index 86233e1e74..529bda3fc7 100644 --- 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 index 75e086bbda..868b7b7b28 100644 --- a/region/maridia/inner-pink/Halfie Climb Room.json +++ b/region/maridia/inner-pink/Halfie Climb Room.json @@ -865,14 +865,16 @@ "canSuitlessMaridia", "HiJump", "canTrickyJump", - "h_maxHeightSpringBallJump", - "canStationaryLateralMidAirMorph" + "canTrickySpringBallJump", + "canSpringFling" ], + "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." + "In order to move horizontally far enough, quickly pause and morph in order to gain a Spring Fling as Samus equips Spring Ball.", + "This can be done from a spin jump or from a stationary lateral mid-air morph." ], - "devNote": "canStationaryLateralMidAirMorph is not strictly required but better describes the difficulty." + "detailNote": "There is a two-frame window for when Samus can jump after escaping the waterline. Starting from a crouch jump does not increase this window." }, { "id": 24, diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json index 29d92b5ed4..8f86c30fd1 100644 --- 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_crouchJumpDownGrab" ]}, - "h_maxHeightSpringBallJump" + "h_underwaterMaxHeightSpringBallJump" ]} ], "flashSuitChecked": true, diff --git a/region/maridia/inner-yellow/Watering Hole.json b/region/maridia/inner-yellow/Watering Hole.json index e760aa8671..daccc74355 100644 --- 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 index 82e3b93974..eead8bc258 100644 --- 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, @@ -2459,7 +2461,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 index 33dd3d10d2..a19aaf7871 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -1192,7 +1192,7 @@ ]} ]}, {"and": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canTrickyUseFrozenEnemies", "canBeVeryPatient", {"or": [ @@ -1246,7 +1246,7 @@ ]} ]}, {"and": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canTrickyUseFrozenEnemies", "canBeVeryPatient", {"or": [ @@ -2232,7 +2232,7 @@ ]} ]}, {"and": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canTrickyUseFrozenEnemies", "canBeVeryPatient", {"or": [ @@ -2285,7 +2285,7 @@ ]} ]}, {"and": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canTrickyUseFrozenEnemies", "canBeVeryPatient", {"or": [ @@ -4640,7 +4640,7 @@ "name": "Suitless Frozen Fish with Spring Ball", "requires": [ "canSuitlessMaridia", - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canStationaryLateralMidAirMorph", "canTrickyUseFrozenEnemies" ], @@ -5022,7 +5022,7 @@ "Wave" ]}, {"and": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", {"or": [ "Wave", "Spazer" @@ -5031,10 +5031,11 @@ "Plasma" ]}, {"or": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canStationaryLateralMidAirMorph" ]} ], + "flashSuitChecked": true, "note": [ "Be sure not to get the first downward moving crab on screen until Samus is in position to quickly and accurately shoot and freeze it. This is much tighter with spring ball relative to HiJump.", "Performing a max height spring ball jump from the frozen crab can get Samus to the next ledge.", @@ -5117,7 +5118,7 @@ "canInsaneJump", "canReserveDoubleDamageBoost", {"or": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "HiJump" ]}, {"or": [ @@ -5127,7 +5128,6 @@ {"autoReserveTrigger": {"minReserveEnergy": 85}}, {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}} ], - "flashSuitChecked": true, "note": [ "Using the slow global crab to ascend the top section of the room requires the speed blocks to not be broken.", "Jump with either Springball or HiJump onto the global crab while it is climbing the section above the Speed locked item.", @@ -5356,7 +5356,7 @@ ]} ]}, {"and": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "canTrickyUseFrozenEnemies", "canBeVeryPatient" ]} @@ -5400,7 +5400,7 @@ {"or": [ "HiJump", "Gravity", - "h_maxHeightSpringBallJump" + "h_underwaterMaxHeightSpringBallJump" ]} ]} ]}, diff --git a/region/maridia/outer/Mama Turtle Room.json b/region/maridia/outer/Mama Turtle Room.json index c8e7affc30..ea8fc96e27 100644 --- a/region/maridia/outer/Mama Turtle Room.json +++ b/region/maridia/outer/Mama Turtle Room.json @@ -1322,12 +1322,25 @@ { "id": 41, "link": [5, 2], - "name": "Walljumpless SpringFling", + "name": "Walljumpless Spring Ball Jump", "requires": [ - "h_maxHeightSpringBallJump", + "canTrickySpringBallJump", + "canTrickyJump", + "canResetFallSpeed" + ], + "flashSuitChecked": true, + "note": "Pausing and morphing early can help by giving Samus a bit of a Spring Fling. Unmorph to reset Samus' fall speed to grab the item." + }, + { + "link": [5, 2], + "name": "Walljumpless SpringFling onto Grapple Block", + "requires": [ + "canTrickySpringBallJump", + "canTrickyJump", "canSpringFling" ], "clearsObstacles": ["B"], + "flashSuitChecked": true, "note": "Time a pause before jumping to give a significant momentum boost in order to reach the Grapple Block." }, { diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json index 1cddb6b82b..91ee6d4e55 100644 --- a/region/maridia/outer/Maridia Tube.json +++ b/region/maridia/outer/Maridia Tube.json @@ -3223,7 +3223,7 @@ {"or": [ "Gravity", "HiJump", - "h_maxHeightSpringBallJump", + "canTrickySpringBallJump", {"and": [ {"not": "f_MaridiaTubeBroken"}, "canRiskPermanentLossOfAccess" diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index 4b3f0fffcb..4222d8c678 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -1430,7 +1430,7 @@ "canInsaneJump", "canReserveDoubleDamageBoost", {"or": [ - "h_maxHeightSpringBallJump", + "h_underwaterMaxHeightSpringBallJump", "HiJump" ]}, {"or": [ @@ -1440,7 +1440,6 @@ {"autoReserveTrigger": {"minReserveEnergy": 85}}, {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}} ], - "flashSuitChecked": true, "note": [ "Jump with either Springball or HiJump onto a Sciser while it is climbing the right-most mountain.", "Have Reserves set to manual and return them to auto after taking a deadly crab hit in order to gain two damage boosts.", diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json index 34bdfe4a22..0ce2956f67 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 3.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 3.json @@ -630,8 +630,9 @@ "requires": [ "canSuitlessMaridia", "HiJump", - "h_maxHeightSpringBallJump" + "h_underwaterMaxHeightSpringBallJump" ], + "flashSuitChecked": true, "note": "Wait for the water to be rising and perform a max height SpringBall Jump." }, { diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json index 25e65b12c8..a5c294b716 100644 --- a/region/norfair/east/Double Chamber.json +++ b/region/norfair/east/Double Chamber.json @@ -327,7 +327,7 @@ "requires": [ {"or": [ "SpaceJump", - "h_maxHeightSpringBallJump", + "canTrickySpringBallJump", "canWalljump", {"and": [ "HiJump", @@ -1200,7 +1200,7 @@ "requires": [ {"or": [ "SpaceJump", - "h_maxHeightSpringBallJump", + "canTrickySpringBallJump", "canWalljump", {"and": [ "HiJump", From 3a3ba8a175f3ce3100b4530c65884aef366d517b Mon Sep 17 00:00:00 2001 From: kjbranch Date: Fri, 29 Aug 2025 18:18:39 -0600 Subject: [PATCH 2/2] feedback update --- region/maridia/inner-pink/Halfie Climb Room.json | 14 +++++++++----- region/maridia/outer/Main Street.json | 6 +++++- region/maridia/outer/Mt. Everest.json | 6 +++++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json index 868b7b7b28..e6ca2962a9 100644 --- a/region/maridia/inner-pink/Halfie Climb Room.json +++ b/region/maridia/inner-pink/Halfie Climb Room.json @@ -866,15 +866,19 @@ "HiJump", "canTrickyJump", "canTrickySpringBallJump", - "canSpringFling" + "canStationaryLateralMidAirMorph", + {"or": [ + "h_underwaterCrouchJump", + "canInsaneJump" + ]} ], "flashSuitChecked": true, "note": [ - "SpringBall jump just as Samus exits the water to reach the distant ledge.", - "In order to move horizontally far enough, quickly pause and morph in order to gain a Spring Fling as Samus equips Spring Ball.", - "This can be done from a spin jump or from a stationary lateral mid-air morph." + "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." ], - "detailNote": "There is a two-frame window for when Samus can jump after escaping the waterline. Starting from a crouch jump does not increase this window." + "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/outer/Main Street.json b/region/maridia/outer/Main Street.json index a19aaf7871..b647b20a4f 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -5123,11 +5123,15 @@ ]}, {"or": [ "Morph", - "canOffScreenMovement" + {"and": [ + "canOffScreenMovement", + "h_trickyToCarryFlashSuit" + ]} ]}, {"autoReserveTrigger": {"minReserveEnergy": 85}}, {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}} ], + "flashSuitChecked": false, "note": [ "Using the slow global crab to ascend the top section of the room requires the speed blocks to not be broken.", "Jump with either Springball or HiJump onto the global crab while it is climbing the section above the Speed locked item.", diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index 4222d8c678..80f2177377 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -1435,11 +1435,15 @@ ]}, {"or": [ "Morph", - "canOffScreenMovement" + {"and": [ + "canOffScreenMovement", + "h_trickyToCarryFlashSuit" + ]} ]}, {"autoReserveTrigger": {"minReserveEnergy": 85}}, {"enemyDamage": {"enemy": "Sciser", "type": "contact", "hits": 1}} ], + "flashSuitChecked": false, "note": [ "Jump with either Springball or HiJump onto a Sciser while it is climbing the right-most mountain.", "Have Reserves set to manual and return them to auto after taking a deadly crab hit in order to gain two damage boosts.",