Skip to content

Commit 4c370ac

Browse files
committed
add canSpeedyJump reqs in cross-room strats
1 parent d7c9b28 commit 4c370ac

23 files changed

Lines changed: 52 additions & 46 deletions

region/brinstar/green/Green Brinstar Main Shaft.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4841,6 +4841,7 @@
48414841
}
48424842
},
48434843
"requires": [
4844+
"canSpeedyJump",
48444845
"canCarefulJump",
48454846
"HiJump"
48464847
],
@@ -4861,6 +4862,7 @@
48614862
}
48624863
},
48634864
"requires": [
4865+
"canSpeedyJump",
48644866
"HiJump"
48654867
],
48664868
"flashSuitChecked": true
@@ -4890,6 +4892,7 @@
48904892
}
48914893
},
48924894
"requires": [
4895+
"canSpeedyJump",
48934896
"canTrickySpringBallJump"
48944897
],
48954898
"flashSuitChecked": true,

region/brinstar/pink/Pink Brinstar Wave Gate Room.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@
912912
"requires": [
913913
"canPrepareForNextRoom",
914914
"HiJump",
915-
"canCarefulJump"
915+
"canSpeedyJump"
916916
],
917917
"flashSuitChecked": true,
918918
"note": "Jump into the room and onto the Grapple block."
@@ -1509,6 +1509,7 @@
15091509
}
15101510
},
15111511
"requires": [
1512+
"canSpeedyJump",
15121513
"canTrickySpringBallJump"
15131514
],
15141515
"flashSuitChecked": true
@@ -1524,6 +1525,7 @@
15241525
}
15251526
},
15261527
"requires": [
1528+
"canSpeedyJump",
15271529
"HiJump"
15281530
],
15291531
"flashSuitChecked": true,
@@ -1558,6 +1560,7 @@
15581560
},
15591561
"requires": [
15601562
"HiJump",
1563+
"canSpeedyJump",
15611564
"canTrickyJump"
15621565
],
15631566
"flashSuitChecked": true,

region/crateria/east/East Ocean.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -432,14 +432,13 @@
432432
{
433433
"id": 8,
434434
"link": [1, 2],
435-
"name": "Speedy Spring Ball Jump and Space Jump",
435+
"name": "Speedy Spring Ball Bounce and Space Jump",
436436
"requires": [
437437
"canTrickyJump",
438438
{"or": [
439439
{"disableEquipment": "SpeedBooster"},
440440
"canTrickyDashJump"
441441
]},
442-
"canSpeedyJump",
443442
"canSpringBallBounce",
444443
"canMockball",
445444
"SpaceJump"
@@ -481,7 +480,6 @@
481480
"requires": [
482481
{"notable": "Speedy Spring Ball Bounce to the Door"},
483482
"canInsaneJump",
484-
"canSpeedyJump",
485483
"canSpringBallBounce",
486484
"canDoubleSpringBallJumpMidAir",
487485
"canMockball"

region/crateria/east/West Ocean.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1746,7 +1746,7 @@
17461746
{
17471747
"id": 57,
17481748
"link": [5, 4],
1749-
"name": "SpeedyJump",
1749+
"name": "Speedy HiJump",
17501750
"requires": [
17511751
"HiJump",
17521752
"canSpeedyJump"

region/lowernorfair/west/Screw Attack Room.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@
242242
{"doorUnlockedAtNode": 2},
243243
"HiJump",
244244
"ScrewAttack",
245+
"canSpeedyJump",
245246
"canTrickyJump",
246247
{"heatFrames": 80}
247248
],
@@ -1351,6 +1352,7 @@
13511352
"h_navigateHeatRooms",
13521353
"ScrewAttack",
13531354
"HiJump",
1355+
"canSpeedyJump",
13541356
"canWalljump",
13551357
{"heatFrames": 150}
13561358
],
@@ -1373,6 +1375,7 @@
13731375
"h_navigateHeatRooms",
13741376
"ScrewAttack",
13751377
"HiJump",
1378+
"canSpeedyJump",
13761379
"canTrickyJump",
13771380
"canWalljump",
13781381
{"heatFrames": 150}
@@ -1396,6 +1399,7 @@
13961399
"h_navigateHeatRooms",
13971400
"ScrewAttack",
13981401
"HiJump",
1402+
"canSpeedyJump",
13991403
{"heatFrames": 150}
14001404
],
14011405
"clearsObstacles": ["A"],

region/maridia/inner-green/East Sand Hall.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,7 @@
703703
},
704704
"requires": [
705705
"canCrossRoomJumpIntoWater",
706-
"HiJump",
707-
"canCarefulJump"
706+
"HiJump"
708707
],
709708
"flashSuitChecked": true,
710709
"note": "By entering the room with run speed, it is possible to jump over the pair of Evirs."

region/maridia/inner-green/West Sand Hall.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -397,15 +397,12 @@
397397
],
398398
"flashSuitChecked": true,
399399
"note": [
400-
"Run into the room using between 10 and 12 tiles of runway,",
400+
"Run into the room using between 7 tiles of runway,",
401401
"and jump at some point after the transition, to reach the center of the room."
402402
],
403403
"detailNote": [
404-
"Enter with extra run speed between $2.9 and $3.3.",
405-
"Speeds in the center part of this range more lenient in the jump timing,",
406-
"allowing the jump at any time after the transition;",
407-
"higher speeds require jumping near the edge of the platform;",
408-
"lower speeds require landing on the single-tile floating block after the first Evir."
404+
"Enter with extra run speed or $2.0 or $2.1.",
405+
"Extra run speeds $2.2 and $2.3 can also work, with a momentum conserving morph."
409406
]
410407
},
411408
{

region/maridia/inner-pink/Botwoon Energy Tank Room.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2354,7 +2354,6 @@
23542354
}
23552355
},
23562356
"requires": [
2357-
"canSpeedyJump",
23582357
"canCrossRoomJumpIntoWater"
23592358
],
23602359
"flashSuitChecked": true,

region/maridia/inner-pink/Halfie Climb Room.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1025,7 +1025,6 @@
10251025
}
10261026
},
10271027
"requires": [
1028-
"canSpeedyJump",
10291028
"canCrossRoomJumpIntoWater"
10301029
],
10311030
"flashSuitChecked": true,
@@ -2351,7 +2350,6 @@
23512350
}
23522351
},
23532352
"requires": [
2354-
"canSpeedyJump",
23552353
"canTrickyJump",
23562354
"canCrossRoomJumpIntoWater"
23572355
],
@@ -2386,7 +2384,6 @@
23862384
}
23872385
},
23882386
"requires": [
2389-
"canSpeedyJump",
23902387
"canTrickySpringBallJump",
23912388
"canCrossRoomJumpIntoWater"
23922389
],
@@ -2424,7 +2421,6 @@
24242421
},
24252422
"requires": [
24262423
"SpaceJump",
2427-
"canSpeedyJump",
24282424
"canCrossRoomJumpIntoWater"
24292425
],
24302426
"flashSuitChecked": true

region/maridia/inner-yellow/Plasma Spark Room.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1764,6 +1764,7 @@
17641764
},
17651765
"requires": [
17661766
"HiJump",
1767+
"canSpeedyJump",
17671768
"canTrickyJump",
17681769
"canLateralMidAirMorph",
17691770
"canTrickySpringBallJump",
@@ -1985,6 +1986,7 @@
19851986
},
19861987
"requires": [
19871988
"HiJump",
1989+
"canSpeedyJump",
19881990
"canTrickyJump",
19891991
"canTrickySpringBallJump"
19901992
],

0 commit comments

Comments
 (0)