Skip to content

Commit bb096a9

Browse files
committed
WIP apply canSpeedyJump tech
1 parent c4a53d1 commit bb096a9

41 files changed

Lines changed: 240 additions & 106 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

helpers.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,6 +1239,18 @@
12391239
]}
12401240
],
12411241
"devNote": "Using a pause abuse to tank a hit and having that take Samus to 0 Energy and then be refilled with minimal Reserve Energy."
1242+
},
1243+
{
1244+
"name": "h_speedDash",
1245+
"requires": [
1246+
"SpeedBooster",
1247+
"canDash"
1248+
],
1249+
"devNote": [
1250+
"This is to cover cases that require running using Speed Booster,",
1251+
"for purposes other than affecting Samus' jump height (canSpeedyJump).",
1252+
"For example, this includes running and jumping over long horizontal gaps."
1253+
]
12421254
}
12431255
]
12441256
},

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4956,6 +4956,7 @@
49564956
}
49574957
},
49584958
"requires": [
4959+
"canSpeedyJump",
49594960
{"useFlashSuit": {}},
49604961
{"shinespark": {"frames": 21, "excessFrames": 12}}
49614962
],

region/brinstar/green/Green Hill Zone.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@
419419
{
420420
"id": 14,
421421
"link": [1, 2],
422-
"name": "Speedy Jump",
422+
"name": "Speed Jump",
423423
"entranceCondition": {
424424
"comeInJumping": {
425425
"speedBooster": true,
@@ -435,7 +435,7 @@
435435
{
436436
"id": 15,
437437
"link": [1, 2],
438-
"name": "Insane Speedy Jump",
438+
"name": "Insane Speed Jump",
439439
"entranceCondition": {
440440
"comeInJumping": {
441441
"speedBooster": true,

region/brinstar/kraid/Warehouse Entrance.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,7 @@
742742
{
743743
"id": 39,
744744
"link": [4, 3],
745-
"name": "Speedjump",
745+
"name": "Tricky Dash Jump",
746746
"requires": [
747747
"canTrickyDashJump"
748748
],

region/brinstar/pink/Dachora Room.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -679,6 +679,7 @@
679679
"HiJump",
680680
"canMidairShinespark",
681681
"h_shinechargeMaxRunway",
682+
"canSpeedyJump",
682683
{"shinespark": {"frames": 85, "excessFrames": 3}}
683684
],
684685
"flashSuitChecked": true,

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
{
518518
"id": 13,
519519
"link": [1, 1],
520-
"name": "Reverse Gate Glitch (Speedy Jump)",
520+
"name": "Reverse Gate Glitch (Tricky Dash Jump)",
521521
"requires": [
522522
{"notable": "Reverse Gate Glitch"},
523523
{"obstaclesCleared": ["A"]},
@@ -836,7 +836,7 @@
836836
"requires": [
837837
"HiJump",
838838
"canTrickyJump",
839-
"SpeedBooster",
839+
"canSpeedyJump",
840840
{"obstaclesCleared": ["A"]}
841841
],
842842
"flashSuitChecked": true,
@@ -872,6 +872,7 @@
872872
},
873873
"requires": [
874874
"canPrepareForNextRoom",
875+
"canSpeedyJump",
875876
"canTrickyJump"
876877
],
877878
"flashSuitChecked": true,
@@ -944,7 +945,7 @@
944945
"requires": [
945946
"canPrepareForNextRoom",
946947
"canTrickySpringBallJump",
947-
"canCarefulJump"
948+
"canSpeedyJump"
948949
],
949950
"flashSuitChecked": true,
950951
"note": "Perform a Spring Ball jump from a speedy jump in the previous room."
@@ -1485,7 +1486,9 @@
14851486
"minTiles": 37
14861487
}
14871488
},
1488-
"requires": [],
1489+
"requires": [
1490+
"canSpeedyJump"
1491+
],
14891492
"flashSuitChecked": true,
14901493
"note": "Jump near the end of the runway in-room. Assumes there is a runway in the adjacent room of at least 37 tiles."
14911494
},

region/brinstar/red/Caterpillar Room.json

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1228,7 +1228,7 @@
12281228
}
12291229
},
12301230
"requires": [
1231-
"canCarefulJump",
1231+
"canSpeedyJump",
12321232
{"or": [
12331233
{"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}},
12341234
"ScrewAttack",
@@ -1696,6 +1696,37 @@
16961696
],
16971697
"flashSuitChecked": true
16981698
},
1699+
{
1700+
"link": [4, 1],
1701+
"name": "Speedy Jump",
1702+
"entranceCondition": {
1703+
"comeInRunning": {
1704+
"minTiles": 38,
1705+
"speedBooster": true
1706+
}
1707+
},
1708+
"requires": [
1709+
"canSpeedyJump",
1710+
"canTrickyJump"
1711+
],
1712+
"wallJumpAvoid": true,
1713+
"flashSuitChecked": true
1714+
},
1715+
{
1716+
"link": [4, 1],
1717+
"name": "Tricky Dash Jump",
1718+
"entranceCondition": {
1719+
"comeInRunning": {
1720+
"minTiles": 34,
1721+
"speedBooster": true
1722+
}
1723+
},
1724+
"requires": [
1725+
"canTrickyDashJump"
1726+
],
1727+
"wallJumpAvoid": true,
1728+
"flashSuitChecked": true
1729+
},
16991730
{
17001731
"id": 61,
17011732
"link": [4, 1],

region/brinstar/red/Red Brinstar Fireflea Room.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,12 +563,12 @@
563563
{
564564
"id": 68,
565565
"link": [2, 1],
566-
"name": "Damage Boost Speedy Jump",
566+
"name": "Damage Boost Speed Jump",
567567
"requires": [
568568
"canHorizontalDamageBoost",
569569
"canTrickyJump",
570570
"canUseIFrames",
571-
"SpeedBooster",
571+
"h_speedDash",
572572
{"or": [
573573
"canInsaneJump",
574574
{"and": [

region/crateria/central/Climb Supers Room.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@
478478
{
479479
"id": 12,
480480
"link": [1, 4],
481-
"name": "Speedy Jump Spring Fling",
481+
"name": "Speed Jump Spring Fling",
482482
"entranceCondition": {
483483
"comeInRunning": {
484484
"speedBooster": true,
@@ -1187,6 +1187,7 @@
11871187
"requires": [
11881188
"canTrivialUseFrozenEnemies",
11891189
"h_shinechargeMaxRunway",
1190+
"canSpeedyJump",
11901191
"canShinechargeMovementComplex",
11911192
{"or": [
11921193
{"shinespark": {"frames": 111, "excessFrames": 6}},

region/crateria/central/Landing Site.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,6 +1615,7 @@
16151615
"requires": [
16161616
"h_shinechargeMaxRunway",
16171617
"canShinechargeMovement",
1618+
"canSpeedyJump",
16181619
"canMidairShinespark",
16191620
{"or": [
16201621
{"shinespark": {"frames": 29, "excessFrames": 1}},

0 commit comments

Comments
 (0)