Merge pull request #2714 from blkerby/slow-short-charge-test

Add test for canSlowShortCharge

Author: osse101

helpers.json

@@ -1702,7 +1702,6 @@
             "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."
           ]
         },

region/brinstar/green/Brinstar Pre-Map Room.json

@@ -309,8 +309,8 @@
       "link": [2, 1],
       "name": "Speedball (In-Room)",
       "requires": [
-        "canSlowShortCharge",
         {"getBlueSpeed": {"usedTiles": 14, "openEnd": 1}},
+        "canSlowShortCharge",
         "canSpeedball"
       ],
       "clearsObstacles": ["A"],
@@ -323,8 +323,8 @@
       "name": "Speedball (In-Room) Extended Runway With Frozen Zeela",
       "requires": [
         "h_frozenEnemyRunway",
-        "canSlowShortCharge",
         {"getBlueSpeed": {"usedTiles": 15, "openEnd": 1}},
+        "canSlowShortCharge",
         "canSpeedball"
       ],
       "clearsObstacles": ["A"],

region/brinstar/kraid/Warehouse Kihunter Room.json

@@ -1107,8 +1107,8 @@
         {"obstaclesNotCleared": ["D"]},
         {"or": [
           {"and": [
-            "canSlowShortCharge",
             {"getBlueSpeed": {"usedTiles": 17, "openEnd": 0}},
+            "canSlowShortCharge",
             "canSpeedball"
           ]},
           {"and": [

region/brinstar/pink/Big Pink.json

@@ -4222,8 +4222,8 @@
       "requires": [
         {"notable": "Off Screen Super Block"},
         {"notable": "Break Raised Bomb Blocks with Blue Speed"},
-        "canSlowShortCharge",
         {"getBlueSpeed": {"usedTiles": 20, "openEnd": 2}},
+        "canSlowShortCharge",
         "canSpeedball",
         "canLateralMidAirMorph",
         "canTrickyJump",

region/wreckedship/main/Wrecked Ship East Super Room.json

@@ -855,9 +855,9 @@
       "requires": [
         {"notable": "Robot Clip Run-In-Place"},
         "canMidAirMorph",
+        {"getBlueSpeed": {"usedTiles": 15, "openEnd": 1}},
         "canSlowShortCharge",
-        "canKago",
-        {"getBlueSpeed": {"usedTiles": 15, "openEnd": 1}}
+        "canKago"
       ],
       "flashSuitChecked": true,
       "note": [

tech.json

@@ -2346,8 +2346,8 @@
             "Being able to 4 tap is expected as that brings out the most value from this tech."
           ],
           "devNote": [
-            "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"
+            "The SpeedBooster and canDash requirements are included for clarity, though they are redundant",
+            "with the shinecharge or blue speed requirements that always accompany this tech (enforced by tests)."
           ]
         },
         {
@@ -2895,8 +2895,9 @@
             "This is not a momentum continuing action like canBlueSpaceJump."
           ],
           "devNote": [
-            "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.",
+            "The SpeedBooster and canDash requirements are included for clarity, though they are redundant",
+            "with the shinecharge or blue speed requirements that always accompany this tech.",
+            "Such requirements would depend on the runway and hence vary from strat to strat.",
             "Tests enforce that some such requirement always precedes this tech."
           ],
           "extensionTechs": [

tests/asserts/keywords.py

@@ -492,8 +492,11 @@ def process_req_speed_state(req, states, err_fn):
             states = {"normal"}
         elif req in ["canTemporaryBlue", "canChainTemporaryBlue", "canLongChainTemporaryBlue"]:
             if not states.issubset(["shinecharging", "blue"]):
-                err_fn(f"{req} while not in blue state")
+                err_fn(f"{req} while not in shinecharging/blue state")
             states = {"blue"}
+        elif req in ["canSlowShortCharge"]:
+            if not states.issubset(["shinecharging", "blue"]):
+                err_fn(f"{req} while not in shinecharging/blue state")
         elif req in ["canSpeedball", "canBlueSpaceJump", "h_blueJump"]:
             if not states.issubset(["blue"]):
                 err_fn(f"{req} while not in blue state")