Merge branch 'master' into ss-comeingettingblue

kjbranch · web-flow · commit 99a2cc116477 · 2026-02-13T17:43:45.000-07:00
diff --git a/helpers.json b/helpers.json
@@ -1678,9 +1678,32 @@
             "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."
+            "This for using Speed Booster to gain high run speed, for cases that do not involve a jump nor blue speed."
+          ]
+        },
+        {
+          "name": "h_speedJump",
+          "requires": [
+            "h_speedDash"
+          ],
+          "note": [
+            "This represents using the speed from Speed Booster to jump with high horizontal speed."
+          ],
+          "devNote": [
+            "This has the same requirements as `h_speedDash`, but is separated to help support modified Speed Booster items in randomizers."
+          ]
+        },
+        {
+          "name": "h_blueJump",
+          "requires": [
+            "h_speedJump"
+          ],
+          "note": [
+            "This represents using Speed Booster to jump with blue speed or to run off of a ledge with blue speed."
+          ],
+          "devNote": [
+            "This needs Speed Booster, but it would be covered by a preceding `getBlueSpeed` or similar requirement.",
+            "This helper exists to help support modified Speed Booster items in randomizers."
           ]
         },
         {
diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json
@@ -1195,13 +1195,13 @@
       "link": [4, 1],
       "name": "Blue Space Jump (Plateau)",
       "requires": [
-        "canBlueSpaceJump",
         {"getBlueSpeed": {
           "usedTiles": 19,
           "steepUpTiles": 2,
           "steepDownTiles": 1,
           "openEnd": 2
-        }}
+        }},
+        "canBlueSpaceJump"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
@@ -1221,9 +1221,9 @@
       "link": [4, 1],
       "name": "Blue Space, HiJump from Below",
       "requires": [
-        "canBlueSpaceJump",
         "HiJump",
-        {"getBlueSpeed": {"usedTiles": 38, "steepDownTiles": 3, "openEnd": 1}}
+        {"getBlueSpeed": {"usedTiles": 38, "steepDownTiles": 3, "openEnd": 1}},
+        "canBlueSpaceJump"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json
@@ -3003,7 +3003,8 @@
               "steepDownTiles": 3,
               "openEnd": 1
             }},
-            "canCarefulJump"
+            "canCarefulJump",
+            "h_blueJump"
           ]},
           {"and": [
             {"canShineCharge": {
@@ -3013,7 +3014,7 @@
               "openEnd": 1
             }},
             "canShinechargeMovement",
-            {"shinespark": {"frames": 2}}
+            {"shinespark": {"frames": 2, "excessFrames": 2}}
           ]}
         ]}
       ],
@@ -3078,7 +3079,8 @@
           "steepUpTiles": 3,
           "steepDownTiles": 3,
           "openEnd": 1
-        }}
+        }},
+        "h_blueJump"
       ],
       "exitCondition": {
         "leaveWithRunway": {
@@ -3120,7 +3122,8 @@
           "steepUpTiles": 3,
           "steepDownTiles": 3,
           "openEnd": 1
-        }}
+        }},
+        "h_blueJump"
       ],
       "exitCondition": {
         "leaveWithGModeSetup": {}
@@ -3460,7 +3463,8 @@
                   "steepDownTiles": 3,
                   "openEnd": 1
                 }},
-                "canCarefulJump"
+                "canCarefulJump",
+                "h_blueJump"
               ]}
             ]}
           ]},
