add canSpeedyJump reqs in cross-room strats

blkerby · blkerby · commit 4c370aceb274 · 2025-10-19T13:52:48.000-06:00
diff --git a/region/brinstar/green/Green Brinstar Main Shaft.json b/region/brinstar/green/Green Brinstar Main Shaft.json
@@ -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,
diff --git a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json
@@ -912,7 +912,7 @@
       "requires": [
         "canPrepareForNextRoom",
         "HiJump",
-        "canCarefulJump"
+        "canSpeedyJump"
       ],
       "flashSuitChecked": true,
       "note": "Jump into the room and onto the Grapple block."
@@ -1509,6 +1509,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "canTrickySpringBallJump"
       ],
       "flashSuitChecked": true
@@ -1524,6 +1525,7 @@
         }
       },
       "requires": [
+        "canSpeedyJump",
         "HiJump"
       ],
       "flashSuitChecked": true,
@@ -1558,6 +1560,7 @@
       },
       "requires": [
         "HiJump",
+        "canSpeedyJump",
         "canTrickyJump"
       ],
       "flashSuitChecked": true,
diff --git a/region/crateria/east/East Ocean.json b/region/crateria/east/East Ocean.json
@@ -432,14 +432,13 @@
     {
       "id": 8,
       "link": [1, 2],
-      "name": "Speedy Spring Ball Jump and Space Jump",
+      "name": "Speedy Spring Ball Bounce and Space Jump",
       "requires": [
         "canTrickyJump",
         {"or": [
           {"disableEquipment": "SpeedBooster"},
           "canTrickyDashJump"
         ]},
-        "canSpeedyJump",
         "canSpringBallBounce",
         "canMockball",
         "SpaceJump"
@@ -481,7 +480,6 @@
       "requires": [
         {"notable": "Speedy Spring Ball Bounce to the Door"},
         "canInsaneJump",
-        "canSpeedyJump",
         "canSpringBallBounce",
         "canDoubleSpringBallJumpMidAir",
         "canMockball"
diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json
@@ -1746,7 +1746,7 @@
     {
       "id": 57,
       "link": [5, 4],
-      "name": "SpeedyJump",
+      "name": "Speedy HiJump",
       "requires": [
         "HiJump",
         "canSpeedyJump"
diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json
@@ -242,6 +242,7 @@
         {"doorUnlockedAtNode": 2},
         "HiJump",
         "ScrewAttack",
+        "canSpeedyJump",
         "canTrickyJump",
         {"heatFrames": 80}
       ],
@@ -1351,6 +1352,7 @@
         "h_navigateHeatRooms",
         "ScrewAttack",
         "HiJump",
+        "canSpeedyJump",
         "canWalljump",
         {"heatFrames": 150}
       ],
@@ -1373,6 +1375,7 @@
         "h_navigateHeatRooms",
         "ScrewAttack",
         "HiJump",
+        "canSpeedyJump",
         "canTrickyJump",
         "canWalljump",
         {"heatFrames": 150}
@@ -1396,6 +1399,7 @@
         "h_navigateHeatRooms",
         "ScrewAttack",
         "HiJump",
+        "canSpeedyJump",
         {"heatFrames": 150}
       ],
       "clearsObstacles": ["A"],
diff --git a/region/maridia/inner-green/East Sand Hall.json b/region/maridia/inner-green/East Sand Hall.json
@@ -703,8 +703,7 @@
       },
       "requires": [
         "canCrossRoomJumpIntoWater",
-        "HiJump",
-        "canCarefulJump"
+        "HiJump"
       ],
       "flashSuitChecked": true,
       "note": "By entering the room with run speed, it is possible to jump over the pair of Evirs."
diff --git a/region/maridia/inner-green/West Sand Hall.json b/region/maridia/inner-green/West Sand Hall.json
@@ -397,15 +397,12 @@
       ],
       "flashSuitChecked": true,
       "note": [
-        "Run into the room using between 10 and 12 tiles of runway,",
+        "Run into the room using between 7 tiles of runway,",
         "and jump at some point after the transition, to reach the center of the room."
       ],
       "detailNote": [
-        "Enter with extra run speed between $2.9 and $3.3.",
-        "Speeds in the center part of this range more lenient in the jump timing,",
-        "allowing the jump at any time after the transition;",
-        "higher speeds require jumping near the edge of the platform;",
-        "lower speeds require landing on the single-tile floating block after the first Evir."
+        "Enter with extra run speed or $2.0 or $2.1.",
+        "Extra run speeds $2.2 and $2.3 can also work, with a momentum conserving morph."
       ]
     },
     {
diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json
@@ -2354,7 +2354,6 @@
         }
       },
       "requires": [
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater"
       ],
       "flashSuitChecked": true,
diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json
@@ -1025,7 +1025,6 @@
         }
       },
       "requires": [
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater"
       ],
       "flashSuitChecked": true,
@@ -2351,7 +2350,6 @@
         }
       },
       "requires": [
-        "canSpeedyJump",
         "canTrickyJump",
         "canCrossRoomJumpIntoWater"
       ],
@@ -2386,7 +2384,6 @@
         }
       },
       "requires": [
-        "canSpeedyJump",
         "canTrickySpringBallJump",
         "canCrossRoomJumpIntoWater"
       ],
@@ -2424,7 +2421,6 @@
       },
       "requires": [
         "SpaceJump",
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater"
       ],
       "flashSuitChecked": true
diff --git a/region/maridia/inner-yellow/Plasma Spark Room.json b/region/maridia/inner-yellow/Plasma Spark Room.json
@@ -1764,6 +1764,7 @@
       },
       "requires": [
         "HiJump",
+        "canSpeedyJump",
         "canTrickyJump",
         "canLateralMidAirMorph",
         "canTrickySpringBallJump",
@@ -1985,6 +1986,7 @@
       },
       "requires": [
         "HiJump",
+        "canSpeedyJump",
         "canTrickyJump",
         "canTrickySpringBallJump"
       ],
diff --git a/region/maridia/inner-yellow/The Beach.json b/region/maridia/inner-yellow/The Beach.json
@@ -594,7 +594,6 @@
       },
       "requires": [
         "canCrossRoomJumpIntoWater",
-        "canSpeedyJump",
         "canTrickyJump",
         "canInsaneJump"
       ],
