Split Speed - comeInRunning, and h_unpauseKeepMomentum (#2713)

Author: blkerby

helpers.json

@@ -1712,6 +1712,25 @@
             "This helper exists to help support modified Speed Booster items in randomizers."
           ]
         },
+        {
+          "name": "h_unpauseKeepMomentum",
+          "requires": [
+            "SpeedBooster"
+          ],
+          "note": [
+            "This represents the ability to keep horizontal momentum through an unpause."
+          ],
+          "devNote": [
+            "Unpausing with Speed Booster unequipped causes the Samus running momentum flag ($0B3C) to be zeroed.",
+            "This helper represents the effect of Speed Booster in skipping that action,",
+            "which may help support randomizers with modified Speed Booster items.",
+            "The effect of the momentum flag being cleared depends on Samus' movement type:",
+            "in some cases, such as if Samus is spinning, it results in an immediate loss of dash speed.",
+            "On the other hand, when Samus is mid-air morphed, this normally would not cause dash speed to be lost;",
+            "however, if Samus is rolling on the ground, or has equipped or unequipped Spring Ball mid-air,",
+            "then the zeroing of the momentum flag does cause dash speed to be lost."
+          ]
+        },
         {
           "name": "h_MoreRTanksThanETanks",
           "requires": [

region/brinstar/green/Green Hill Zone.json

@@ -422,6 +422,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canTrickyJump",
         "canLateralMidAirMorph"
       ],
@@ -438,6 +439,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canInsaneJump",
         "canMomentumConservingMorph"
       ],

region/crateria/central/Climb Supers Room.json

@@ -624,6 +624,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canTrickyJump",
         "canLateralMidAirMorph",
         "canSpringFling"

region/crateria/east/The Moat.json

@@ -184,6 +184,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canTrickyJump"
       ],
       "flashSuitChecked": true,
@@ -200,6 +201,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canInsaneJump"
       ],
       "flashSuitChecked": true,
@@ -216,6 +218,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canTrickyJump",
         "canLateralMidAirMorph"
       ],
@@ -233,6 +236,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canInsaneJump",
         "canLateralMidAirMorph",
         "canMomentumConservingMorph"

region/maridia/inner-green/East Sand Hall.json

@@ -337,6 +337,7 @@
         {"notable": "Cross-Room Spring Ball Jump"},
         "canPlayInSand",
         "canCrossRoomJumpIntoWater",
+        "h_speedJump",
         "canLateralMidAirMorph",
         "canTrickySpringBallJump",
         "canTrickyJump"
@@ -1184,6 +1185,7 @@
         {"notable": "Cross-Room Spring Ball Jump"},
         "canPlayInSand",
         "canCrossRoomJumpIntoWater",
+        "h_speedJump",
         "canLateralMidAirMorph",
         "canTrickySpringBallJump",
         "canTrickyJump"

region/maridia/inner-green/West Sand Hall.json

@@ -496,7 +496,7 @@
       "name": "Spring Fling with Momentum",
       "entranceCondition": {
         "comeInRunning": {
-          "speedBooster": "yes",
+          "speedBooster": "no",
           "minTiles": 1
         }
       },
@@ -506,11 +506,12 @@
         "canPlayInSand",
         "canLateralMidAirMorph",
         "canTrickySpringBallJump",
-        "canSpringFling"
+        "canSpringFling",
+        "h_unpauseKeepMomentum"
       ],
       "flashSuitChecked": true,
       "note": [
-        "Enter with at least 1 tile of run speed from an air room, with Speedbooster unequipped.",
+        "Enter with at least 1 tile of run speed from an air room, with Speed Booster unequipped.",
         "Jump from near the end of the runway (though a jump from 1-2 tiles away from the end can still work).",
         "Press pause while crossing the narrow first sandfall, then perform a lateral mid-air morph after exiting the sandfall.",
         "Equip both Spring Ball and Speed Booster, and perform a mid-air Spring Ball jump at somewhere close to the maximum height.",

region/maridia/inner-pink/Botwoon Energy Tank Room.json

@@ -1031,6 +1031,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canInsaneJump",
         "canLateralMidAirMorph",
         "canCrossRoomJumpIntoWater",
@@ -1041,7 +1042,7 @@
       "note": [
         "Needs near max horizontal speed coming from about 40 runway tiles in the adjacent room.",
         "Jump after the transition.",
-        "Running a longer on the short runway is more difficult at maximum speed, but will increase the success of the jump.",
+        "Running longer on the short runway is more difficult at maximum speed, but will increase the success of the jump.",
         "A crisp momentum conserving morph can also make up for a jump that is buffered through the door."
       ]
     },
