Merge pull request #2341 from blkerby/speedy-jump

Speedy jumps first pass

Author: osse101

helpers.json

@@ -651,7 +651,8 @@
           "name": "h_waterGetBlueSpeed",
           "requires": [
             {"tech": "canWaterShineCharge"},
-            "SpeedBooster"
+            "SpeedBooster",
+            "canDash"
           ],
           "devNote": [
             "This is a way to require the `canWaterShineCharge` tech but gaining only blue speed, not a shinecharge.",
@@ -662,7 +663,8 @@
           "name": "h_stutterWaterGetBlueSpeed",
           "requires": [
             {"tech": "canStutterWaterShineCharge"},
-            "SpeedBooster"
+            "SpeedBooster",
+            "canDash"
           ],
           "devNote": [
             "This is a way to require the `canStutterWaterShineCharge` tech but gaining only blue speed, not a shinecharge.",
@@ -1240,6 +1242,18 @@
             ]}
           ],
           "devNote": "Using a pause abuse to tank a hit and having that take Samus to 0 Energy and then be refilled with minimal Reserve Energy."
+        },
+        {
+          "name": "h_speedDash",
+          "requires": [
+            "SpeedBooster",
+            "canDash"
+          ],
+          "devNote": [
+            "This is to cover cases that require running using Speed Booster,",
+            "for purposes other than affecting Samus' jump height (canSpeedyJump).",
+            "For example, this includes running and jumping over long horizontal gaps."
+          ]
         }
       ]
     },

logicalRequirements.md

@@ -591,11 +591,7 @@ If the door node in a `doorUnlockedAtNode` also appears in the strat's [`unlocks
 
 __Example:__
 ```json
-{"requires": [
-  {"doorUnlockedAtNode": 1},
-  "HiJump",
-  "SpeedBooster"
-]}
+{"doorUnlockedAtNode": 1}
 ```
 
 ### Obstacle-related objects

region/brinstar/blue/Blue Brinstar Boulder Room.json

@@ -478,7 +478,7 @@
       "link": [2, 1],
       "name": "Speedy Airball",
       "requires": [
-        "SpeedBooster",
+        "canSpeedyJump",
         "canLateralMidAirMorph",
         "canCarefulJump"
       ],
@@ -584,7 +584,7 @@
             {"or": [
               {"and": [
                 "canTrickyJump",
-                "SpeedBooster"
+                "canSpeedyJump"
               ]},
               "canInsaneJump"
             ]}

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

@@ -244,7 +244,7 @@
       "name": "Leave With Side Platform (Power Bomb Blocks Broken)",
       "requires": [
         {"obstaclesCleared": ["C"]},
-        "SpeedBooster",
+        "h_speedDash",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
@@ -283,7 +283,7 @@
       "link": [1, 1],
       "name": "Leave With Side Platform (Power Bomb Blocks Intact)",
       "requires": [
-        "SpeedBooster",
+        "h_speedDash",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
@@ -669,7 +669,7 @@
       "link": [1, 3],
       "name": "Ceiling Item Speed Jump",
       "requires": [
-        "SpeedBooster",
+        "canSpeedyJump",
         "canCarefulJump"
       ],
       "flashSuitChecked": true,

region/brinstar/blue/Morph Ball Room.json

@@ -221,7 +221,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         {"obstaclesCleared": ["C"]},
-        "SpeedBooster",
+        "h_speedDash",
         "canInsaneJump",
         "canMomentumConservingMorph"
       ],

region/brinstar/green/Early Supers Room.json

@@ -298,7 +298,7 @@
       "name": "Speed Through",
       "requires": [
         {"obstaclesNotCleared": ["A"]},
-        "SpeedBooster"
+        "h_speedDash"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true
@@ -473,7 +473,7 @@
       "requires": [
         {"obstaclesNotCleared": ["A"]},
         {"or": [
-          "SpeedBooster",
+          "h_speedDash",
           "canMockball",
           {"and": [
             "canCrouchGateClip",

region/brinstar/green/Green Brinstar Main Shaft.json

@@ -4637,7 +4637,7 @@
           ]},
           {"and": [
             "HiJump",
-            "SpeedBooster",
+            "canSpeedyJump",
             {"shinespark": {"frames": 60, "excessFrames": 8}}
           ]}
         ]}
@@ -4841,6 +4841,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "canCarefulJump",
         "HiJump"
       ],
@@ -4861,6 +4862,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "HiJump"
       ],
       "flashSuitChecked": true
@@ -4890,6 +4892,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "canTrickySpringBallJump"
       ],
       "flashSuitChecked": true,
@@ -4992,6 +4995,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         {"useFlashSuit": {}},
         {"shinespark": {"frames": 21, "excessFrames": 12}}
       ],

region/brinstar/green/Green Hill Zone.json

@@ -368,7 +368,7 @@
           "HiJump",
           "canSpringBallJumpMidAir",
           {"and": [
-            "SpeedBooster",
+            "canSpeedyJump",
             "canWalljump"
           ]}
         ]}
@@ -421,7 +421,7 @@
     {
       "id": 14,
       "link": [1, 2],
-      "name": "Speedy Jump",
+      "name": "Speed Jump",
       "entranceCondition": {
         "comeInJumping": {
           "speedBooster": true,
@@ -437,7 +437,7 @@
     {
       "id": 15,
       "link": [1, 2],
-      "name": "Insane Speedy Jump",
+      "name": "Insane Speed Jump",
       "entranceCondition": {
         "comeInJumping": {
           "speedBooster": true,
@@ -851,7 +851,7 @@
       "link": [1, 5],
       "name": "Airball",
       "requires": [
-        "SpeedBooster",
+        "h_speedDash",
         "canTrickyJump",
         "canLateralMidAirMorph",
         "can4HighMidAirMorph"
@@ -1223,7 +1223,7 @@
       "requires": [
         {"notable": "Grapple Gate Glitch"},
         "canPreciseGrapple",
-        "SpeedBooster",
+        "h_speedDash",
         "canTrickyJump"
       ],
       "clearsObstacles": ["B"],

region/brinstar/green/Noob Bridge.json

@@ -405,7 +405,7 @@
       "link": [2, 2],
       "name": "Leave With Side Platform",
       "requires": [
-        "SpeedBooster",
+        "h_speedDash",
         "canMomentumConservingMorph"
       ],
       "exitCondition": {

region/brinstar/kraid/Baby Kraid Room.json

@@ -128,7 +128,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         {"obstaclesCleared": ["A"]},
-        "SpeedBooster",
+        "h_speedDash",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
@@ -790,7 +790,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         {"obstaclesCleared": ["A"]},
-        "SpeedBooster",
+        "h_speedDash",
         "canInsaneJump",
         "canMomentumConservingMorph"
       ],