Speed Hall and Croc Speedway: h_speedDash and alternatives (#2758)

Author: blkerby

helpers.json

@@ -374,6 +374,14 @@
             "To avoid this, it would be an option for randomizers to change this behavior,",
             "to condition the lava trap on Speed Booster being equipped rather than collected."
           ]
+        },
+        {
+          "name": "h_speedButSlow",
+          "requires": ["never"],
+          "note": [
+            "Represents having Speed Booster collected but not being able to use it to gain high dash speed.",
+            "This is not applicable to the vanilla game but is included to help support modified Speed Booster items in randomizers."
+          ]
         }
       ]
     },

region/norfair/east/Speed Booster Hall.json

@@ -265,7 +265,7 @@
       "requires": [
         "canDash",
         {"obstaclesNotCleared": ["A"]},
-        {"simpleHeatFrames": 560},
+        {"simpleHeatFrames": 535},
         {"heatFrames": 60}
       ],
       "exitCondition": {
@@ -350,8 +350,18 @@
       "requires": [
         {"obstaclesNotCleared": ["A"]},
         "h_shinechargeMaxRunway",
-        {"simpleHeatFrames": 310},
-        {"heatFrames": 40},
+        {"or": [
+          {"and": [
+            "h_speedDash",
+            {"simpleHeatFrames": 310},
+            {"heatFrames": 40}
+          ]},
+          {"and": [
+            "h_speedButSlow",
+            {"simpleHeatFrames": 560},
+            {"heatFrames": 60}
+          ]}
+        ]},
         {"shineChargeFrames": 35}
       ],
       "exitCondition": {
@@ -370,8 +380,8 @@
       "name": "Speed Run, Leave With Runway",
       "requires": [
         {"obstaclesNotCleared": ["A"]},
-        "h_speedDash",
         "canHeroShot",
+        "h_speedDash",
         {"simpleHeatFrames": 250},
         {"heatFrames": 40}
       ],
@@ -544,8 +554,18 @@
             {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
           ]}
         ]},
-        {"simpleHeatFrames": 310},
-        {"heatFrames": 40},
+        {"or": [
+          {"and": [
+            "h_speedButSlow",
+            {"simpleHeatFrames": 560},
+            {"heatFrames": 60}
+          ]},
+          {"and": [
+            "h_speedDash",
+            {"simpleHeatFrames": 310},
+            {"heatFrames": 40}
+          ]}
+        ]},
         "h_shinechargeMaxRunway",
         "h_heatTriggerRModeSparkInterrupt"
       ],
@@ -691,7 +711,7 @@
       "requires": [
         "canDash",
         {"obstaclesNotCleared": ["A"]},
-        {"simpleHeatFrames": 560},
+        {"simpleHeatFrames": 535},
         {"heatFrames": 60}
       ],
       "exitCondition": {
@@ -775,8 +795,18 @@
             {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
           ]}
         ]},
-        {"simpleHeatFrames": 310},
-        {"heatFrames": 40},
+        {"or": [
+          {"and": [
+            "h_speedButSlow",
+            {"simpleHeatFrames": 560},
+            {"heatFrames": 60}
+          ]},
+          {"and": [
+            "h_speedDash",
+            {"simpleHeatFrames": 310},
+            {"heatFrames": 40}
+          ]}
+        ]},
         "h_shinechargeMaxRunway",
         "h_heatTriggerRModeSparkInterrupt"
       ],
@@ -794,8 +824,18 @@
       "requires": [
         {"obstaclesNotCleared": ["A"]},
         "h_shinechargeMaxRunway",
-        {"simpleHeatFrames": 310},
-        {"heatFrames": 40},
+        {"or": [
+          {"and": [
+            "h_speedButSlow",
+            {"simpleHeatFrames": 560},
+            {"heatFrames": 60}
+          ]},
+          {"and": [
+            "h_speedDash",
+            {"simpleHeatFrames": 310},
+            {"heatFrames": 40}
+          ]}
+        ]},
         {"shineChargeFrames": 35}
       ],
       "exitCondition": {
@@ -806,7 +846,8 @@
         {"types": ["missiles", "powerbomb"], "requires": ["never"]}
       ],
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "devNote": ["This assumes that in the h_speedButSlow case the lava will not be rising."]
     },
     {
       "id": 17,