@@ -1072,7 +1071,7 @@
     {
       "id": 45,
       "link": [2, 4],
-      "name": "Cross Room Jump - HiJump Speed Jump",
+      "name": "Cross Room Jump - Speedy HiJump",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 10,
@@ -1100,7 +1099,7 @@
     {
       "id": 46,
       "link": [2, 4],
-      "name": "Cross Room Jump - HiJump Speed Jump through Toilet",
+      "name": "Cross Room Jump - Speedy HiJump through Toilet",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 10,
@@ -1303,7 +1302,7 @@
     {
       "id": 54,
       "link": [2, 4],
-      "name": "Cross Room Jump - Speed Jump",
+      "name": "Cross Room Jump - Speedy Jump",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 9,
@@ -1332,7 +1331,7 @@
     {
       "id": 55,
       "link": [2, 4],
-      "name": "Cross Room Jump - Speed Jump through Toilet",
+      "name": "Cross Room Jump - Speedy Jump through Toilet",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 9,
diff --git a/region/maridia/inner-yellow/Yoink Room.json b/region/maridia/inner-yellow/Yoink Room.json
@@ -517,6 +517,7 @@
       "requires": [
         {"notable": "Cross Room Jump Morph"},
         "Morph",
+        "canSpeedyJump",
         "canTrickyJump",
         "canLateralMidAirMorph",
         {"doorUnlockedAtNode": 3}
@@ -887,6 +888,7 @@
       "requires": [
         {"notable": "Cross Room Jump Morph"},
         "Morph",
+        "canSpeedyJump",
         "canTrickyJump",
         "canLateralMidAirMorph",
         {"doorUnlockedAtNode": 1}
diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json
@@ -992,7 +992,6 @@
         }
       },
       "requires": [
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater"
       ],
       "flashSuitChecked": true,
@@ -1009,7 +1008,6 @@
         }
       },
       "requires": [
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater",
         "canSpringBallJumpMidAir",
         "canTrickyJump"
diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json
@@ -896,7 +896,7 @@
     {
       "id": 15,
       "link": [1, 3],
-      "name": "Cross Room Jump - Speed Jump (From Left)",
+      "name": "Cross Room Jump - Speedy Jump (Fyom Left)",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 9,
diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json
@@ -730,7 +730,6 @@
       },
       "requires": [
         "f_MaridiaTubeBroken",
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater",
         "h_midAirShootUp"
       ],
@@ -2649,7 +2648,6 @@
       },
       "requires": [
         "f_MaridiaTubeBroken",
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater",
         "h_midAirShootUp"
       ],
diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json
@@ -1655,7 +1655,7 @@
     {
       "id": 50,
       "link": [2, 8],
-      "name": "Cross Room Jump - HiJump Speed Jump",
+      "name": "Cross Room Jump - Speedy HiJump",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 8,
@@ -1676,7 +1676,7 @@
     {
       "id": 51,
       "link": [2, 8],
-      "name": "Cross Room Jump - Speed Jump",
+      "name": "Cross Room Jump - Speedy Jump",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "maxHeight": 10,
@@ -2237,7 +2237,7 @@
     {
       "id": 69,
       "link": [3, 4],
-      "name": "Cross Room Jump - Speed Jump",
+      "name": "Cross Room Jump - Speedy Jump",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "maxHeight": 10,
@@ -2402,7 +2402,7 @@
     {
       "id": 78,
       "link": [3, 7],
-      "name": "Cross Room Jump - Speed Jump",
+      "name": "Cross Room Jump - Speedy Jump",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 9,
@@ -3149,7 +3149,6 @@
       },
       "requires": [
         {"notable": "Spring Ball Bounce Right to Left"},
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater",
         "canTrickySpringBallBounce"
       ],
@@ -3220,7 +3219,6 @@
         }
       },
       "requires": [
-        "canSpeedyJump",
         "canCrossRoomJumpIntoWater",
         "canInsaneJump"
       ],
diff --git a/region/maridia/outer/Red Fish Room.json b/region/maridia/outer/Red Fish Room.json
@@ -649,7 +649,7 @@
     {
       "id": 28,
       "link": [2, 3],
-      "name": "Cross Room Jump - Speed Jump",
+      "name": "Cross Room Jump - Speedy Jump",
       "entranceCondition": {
         "comeInWithPlatformBelow": {
           "minHeight": 9,
diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json
diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json
diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json
diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json
diff --git a/strats.md b/strats.md
diff --git a/tech.json b/tech.json

Original file line number	Diff line number	Diff line change
`@@ -1746,7 +1746,7 @@`
`1746`	`1746`	`{`
`1747`	`1747`	`"id": 57,`
`1748`	`1748`	`"link": [5, 4],`
`1749`		`- "name": "SpeedyJump",`
	`1749`	`+ "name": "Speedy HiJump",`
`1750`	`1750`	`"requires": [`
`1751`	`1751`	`"HiJump",`
`1752`	`1752`	`"canSpeedyJump"`
Original file line number	Diff line number	Diff line change
`@@ -2354,7 +2354,6 @@`
`2354`	`2354`	`}`
`2355`	`2355`	`},`
`2356`	`2356`	`"requires": [`
`2357`		`- "canSpeedyJump",`
`2358`	`2357`	`"canCrossRoomJumpIntoWater"`
`2359`	`2358`	`],`
`2360`	`2359`	`"flashSuitChecked": true,`