diff --git a/region/crateria/east/East Ocean.json b/region/crateria/east/East Ocean.json
@@ -270,7 +270,7 @@
       "name": "Leave With Spring Ball Bounce (Space Jump)",
       "requires": [
         "Gravity",
-        "canBlueSpaceJump"
+        "canPreciseSpaceJump"
       ],
       "exitCondition": {
         "leaveWithSpringBallBounce": {
@@ -1034,14 +1034,14 @@
       "name": "Leave With Temporary Blue (Blue Space Jump)",
       "requires": [
         "Gravity",
-        "canBlueSpaceJump",
-        {"canShineCharge": {
+        {"getBlueSpeed": {
           "usedTiles": 18,
           "steepUpTiles": 2,
           "steepDownTiles": 2,
           "startingDownTiles": 1,
           "openEnd": 0
         }},
+        "canBlueSpaceJump",
         "canChainTemporaryBlue"
       ],
       "exitCondition": {
diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json
@@ -1001,7 +1001,7 @@
       "link": [4, 4],
       "name": "Leave With Temporary Blue (Blue Space Jump)",
       "requires": [
-        {"canShineCharge": {
+        {"getBlueSpeed": {
           "usedTiles": 23,
           "steepUpTiles": 1,
           "steepDownTiles": 5,
@@ -1051,7 +1051,7 @@
       "link": [4, 4],
       "name": "Leave With Temporary Blue (Spring Ball Bounce)",
       "requires": [
-        {"canShineCharge": {
+        {"getBlueSpeed": {
           "usedTiles": 20,
           "steepUpTiles": 1,
           "steepDownTiles": 4,
@@ -1883,7 +1883,7 @@
       "name": "Leave With Temporary Blue (Gravity)",
       "requires": [
         "Gravity",
-        "h_shinechargeMaxRunway",
+        "h_getBlueSpeedMaxRunway",
         {"or": [
           {"and": [
             "canSpringBallJumpMidAir",
@@ -1906,7 +1906,7 @@
       "link": [5, 5],
       "name": "Leave With Temporary Blue (Spring Ball Bounce)",
       "requires": [
-        {"canShineCharge": {
+        {"getBlueSpeed": {
           "usedTiles": 20,
           "steepUpTiles": 1,
           "steepDownTiles": 4,
diff --git a/region/lowernorfair/east/Main Hall.json b/region/lowernorfair/east/Main Hall.json
@@ -643,8 +643,8 @@
         {"or": [
           "ScrewAttack",
           {"and": [
-            "canBlueSpaceJump",
-            {"getBlueSpeed": {"usedTiles": 23, "openEnd": 2}}
+            {"getBlueSpeed": {"usedTiles": 23, "openEnd": 2}},
+            "canBlueSpaceJump"
           ]}
         ]},
         {"heatFrames": 410}
diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json
@@ -731,7 +731,7 @@
         }
       },
       "requires": [
-        "canWaterShineCharge",
+        "h_waterGetBlueSpeed",
         "canSpeedball",
         "canTrickyJump"
       ],
@@ -764,7 +764,7 @@
         }
       },
       "requires": [
-        "canWaterShineCharge",
+        "h_waterGetBlueSpeed",
         "canSpeedball",
         "canTrickyJump",
         "canChainTemporaryBlue"
diff --git a/region/norfair/crocomire/Crocomire's Room.json b/region/norfair/crocomire/Crocomire's Room.json
@@ -1011,7 +1011,7 @@
       "name": "Speedy Wall Jump",
       "requires": [
         "f_DefeatedCrocomire",
-        "h_speedDash",
+        "h_speedJump",
         "canTrickyJump",
         "canWalljump"
       ],
@@ -1024,7 +1024,7 @@
       "name": "Insane Speedy Airball",
       "requires": [
         "f_DefeatedCrocomire",
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         "canLateralMidAirMorph"
       ],
@@ -1061,7 +1061,7 @@
             {"shinespark": {"frames": 31, "excessFrames": 7}}
           ]},
           {"and": [
-            "h_speedDash",
+            "h_speedJump",
             {"shinespark": {"frames": 6, "excessFrames": 4}}
           ]}
         ]}
diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json
@@ -622,8 +622,8 @@
       "link": [1, 2],
       "name": "Blue SpaceJump",
       "requires": [
-        "canBlueSpaceJump",
-        {"getBlueSpeed": {"usedTiles": 31, "openEnd": 1}}
+        {"getBlueSpeed": {"usedTiles": 31, "openEnd": 1}},
+        "canBlueSpaceJump"
       ],
       "flashSuitChecked": true
     },
@@ -1264,8 +1264,8 @@
       "link": [2, 1],
       "name": "Blue SpaceJump",
       "requires": [
-        "canBlueSpaceJump",
         {"getBlueSpeed": {"usedTiles": 22, "openEnd": 1}},
+        "canBlueSpaceJump",
         {"metroidFrames": 67}
       ],
       "flashSuitChecked": true
diff --git a/region/wreckedship/main/Bowling Alley.json b/region/wreckedship/main/Bowling Alley.json
@@ -1749,7 +1749,7 @@
           ]},
           {"and": [
             {"obstaclesCleared": ["A"]},
-            {"canShineCharge": {"usedTiles": 35, "openEnd": 1}},
+            {"getBlueSpeed": {"usedTiles": 35, "openEnd": 1}},
             {"or": [
               "f_DefeatedPhantoon",
               "canSpeedball"
@@ -1784,7 +1784,7 @@
           ]},
           {"and": [
             {"obstaclesCleared": ["A"]},
-            {"canShineCharge": {"usedTiles": 35, "openEnd": 1}},
+            {"getBlueSpeed": {"usedTiles": 35, "openEnd": 1}},
             {"or": [
               "f_DefeatedPhantoon",
               "canSpeedball"
diff --git a/schema/m3-string-requirements.schema.json b/schema/m3-string-requirements.schema.json
@@ -461,6 +461,8 @@
     "h_runOverRespawningEnemies",
     "h_pauseAbuseMinimalReserveRefill",
     "h_speedDash",
+    "h_speedJump",
+    "h_blueJump",
     "h_MoreRTanksThanETanks",
     "h_RModeCanRefillReserves",
     "h_CrystalFlashForReserveEnergy",
diff --git a/tech.json b/tech.json
@@ -674,7 +674,7 @@
                 "canCarefulJump"
               ],
               "otherRequires": [
-                "SpeedBooster"
+                "h_blueJump"
               ],
               "note": [
                 "Maintain the SpeedBooster effect while rolling as a Morph Ball in order to destroy bomb blocks in Morph tunnels.",
@@ -2136,7 +2136,7 @@
                 "SpeedBooster"
               ],
               "note": [
-                "The ability to use dash speed with Speed Booster to jump higher.",
+                "The ability to use dash speed with Speed Booster to jump higher and possibly further.",
                 "Without HiJump, it is also possible to use a short speedy jump to jump lower;",
                 "this has fewer applications, but can be useful, i.e. to jump further if there is a low ceiling."
               ],
@@ -2869,16 +2869,15 @@
             "canDash"
           ],
           "otherRequires": [
-            "SpeedBooster",
+            "h_blueJump",
             "SpaceJump"
           ],
           "note": [
             "Using Space Jump to carry SpeedBooster's blue suit across a room that couldn't be reached by simply running and jumping.",
             "This can be used to break destructible blocks, kill enemies, or cross the room to then store the speed as a temporary blue state."
           ],
           "devNote": [
-            "The SpeedBooster and canDash requirements are included to be safe, though they would be redundant",
-            "with the blue speed requirements that should always accompany this tech"
+            "The canDash requirement is included to be safe, though it is redundant with the blue speed requirements that should always accompany this tech."
           ]
         },
         {
@@ -2898,10 +2897,13 @@
             "3. Sliding off a ledge while gaining a shinecharge,",
             "4. Running, gaining blue speed, jumping into a mid-air morph, and unmorphing."
           ],
+          "detailNote": [
+            "This is not a momentum continuing action like canBlueSpaceJump."
+          ],
           "devNote": [
-            "This is not a momentum continuing action like canBlueSpaceJump.",
-            "The SpeedBooster and canDash requirements are included to be safe, though they would be redundant",
-            "with the shinecharge or blue speed requirements that should always accompany this tech"
+            "This does not include a requirement to gain blue speed or a shinecharge,",
+            "which would depend on the runway and hence vary from strat to strat.",
+            "Tests enforce that some such requirement always precedes this tech."
           ],
           "extensionTechs": [
             {
diff --git a/tests/asserts/keywords.py b/tests/asserts/keywords.py
@@ -490,10 +490,14 @@ def process_req_speed_state(req, states, err_fn):
             if not states.issubset(["shinecharging", "shinecharged", "preshinespark"]):
                 err_fn(f"{req} while not shinecharging/shinecharged/preshinespark")
             states = {"normal"}
-        elif req in ["canTemporaryBlue", "canChainTemporaryBlue", "canLongChainTemporaryBlue", "canSpeedball"]:
+        elif req in ["canTemporaryBlue", "canChainTemporaryBlue", "canLongChainTemporaryBlue"]:
             if not states.issubset(["shinecharging", "blue"]):
                 err_fn(f"{req} while not in blue state")
             states = {"blue"}
+        elif req in ["canSpeedball", "canBlueSpaceJump", "h_blueJump"]:
+            if not states.issubset(["blue"]):
+                err_fn(f"{req} while not in blue state")
+            states = {"blue"}
         elif req in ["h_XModeShinecharge", "h_spikeXModeShinecharge", "h_thornXModeShinecharge",
                      "h_thornXModeShinechargeWithoutLenience"]:
             states = {"shinecharged"}
