Skip to content

Commit 990f495

Browse files
committed
Add and use canLongUnderwaterWalljump
1 parent fc51539 commit 990f495

4 files changed

Lines changed: 18 additions & 22 deletions

File tree

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,10 +1101,9 @@
11011101
{
11021102
"id": 48,
11031103
"link": [2, 1],
1104-
"name": "Halfie Climb Very Long Underwater Walljump Climb",
1104+
"name": "Very Long Underwater Walljump Climb",
11051105
"requires": [
1106-
{"notable": "Halfie Climb Very Long Underwater Walljump Climb"},
1107-
"canUnderwaterWalljump"
1106+
"canLongUnderwaterWalljump"
11081107
],
11091108
"note": "This underwater walljump is very long."
11101109
},
@@ -2831,11 +2830,6 @@
28312830
"Samus will fall into the door transition, bypassing any lock that may be on the door."
28322831
]
28332832
},
2834-
{
2835-
"id": 4,
2836-
"name": "Halfie Climb Very Long Underwater Walljump Climb",
2837-
"note": "This underwater walljump is very long."
2838-
},
28392833
{
28402834
"id": 5,
28412835
"name": "Halfie Climb Very Deep Stuck X-Ray Climb",

region/maridia/inner-pink/The Precious Room.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@
538538
"name": "Long Underwater Wall Jump, Use Flash Suit",
539539
"requires": [
540540
"canTrickyCarryFlashSuit",
541-
"canUnderwaterWalljump",
541+
"canLongUnderwaterWalljump",
542542
{"useFlashSuit": {}},
543543
{"shinespark": {"frames": 12, "excessFrames": 8}}
544544
],

region/maridia/outer/Fish Tank.json

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -675,10 +675,9 @@
675675
{
676676
"id": 26,
677677
"link": [1, 5],
678-
"name": "Fish Tank Very Long Underwater Walljump Climb (In Room)",
678+
"name": "Very Long Underwater Walljump Climb (In Room)",
679679
"requires": [
680-
{"notable": "Fish Tank Very Long Underwater Walljump Climb"},
681-
"canUnderwaterWalljump",
680+
"canLongUnderwaterWalljump",
682681
{"or": [
683682
"canUseFrozenEnemies",
684683
"canSpringBallJumpMidAir",
@@ -700,16 +699,15 @@
700699
{
701700
"id": 27,
702701
"link": [1, 5],
703-
"name": "Fish Tank Very Long Underwater Walljump Climb (Cross Room)",
702+
"name": "Very Long Underwater Walljump Climb (Cross Room)",
704703
"entranceCondition": {
705704
"comeInJumping": {
706705
"speedBooster": "any",
707706
"minTiles": 2.4375
708707
}
709708
},
710709
"requires": [
711-
{"notable": "Fish Tank Very Long Underwater Walljump Climb"},
712-
"canUnderwaterWalljump",
710+
"canLongUnderwaterWalljump",
713711
"canTrickyJump",
714712
"canDisableEquipment",
715713
"canMomentumConservingTurnaround"
@@ -1888,13 +1886,6 @@
18881886
"This requires a very precise jump from the very edge of the ledge and risks falling into the Bottom-Left pit which may be difficult to climb back from."
18891887
]
18901888
},
1891-
{
1892-
"id": 2,
1893-
"name": "Fish Tank Very Long Underwater Walljump Climb",
1894-
"note": [
1895-
"This underwater walljump is very long. Some jump assistance, cross room jump, or a flatley jump from the door frame is needed to get to the first overhang."
1896-
]
1897-
},
18981889
{
18991890
"id": 3,
19001891
"name": "Fish Tank Grapple Teleport into Grapple Jump",

tech.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1105,6 +1105,17 @@
11051105
"This tech assumes Samus has HiJump and only expects gaining about 1 tile of height through consecutive walljumping."
11061106
],
11071107
"extensionTechs": [
1108+
{
1109+
"name": "canLongUnderwaterWalljump",
1110+
"techRequires": [
1111+
"canUnderwaterWalljump"
1112+
],
1113+
"otherRequires": [],
1114+
"note": [
1115+
"The ability to gain height by walljumping underwater against a single wall.",
1116+
"This tech assumes Samus has HiJump and expects gaining more than 1 tile of height through consecutive walljumping."
1117+
]
1118+
},
11081119
{
11091120
"id": 186,
11101121
"name": "canUnderwaterWalljumpBreakFree",

0 commit comments

Comments
 (0)