@@ -2438,6 +2439,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "canCrossRoomJumpIntoWater"
       ],
       "flashSuitChecked": true,

region/maridia/outer/Main Street.json

@@ -1533,6 +1533,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "canCrossRoomJumpIntoWater",
         "canCarefulJump"
       ],
@@ -1551,6 +1552,7 @@
       },
       "requires": [
         "HiJump",
+        "canSpeedyJump",
         "canCrossRoomJumpIntoWater",
         "canTrickyJump",
         "canDodgeWhileShooting",
@@ -3105,8 +3107,7 @@
       "link": [3, 6],
       "name": "Stutter Water Shinecharge",
       "entranceCondition": {
-        "comeInRunning": {
-          "speedBooster": "yes",
+        "comeInStutterShinecharging": {
           "minTiles": 1
         }
       },
@@ -3398,8 +3399,7 @@
       "link": [3, 9],
       "name": "Stutter Water Shinecharge",
       "entranceCondition": {
-        "comeInRunning": {
-          "speedBooster": "yes",
+        "comeInStutterShinecharging": {
           "minTiles": 1
         }
       },
@@ -4176,15 +4176,14 @@
     {
       "id": 108,
       "link": [4, 6],
-      "name": "Temporary Blue Chain, Stutter Water Shinecharge",
+      "name": "Temporary Blue Chain, Precise Stutter Water Shinecharge",
       "entranceCondition": {
-        "comeInRunning": {
-          "speedBooster": "yes",
-          "minTiles": 1.4375
+        "comeInStutterShinecharging": {
+          "minTiles": 2
         }
       },
       "requires": [
-        "canStutterWaterShineCharge",
+        "canPreciseStutterWaterShineCharge",
         "canChainTemporaryBlue",
         "canXRayTurnaround",
         {"or": [
@@ -4201,6 +4200,35 @@
       ],
       "devNote": "For other doors, a shinespark is more reasonable than a complex Temporary Blue Chain. And the enemies here are farmable for energy."
     },
+    {
+      "link": [4, 6],
+      "name": "Temporary Blue Chain, Very Precise Stutter Water Shinecharge",
+      "entranceCondition": {
+        "comeInStutterShinecharging": {
+          "minTiles": 1
+        }
+      },
+      "requires": [
+        "canPreciseStutterWaterShineCharge",
+        "canInsaneJump",
+        "canChainTemporaryBlue",
+        "canXRayTurnaround",
+        {"or": [
+          "Gravity",
+          "HiJump",
+          "canSpringBallJumpMidAir"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Bring a Shinecharge from the top door to the speed blocks below the Missile item location.",
+        "Be especially mindfull of the aquatic life during the descent.",
+        "Line up directly below the speed blocks when jumping up, especially if using a SpringBall jump."
+      ],
+      "detailNote": [
+        "With only 1 tile of runway, this requires a single-frame stutter (release forward then repress on the next frame), on the last possible frame."
+      ]
+    },
     {
       "id": 111,
       "link": [4, 9],

region/maridia/outer/Mt. Everest.json

@@ -3176,6 +3176,7 @@
         }
       },
       "requires": [
+        "h_speedJump",
         "canCrossRoomJumpIntoWater",
         "canInsaneJump"
       ],
@@ -3260,6 +3261,7 @@
         "canCrossRoomJumpIntoWater",
         "canTrickySpringBallBounce",
         "canSpringFling",
+        "h_unpauseKeepMomentum",
         "canInsaneJump"
       ],
       "flashSuitChecked": true,

region/norfair/crocomire/Grapple Tutorial Room 3.json

@@ -431,13 +431,17 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "canInsaneJump",
         "canMockball",
         "canSpringBallBounce"
       ],
       "flashSuitChecked": true,
       "note": [
         "With at least two tiles of run speed, jump over the first moat by maximizing the jump distance and then mockball into a regular Spring Ball to jump over the second moat."
+      ],
+      "detailNote": [
+        "Speed Booster is used to reduce Samus' jump height, to delay bonking the ceiling."
       ]
     },
     {
@@ -529,7 +533,7 @@
     {
       "id": 20,
       "link": [1, 4],
-      "name": "Little Run Speedy Jump",
+      "name": "Little Run Speed Jump",
       "entranceCondition": {
         "comeInRunning": {
           "speedBooster": "any",