Merge pull request #2711 from blkerby/speed-jump

osse101 · web-flow · commit 46b3d1e913aa · 2026-02-18T13:27:37.000-06:00
Split Speed - h_speedDash to h_speedJump
diff --git a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json
@@ -199,7 +199,7 @@
       "name": "Leave With Side Platform (Power Bomb Blocks Broken)",
       "requires": [
         {"obstaclesCleared": ["C"]},
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
@@ -239,7 +239,7 @@
       "link": [1, 1],
       "name": "Leave With Side Platform (Power Bomb Blocks Intact)",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
diff --git a/region/brinstar/blue/Morph Ball Room.json b/region/brinstar/blue/Morph Ball Room.json
@@ -175,7 +175,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         {"obstaclesCleared": ["C"]},
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         "canMomentumConservingMorph"
       ],
diff --git a/region/brinstar/green/Green Hill Zone.json b/region/brinstar/green/Green Hill Zone.json
@@ -869,7 +869,7 @@
       "link": [1, 5],
       "name": "Airball",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         "canTrickyJump",
         "canLateralMidAirMorph",
         "can4HighMidAirMorph"
@@ -1306,7 +1306,7 @@
       "requires": [
         {"notable": "Grapple Gate Glitch"},
         "canPreciseGrapple",
-        "h_speedDash",
+        "h_speedJump",
         "canTrickyJump"
       ],
       "clearsObstacles": ["B"],
@@ -1570,7 +1570,7 @@
           {"and": [
             {"notable": "Grapple Gate Glitch"},
             "canPreciseGrapple",
-            "h_speedDash",
+            "h_speedJump",
             "canTrickyJump"
           ]}
         ]},
diff --git a/region/brinstar/green/Noob Bridge.json b/region/brinstar/green/Noob Bridge.json
@@ -485,7 +485,7 @@
       "link": [2, 2],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         "canMomentumConservingMorph"
       ],
       "exitCondition": {
diff --git a/region/brinstar/kraid/Baby Kraid Room.json b/region/brinstar/kraid/Baby Kraid Room.json
@@ -115,7 +115,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         {"obstaclesCleared": ["A"]},
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
@@ -1043,7 +1043,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         {"obstaclesCleared": ["A"]},
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         "canMomentumConservingMorph"
       ],
diff --git a/region/brinstar/kraid/Kraid Room.json b/region/brinstar/kraid/Kraid Room.json
@@ -98,7 +98,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         "f_DefeatedKraid",
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         "canMomentumConservingMorph"
       ],
@@ -777,7 +777,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         "f_DefeatedKraid",
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         "canMomentumConservingMorph"
       ],
diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json
@@ -673,7 +673,7 @@
         "canHorizontalDamageBoost",
         "canTrickyJump",
         "canUseIFrames",
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canInsaneJump",
           {"and": [
diff --git a/region/crateria/central/Climb Supers Room.json b/region/crateria/central/Climb Supers Room.json
@@ -1809,7 +1809,7 @@
         {"or": [
           "canCarefulJump",
           "SpaceJump",
-          "h_speedDash"
+          "h_speedJump"
         ]}
       ],
       "flashSuitChecked": true,
@@ -2136,7 +2136,7 @@
         {"or": [
           "canCarefulJump",
           "SpaceJump",
-          "h_speedDash"
+          "h_speedJump"
         ]}
       ],
       "flashSuitChecked": true,
diff --git a/region/crateria/central/Flyway.json b/region/crateria/central/Flyway.json
@@ -84,7 +84,7 @@
       "link": [1, 1],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
@@ -422,7 +422,7 @@
       "link": [2, 2],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json
@@ -893,7 +893,7 @@
       "name": "Leave With Controlled Spring Ball Bounce (Long Runway)",
       "requires": [
         {"obstaclesCleared": ["A", "C"]},
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump"
       ],
       "exitCondition": {
diff --git a/region/crateria/east/The Moat.json b/region/crateria/east/The Moat.json
@@ -965,7 +965,7 @@
           {"doorUnlockedAtNode": 2},
           "canTrickyJump",
           "canLateralMidAirMorph",
-          "h_speedDash"
+          "h_speedJump"
         ]}
       ],
       "collectsItems": [3],
diff --git a/region/crateria/west/Statues Hallway.json b/region/crateria/west/Statues Hallway.json
@@ -56,7 +56,7 @@
       "link": [1, 1],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
@@ -305,7 +305,7 @@
       "link": [2, 2],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMomentumConservingMorph",
           "canInsaneJump"
