Skip to content

Commit a03b5d7

Browse files
osse101osse101
authored
Merge pull request #2856 from kjbranch/rename-walljump
Capitalize the J in more WallJump tech
2 parents 7d9de23 + 25339a5 commit a03b5d7

83 files changed

Lines changed: 493 additions & 493 deletions

File tree

Some content is hidden

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

‎region/brinstar/blue/Blue Brinstar Boulder Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@
448448
},
449449
"requires": [
450450
"canTrickyJump",
451-
"canPreciseWalljump"
451+
"canPreciseWallJump"
452452
],
453453
"flashSuitChecked": true,
454454
"blueSuitChecked": true,
@@ -513,7 +513,7 @@
513513
"name": "Doorsill Jump",
514514
"requires": [
515515
"canDash",
516-
"canPreciseWalljump",
516+
"canPreciseWallJump",
517517
"canTrickyJump",
518518
{"or": [
519519
{"spikeHits": 1},
@@ -674,7 +674,7 @@
674674
}
675675
},
676676
"requires": [
677-
"canPreciseWalljump",
677+
"canPreciseWallJump",
678678
"canTrickyJump",
679679
{"or": [
680680
{"spikeHits": 1},
@@ -995,7 +995,7 @@
995995
"name": "Naked Walljump",
996996
"requires": [
997997
"canSuitlessMaridia",
998-
"canInsaneWalljump"
998+
"canInsaneWallJump"
999999
],
10001000
"flashSuitChecked": true,
10011001
"blueSuitChecked": true,

‎region/brinstar/blue/Blue Brinstar Energy Tank Room.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@
789789
"requires": [
790790
{"notable": "Taco Tank"},
791791
"canCWJ",
792-
"canInsaneWalljump",
792+
"canInsaneWallJump",
793793
"canStationarySpinJump"
794794
],
795795
"flashSuitChecked": false,
@@ -943,7 +943,7 @@
943943
"HiJump",
944944
{"canShineCharge": {"usedTiles": 35, "openEnd": 1}},
945945
"canShinechargeMovementTricky",
946-
"canFastWalljumpClimb",
946+
"canFastWallJumpClimb",
947947
{"shinespark": {"frames": 8, "excessFrames": 0}}
948948
],
949949
"exitCondition": {
@@ -965,7 +965,7 @@
965965
{"obstaclesCleared": ["A"]}
966966
]},
967967
{"or": [
968-
"canConsecutiveWalljump",
968+
"canConsecutiveWallJump",
969969
"SpaceJump",
970970
"canLongIBJ"
971971
]}
@@ -1036,7 +1036,7 @@
10361036
{"haveBlueSuit": {}}
10371037
]},
10381038
{"or": [
1039-
"canConsecutiveWalljump",
1039+
"canConsecutiveWallJump",
10401040
{"and": [
10411041
"SpaceJump",
10421042
{"cycleFrames": 250}
@@ -1214,7 +1214,7 @@
12141214
{"notable": "Return Through Crumble Blocks"},
12151215
"Morph",
12161216
{"or": [
1217-
"canConsecutiveWalljump",
1217+
"canConsecutiveWallJump",
12181218
"SpaceJump",
12191219
"canLongIBJ"
12201220
]},
@@ -1234,7 +1234,7 @@
12341234
{"obstaclesCleared": ["C"]}
12351235
]},
12361236
{"or": [
1237-
"canConsecutiveWalljump",
1237+
"canConsecutiveWallJump",
12381238
"SpaceJump",
12391239
"canLongIBJ"
12401240
]},
@@ -1263,7 +1263,7 @@
12631263
{"obstaclesCleared": ["C"]}
12641264
]},
12651265
{"or": [
1266-
"canConsecutiveWalljump",
1266+
"canConsecutiveWallJump",
12671267
"SpaceJump"
12681268
]}
12691269
],
@@ -1288,7 +1288,7 @@
12881288
]},
12891289
"canLongIBJ",
12901290
{"and": [
1291-
"canConsecutiveWalljump",
1291+
"canConsecutiveWallJump",
12921292
"canWallJumpInstantMorph"
12931293
]}
12941294
]}
@@ -1406,7 +1406,7 @@
14061406
]},
14071407
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
14081408
"canShinechargeMovementComplex",
1409-
"canConsecutiveWalljump",
1409+
"canConsecutiveWallJump",
14101410
{"shinespark": {"frames": 17, "excessFrames": 3}}
14111411
],
14121412
"clearsObstacles": ["A", "B", "C"],
@@ -1430,7 +1430,7 @@
14301430
]},
14311431
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
14321432
"canShinechargeMovementComplex",
1433-
"canConsecutiveWalljump",
1433+
"canConsecutiveWallJump",
14341434
"HiJump",
14351435
{"shinespark": {"frames": 9, "excessFrames": 9}}
14361436
],
@@ -1453,7 +1453,7 @@
14531453
]},
14541454
{"canShineCharge": {"usedTiles": 42, "openEnd": 0}},
14551455
"canShinechargeMovementComplex",
1456-
"canFastWalljumpClimb",
1456+
"canFastWallJumpClimb",
14571457
{"shinespark": {"frames": 9, "excessFrames": 9}}
14581458
],
14591459
"clearsObstacles": ["A", "B", "C"],
@@ -1493,7 +1493,7 @@
14931493
]},
14941494
{"and": [
14951495
{"or": [
1496-
"canConsecutiveWalljump",
1496+
"canConsecutiveWallJump",
14971497
"SpaceJump"
14981498
]},
14991499
{"shinespark": {"frames": 9, "excessFrames": 9}}
@@ -1521,7 +1521,7 @@
15211521
]},
15221522
{"and": [
15231523
{"or": [
1524-
"canConsecutiveWalljump",
1524+
"canConsecutiveWallJump",
15251525
"SpaceJump"
15261526
]},
15271527
{"shinespark": {"frames": 9, "excessFrames": 9}}
@@ -1574,7 +1574,7 @@
15741574
"canGMode",
15751575
"h_artificialMorphIBJ",
15761576
{"or": [
1577-
"canConsecutiveWalljump",
1577+
"canConsecutiveWallJump",
15781578
"SpaceJump",
15791579
{"and": [
15801580
"h_artificialMorphLongIBJ",
@@ -1612,7 +1612,7 @@
16121612
"canGMode",
16131613
"Morph",
16141614
{"or": [
1615-
"canConsecutiveWalljump",
1615+
"canConsecutiveWallJump",
16161616
"SpaceJump"
16171617
]},
16181618
{"or": [
@@ -1637,7 +1637,7 @@
16371637
"h_artificialMorphPowerBomb",
16381638
"h_artificialMorphMovement",
16391639
{"or": [
1640-
"canConsecutiveWalljump",
1640+
"canConsecutiveWallJump",
16411641
"SpaceJump",
16421642
{"and": [
16431643
{"blueSuitShinecharge": {}},
@@ -1733,7 +1733,7 @@
17331733
{"itemNotCollectedAtNode": 4},
17341734
"h_artificialMorphSpringBall",
17351735
{"or": [
1736-
"canConsecutiveWalljump",
1736+
"canConsecutiveWallJump",
17371737
"SpaceJump",
17381738
{"and": [
17391739
{"blueSuitShinecharge": {}},

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4435,7 +4435,7 @@
44354435
{"resourceAtMost": [{"type": "ReserveEnergy", "count": 5}]}
44364436
]},
44374437
{"or": [
4438-
"canConsecutiveWalljump",
4438+
"canConsecutiveWallJump",
44394439
"canLongIBJ",
44404440
"SpaceJump"
44414441
]},
@@ -4772,7 +4772,7 @@
47724772
{"or": [
47734773
"SpaceJump",
47744774
"canLongIBJ",
4775-
"canConsecutiveWalljump"
4775+
"canConsecutiveWallJump"
47764776
]}
47774777
]
47784778
},
@@ -4942,7 +4942,7 @@
49424942
"canTrivialMidAirMorph",
49434943
{"or": [
49444944
"SpaceJump",
4945-
"canConsecutiveWalljump"
4945+
"canConsecutiveWallJump"
49464946
]}
49474947
]},
49484948
{"and": [
@@ -6018,7 +6018,7 @@
60186018
"link": [14, 9],
60196019
"name": "Full Etecoon Wall Jump Climb",
60206020
"requires": [
6021-
"canConsecutiveWalljump"
6021+
"canConsecutiveWallJump"
60226022
],
60236023
"flashSuitChecked": true,
60246024
"blueSuitChecked": true,

‎region/brinstar/green/Green Hill Zone.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@
348348
"name": "Wall Jump to Top Right Door",
349349
"requires": [
350350
{"notable": "Wall Jump to Top Right Door"},
351-
"canPreciseWalljump"
351+
"canPreciseWallJump"
352352
],
353353
"flashSuitChecked": true,
354354
"blueSuitChecked": true,
@@ -1113,7 +1113,7 @@
11131113
"link": [2, 2],
11141114
"name": "Leave With Spark (Far Runway)",
11151115
"requires": [
1116-
"canPreciseWalljump",
1116+
"canPreciseWallJump",
11171117
{"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
11181118
"canShinechargeMovementTricky",
11191119
{"shinespark": {"frames": 19, "excessFrames": 0}}

‎region/brinstar/kraid/Warehouse Entrance.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,7 @@
834834
"name": "Wall Jump",
835835
"requires": [
836836
"canDash",
837-
"canPreciseWalljump",
837+
"canPreciseWallJump",
838838
{"disableEquipment": "SpeedBooster"}
839839
],
840840
"flashSuitChecked": true,

‎region/brinstar/pink/Big Pink.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4085,7 +4085,7 @@
40854085
"name": "Zeb Ice Clip",
40864086
"requires": [
40874087
{"notable": "Zeb Ice Clip"},
4088-
"canTrickyWalljump",
4088+
"canTrickyWallJump",
40894089
"canCameraManip",
40904090
{"or": [
40914091
"Wave",
@@ -4111,7 +4111,7 @@
41114111
"name": "Blind Zeb Ice Clip (Preserve Flash Suit)",
41124112
"requires": [
41134113
{"notable": "Blind Zeb Ice Clip (Preserve Flash Suit)"},
4114-
"canTrickyWalljump",
4114+
"canTrickyWallJump",
41154115
"canCameraManip",
41164116
"canOffScreenMovement",
41174117
{"or": [
@@ -4140,7 +4140,7 @@
41404140
{"notable": "Zeb Ice Clip"},
41414141
"canSpecialBeamAttack",
41424142
{"ammo": {"type": "PowerBomb", "count": 1}},
4143-
"canTrickyWalljump",
4143+
"canTrickyWallJump",
41444144
"h_preciseIceClip",
41454145
{"disableEquipment": "Ice"}
41464146
],

‎region/brinstar/pink/Dachora Room.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -698,7 +698,7 @@
698698
},
699699
"requires": [
700700
{"or": [
701-
"canConsecutiveWalljump",
701+
"canConsecutiveWallJump",
702702
"SpaceJump"
703703
]}
704704
],
@@ -796,7 +796,7 @@
796796
{"shinespark": {"frames": 85, "excessFrames": 3}}
797797
]},
798798
{"and": [
799-
"canFastWalljumpClimb",
799+
"canFastWallJumpClimb",
800800
"canMidairShinespark",
801801
{"or": [
802802
{"and": [
@@ -870,7 +870,7 @@
870870
"name": "Spark from Fast Wall Jumps",
871871
"requires": [
872872
"HiJump",
873-
"canFastWalljumpClimb",
873+
"canFastWallJumpClimb",
874874
"canShinechargeMovementComplex",
875875
"h_shinechargeMaxRunway",
876876
{"shinespark": {"frames": 67, "excessFrames": 3}}
@@ -884,7 +884,7 @@
884884
"name": "Tankless Bootless Shinespark",
885885
"requires": [
886886
{"notable": "Tankless Bootless Shinespark"},
887-
"canFastWalljumpClimb",
887+
"canFastWallJumpClimb",
888888
"canShinechargeMovementComplex",
889889
"h_shinechargeMaxRunway",
890890
{"shinespark": {"frames": 73, "excessFrames": 3}}
@@ -901,7 +901,7 @@
901901
"requires": [
902902
{"haveBlueSuit": {}},
903903
{"or": [
904-
"canConsecutiveWalljump",
904+
"canConsecutiveWallJump",
905905
"SpaceJump",
906906
{"and": [
907907
"canLongIBJ",
@@ -919,7 +919,7 @@
919919
"requires": [
920920
{"useFlashSuit": {}},
921921
{"or": [
922-
"canConsecutiveWalljump",
922+
"canConsecutiveWallJump",
923923
"SpaceJump",
924924
{"and": [
925925
"canLongIBJ",
@@ -968,7 +968,7 @@
968968
},
969969
"requires": [
970970
{"or": [
971-
"canConsecutiveWalljump",
971+
"canConsecutiveWallJump",
972972
"SpaceJump"
973973
]}
974974
],

‎region/brinstar/pink/Mission Impossible Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -937,7 +937,7 @@
937937
{"notable": "Mission Impossible"},
938938
"canQuickDrop",
939939
"HiJump",
940-
"canPreciseWalljump",
940+
"canPreciseWallJump",
941941
{"obstaclesCleared": ["A", "B"]}
942942
],
943943
"flashSuitChecked": true,

‎region/brinstar/pink/Spore Spawn Super Room.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
},
203203
"requires": [
204204
{"or": [
205-
"canConsecutiveWalljump",
205+
"canConsecutiveWallJump",
206206
"SpaceJump"
207207
]}
208208
],

‎region/brinstar/pink/Waterway Energy Tank Room.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
{"and": [
102102
"canSuitlessMaridia",
103103
{"or": [
104-
"canPreciseWalljump",
104+
"canPreciseWallJump",
105105
"canBombJumpWaterEscape",
106106
{"and": [
107107
"h_useSpringBall",
@@ -624,7 +624,7 @@
624624
"name": "Precise Wall Jump",
625625
"requires": [
626626
"canSuitlessMaridia",
627-
"canPreciseWalljump"
627+
"canPreciseWallJump"
628628
],
629629
"flashSuitChecked": true,
630630
"blueSuitChecked": true
@@ -690,7 +690,7 @@
690690
"Gravity",
691691
{"and": [
692692
{"or": [
693-
"canPreciseWalljump",
693+
"canPreciseWallJump",
694694
"SpaceJump",
695695
{"and": [
696696
"Ice",
@@ -970,7 +970,7 @@
970970
"requires": [
971971
{"or": [
972972
"SpaceJump",
973-
"canPreciseWalljump",
973+
"canPreciseWallJump",
974974
"canTrickySpringBallJump",
975975
{"and": [
976976
"h_useSpringBall",

0 commit comments

Comments
 (0)