diff --git a/region/lowernorfair/west/Fast Ripper Room.json b/region/lowernorfair/west/Fast Ripper Room.json
@@ -1570,7 +1570,7 @@
         {"or": [
           {"heatFrames": 270},
           {"and": [
-            "h_speedDash",
+            "h_speedJump",
             "canWalljump",
             {"heatFrames": 225}
           ]}
@@ -1621,7 +1621,7 @@
         {"or": [
           {"heatFrames": 300},
           {"and": [
-            "h_speedDash",
+            "h_speedJump",
             "canWalljump",
             {"heatFrames": 225}
           ]}
@@ -1639,7 +1639,7 @@
         {"or": [
           {"heatFrames": 270},
           {"and": [
-            "h_speedDash",
+            "h_speedJump",
             "canWalljump",
             {"heatFrames": 225}
           ]}
diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json
@@ -147,7 +147,7 @@
       "requires": [
         {"obstaclesCleared": ["A"]},
         "Gravity",
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         {"or": [
           {"and": [
diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
@@ -1348,7 +1348,7 @@
       "name": "Leave With Side Platform",
       "requires": [
         "Gravity",
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         "canMomentumConservingMorph",
         "canInsaneMidAirMorph"
diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json
@@ -1225,7 +1225,7 @@
           "canLateralMidAirMorph",
           "canInsaneWalljump",
           {"and": [
-            "h_speedDash",
+            "h_speedJump",
             "canPreciseWalljump"
           ]}
         ]}
@@ -1245,7 +1245,7 @@
         "canCarefulJump",
         "canLateralMidAirMorph",
         "canSpringFling",
-        "h_speedDash"
+        "h_speedJump"
       ],
       "flashSuitChecked": true
     },
diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json
@@ -697,7 +697,7 @@
             "canCarefulJump"
           ]},
           {"and": [
-            "h_speedDash",
+            "h_speedJump",
             "HiJump"
           ]}
         ]},
diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
@@ -604,7 +604,7 @@
       "link": [1, 7],
       "name": "Speed Jump Across",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         "canCarefulJump",
         {"or": [
           {"doorUnlockedAtNode": 1},
diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json
@@ -4400,9 +4400,9 @@
     {
       "id": 162,
       "link": [4, 3],
-      "name": "Speedy Jump Spring Fling",
+      "name": "Speed Jump Spring Fling",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         "canMomentumConservingMorph",
         "canSpringFling",
         {"heatFrames": 190}
diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json
@@ -604,7 +604,7 @@
           ]},
           {"and": [
             {"notable": "Ceiling Mockball Spring Fling"},
-            "h_speedDash",
+            "h_speedJump",
             "canInsaneJump",
             "canMomentumConservingMorph",
             "canSpringFling"
@@ -895,7 +895,7 @@
           ]},
           {"and": [
             {"notable": "Ceiling Mockball Spring Fling"},
-            "h_speedDash",
+            "h_speedJump",
             "canInsaneJump",
             "canMomentumConservingMorph",
             "canSpringFling"
@@ -1366,7 +1366,7 @@
       "name": "Ceiling Mockball Spring Fling",
       "requires": [
         {"notable": "Ceiling Mockball Spring Fling"},
-        "h_speedDash",
+        "h_speedJump",
         "canInsaneJump",
         {"heatFrames": 500},
         "canMomentumConservingMorph",
@@ -1573,7 +1573,7 @@
           ]},
           {"and": [
             {"notable": "Ceiling Mockball Spring Fling"},
-            "h_speedDash",
+            "h_speedJump",
             "canInsaneJump",
             "canMomentumConservingMorph",
             "canSpringFling"
@@ -1692,7 +1692,7 @@
           ]},
           {"and": [
             {"notable": "Ceiling Mockball Spring Fling"},
-            "h_speedDash",
+            "h_speedJump",
             "canInsaneJump",
             "canMomentumConservingMorph",
             "canSpringFling"
diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json
@@ -3381,7 +3381,7 @@
             "canTrickyJump",
             "SpaceJump"
           ]},
-          "h_speedDash",
+          "h_speedJump",
           {"spikeHits": 1}
         ]},
         "h_heatedGModeOffCameraDoor"
diff --git a/region/norfair/west/Ice Beam Tutorial Room.json b/region/norfair/west/Ice Beam Tutorial Room.json
@@ -154,11 +154,10 @@
     {
       "id": 4,
       "link": [1, 2],
-      "name": "Speed Jump",
+      "name": "Speedy Jump",
       "requires": [
         "canMidAirMorph",
-        "h_speedDash",
-        "canCarefulJump",
+        "canSpeedyJump",
         {"heatFrames": 240}
       ],
       "flashSuitChecked": true,
diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json
@@ -138,7 +138,7 @@
       "link": [1, 1],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMetroidAvoid",
           "Ice",
@@ -1067,7 +1067,7 @@
       "link": [2, 1],
       "name": "Speed Jump",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         "canCarefulJump",
         {"or": [
           "canPreciseWalljump",
@@ -1530,7 +1530,7 @@
       "link": [2, 2],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMetroidAvoid",
           "f_KilledMetroidRoom1"
diff --git a/region/tourian/main/Metroid Room 2.json b/region/tourian/main/Metroid Room 2.json
@@ -1231,7 +1231,7 @@
       "link": [2, 2],
       "name": "Leave With Side Platform",
       "requires": [
-        "h_speedDash",
+        "h_speedJump",
         {"or": [
           "canMetroidAvoid",
           "f_KilledMetroidRoom2"
diff --git a/region/wreckedship/main/Basement.json b/region/wreckedship/main/Basement.json
diff --git a/region/wreckedship/main/Bowling Alley.json b/region/wreckedship/main/Bowling Alley.json
