From 4fe3977532ecc9f386c0c151a23b8979302c2845 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Fri, 24 Apr 2026 14:18:18 -0600 Subject: [PATCH] Capitalize J in canWallJump This also capitalizes it in canWallJumpWithCharge. There are probably more tech that could benefit from standardization, but this was just one find and replace all. Others can be done in a separate PR. --- .../blue/Blue Brinstar Boulder Room.json | 4 +- region/brinstar/blue/Morph Ball Room.json | 2 +- region/brinstar/green/Early Supers Room.json | 18 ++--- .../green/Etecoon Energy Tank Room.json | 22 +++--- .../green/Green Brinstar Main Shaft.json | 22 +++--- region/brinstar/green/Green Hill Zone.json | 8 +-- region/brinstar/kraid/Kraid Room.json | 10 +-- .../kraid/Warehouse Kihunter Room.json | 4 +- region/brinstar/pink/Big Pink.json | 18 ++--- .../pink/Pink Brinstar Wave Gate Room.json | 10 +-- region/brinstar/red/Below Spazer.json | 4 +- region/brinstar/red/Beta Power Bomb Room.json | 2 +- region/brinstar/red/Caterpillar Room.json | 52 +++++++------- .../red/Red Brinstar Fireflea Room.json | 8 +-- region/brinstar/red/Red Tower.json | 58 +++++++-------- region/brinstar/red/Skree Boost Room.json | 2 +- region/crateria/central/Landing Site.json | 14 ++-- .../crateria/central/Parlor and Alcatraz.json | 6 +- region/crateria/east/Crab Maze.json | 2 +- region/crateria/east/East Ocean.json | 18 ++--- region/crateria/east/The Moat.json | 8 +-- region/crateria/east/West Ocean.json | 26 +++---- region/crateria/west/Statues Room.json | 8 +-- region/lowernorfair/east/Amphitheatre.json | 14 ++-- .../east/Fast Pillars Setup Room.json | 26 +++---- .../east/Lower Norfair Fireflea Room.json | 6 +- .../east/Lower Norfair Spring Ball Maze.json | 18 ++--- region/lowernorfair/east/Main Hall.json | 4 +- .../lowernorfair/east/Mickey Mouse Room.json | 6 +- region/lowernorfair/east/Pillar Room.json | 14 ++-- .../lowernorfair/east/Red Kihunter Shaft.json | 2 +- region/lowernorfair/east/Ridley's Room.json | 14 ++-- .../east/The Worst Room In The Game.json | 30 ++++---- .../east/Three Musketeers' Room.json | 32 ++++----- region/lowernorfair/east/Wasteland.json | 2 +- .../lowernorfair/west/Acid Statue Room.json | 10 +-- .../lowernorfair/west/Fast Ripper Room.json | 6 +- .../west/Golden Torizo's Room.json | 16 ++--- .../lowernorfair/west/Screw Attack Room.json | 36 +++++----- .../maridia/inner-green/East Sand Hall.json | 8 +-- region/maridia/inner-green/Pants Room.json | 8 +-- .../maridia/inner-green/Spring Ball Room.json | 2 +- .../maridia/inner-green/West Sand Hall.json | 2 +- region/maridia/inner-pink/Aqueduct.json | 8 +-- .../maridia/inner-pink/Botwoon Hallway.json | 2 +- region/maridia/inner-pink/Colosseum.json | 36 +++++----- region/maridia/inner-pink/Crab Shaft.json | 4 +- region/maridia/inner-pink/Draygon's Room.json | 10 +-- .../maridia/inner-pink/East Cactus Alley.json | 34 ++++----- region/maridia/inner-pink/East Sand Pit.json | 4 +- .../maridia/inner-pink/Halfie Climb Room.json | 28 ++++---- .../maridia/inner-pink/West Cactus Alley.json | 14 ++-- region/maridia/inner-pink/West Sand Pit.json | 2 +- region/maridia/inner-yellow/Kassiuz Room.json | 4 +- .../inner-yellow/Maridia Elevator Room.json | 18 ++--- .../Maridia Swiss Cheese Room.json | 8 +-- region/maridia/inner-yellow/Plasma Room.json | 16 ++--- .../inner-yellow/Plasma Spark Room.json | 18 ++--- region/maridia/inner-yellow/The Beach.json | 6 +- .../maridia/inner-yellow/Watering Hole.json | 4 +- region/maridia/inner-yellow/Yoink Room.json | 14 ++-- region/maridia/outer/Boyon Gate Hall.json | 8 +-- region/maridia/outer/Crab Hole.json | 10 +-- region/maridia/outer/Fish Tank.json | 18 ++--- region/maridia/outer/Main Street.json | 26 +++---- region/maridia/outer/Mama Turtle Room.json | 18 ++--- region/maridia/outer/Maridia Tube.json | 4 +- region/maridia/outer/Mt. Everest.json | 36 +++++----- region/maridia/outer/Red Fish Room.json | 8 +-- .../norfair/crocomire/Crocomire's Room.json | 18 ++--- .../norfair/crocomire/Grapple Beam Room.json | 2 +- .../crocomire/Grapple Tutorial Room 1.json | 2 +- .../crocomire/Grapple Tutorial Room 2.json | 2 +- .../crocomire/Grapple Tutorial Room 3.json | 10 +-- .../norfair/crocomire/Indiana Jones Room.json | 22 +++--- .../Post Crocomire Farming Room.json | 22 +++--- region/norfair/east/Bat Cave.json | 6 +- region/norfair/east/Bubble Mountain.json | 26 +++---- region/norfair/east/Cathedral Entrance.json | 10 +-- region/norfair/east/Double Chamber.json | 70 +++++++++---------- region/norfair/east/Lava Dive Room.json | 4 +- .../east/Norfair Reserve Tank Room.json | 4 +- region/norfair/east/Red Pirate Shaft.json | 4 +- region/norfair/east/Single Chamber.json | 60 ++++++++-------- region/norfair/east/Speed Booster Hall.json | 2 +- .../norfair/east/Spiky Platforms Tunnel.json | 28 ++++---- .../east/Upper Norfair Farming Room.json | 8 +-- region/norfair/west/Business Center.json | 12 ++-- region/norfair/west/Crocomire Escape.json | 18 ++--- region/norfair/west/Crocomire Speedway.json | 18 ++--- region/norfair/west/Crumble Shaft.json | 4 +- .../west/Hi Jump Energy Tank Room.json | 10 +-- region/norfair/west/Ice Beam Gate Room.json | 6 +- region/norfair/west/Ice Beam Snake Room.json | 16 ++--- .../norfair/west/Ice Beam Tutorial Room.json | 6 +- region/tourian/main/Metroid Room 1.json | 12 ++-- region/tourian/main/Metroid Room 2.json | 6 +- region/tourian/main/Metroid Room 3.json | 2 +- region/tourian/main/Rinka Shaft.json | 26 +++---- region/tourian/main/Seaweed Room.json | 14 ++-- .../tourian/main/Tourian Escape Room 2.json | 2 +- .../tourian/main/Tourian Escape Room 3.json | 4 +- .../tourian/main/Tourian Escape Room 4.json | 10 +-- region/tourian/main/Tourian First Room.json | 4 +- region/wreckedship/main/Bowling Alley.json | 4 +- region/wreckedship/main/Sponge Bath.json | 14 ++-- .../main/Wrecked Ship Energy Tank Room.json | 6 +- .../main/Wrecked Ship Main Shaft.json | 6 +- schema/m3-string-requirements.schema.json | 4 +- strats.md | 6 +- tech.json | 14 ++-- 111 files changed, 732 insertions(+), 732 deletions(-) diff --git a/region/brinstar/blue/Blue Brinstar Boulder Room.json b/region/brinstar/blue/Blue Brinstar Boulder Room.json index 020a0cf7a..a9cc786ea 100644 --- a/region/brinstar/blue/Blue Brinstar Boulder Room.json +++ b/region/brinstar/blue/Blue Brinstar Boulder Room.json @@ -956,7 +956,7 @@ "requires": [ "SpaceJump", {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canSpaceJumpWaterEscape", "HiJump" @@ -1037,7 +1037,7 @@ {"doorUnlockedAtNode": 2}, {"or": [ "canDownGrab", - "canWalljump", + "canWallJump", "Gravity", "HiJump", "canTrickySpringBallJump" diff --git a/region/brinstar/blue/Morph Ball Room.json b/region/brinstar/blue/Morph Ball Room.json index ab469a925..1334704a4 100644 --- a/region/brinstar/blue/Morph Ball Room.json +++ b/region/brinstar/blue/Morph Ball Room.json @@ -1792,7 +1792,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "Morph", "SpaceJump", "HiJump" diff --git a/region/brinstar/green/Early Supers Room.json b/region/brinstar/green/Early Supers Room.json index d6de97bcb..72820a1ee 100644 --- a/region/brinstar/green/Early Supers Room.json +++ b/region/brinstar/green/Early Supers Room.json @@ -281,7 +281,7 @@ "requires": [ "canComplexGMode", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -448,7 +448,7 @@ "types": ["missiles", "powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -484,7 +484,7 @@ "types": ["powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -626,7 +626,7 @@ "canOffScreenMovement", "canComplexGMode", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -709,7 +709,7 @@ "requires": [ {"refill": ["Energy"]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -931,7 +931,7 @@ "name": "Leave Shinecharged (Run Above)", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -1037,7 +1037,7 @@ "requires": [ {"resetRoom": {"nodes": [2]}}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canCrouchJump", {"or": [ @@ -1224,7 +1224,7 @@ }, "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -1259,7 +1259,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json index ee6c8acca..c234aa8c9 100644 --- a/region/brinstar/green/Etecoon Energy Tank Room.json +++ b/region/brinstar/green/Etecoon Energy Tank Room.json @@ -933,14 +933,14 @@ {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}, {"or": [ "h_preciseIceClip", - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}} ]}, {"or": [ "canCrumbleJump", - "canWalljump", + "canWallJump", "HiJump", "SpaceJump" ]} @@ -968,7 +968,7 @@ "Morph", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}} @@ -1366,7 +1366,7 @@ ]}, {"ammo": {"type": "PowerBomb", "count": 2}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -1500,7 +1500,7 @@ ]}, {"ammo": {"type": "PowerBomb", "count": 2}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -1948,7 +1948,7 @@ ]}, {"ammo": {"type": "PowerBomb", "count": 2}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -1990,7 +1990,7 @@ ]}, {"ammo": {"type": "PowerBomb", "count": 2}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -2306,7 +2306,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]} ]} @@ -2342,7 +2342,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]} ]} @@ -2391,7 +2391,7 @@ ]}, {"ammo": {"type": "PowerBomb", "count": 2}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -2432,7 +2432,7 @@ ]}, {"ammo": {"type": "PowerBomb", "count": 2}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", diff --git a/region/brinstar/green/Green Brinstar Main Shaft.json b/region/brinstar/green/Green Brinstar Main Shaft.json index 8b67af28e..50354d7a3 100644 --- a/region/brinstar/green/Green Brinstar Main Shaft.json +++ b/region/brinstar/green/Green Brinstar Main Shaft.json @@ -1489,7 +1489,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 135} ], @@ -1537,7 +1537,7 @@ "requires": [ {"shineChargeFrames": 105}, "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1581,7 +1581,7 @@ }, "requires": [ {"shineChargeFrames": 130}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1625,7 +1625,7 @@ "requires": [ {"shineChargeFrames": 80}, "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 7, "excessFrames": 0}} ], @@ -1671,7 +1671,7 @@ }, "requires": [ {"shineChargeFrames": 110}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 6, "excessFrames": 0}} ], @@ -1832,7 +1832,7 @@ }, "requires": [ {"shineChargeFrames": 145}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -2505,7 +2505,7 @@ }, "requires": [ {"shineChargeFrames": 130}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -2570,7 +2570,7 @@ }, "requires": [ {"shineChargeFrames": 110}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 6, "excessFrames": 0}} ], @@ -3209,7 +3209,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 125} ], @@ -3234,7 +3234,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 145} ], @@ -5286,7 +5286,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", {"and": [ diff --git a/region/brinstar/green/Green Hill Zone.json b/region/brinstar/green/Green Hill Zone.json index b7e5b489f..6d087b99a 100644 --- a/region/brinstar/green/Green Hill Zone.json +++ b/region/brinstar/green/Green Hill Zone.json @@ -181,7 +181,7 @@ {"shineChargeFrames": 130} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 170} ]}, {"shineChargeFrames": 175} @@ -335,7 +335,7 @@ "canSpringBallJumpMidAir", {"and": [ "canSpeedyJump", - "canWalljump" + "canWallJump" ]} ]} ], @@ -888,7 +888,7 @@ "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", - "canWalljump", + "canWallJump", "canUseFrozenEnemies", "canSpringBallJumpMidAir" ]} @@ -1146,7 +1146,7 @@ ]}, {"and": [ "canTrickyDashJump", - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"shineChargeFrames": 155} ]} diff --git a/region/brinstar/kraid/Kraid Room.json b/region/brinstar/kraid/Kraid Room.json index d40d0cd2f..f34bb573d 100644 --- a/region/brinstar/kraid/Kraid Room.json +++ b/region/brinstar/kraid/Kraid Room.json @@ -137,7 +137,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ @@ -163,7 +163,7 @@ {"ammo": {"type": "Missile", "count": 2}}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ @@ -208,7 +208,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ @@ -321,7 +321,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ @@ -601,7 +601,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json index 39e7a53bf..3b136bccb 100644 --- a/region/brinstar/kraid/Warehouse Kihunter Room.json +++ b/region/brinstar/kraid/Warehouse Kihunter Room.json @@ -474,7 +474,7 @@ "canDodgeWhileShooting", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab", "SpaceJump" ]}, @@ -564,7 +564,7 @@ "HiJump", "SpaceJump", "canIBJ", - "canWalljump" + "canWallJump" ]} ], "clearsObstacles": ["C", "D"], diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json index 774075f20..71ab489b8 100644 --- a/region/brinstar/pink/Big Pink.json +++ b/region/brinstar/pink/Big Pink.json @@ -770,7 +770,7 @@ "Morph", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -942,7 +942,7 @@ "canShinechargeMovementComplex", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"shinespark": {"frames": 28, "excessFrames": 0}} ], @@ -1090,7 +1090,7 @@ "Morph", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "canPreciseGrapple", {"and": [ "HiJump", @@ -1446,7 +1446,7 @@ "Morph", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "canPreciseGrapple", {"and": [ "HiJump", @@ -1632,7 +1632,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canSpringBallJumpMidAir" @@ -2470,7 +2470,7 @@ "Morph", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "canPreciseGrapple", {"and": [ "HiJump", @@ -3225,7 +3225,7 @@ "Morph", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "canPreciseGrapple", {"and": [ "HiJump", @@ -3993,7 +3993,7 @@ ]}, {"and": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canInsaneJump" ]}, @@ -4404,7 +4404,7 @@ {"or": [ "Grapple", "SpaceJump", - "canWalljump", + "canWallJump", "canLongIBJ", {"and": [ "HiJump", diff --git a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json index 9fc053f64..e2592cb7f 100644 --- a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json +++ b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json @@ -953,7 +953,7 @@ ]}, {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", {"and": [ "Grapple", "h_midAirShootUp", @@ -983,7 +983,7 @@ "canPrepareForNextRoom", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", {"and": [ "Grapple", "h_midAirShootUp", @@ -1630,7 +1630,7 @@ "link": [2, 2], "name": "Sidehopper Farm", "requires": [ - "canWalljump", + "canWallJump", "canTrickyJump", {"resetRoom": {"nodes": [2]}}, {"or": [ @@ -1717,7 +1717,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", {"and": [ @@ -2658,7 +2658,7 @@ "requires": [ {"obstaclesCleared": ["B"]}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "Grapple", {"and": [ diff --git a/region/brinstar/red/Below Spazer.json b/region/brinstar/red/Below Spazer.json index 49eaf13de..506a8f753 100644 --- a/region/brinstar/red/Below Spazer.json +++ b/region/brinstar/red/Below Spazer.json @@ -406,7 +406,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canJumpIntoIBJ", {"and": [ @@ -1278,7 +1278,7 @@ {"and": [ "canCrumbleJump", "canTrickyJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "canTrickyJump", diff --git a/region/brinstar/red/Beta Power Bomb Room.json b/region/brinstar/red/Beta Power Bomb Room.json index be55fa7b7..1c1cc639e 100644 --- a/region/brinstar/red/Beta Power Bomb Room.json +++ b/region/brinstar/red/Beta Power Bomb Room.json @@ -810,7 +810,7 @@ {"obstaclesCleared": ["B"]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "SpaceJump", "canIBJ", diff --git a/region/brinstar/red/Caterpillar Room.json b/region/brinstar/red/Caterpillar Room.json index c0f6172b2..78d3b0816 100644 --- a/region/brinstar/red/Caterpillar Room.json +++ b/region/brinstar/red/Caterpillar Room.json @@ -255,7 +255,7 @@ "canBePatient", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -277,7 +277,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canTrickyUseFrozenEnemies", @@ -771,7 +771,7 @@ {"resetRoom": {"nodes": [4]}}, {"cycleFrames": 660}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canDoubleBombJump", @@ -788,7 +788,7 @@ {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 840}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"and": [ @@ -817,7 +817,7 @@ {"resetRoom": {"nodes": [6]}}, {"cycleFrames": 1900}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"and": [ @@ -919,7 +919,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canTrickyUseFrozenEnemies", @@ -1031,7 +1031,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -1182,7 +1182,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"shineChargeFrames": 135} ], @@ -1236,7 +1236,7 @@ }, "requires": [ {"shineChargeFrames": 145}, - "canWalljump", + "canWallJump", "canShinechargeMovementTricky" ], "exitCondition": { @@ -1344,7 +1344,7 @@ }, "requires": [ {"shineChargeFrames": 120}, - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}}, {"shinespark": {"frames": 6, "excessFrames": 0}} @@ -1505,7 +1505,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ @@ -1578,7 +1578,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ @@ -1764,7 +1764,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ" ]} @@ -1864,7 +1864,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 155} ], @@ -1909,7 +1909,7 @@ }, "requires": [ {"shineChargeFrames": 155}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1954,7 +1954,7 @@ }, "requires": [ {"shineChargeFrames": 125}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 10, "excessFrames": 0}} ], @@ -2112,7 +2112,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"and": [ @@ -2256,7 +2256,7 @@ "canBePatient", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -2279,7 +2279,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canTrickyUseFrozenEnemies", @@ -2353,7 +2353,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir", @@ -2391,7 +2391,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "h_crouchJumpDownGrab" @@ -2457,7 +2457,7 @@ {"resetRoom": {"nodes": [5]}}, {"cycleFrames": 1340}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"and": [ @@ -2562,7 +2562,7 @@ "canBePatient", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -2589,7 +2589,7 @@ "canBePatient", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -2636,7 +2636,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir", @@ -2684,7 +2684,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canTrickyUseFrozenEnemies", diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json index d27ee2bf2..669dcf257 100644 --- a/region/brinstar/red/Red Brinstar Fireflea Room.json +++ b/region/brinstar/red/Red Brinstar Fireflea Room.json @@ -551,7 +551,7 @@ "canTrickyJump", {"or": [ "canDash", - "canWalljump", + "canWallJump", {"and": [ "canFlatleyJump", {"disableEquipment": "HiJump"} @@ -729,7 +729,7 @@ {"enemyDamage": {"enemy": "Waver", "type": "contact", "hits": 3}} ]}, {"or": [ - "canWalljump", + "canWallJump", "canTrickyDodgeEnemies" ]} ], @@ -1526,7 +1526,7 @@ "canTrickyJump", {"and": [ "canDash", - "canWalljump" + "canWallJump" ]} ]}, {"or": [ @@ -1980,7 +1980,7 @@ "canSpeedyJump", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"or": [ "canTrickyJump", {"spikeHits": 1} diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json index 350ddfbe4..8853af27c 100644 --- a/region/brinstar/red/Red Tower.json +++ b/region/brinstar/red/Red Tower.json @@ -261,7 +261,7 @@ {"and": [ {"resetRoom": {"nodes": [3, 4]}}, "HiJump", - "canWalljump", + "canWallJump", {"cycleFrames": 800} ]}, {"and": [ @@ -805,7 +805,7 @@ "types": ["powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canSpringBallJumpMidAir", @@ -848,7 +848,7 @@ "types": ["powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canSpringBallJumpMidAir", @@ -894,7 +894,7 @@ "types": ["powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canSpringBallJumpMidAir", @@ -938,7 +938,7 @@ "types": ["powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canSpringBallJumpMidAir", @@ -981,7 +981,7 @@ "types": ["powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canSpringBallJumpMidAir", @@ -1027,7 +1027,7 @@ "types": ["powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canSpringBallJumpMidAir", @@ -1061,7 +1061,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump" + "canWallJump" ]}, "canMoondance", "canCount", @@ -1091,7 +1091,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump" + "canWallJump" ]}, "canExtendedMoondance", "canTrickyUseFrozenEnemies", @@ -1430,7 +1430,7 @@ "HiJump", "SpaceJump", "canIBJ", - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -1448,7 +1448,7 @@ "canLongIBJ", "canStaggeredIBJ" ]}, - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -1867,7 +1867,7 @@ ]}, "h_artificialMorphPowerBomb", {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]} ], @@ -1897,7 +1897,7 @@ "h_artificialMorphPowerBomb", "h_artificialMorphLongIBJ", {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]} ], @@ -1922,7 +1922,7 @@ {"notable": "R-Mode Frozen Beetom X-Ray Climb"}, {"noBlueSuit": {}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -2392,7 +2392,7 @@ {"canShineCharge": {"usedTiles": 14, "openEnd": 0}}, {"shinespark": {"frames": 45, "excessFrames": 5}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -2473,7 +2473,7 @@ ]}, "h_artificialMorphPowerBomb", {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]} ], @@ -2503,7 +2503,7 @@ "h_artificialMorphPowerBomb", "h_artificialMorphLongIBJ", {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]} ], @@ -2528,7 +2528,7 @@ {"notable": "R-Mode Frozen Beetom X-Ray Climb"}, {"noBlueSuit": {}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -2915,7 +2915,7 @@ {"canShineCharge": {"usedTiles": 14, "openEnd": 0}}, {"shinespark": {"frames": 45, "excessFrames": 5}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -3223,7 +3223,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -3283,7 +3283,7 @@ "canSpeedyJump", {"or": [ "canTrickyJump", - "canWalljump" + "canWallJump" ]} ]}, {"and": [ @@ -3304,7 +3304,7 @@ "canTrivialUseFrozenEnemies", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canIBJ" ]} @@ -3320,12 +3320,12 @@ "canLongIBJ", {"or": [ {"and": [ - "canWalljump", + "canWallJump", "ScrewAttack" ]}, {"and": [ {"or": [ - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]}, {"ammo": {"type": "PowerBomb", "count": 1}} @@ -3406,7 +3406,7 @@ "link": [7, 6], "name": "Diagonal Bomb Jump", "requires": [ - "canWalljump", + "canWallJump", "canDiagonalBombJump" ], "flashSuitChecked": true, @@ -3583,7 +3583,7 @@ "HiJump", {"and": [ "canCarefulJump", - "canWalljump" + "canWallJump" ]} ]}, {"obstaclesCleared": ["B"]} @@ -3742,7 +3742,7 @@ "h_usePowerBomb", "canCarefulJump", {"or": [ - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "SpaceJump", {"and": [ @@ -3770,7 +3770,7 @@ "requires": [ {"ammo": {"type": "Super", "count": 4}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "canJumpIntoIBJ", @@ -3804,7 +3804,7 @@ "SpaceJump", "canConsecutiveWalljump", {"and": [ - "canWalljump", + "canWallJump", "HiJump" ]} ]} diff --git a/region/brinstar/red/Skree Boost Room.json b/region/brinstar/red/Skree Boost Room.json index 82f6e174d..0af43ed0a 100644 --- a/region/brinstar/red/Skree Boost Room.json +++ b/region/brinstar/red/Skree Boost Room.json @@ -277,7 +277,7 @@ "HiJump", "h_underwaterCrouchJumpDownGrab" ]}, - "canWalljump", + "canWallJump", "Gravity", "SpaceJump", {"and": [ diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json index 7d839b6f1..9d1752d85 100644 --- a/region/crateria/central/Landing Site.json +++ b/region/crateria/central/Landing Site.json @@ -461,7 +461,7 @@ {"or": [ "HiJump", "canSpringBallJumpMidAir", - "canWalljump" + "canWallJump" ]} ]}, {"and": [ @@ -1514,7 +1514,7 @@ "canComplexGMode", "canGModeXRayClimb", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "h_getBlueSpeedMaxRunway", @@ -1607,7 +1607,7 @@ "canComplexGMode", "canGModeXRayClimb", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "h_getBlueSpeedMaxRunway", @@ -1818,7 +1818,7 @@ "name": "Over the Top", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "HiJump", @@ -1965,7 +1965,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ" @@ -2043,7 +2043,7 @@ "h_storedSpark", {"shinespark": {"frames": 54, "excessFrames": 43}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -2066,7 +2066,7 @@ "requires": [ {"haveBlueSuit": {}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "HiJump", "canSpringBallJumpMidAir" diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json index 22f722f30..e58b5bfed 100644 --- a/region/crateria/central/Parlor and Alcatraz.json +++ b/region/crateria/central/Parlor and Alcatraz.json @@ -2556,7 +2556,7 @@ {"shineChargeFrames": 165}, "canShinechargeMovementComplex", "HiJump", - "canWalljump", + "canWallJump", "Morph" ], "exitCondition": { @@ -2586,7 +2586,7 @@ ]}, "canShinechargeMovementComplex", "HiJump", - "canWalljump", + "canWallJump", "Morph", {"shinespark": {"frames": 5, "excessFrames": 0}} ], @@ -2619,7 +2619,7 @@ ]}, "canShinechargeMovementComplex", "HiJump", - "canWalljump", + "canWallJump", "Morph", {"shinespark": {"frames": 3, "excessFrames": 0}} ], diff --git a/region/crateria/east/Crab Maze.json b/region/crateria/east/Crab Maze.json index 014e8a6a9..0ce8cf908 100644 --- a/region/crateria/east/Crab Maze.json +++ b/region/crateria/east/Crab Maze.json @@ -999,7 +999,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab", "canIBJ", "canSpringBallJumpMidAir" diff --git a/region/crateria/east/East Ocean.json b/region/crateria/east/East Ocean.json index d2e24e7d3..ae47e3083 100644 --- a/region/crateria/east/East Ocean.json +++ b/region/crateria/east/East Ocean.json @@ -247,7 +247,7 @@ "name": "Leave Shinecharged (Wall Jump, Short Runway)", "requires": [ "Gravity", - "canWalljump", + "canWallJump", {"canShineCharge": { "usedTiles": 12, "steepUpTiles": 3, @@ -531,7 +531,7 @@ "canMockball", {"or": [ "canDownGrab", - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -607,7 +607,7 @@ "canTrickyJump", "canDownGrab" ]}, - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -1060,7 +1060,7 @@ {"or": [ "HiJump", {"and": [ - "canWalljump", + "canWallJump", {"cycleFrames": 45} ]} ]}, @@ -1290,7 +1290,7 @@ "requires": [ "canSpaceJumpWaterBounce", {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canTrickyJump", "canDownGrab" @@ -1525,7 +1525,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canLongIBJ", @@ -1621,7 +1621,7 @@ "canSpringFling" ]}, "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -1752,7 +1752,7 @@ "requires": [ "canShinechargeMovementComplex", "Gravity", - "canWalljump", + "canWallJump", {"canShineCharge": { "usedTiles": 22, "steepUpTiles": 3, @@ -1776,7 +1776,7 @@ "requires": [ "canShinechargeMovementComplex", "Gravity", - "canWalljump", + "canWallJump", {"canShineCharge": { "usedTiles": 17, "steepUpTiles": 2, diff --git a/region/crateria/east/The Moat.json b/region/crateria/east/The Moat.json index 1e24816be..0f7afc08d 100644 --- a/region/crateria/east/The Moat.json +++ b/region/crateria/east/The Moat.json @@ -780,7 +780,7 @@ ]}, {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]}, {"and": [ "Gravity", @@ -1005,7 +1005,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "canGravityJump", {"and": [ "canSpringBallJumpMidAir", @@ -1252,7 +1252,7 @@ "SpaceJump", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]} ]} ], @@ -1613,7 +1613,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"or": [ "canDash", "canTrickyJump" diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json index 7f675f0fc..e5d602367 100644 --- a/region/crateria/east/West Ocean.json +++ b/region/crateria/east/West Ocean.json @@ -519,7 +519,7 @@ "requires": [ "HiJump", "canTrickyDashJump", - "canWalljump", + "canWallJump", {"canShineCharge": {"usedTiles": 25, "steepUpTiles": 4, "openEnd": 1}}, "canShinechargeMovementComplex", {"shineChargeFrames": 125} @@ -571,7 +571,7 @@ "requires": [ {"canShineCharge": {"usedTiles": 32, "steepUpTiles": 4, "openEnd": 1}}, "canTrickyDashJump", - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"shinespark": {"frames": 10, "excessFrames": 0}} ], @@ -592,7 +592,7 @@ "requires": [ {"canShineCharge": {"usedTiles": 18, "steepUpTiles": 4, "openEnd": 1}}, "canTrickyDashJump", - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", "canInsaneJump", {"shineChargeFrames": 170} @@ -1186,7 +1186,7 @@ "requires": [ {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", {"and": [ "canLongIBJ", "Gravity" @@ -1328,7 +1328,7 @@ "canSkipDoorLock", {"or": [ "canArtificialMorph", - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "canLongIBJ", @@ -1407,7 +1407,7 @@ {"notable": "Get Inside the Bridge"}, {"or": [ "canArtificialMorph", - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "canLongIBJ", @@ -1469,7 +1469,7 @@ "canGModeXRayClimb", {"or": [ "canArtificialMorph", - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "canLongIBJ", @@ -1672,7 +1672,7 @@ "link": [5, 4], "name": "Wall Jump", "requires": [ - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -3022,7 +3022,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canIBJ", "canGravityJump" @@ -3329,7 +3329,7 @@ {"resetRoom": {"nodes": [4]}}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"cycleFrames": 380} ]}, {"and": [ @@ -3388,7 +3388,7 @@ ]}, {"and": [ "Gravity", - "canWalljump", + "canWallJump", {"cycleFrames": 650}, {"or": [ "canDash", @@ -3409,7 +3409,7 @@ ]}, {"and": [ "canDash", - "canWalljump", + "canWallJump", {"cycleFrames": 1420} ]} ]} @@ -3429,7 +3429,7 @@ {"and": [ "Gravity", "canDash", - "canWalljump", + "canWallJump", {"cycleFrames": 820} ]}, {"and": [ diff --git a/region/crateria/west/Statues Room.json b/region/crateria/west/Statues Room.json index 902b2c8bc..e9190b5f0 100644 --- a/region/crateria/west/Statues Room.json +++ b/region/crateria/west/Statues Room.json @@ -184,7 +184,7 @@ "SpaceJump", "canIBJ", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", "canGravityJump" ]} ], @@ -304,7 +304,7 @@ "f_TourianOpen", "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -329,7 +329,7 @@ "f_TourianOpen", "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 9, "excessFrames": 0}} ], @@ -379,7 +379,7 @@ {"shineChargeFrames": 120}, "f_TourianOpen", "Gravity", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 8, "excessFrames": 0}} ], diff --git a/region/lowernorfair/east/Amphitheatre.json b/region/lowernorfair/east/Amphitheatre.json index b739a08cf..895687205 100644 --- a/region/lowernorfair/east/Amphitheatre.json +++ b/region/lowernorfair/east/Amphitheatre.json @@ -228,7 +228,7 @@ "canPrepareForNextRoom", {"or": [ "SpaceJump", - "canWalljump" + "canWallJump" ]}, {"heatFrames": 80}, {"doorUnlockedAtNode": 1} @@ -351,7 +351,7 @@ "requires": [ "canDash", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canSpringBallJumpMidAir", @@ -387,7 +387,7 @@ "requires": [ "canDash", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canTrickySpringBallJump", @@ -1326,7 +1326,7 @@ ]}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 345} ]}, {"and": [ @@ -1334,7 +1334,7 @@ {"heatFrames": 345} ]}, {"and": [ - "canWalljump", + "canWallJump", "HiJump", {"heatFrames": 300} ]}, @@ -1394,7 +1394,7 @@ "canInsaneJump", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 460} ]}, {"and": [ @@ -1643,7 +1643,7 @@ {"heatFrames": 500}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 390} ]}, {"and": [ diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json index 2c3a3f359..ac6723b81 100644 --- a/region/lowernorfair/east/Fast Pillars Setup Room.json +++ b/region/lowernorfair/east/Fast Pillars Setup Room.json @@ -139,7 +139,7 @@ "canDodgeWhileShooting" ]}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -303,7 +303,7 @@ "canDodgeWhileShooting", "canTrickyJump", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump" ]}, @@ -419,7 +419,7 @@ {"heatFrames": 155} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 135} ]} ]}, @@ -506,7 +506,7 @@ "requires": [ {"or": [ "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", "SpaceJump" ]}, {"or": [ @@ -854,7 +854,7 @@ }, "requires": [ "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", "canTrickyDodgeEnemies", {"heatFrames": 145}, {"shineChargeFrames": 140} @@ -887,7 +887,7 @@ "HiJump", "canShinechargeMovementComplex", "canDodgeWhileShooting", - "canWalljump", + "canWallJump", {"heatFrames": 115}, {"shineChargeFrames": 110} ], @@ -919,7 +919,7 @@ "HiJump", "ScrewAttack", "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"heatFrames": 105}, {"shineChargeFrames": 100} ], @@ -980,7 +980,7 @@ "requires": [ "ScrewAttack", "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"heatFrames": 125}, {"shineChargeFrames": 120} ], @@ -1008,7 +1008,7 @@ "requires": [ {"shineChargeFrames": 135}, "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", "canDodgeWhileShooting", {"heatFrames": 135} ], @@ -1087,7 +1087,7 @@ "requires": [ {"shineChargeFrames": 95}, "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", "canDodgeWhileShooting", {"heatFrames": 130}, {"shinespark": {"frames": 12, "excessFrames": 0}} @@ -1114,7 +1114,7 @@ "requires": [ {"shineChargeFrames": 105}, "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", "canDodgeWhileShooting", {"heatFrames": 140}, {"shinespark": {"frames": 11, "excessFrames": 0}} @@ -1190,7 +1190,7 @@ "h_heatedGMode", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", {"and": [ @@ -2961,7 +2961,7 @@ "canInsaneJump" ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", {"and": [ "SpaceJump", diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json index b9d03b53c..c65b52ccc 100644 --- a/region/lowernorfair/east/Lower Norfair Fireflea Room.json +++ b/region/lowernorfair/east/Lower Norfair Fireflea Room.json @@ -1672,7 +1672,7 @@ "name": "HiJump Walljump", "requires": [ "HiJump", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -1684,7 +1684,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", "canUseFrozenEnemies" ]}, {"and": [ @@ -1885,7 +1885,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]} ], diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json index 7af8e378a..85bab2964 100644 --- a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json +++ b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json @@ -539,7 +539,7 @@ }, "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -810,7 +810,7 @@ }, "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -868,7 +868,7 @@ "requires": [ "canOffScreenMovement", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -968,7 +968,7 @@ {"and": [ {"resetRoom": {"nodes": [1]}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump" ]}, @@ -1226,7 +1226,7 @@ "requires": [ "h_heatedGMode", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -1328,7 +1328,7 @@ ]}, {"heatFrames": 160}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -1422,7 +1422,7 @@ }, "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -2229,7 +2229,7 @@ {"heatFrames": 140} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 170} ]}, {"and": [ @@ -2522,7 +2522,7 @@ {"heatFrames": 120} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 150} ]}, {"and": [ diff --git a/region/lowernorfair/east/Main Hall.json b/region/lowernorfair/east/Main Hall.json index 4007c1908..495be914e 100644 --- a/region/lowernorfair/east/Main Hall.json +++ b/region/lowernorfair/east/Main Hall.json @@ -236,7 +236,7 @@ {"heatFrames": 90}, {"or": [ "Gravity", - "canWalljump", + "canWallJump", {"and": [ "HiJump", {"acidFrames": 20}, @@ -855,7 +855,7 @@ {"heatFrames": 90}, {"or": [ "Gravity", - "canWalljump", + "canWallJump", {"and": [ "HiJump", {"acidFrames": 20}, diff --git a/region/lowernorfair/east/Mickey Mouse Room.json b/region/lowernorfair/east/Mickey Mouse Room.json index c0303625f..a87f63256 100644 --- a/region/lowernorfair/east/Mickey Mouse Room.json +++ b/region/lowernorfair/east/Mickey Mouse Room.json @@ -1787,7 +1787,7 @@ {"heatFrames": 160}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "HiJump", {"and": [ @@ -2811,7 +2811,7 @@ {"enemyDamage": {"enemy": "Multiviola", "type": "contact", "hits": 1}}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "HiJump", "SpaceJump", @@ -2841,7 +2841,7 @@ "h_XRayMorphIceClip", {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "HiJump", "SpaceJump", diff --git a/region/lowernorfair/east/Pillar Room.json b/region/lowernorfair/east/Pillar Room.json index d56b9e62c..212cbfb87 100644 --- a/region/lowernorfair/east/Pillar Room.json +++ b/region/lowernorfair/east/Pillar Room.json @@ -428,7 +428,7 @@ {"heatFrames": 660} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 660}, {"or": [ "canWallJumpInstantMorph", @@ -929,7 +929,7 @@ "canInsaneJump", {"and": [ "canTrickyJump", - "canWalljump" + "canWallJump" ]}, {"acidFrames": 5} ]}, @@ -984,7 +984,7 @@ "canInsaneJump", {"and": [ "canTrickyJump", - "canWalljump" + "canWallJump" ]} ]} ]}, @@ -993,7 +993,7 @@ {"heatFrames": 20}, {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]} ]}, @@ -1045,7 +1045,7 @@ "canInsaneJump", {"and": [ "canTrickyJump", - "canWalljump" + "canWallJump" ]} ]} ]}, @@ -1054,7 +1054,7 @@ {"heatFrames": 20}, {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]} ]}, @@ -1101,7 +1101,7 @@ {"heatFrames": 690} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 660}, {"acidFrames": 36} ]}, diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json index c51eca9bb..b8b2f6317 100644 --- a/region/lowernorfair/east/Red Kihunter Shaft.json +++ b/region/lowernorfair/east/Red Kihunter Shaft.json @@ -970,7 +970,7 @@ "canTrickyDodgeEnemies", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"heatFrames": 570} ], diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json index 477fb1947..de498cec6 100644 --- a/region/lowernorfair/east/Ridley's Room.json +++ b/region/lowernorfair/east/Ridley's Room.json @@ -452,7 +452,7 @@ {"not": "f_DefeatedRidley"}, "canRiskPermanentLossOfAccess" ]}, - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -525,7 +525,7 @@ {"or": [ {"and": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump" @@ -655,7 +655,7 @@ "canPrepareForNextRoom", {"or": [ "SpaceJump", - "canWalljump" + "canWallJump" ]}, {"heatFrames": 80}, {"doorUnlockedAtNode": 2} @@ -694,7 +694,7 @@ "canComplexGMode", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpringBallJumpMidAir" @@ -731,7 +731,7 @@ "requires": [ {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", {"and": [ "canJumpIntoIBJ", "canInsaneJump", @@ -866,7 +866,7 @@ {"or": [ {"and": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump" @@ -958,7 +958,7 @@ "link": [3, 2], "name": "Wall Jump", "requires": [ - "canWalljump", + "canWallJump", {"or": [ {"and": [ "HiJump", diff --git a/region/lowernorfair/east/The Worst Room In The Game.json b/region/lowernorfair/east/The Worst Room In The Game.json index 17300c87e..b6ac4d1c3 100644 --- a/region/lowernorfair/east/The Worst Room In The Game.json +++ b/region/lowernorfair/east/The Worst Room In The Game.json @@ -472,7 +472,7 @@ "canTrickyUseFrozenEnemies", "HiJump", {"or": [ - "canWalljump", + "canWallJump", "canTrickyDodgeEnemies" ]} ]}, @@ -495,7 +495,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 20} ]}, {"heatFrames": 120} @@ -655,7 +655,7 @@ "canTrickyUseFrozenEnemies", "HiJump", {"or": [ - "canWalljump", + "canWallJump", "canTrickyDodgeEnemies" ]} ]}, @@ -1009,7 +1009,7 @@ "canTrickyUseFrozenEnemies", "Charge", "canPreciseWalljump", - "canWalljumpWithCharge", + "canWallJumpWithCharge", "canTrivialMidAirMorph", "canTrickyDodgeEnemies", {"ammo": {"type": "Missile", "count": 1}}, @@ -1048,7 +1048,7 @@ "Charge", "canPreciseWalljump", "canResetFallSpeed", - "canWalljumpWithCharge", + "canWallJumpWithCharge", "h_useMorphBombs", "canWallJumpInstantMorph", "canTrickyDodgeEnemies", @@ -1211,7 +1211,7 @@ "ScrewAttack", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 265} ]}, {"and": [ @@ -1232,7 +1232,7 @@ {"haveBlueSuit": {}}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 265} ]}, {"and": [ @@ -1475,7 +1475,7 @@ {"or": [ {"and": [ "canTrickyJump", - "canWalljump", + "canWallJump", {"heatFrames": 165} ]}, {"and": [ @@ -1507,7 +1507,7 @@ {"or": [ {"and": [ "canTrickyJump", - "canWalljump", + "canWallJump", {"heatFrames": 175} ]}, {"and": [ @@ -1542,7 +1542,7 @@ "requires": [ "canShinechargeMovementTricky", {"or": [ - "canWalljump", + "canWallJump", "canInsaneJump" ]}, {"heatFrames": 205}, @@ -1724,7 +1724,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 20} ]}, {"heatFrames": 120} @@ -1751,7 +1751,7 @@ "h_artificialMorphPowerBomb", {"or": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 20} ]}, {"heatFrames": 120} @@ -2188,7 +2188,7 @@ {"or": [ {"heatFrames": 180}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 160} ]}, {"and": [ @@ -2741,7 +2741,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 150} ]}, {"and": [ @@ -2831,7 +2831,7 @@ "canMidAirMorph", "h_useMorphBombs", "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 200}, {"or": [ {"and": [ diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index af3224be9..f5478e55e 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -160,7 +160,7 @@ "h_crouchJumpDownGrab", {"cycleFrames": 60} ]}, - "canWalljump", + "canWallJump", "HiJump", {"and": [ "SpaceJump", @@ -563,7 +563,7 @@ "HiJump", "canSpeedyJump", "canCarefulJump", - "canWalljump", + "canWallJump", {"or": [ "canInsaneWalljump", {"acidFrames": 30} @@ -733,7 +733,7 @@ {"heatFrames": 340} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 290} ]}, {"and": [ @@ -786,7 +786,7 @@ ]}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 410} ]}, {"and": [ @@ -870,7 +870,7 @@ ]}, {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]} ], "clearsObstacles": ["A", "B"], @@ -891,7 +891,7 @@ ]}, {"and": [ "canUseIFrames", - "canWalljump" + "canWallJump" ]}, {"and": [ "canUseIFrames", @@ -930,7 +930,7 @@ "requires": [ "canDash", {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]}, "canTrickyJump", @@ -966,7 +966,7 @@ ]}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 360} ]}, {"and": [ @@ -1024,7 +1024,7 @@ ]}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canSpringBallJumpMidAir", @@ -1062,7 +1062,7 @@ "Plasma", {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canSpringBallJumpMidAir", @@ -1099,7 +1099,7 @@ ]}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canSpringBallJumpMidAir", @@ -1141,7 +1141,7 @@ ]}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canSpringBallJumpMidAir", @@ -1182,7 +1182,7 @@ ]}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canSpringBallJumpMidAir", @@ -1220,7 +1220,7 @@ }}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -1441,7 +1441,7 @@ {"obstaclesCleared": ["A"]}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -1555,7 +1555,7 @@ ]}, {"or": [ "h_crouchJumpDownGrab", - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", diff --git a/region/lowernorfair/east/Wasteland.json b/region/lowernorfair/east/Wasteland.json index 202151c68..5b979baf5 100644 --- a/region/lowernorfair/east/Wasteland.json +++ b/region/lowernorfair/east/Wasteland.json @@ -338,7 +338,7 @@ "canUseEnemies", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 390} ]}, {"and": [ diff --git a/region/lowernorfair/west/Acid Statue Room.json b/region/lowernorfair/west/Acid Statue Room.json index a1e9a415f..41e9445a1 100644 --- a/region/lowernorfair/west/Acid Statue Room.json +++ b/region/lowernorfair/west/Acid Statue Room.json @@ -300,7 +300,7 @@ "canSuitlessLavaDive", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]}, {"acidFrames": 110}, @@ -342,7 +342,7 @@ {"heatFrames": 230} ]}, {"and": [ - "canWalljump", + "canWallJump", {"acidFrames": 90}, {"heatFrames": 245} ]}, @@ -743,7 +743,7 @@ ]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canDoubleBombJump" ]}, @@ -1080,7 +1080,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]}, {"heatFrames": 120} @@ -1590,7 +1590,7 @@ {"heatFrames": 55} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 55} ]}, {"and": [ diff --git a/region/lowernorfair/west/Fast Ripper Room.json b/region/lowernorfair/west/Fast Ripper Room.json index fd42c4a54..83de7c240 100644 --- a/region/lowernorfair/west/Fast Ripper Room.json +++ b/region/lowernorfair/west/Fast Ripper Room.json @@ -1706,7 +1706,7 @@ {"heatFrames": 270}, {"and": [ "h_speedJump", - "canWalljump", + "canWallJump", {"heatFrames": 225} ]} ]} @@ -1773,7 +1773,7 @@ {"heatFrames": 300}, {"and": [ "h_speedJump", - "canWalljump", + "canWallJump", {"heatFrames": 225} ]} ]} @@ -1793,7 +1793,7 @@ {"heatFrames": 270}, {"and": [ "h_speedJump", - "canWalljump", + "canWallJump", {"heatFrames": 225} ]} ]}, diff --git a/region/lowernorfair/west/Golden Torizo's Room.json b/region/lowernorfair/west/Golden Torizo's Room.json index c701c15ea..773f16d9a 100644 --- a/region/lowernorfair/west/Golden Torizo's Room.json +++ b/region/lowernorfair/west/Golden Torizo's Room.json @@ -1580,7 +1580,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 200} ]}, {"and": [ @@ -1665,7 +1665,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 125} ]}, {"and": [ @@ -2208,7 +2208,7 @@ {"and": [ "f_DefeatedGoldenTorizo", "canTrickyDashJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "f_DefeatedGoldenTorizo", @@ -2220,7 +2220,7 @@ {"canShineCharge": {"usedTiles": 28, "openEnd": 0}}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"shinespark": {"frames": 9, "excessFrames": 4}} ]}, {"and": [ @@ -2274,7 +2274,7 @@ {"and": [ "f_DefeatedGoldenTorizo", "canTrickyDashJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "f_DefeatedGoldenTorizo", @@ -2286,7 +2286,7 @@ {"canShineCharge": {"usedTiles": 28, "openEnd": 0}}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"shinespark": {"frames": 9, "excessFrames": 4}} ]}, {"and": [ @@ -2324,7 +2324,7 @@ {"and": [ "HiJump", {"or": [ - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canSpeedyJump" ]} @@ -2340,7 +2340,7 @@ {"and": [ "f_DefeatedGoldenTorizo", "canTrickyDashJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "f_DefeatedGoldenTorizo", diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json index f2cfa0853..fe992496e 100644 --- a/region/lowernorfair/west/Screw Attack Room.json +++ b/region/lowernorfair/west/Screw Attack Room.json @@ -343,7 +343,7 @@ }, "requires": [ "ScrewAttack", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"heatFrames": 155}, {"shineChargeFrames": 160} @@ -370,7 +370,7 @@ }, "requires": [ "ScrewAttack", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"heatFrames": 170}, {"shinespark": {"frames": 2, "excessFrames": 0}} @@ -395,7 +395,7 @@ "requires": [ {"shineChargeFrames": 145}, "ScrewAttack", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"heatFrames": 170}, {"shinespark": {"frames": 2, "excessFrames": 0}} @@ -1373,7 +1373,7 @@ "requires": [ {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "canSpeedyJump", @@ -1433,7 +1433,7 @@ {"or": [ {"heatFrames": 180}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 150} ]}, {"and": [ @@ -1474,11 +1474,11 @@ {"heatFrames": 170} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 160} ]}, {"and": [ - "canWalljump", + "canWallJump", "HiJump", {"heatFrames": 140} ]} @@ -1632,7 +1632,7 @@ "ScrewAttack", "HiJump", "canSpeedyJump", - "canWalljump", + "canWallJump", {"heatFrames": 150} ], "clearsObstacles": ["A"], @@ -1657,7 +1657,7 @@ "HiJump", "canSpeedyJump", "canTrickyJump", - "canWalljump", + "canWallJump", {"heatFrames": 150} ], "clearsObstacles": ["A"], @@ -1704,7 +1704,7 @@ "ScrewAttack", "HiJump", "canTrickyDashJump", - "canWalljump", + "canWallJump", {"heatFrames": 150} ], "clearsObstacles": ["A"], @@ -1832,7 +1832,7 @@ "h_blueJump", "HiJump", "canInsaneJump", - "canWalljump", + "canWallJump", {"heatFrames": 130} ], "clearsObstacles": ["A"], @@ -2032,7 +2032,7 @@ "canGModeXRayClimb", "h_heatProof", {"or": [ - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab", "HiJump", "SpaceJump", @@ -2503,7 +2503,7 @@ {"and": [ "h_usePowerBomb", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -2573,7 +2573,7 @@ {"and": [ "h_usePowerBomb", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -2848,7 +2848,7 @@ }, "requires": [ "canShinechargeMovementTricky", - "canWalljump", + "canWallJump", {"heatFrames": 145}, {"shineChargeFrames": 145} ], @@ -2984,7 +2984,7 @@ "requires": [ "ScrewAttack", "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"heatFrames": 145}, {"shineChargeFrames": 145} ], @@ -3512,7 +3512,7 @@ "startsWithShineCharge": true, "requires": [ "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"or": [ "ScrewAttack", {"obstaclesCleared": ["B"]} @@ -3855,7 +3855,7 @@ {"heatFrames": 80} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 50} ]}, {"and": [ diff --git a/region/maridia/inner-green/East Sand Hall.json b/region/maridia/inner-green/East Sand Hall.json index e6917f8e7..18baf0aa1 100644 --- a/region/maridia/inner-green/East Sand Hall.json +++ b/region/maridia/inner-green/East Sand Hall.json @@ -1505,7 +1505,7 @@ "canPlayInSand", {"or": [ "HiJump", - "canWalljump", + "canWallJump", {"and": [ "canGravityJump", "h_doubleEquipmentScreenCycleFrames" @@ -1571,7 +1571,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canGravityJump", @@ -2022,7 +2022,7 @@ "Gravity", {"or": [ "canPlayInSand", - "canWalljump", + "canWallJump", "h_useSpringBall" ]}, {"or": [ @@ -2221,7 +2221,7 @@ ]}, "canPlayInSand", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canUseFrozenEnemies", "canGravityJump", diff --git a/region/maridia/inner-green/Pants Room.json b/region/maridia/inner-green/Pants Room.json index 1a1ccd069..342087c9e 100644 --- a/region/maridia/inner-green/Pants Room.json +++ b/region/maridia/inner-green/Pants Room.json @@ -162,7 +162,7 @@ "canOffScreenMovement", {"or": [ "canTrickyJump", - "canWalljump", + "canWallJump", "SpaceJump" ]} ], @@ -767,7 +767,7 @@ "canDownBack" ]} ]}, - "canWalljump", + "canWallJump", "canResetFallSpeed" ]} ], @@ -810,7 +810,7 @@ "ScrewAttack", {"haveBlueSuit": {}}, "canTrickyWalljump", - "canWalljumpWithCharge", + "canWallJumpWithCharge", {"enemyDamage": {"enemy": "Menu", "type": "contact", "hits": 1}} ]} ], @@ -827,7 +827,7 @@ {"or": [ {"and": [ "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ]}, "canSpaceJumpWaterEscape" ]}, diff --git a/region/maridia/inner-green/Spring Ball Room.json b/region/maridia/inner-green/Spring Ball Room.json index c41408cc6..4f8eaacf4 100644 --- a/region/maridia/inner-green/Spring Ball Room.json +++ b/region/maridia/inner-green/Spring Ball Room.json @@ -162,7 +162,7 @@ {"and": [ "canMidAirMorph", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canGravityJump", "SpaceJump", diff --git a/region/maridia/inner-green/West Sand Hall.json b/region/maridia/inner-green/West Sand Hall.json index 7d68ed53d..8206476a8 100644 --- a/region/maridia/inner-green/West Sand Hall.json +++ b/region/maridia/inner-green/West Sand Hall.json @@ -1359,7 +1359,7 @@ "Gravity", {"or": [ "canPlayInSand", - "canWalljump", + "canWallJump", "h_useSpringBall", "canCarefulJump" ]}, diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json index 7f8a871ea..0833ece87 100644 --- a/region/maridia/inner-pink/Aqueduct.json +++ b/region/maridia/inner-pink/Aqueduct.json @@ -548,7 +548,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", @@ -793,7 +793,7 @@ {"or": [ {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 100} ]}, {"and": [ @@ -806,7 +806,7 @@ {"shineChargeFrames": 125} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 125} ]}, {"and": [ @@ -1508,7 +1508,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", diff --git a/region/maridia/inner-pink/Botwoon Hallway.json b/region/maridia/inner-pink/Botwoon Hallway.json index 6862bdcfd..98c9b3ad3 100644 --- a/region/maridia/inner-pink/Botwoon Hallway.json +++ b/region/maridia/inner-pink/Botwoon Hallway.json @@ -1153,7 +1153,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", {"cycleFrames": 150} ]} diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json index 5170dfe87..c87e7c423 100644 --- a/region/maridia/inner-pink/Colosseum.json +++ b/region/maridia/inner-pink/Colosseum.json @@ -89,7 +89,7 @@ "Gravity", {"or": [ "SpaceJump", - "canWalljump" + "canWallJump" ]} ]} ]}, @@ -247,7 +247,7 @@ "Grapple", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]} ]} ], @@ -516,7 +516,7 @@ {"or": [ {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"or": [ "canPlayInSand", "canConsecutiveWalljump" @@ -624,7 +624,7 @@ {"and": [ {"shinespark": {"frames": 128, "excessFrames": 21}}, "canControlShinesparkEnd", - "canWalljump" + "canWallJump" ]} ]} ], @@ -759,7 +759,7 @@ "requires": [ {"notable": "Spike Platforming with Move Assist (Left to Right)"}, "canDash", - "canWalljump", + "canWallJump", "Morph", "canUseIFrames", {"or": [ @@ -800,7 +800,7 @@ }, "requires": [ {"notable": "Spike Platforming with Spring Ball (Left to Right)"}, - "canWalljump", + "canWallJump", "Morph", "canUseIFrames", "h_useSpringBall", @@ -826,7 +826,7 @@ "requires": [ {"notable": "Spike Platforming with No Equipment"}, "canDash", - "canWalljump", + "canWallJump", "canInsaneJump", "canHorizontalDamageBoost", "canUseIFrames", @@ -1328,7 +1328,7 @@ "link": [2, 2], "name": "Gain Flash Suit (X-Mode Spikesuit)", "requires": [ - "canWalljump", + "canWallJump", "canTrickyUseFrozenEnemies", "canTrickySpikeSuit", "h_spikeXModeSpikeSuit", @@ -1374,7 +1374,7 @@ "Grapple", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]} ]} ], @@ -1411,7 +1411,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", @@ -2216,7 +2216,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 95} ]} ]} @@ -2248,7 +2248,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 95} ]}, {"and": [ @@ -2287,7 +2287,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"or": [ {"shineChargeFrames": 85}, {"and": [ @@ -2342,7 +2342,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"or": [ {"shineChargeFrames": 75}, {"and": [ @@ -2389,7 +2389,7 @@ "canConsecutiveWalljump", "Grapple", {"and": [ - "canWalljump", + "canWallJump", "HiJump", "canPlayInSand" ]} @@ -2487,7 +2487,7 @@ {"shinespark": {"frames": 127, "excessFrames": 16}}, "canControlShinesparkEnd", {"or": [ - "canWalljump", + "canWallJump", "canTrickyJump" ]} ]} @@ -3101,7 +3101,7 @@ "Gravity", {"or": [ "SpaceJump", - "canWalljump" + "canWallJump" ]} ]} ]}, @@ -3444,7 +3444,7 @@ "Grapple", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]} ]} ], diff --git a/region/maridia/inner-pink/Crab Shaft.json b/region/maridia/inner-pink/Crab Shaft.json index 4d004d238..1edacae18 100644 --- a/region/maridia/inner-pink/Crab Shaft.json +++ b/region/maridia/inner-pink/Crab Shaft.json @@ -713,7 +713,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canUseFrozenEnemies", @@ -1612,7 +1612,7 @@ {"resetRoom": {"nodes": [3]}}, "Gravity", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump" ]}, diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json index f50cd8b0c..d92e59063 100644 --- a/region/maridia/inner-pink/Draygon's Room.json +++ b/region/maridia/inner-pink/Draygon's Room.json @@ -142,7 +142,7 @@ {"and": [ "f_DefeatedDraygon", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "h_breakOneDraygonTurret" ]} @@ -393,7 +393,7 @@ {"enemyDamage": {"enemy": "Draygon", "type": "turretProjectile", "hits": 1}} ]}, {"or": [ - "canWalljump", + "canWallJump", "canGravityJump" ]} ]} @@ -897,7 +897,7 @@ "HiJump", "canSpeedyJump", {"or": [ - "canWalljump", + "canWallJump", "canTrickyJump" ]} ], @@ -1012,7 +1012,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 155} ]}, {"and": [ @@ -1443,7 +1443,7 @@ {"and": [ "f_DefeatedDraygon", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "h_breakOneDraygonTurret" ]} diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json index 60ea9cd9f..3851ed477 100644 --- a/region/maridia/inner-pink/East Cactus Alley.json +++ b/region/maridia/inner-pink/East Cactus Alley.json @@ -149,7 +149,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"cycleFrames": 310} ]}, {"and": [ @@ -192,7 +192,7 @@ {"and": [ "HiJump", "canSpaceJumpWaterBounce", - "canWalljump", + "canWallJump", {"cycleFrames": 390} ]}, {"and": [ @@ -203,7 +203,7 @@ {"and": [ {"notable": "Suitless Bootless Space Jump"}, "canSpaceJumpWaterBounce", - "canWalljump", + "canWallJump", {"cycleFrames": 440} ]}, {"and": [ @@ -649,7 +649,7 @@ "Gravity", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"cycleFrames": 740} ]}, {"and": [ @@ -682,7 +682,7 @@ {"and": [ "HiJump", "canSpaceJumpWaterBounce", - "canWalljump", + "canWallJump", {"cycleFrames": 810} ]}, {"and": [ @@ -818,7 +818,7 @@ "Gravity", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "h_IBJFromSpikes" ]} ], @@ -881,7 +881,7 @@ "canSpaceJumpWaterEscape", {"and": [ "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ]} ]} ], @@ -1026,7 +1026,7 @@ }, "requires": [ {"or": [ - "canWalljump", + "canWallJump", "canTrickySpringBallJump", "SpaceJump" ]}, @@ -1077,7 +1077,7 @@ "requires": [ "HiJump", {"or": [ - "canWalljump", + "canWallJump", "canTrickyJump", "canSpeedyJump" ]}, @@ -1494,7 +1494,7 @@ ]}, {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]} ], @@ -1587,7 +1587,7 @@ "canSpaceJumpWaterEscape", {"and": [ "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ]} ]} ], @@ -1601,7 +1601,7 @@ "requires": [ {"notable": "Suitless Bootless Space Jump"}, "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -1825,7 +1825,7 @@ "Gravity", {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canDiagonalBombJump", "h_IBJFromSpikes" @@ -1996,7 +1996,7 @@ ]}, {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", "HiJump", "canIBJ", "canHBJ", @@ -2059,7 +2059,7 @@ {"spikeHits": 1}, {"or": [ "Gravity", - "canWalljump", + "canWallJump", "canSpaceJumpWaterEscape", "canSpringBallJumpMidAir", {"and": [ @@ -2106,7 +2106,7 @@ {"or": [ "canTrickySpringBallJump", {"and": [ - "canWalljump", + "canWallJump", "canSpaceJumpWaterBounce" ]}, {"and": [ @@ -2154,7 +2154,7 @@ {"and": [ "HiJump", {"or": [ - "canWalljump", + "canWallJump", "canDownGrab", "canSpaceJumpWaterEscape", "canSpringBallJumpMidAir" diff --git a/region/maridia/inner-pink/East Sand Pit.json b/region/maridia/inner-pink/East Sand Pit.json index 73aec5cac..da96b2246 100644 --- a/region/maridia/inner-pink/East Sand Pit.json +++ b/region/maridia/inner-pink/East Sand Pit.json @@ -165,7 +165,7 @@ {"or": [ {"and": [ {"or": [ - "canWalljump", + "canWallJump", "canGravityJump", "HiJump" ]}, @@ -668,7 +668,7 @@ "requires": [ {"or": [ "Gravity", - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json index b76b9206a..599ceed29 100644 --- a/region/maridia/inner-pink/Halfie Climb Room.json +++ b/region/maridia/inner-pink/Halfie Climb Room.json @@ -164,7 +164,7 @@ "Gravity", {"or": [ "SpaceJump", - "canWalljump" + "canWallJump" ]} ]} ]}, @@ -813,7 +813,7 @@ "HiJump", {"or": [ "canSpringBallJumpMidAir", - "canWalljump" + "canWallJump" ]} ]}, "canConsecutiveWalljump" @@ -898,7 +898,7 @@ {"or": [ {"and": [ "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ]}, "canSpaceJumpWaterEscape" ]} @@ -954,7 +954,7 @@ "canCrossRoomJumpIntoWater", "canTrickyJump", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]} ], @@ -994,7 +994,7 @@ "requires": [ "canCrossRoomJumpIntoWater", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]} ], @@ -1259,7 +1259,7 @@ {"shineChargeFrames": 125}, "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1289,7 +1289,7 @@ ]}, "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 7, "excessFrames": 0}} ], @@ -1320,7 +1320,7 @@ ]}, "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 18, "excessFrames": 0}} ], @@ -1550,7 +1550,7 @@ "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", - "canWalljump", + "canWallJump", "canGravityJump", {"and": [ "HiJump", @@ -1759,7 +1759,7 @@ "requires": [ "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 120} ], @@ -1785,7 +1785,7 @@ }, "requires": [ "Gravity", - "canWalljump", + "canWallJump", "canFastWalljumpClimb", "canShinechargeMovementComplex", {"shineChargeFrames": 145} @@ -1910,7 +1910,7 @@ {"shineChargeFrames": 90}, "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1940,7 +1940,7 @@ ]}, "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 2, "excessFrames": 0}} ], @@ -4653,7 +4653,7 @@ "Gravity", {"or": [ "SpaceJump", - "canWalljump" + "canWallJump" ]} ]} ]}, diff --git a/region/maridia/inner-pink/West Cactus Alley.json b/region/maridia/inner-pink/West Cactus Alley.json index 39468ec28..9896af891 100644 --- a/region/maridia/inner-pink/West Cactus Alley.json +++ b/region/maridia/inner-pink/West Cactus Alley.json @@ -127,7 +127,7 @@ "h_crouchJumpDownGrab", "canUseFrozenEnemies", "canGravityJump", - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -179,7 +179,7 @@ "canSpaceJumpWaterBounce", {"or": [ "canTrickyJump", - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -610,7 +610,7 @@ {"shineChargeFrames": 120} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 150} ]} ]} @@ -641,7 +641,7 @@ {"shineChargeFrames": 115} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 130} ]} ]} @@ -673,7 +673,7 @@ {"shinespark": {"frames": 6, "excessFrames": 0}} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 110}, {"shinespark": {"frames": 5, "excessFrames": 0}} ]} @@ -712,7 +712,7 @@ {"shineChargeFrames": 110} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 110} ]} ]}, @@ -1202,7 +1202,7 @@ {"cycleFrames": 360} ]}, {"and": [ - "canWalljump", + "canWallJump", {"cycleFrames": 390} ]}, {"and": [ diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json index 1400583cc..4eca17e32 100644 --- a/region/maridia/inner-pink/West Sand Pit.json +++ b/region/maridia/inner-pink/West Sand Pit.json @@ -189,7 +189,7 @@ {"or": [ "HiJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", "canIBJ", "canGravityJump" ]} diff --git a/region/maridia/inner-yellow/Kassiuz Room.json b/region/maridia/inner-yellow/Kassiuz Room.json index 0f7ceb416..c0a73d17a 100644 --- a/region/maridia/inner-yellow/Kassiuz Room.json +++ b/region/maridia/inner-yellow/Kassiuz Room.json @@ -137,7 +137,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "SpaceJump", {"cycleFrames": 300} @@ -228,7 +228,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", diff --git a/region/maridia/inner-yellow/Maridia Elevator Room.json b/region/maridia/inner-yellow/Maridia Elevator Room.json index 505c517c3..9472f9c19 100644 --- a/region/maridia/inner-yellow/Maridia Elevator Room.json +++ b/region/maridia/inner-yellow/Maridia Elevator Room.json @@ -226,7 +226,7 @@ {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 470}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]} ]}, @@ -274,7 +274,7 @@ "HiJump", "SpaceJump", "canIBJ", - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab", "canSpringBallJumpMidAir" ]} @@ -460,7 +460,7 @@ "canShinechargeMovementComplex", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"shinespark": {"frames": 17, "excessFrames": 0}} ], @@ -555,7 +555,7 @@ {"shinespark": {"frames": 15, "excessFrames": 0}} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 85}, {"shinespark": {"frames": 20, "excessFrames": 0}} ]} @@ -595,7 +595,7 @@ {"shinespark": {"frames": 14, "excessFrames": 0}} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 90}, {"shinespark": {"frames": 19, "excessFrames": 0}} ]} @@ -718,7 +718,7 @@ ]} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 40}, {"shinespark": {"frames": 43, "excessFrames": 11}} ]} @@ -794,7 +794,7 @@ "enemies": [["Ripper", "Ripper", "Ripper"]] }}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]} ]}, @@ -1020,7 +1020,7 @@ "canConsecutiveWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, "SpaceJump" ]}, @@ -1381,7 +1381,7 @@ "enemies": [["Ripper", "Ripper", "Ripper"]] }}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]} ]}, diff --git a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json index 48482e8ce..dd8f7ba7a 100644 --- a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json +++ b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json @@ -835,7 +835,7 @@ "canCarefulJump", "canCrouchJump", "canDownGrab", - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -920,7 +920,7 @@ "requires": [ {"or": [ "canIBJ", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]}, {"or": [ @@ -981,11 +981,11 @@ {"canShineCharge": {"usedTiles": 20, "openEnd": 2}}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 125} ]}, {"and": [ - "canWalljump", + "canWallJump", "canSpeedyJump", {"shineChargeFrames": 120} ]}, diff --git a/region/maridia/inner-yellow/Plasma Room.json b/region/maridia/inner-yellow/Plasma Room.json index 2187c171a..a53946a22 100644 --- a/region/maridia/inner-yellow/Plasma Room.json +++ b/region/maridia/inner-yellow/Plasma Room.json @@ -321,7 +321,7 @@ {"and": [ "canDoubleBombJump", {"or": [ - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab" ]}, {"cycleFrames": 1410} @@ -492,7 +492,7 @@ {"canShineCharge": {"usedTiles": 21, "openEnd": 0}}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpeedyJump", "canSpringBallJumpMidAir" ]}, @@ -533,7 +533,7 @@ ]}, {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]}, {"and": [ @@ -550,7 +550,7 @@ {"or": [ {"and": [ "canShinechargeMovementComplex", - "canWalljump" + "canWallJump" ]}, {"and": [ "canShinechargeMovementTricky", @@ -591,7 +591,7 @@ {"and": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpeedyJump", "canTrickySpringBallJump", "SpaceJump" @@ -600,7 +600,7 @@ ]}, {"and": [ {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canShinechargeMovementTricky", {"or": [ @@ -788,7 +788,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab", "HiJump", "SpaceJump", @@ -891,7 +891,7 @@ "requires": [ "HiJump", "canSpeedyJump", - "canWalljump", + "canWallJump", {"or": [ "canTrickyJump", {"obstaclesCleared": ["B"]} diff --git a/region/maridia/inner-yellow/Plasma Spark Room.json b/region/maridia/inner-yellow/Plasma Spark Room.json index b1100becb..6f94789c2 100644 --- a/region/maridia/inner-yellow/Plasma Spark Room.json +++ b/region/maridia/inner-yellow/Plasma Spark Room.json @@ -279,7 +279,7 @@ {"cycleFrames": 120} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", {"and": [ "SpaceJump", @@ -433,7 +433,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", {"and": [ @@ -541,7 +541,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -566,7 +566,7 @@ {"or": [ "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump", - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -628,7 +628,7 @@ {"and": [ {"shinespark": {"frames": 90, "excessFrames": 59}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump", @@ -1322,7 +1322,7 @@ "canSuitlessMaridia", "canSpringBallJumpMidAir", {"or": [ - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump" ]} @@ -1441,7 +1441,7 @@ {"or": [ "HiJump", "canTrickySpringBallJump", - "canWalljump", + "canWallJump", {"and": [ "canGravityJump", "canShinechargeMovementTricky" @@ -1978,7 +1978,7 @@ "requires": [ "canTrickyUseFrozenEnemies", "HiJump", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -2246,7 +2246,7 @@ "SpaceJump", {"and": [ "canConsecutiveWalljump", - "canWalljumpWithCharge" + "canWallJumpWithCharge" ]} ]}, {"enemyKill": { diff --git a/region/maridia/inner-yellow/The Beach.json b/region/maridia/inner-yellow/The Beach.json index 0dcf740e8..5f6096191 100644 --- a/region/maridia/inner-yellow/The Beach.json +++ b/region/maridia/inner-yellow/The Beach.json @@ -289,7 +289,7 @@ "Gravity", {"or": [ "h_crouchJumpDownGrab", - "canWalljump" + "canWallJump" ]}, {"cycleFrames": 130} ]} @@ -563,7 +563,7 @@ "requires": [ "Gravity", "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"canShineCharge": { "usedTiles": 28, "gentleUpTiles": 4, @@ -1036,7 +1036,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpeedyJump", diff --git a/region/maridia/inner-yellow/Watering Hole.json b/region/maridia/inner-yellow/Watering Hole.json index 23a73a49d..96d332dd1 100644 --- a/region/maridia/inner-yellow/Watering Hole.json +++ b/region/maridia/inner-yellow/Watering Hole.json @@ -331,7 +331,7 @@ {"canShineCharge": {"usedTiles": 19, "openEnd": 1}}, {"shinespark": {"frames": 20, "excessFrames": 11}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -385,7 +385,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", diff --git a/region/maridia/inner-yellow/Yoink Room.json b/region/maridia/inner-yellow/Yoink Room.json index f0fbbb932..d0f96a71c 100644 --- a/region/maridia/inner-yellow/Yoink Room.json +++ b/region/maridia/inner-yellow/Yoink Room.json @@ -262,7 +262,7 @@ {"or": [ "Gravity", "HiJump", - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump", "canUseFrozenEnemies" @@ -755,7 +755,7 @@ {"or": [ "Gravity", "HiJump", - "canWalljump", + "canWallJump", {"and": [ "h_underwaterCrouchJumpDownGrab", {"doorUnlockedAtNode": 1} @@ -1338,7 +1338,7 @@ {"or": [ "Gravity", "HiJump", - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump", "canUseFrozenEnemies" @@ -1454,7 +1454,7 @@ "canSuitlessMaridia", "canCarefulJump", {"or": [ - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump" ]}, @@ -1477,7 +1477,7 @@ "canSuitlessMaridia", {"obstaclesCleared": ["A"]}, {"or": [ - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump" ]}, @@ -1733,7 +1733,7 @@ "canSuitlessMaridia", "canCarefulJump", {"or": [ - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump" ]}, @@ -1756,7 +1756,7 @@ "canSuitlessMaridia", {"obstaclesCleared": ["B"]}, {"or": [ - "canWalljump", + "canWallJump", "h_underwaterCrouchJumpDownGrab", "canTrickySpringBallJump" ]}, diff --git a/region/maridia/outer/Boyon Gate Hall.json b/region/maridia/outer/Boyon Gate Hall.json index 90f39eb83..0a2c23b41 100644 --- a/region/maridia/outer/Boyon Gate Hall.json +++ b/region/maridia/outer/Boyon Gate Hall.json @@ -368,7 +368,7 @@ }, "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", @@ -397,7 +397,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", @@ -878,7 +878,7 @@ }, "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", "canJumpIntoIBJ", @@ -1636,7 +1636,7 @@ {"refill": ["Energy"]}, "canShinechargeMovementTricky", {"or": [ - "canWalljump", + "canWallJump", {"and": [ "SpaceJump", "HiJump" diff --git a/region/maridia/outer/Crab Hole.json b/region/maridia/outer/Crab Hole.json index bb97cfd3a..78a48ce89 100644 --- a/region/maridia/outer/Crab Hole.json +++ b/region/maridia/outer/Crab Hole.json @@ -964,7 +964,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", "canMidAirMorph" ]}, {"and": [ @@ -997,7 +997,7 @@ "requires": [ "canMidAirMorph", "Gravity", - "canWalljump", + "canWallJump", "canTrickyDashJump" ], "flashSuitChecked": true, @@ -1015,7 +1015,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canTrickyUseFrozenEnemies" ]}, @@ -2659,7 +2659,7 @@ "HiJump", {"or": [ "canSpringBallJumpMidAir", - "canWalljump" + "canWallJump" ]} ]}, {"and": [ @@ -3878,7 +3878,7 @@ "HiJump", {"or": [ "canSpringBallJumpMidAir", - "canWalljump" + "canWallJump" ]} ]}, {"and": [ diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json index 5308a41cd..4054336a1 100644 --- a/region/maridia/outer/Fish Tank.json +++ b/region/maridia/outer/Fish Tank.json @@ -918,7 +918,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ", {"and": [ @@ -2391,7 +2391,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", {"and": [ @@ -3182,7 +3182,7 @@ "canLongIBJ", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -3200,7 +3200,7 @@ "Gravity", "canUseFrozenEnemies", {"or": [ - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -3608,7 +3608,7 @@ {"or": [ {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "canPreciseWalljump", @@ -3884,7 +3884,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", {"cycleFrames": 90} ]}, {"or": [ @@ -3896,7 +3896,7 @@ {"and": [ {"haveBlueSuit": {}}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]}, {"cycleFrames": 300} @@ -3917,7 +3917,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canGravityJump", @@ -4041,7 +4041,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canDodgeWhileShooting", "canGravityJump", diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json index 1d1db0023..bd4dfb3a2 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -330,7 +330,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "canGravityJump", "SpaceJump", "canIBJ", @@ -1109,7 +1109,7 @@ "canGravityJump", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]}, {"and": [ "Gravity", @@ -1164,7 +1164,7 @@ "canGravityJump", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]}, {"and": [ "Gravity", @@ -2266,7 +2266,7 @@ "canGravityJump", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]}, {"and": [ "Gravity", @@ -2320,7 +2320,7 @@ "canGravityJump", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]}, {"and": [ "Gravity", @@ -2446,7 +2446,7 @@ "types": ["missiles", "powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "canGravityJump" ]} ] @@ -2491,7 +2491,7 @@ "types": ["missiles", "powerbomb"], "requires": [ {"or": [ - "canWalljump", + "canWallJump", "canGravityJump" ]} ] @@ -2637,7 +2637,7 @@ "canDash", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump" ]}, {"or": [ @@ -3384,7 +3384,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canUseFrozenEnemies", @@ -5222,7 +5222,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir", @@ -5647,7 +5647,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir", @@ -6137,7 +6137,7 @@ "canGravityJump", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]}, {"and": [ "Gravity", @@ -6190,7 +6190,7 @@ "canGravityJump", {"and": [ "Gravity", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", diff --git a/region/maridia/outer/Mama Turtle Room.json b/region/maridia/outer/Mama Turtle Room.json index 3c5de42a7..460882ddc 100644 --- a/region/maridia/outer/Mama Turtle Room.json +++ b/region/maridia/outer/Mama Turtle Room.json @@ -915,7 +915,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canLongIBJ" ]} @@ -1009,7 +1009,7 @@ {"or": [ "canConsecutiveWalljump", {"and": [ - "canWalljump", + "canWallJump", "HiJump" ]}, "SpaceJump", @@ -1042,7 +1042,7 @@ {"or": [ {"and": [ "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ]}, "canSpaceJumpWaterEscape" ]} @@ -1060,7 +1060,7 @@ {"or": [ "canConsecutiveWalljump", {"and": [ - "canWalljump", + "canWallJump", "HiJump" ]}, "SpaceJump", @@ -1308,7 +1308,7 @@ "canDisableEquipment" ]}, "canUseGrapple", - "canWalljump", + "canWallJump", "SpaceJump" ]}, {"obstaclesCleared": ["B"]} @@ -1502,7 +1502,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "HiJump", @@ -1535,7 +1535,7 @@ {"or": [ "h_midAirShootUp", "HiJump", - "canWalljump" + "canWallJump" ]} ]} ]} @@ -1580,7 +1580,7 @@ "HiJump", "canTrickyJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ], "clearsObstacles": ["B"], "flashSuitChecked": true, @@ -1731,7 +1731,7 @@ "HiJump", "canTrickyJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ], "clearsObstacles": ["B"], "flashSuitChecked": true, diff --git a/region/maridia/outer/Maridia Tube.json b/region/maridia/outer/Maridia Tube.json index 3ebafa21c..274218df3 100644 --- a/region/maridia/outer/Maridia Tube.json +++ b/region/maridia/outer/Maridia Tube.json @@ -957,7 +957,7 @@ "requires": [ "f_MaridiaTubeBroken", "Gravity", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 145} ], @@ -1047,7 +1047,7 @@ "f_MaridiaTubeBroken", "Gravity", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 115} ], diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index 5830ca2eb..e0f6d1f98 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -1430,7 +1430,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpeedyJump", "SpaceJump", "canIBJ", @@ -2149,7 +2149,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpeedyJump", "SpaceJump", "canSpringBallJumpMidAir", @@ -2268,7 +2268,7 @@ {"or": [ "canGravityJump", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canJumpIntoIBJ", "canSpringBallJumpMidAir" @@ -2306,7 +2306,7 @@ {"and": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "HiJump", {"and": [ "canSpringBallJumpMidAir", @@ -2450,7 +2450,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -2940,7 +2940,7 @@ "Gravity", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir", @@ -4713,7 +4713,7 @@ {"or": [ "canGravityJump", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -4750,7 +4750,7 @@ {"or": [ "canGravityJump", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -4893,7 +4893,7 @@ {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 1125}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canGravityJump", {"cycleFrames": 55}, @@ -4910,7 +4910,7 @@ {"resetRoom": {"nodes": [3]}}, {"cycleFrames": 1145}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canGravityJump", {"cycleFrames": 80}, @@ -4931,7 +4931,7 @@ "Morph", {"cycleFrames": 1400}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canGravityJump", {"cycleFrames": 55}, @@ -4968,7 +4968,7 @@ {"cycleFrames": 400} ]}, {"or": [ - "canWalljump", + "canWallJump", "SpaceJump" ]}, {"or": [ @@ -5207,7 +5207,7 @@ "Gravity", "HiJump", "canTrickyDashJump", - "canWalljump" + "canWallJump" ], "clearsObstacles": ["A", "B"], "flashSuitChecked": true, @@ -5606,7 +5606,7 @@ ]}, "HiJump", "SpaceJump", - "canWalljump", + "canWallJump", "canGravityJump", "canIBJ", "canSpringBallJumpMidAir" @@ -5832,7 +5832,7 @@ "name": "First Frame Dash Jump with Wall Jump", "requires": [ "Gravity", - "canWalljump", + "canWallJump", "canTrickyDashJump" ], "flashSuitChecked": true, @@ -6024,7 +6024,7 @@ {"and": [ "HiJump", "canTrickyDashJump", - "canWalljump" + "canWallJump" ]}, "canGravityJump" ]} @@ -6118,7 +6118,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", "canSpeedyJump" ]} ]} @@ -6380,7 +6380,7 @@ {"and": [ "HiJump", {"or": [ - "canWalljump", + "canWallJump", "canTrickyDashJump" ]} ]} diff --git a/region/maridia/outer/Red Fish Room.json b/region/maridia/outer/Red Fish Room.json index d4fbc3105..373a02314 100644 --- a/region/maridia/outer/Red Fish Room.json +++ b/region/maridia/outer/Red Fish Room.json @@ -499,7 +499,7 @@ "HiJump", {"or": [ {"and": [ - "canWalljump", + "canWallJump", "canCarefulJump" ]}, "canSpringBallJumpMidAir" @@ -516,7 +516,7 @@ {"or": [ {"and": [ "canSpaceJumpWaterBounce", - "canWalljump" + "canWallJump" ]}, {"and": [ "canSpaceJumpWaterEscape", @@ -535,7 +535,7 @@ "canSuitlessMaridia", "canUseFrozenEnemies", {"or": [ - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", {"and": [ "HiJump", @@ -885,7 +885,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", {"and": [ "canIBJ", diff --git a/region/norfair/crocomire/Crocomire's Room.json b/region/norfair/crocomire/Crocomire's Room.json index addbfa0bf..75ee33511 100644 --- a/region/norfair/crocomire/Crocomire's Room.json +++ b/region/norfair/crocomire/Crocomire's Room.json @@ -489,7 +489,7 @@ "HiJump", "SpaceJump", "canIBJ", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]} ], @@ -683,7 +683,7 @@ "requires": [ {"acidFrames": 100}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canDash", {"acidFrames": 15} @@ -703,7 +703,7 @@ {"acidFrames": 75}, {"or": [ "canDash", - "canWalljump", + "canWallJump", {"acidFrames": 25} ]} ], @@ -810,7 +810,7 @@ "HiJump", "SpaceJump", "canIBJ", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]} ], @@ -822,7 +822,7 @@ "link": [4, 2], "name": "Leave Shinecharged with Walljump", "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovement", {"or": [ {"canShineCharge": {"usedTiles": 22, "openEnd": 1}}, @@ -1026,7 +1026,7 @@ {"or": [ {"and": [ "canDash", - "canWalljump", + "canWallJump", {"acidFrames": 20} ]}, {"and": [ @@ -1045,7 +1045,7 @@ "name": "Acid Bath Wall Jump", "requires": [ "f_DefeatedCrocomire", - "canWalljump", + "canWallJump", {"or": [ {"and": [ "canDash", @@ -1068,7 +1068,7 @@ "requires": [ "f_DefeatedCrocomire", "canLateralMidAirMorph", - "canWalljump", + "canWallJump", {"acidFrames": 35} ], "flashSuitChecked": true, @@ -1135,7 +1135,7 @@ "f_DefeatedCrocomire", "h_speedJump", "canTrickyJump", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/norfair/crocomire/Grapple Beam Room.json b/region/norfair/crocomire/Grapple Beam Room.json index fe618b62e..0d880d8cf 100644 --- a/region/norfair/crocomire/Grapple Beam Room.json +++ b/region/norfair/crocomire/Grapple Beam Room.json @@ -491,7 +491,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab", "canSpringBallJumpMidAir" ]} diff --git a/region/norfair/crocomire/Grapple Tutorial Room 1.json b/region/norfair/crocomire/Grapple Tutorial Room 1.json index 6653f44d1..d1a859af4 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 1.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 1.json @@ -87,7 +87,7 @@ {"or": [ "canDash", "Grapple", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canBombJumpWaterEscape", diff --git a/region/norfair/crocomire/Grapple Tutorial Room 2.json b/region/norfair/crocomire/Grapple Tutorial Room 2.json index 9e269f4b7..b65475ec0 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 2.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 2.json @@ -215,7 +215,7 @@ "Grapple", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]}, "h_midAirShootUp" ], diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json index 41198b69d..644c8810f 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 3.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 3.json @@ -578,7 +578,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "canIBJ", @@ -597,7 +597,7 @@ "canSpeedyJump", "canTrickyJump", {"or": [ - "canWalljump", + "canWallJump", "canLateralMidAirMorph" ]} ], @@ -617,7 +617,7 @@ "requires": [ "canTrickyJump", {"or": [ - "canWalljump", + "canWallJump", "canLateralMidAirMorph" ]} ], @@ -638,7 +638,7 @@ "canCarefulJump", {"or": [ "canTrickyJump", - "canWalljump", + "canWallJump", "canLateralMidAirMorph" ]} ], @@ -1378,7 +1378,7 @@ "requires": [ "Gravity", {"or": [ - "canWalljump", + "canWallJump", "canGravityJump", "canLongIBJ", {"and": [ diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json index 1a98c2308..ab95dba79 100644 --- a/region/norfair/crocomire/Indiana Jones Room.json +++ b/region/norfair/crocomire/Indiana Jones Room.json @@ -274,7 +274,7 @@ }, "requires": [ "canSpeedyJump", - "canWalljump", + "canWallJump", "canCarefulJump" ], "flashSuitChecked": true, @@ -332,7 +332,7 @@ "canShinechargeMovementComplex", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"shinespark": {"frames": 80}} ]}, {"and": [ @@ -360,7 +360,7 @@ "canShinechargeMovementComplex", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"shinespark": {"frames": 80}} ]}, {"and": [ @@ -660,7 +660,7 @@ "link": [2, 1], "name": "Wall Jump Shinespark to Left Door", "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"obstaclesCleared": ["B"]}, {"or": [ @@ -776,7 +776,7 @@ "requires": [ {"obstaclesCleared": ["B", "E"]}, {"canShineCharge": {"usedTiles": 32, "gentleUpTiles": 6, "openEnd": 1}}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 85}} ], @@ -1251,7 +1251,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canWalljump", + "canWallJump", {"cycleFrames": 120} ]}, {"and": [ @@ -1656,7 +1656,7 @@ "canSpeedyJump", {"or": [ "canSpringBallJumpMidAir", - "canWalljump" + "canWallJump" ]} ], "flashSuitChecked": true, @@ -1725,7 +1725,7 @@ "canTrickyJump", {"and": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]}, {"acidFrames": 25} @@ -2251,7 +2251,7 @@ "Morph" ]}, {"or": [ - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]} ], @@ -2271,7 +2271,7 @@ "canManipulateMellas", "canBePatient", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", {"and": [ @@ -2310,7 +2310,7 @@ "canConsecutiveWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]} ], diff --git a/region/norfair/crocomire/Post Crocomire Farming Room.json b/region/norfair/crocomire/Post Crocomire Farming Room.json index 21e6e6482..d90174c28 100644 --- a/region/norfair/crocomire/Post Crocomire Farming Room.json +++ b/region/norfair/crocomire/Post Crocomire Farming Room.json @@ -162,7 +162,7 @@ ]}, "canShinechargeMovementTricky", "canTrickyDashJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 160} ], "exitCondition": { @@ -219,7 +219,7 @@ }}, "canShinechargeMovementTricky", "canTrickyDashJump", - "canWalljump", + "canWallJump", {"shinespark": {"frames": 12, "excessFrames": 0}} ], "exitCondition": { @@ -279,7 +279,7 @@ "HiJump", {"or": [ "canSpeedyJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]} ]} @@ -616,7 +616,7 @@ "canTrickyUseFrozenEnemies", {"or": [ {"and": [ - "canWalljump", + "canWallJump", "canDash" ]}, "canTrickyJump" @@ -646,7 +646,7 @@ "requires": [ "h_runOverRespawningEnemies", "canTrickyDashJump", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -717,7 +717,7 @@ {"notable": "Damage Boost"}, "canTrickyJump", {"or": [ - "canWalljump", + "canWallJump", {"and": [ "h_crouchJumpDownGrab", "canTrickyDodgeEnemies" @@ -1185,7 +1185,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir" ]} ], @@ -1344,7 +1344,7 @@ "gentleDownTiles": 4, "openEnd": 1 }}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 15, "excessFrames": 0}} ], @@ -1425,7 +1425,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canFastWalljumpClimb", "canShinechargeMovementComplex", {"shineChargeFrames": 165} @@ -1847,7 +1847,7 @@ "gentleDownTiles": 4, "openEnd": 1 }}, - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"shinespark": {"frames": 5, "excessFrames": 0}} ], @@ -1951,7 +1951,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "canTrickyUseFrozenEnemies", {"and": [ diff --git a/region/norfair/east/Bat Cave.json b/region/norfair/east/Bat Cave.json index fa37c6f59..32f30a181 100644 --- a/region/norfair/east/Bat Cave.json +++ b/region/norfair/east/Bat Cave.json @@ -128,7 +128,7 @@ "requires": [ "canDash", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canSpringBallJumpMidAir" @@ -146,7 +146,7 @@ {"haveBlueSuit": {}}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 210} ]}, {"and": [ @@ -251,7 +251,7 @@ {"heatFrames": 160} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 180} ]}, {"and": [ diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json index c433ee374..4e042df21 100644 --- a/region/norfair/east/Bubble Mountain.json +++ b/region/norfair/east/Bubble Mountain.json @@ -540,7 +540,7 @@ "name": "Walljump", "requires": [ "canDash", - "canWalljump", + "canWallJump", "canCarefulJump", {"or": [ "canCameraManip", @@ -1751,7 +1751,7 @@ {"or": [ "canTrickyWalljump", "ScrewAttack", - "canWalljumpWithCharge", + "canWallJumpWithCharge", {"and": [ "canWallJumpInstantMorph", {"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}} @@ -1777,7 +1777,7 @@ {"or": [ "canTrickyWalljump", "ScrewAttack", - "canWalljumpWithCharge", + "canWallJumpWithCharge", {"and": [ "canWallJumpInstantMorph", {"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}} @@ -1803,7 +1803,7 @@ {"or": [ "canTrickyWalljump", "ScrewAttack", - "canWalljumpWithCharge", + "canWallJumpWithCharge", {"and": [ "canWallJumpInstantMorph", {"enemyDamage": {"enemy": "Cacatac", "type": "spike", "hits": 1}} @@ -1896,7 +1896,7 @@ ]}, "canHeroShot", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"shinespark": {"frames": 27, "excessFrames": 0}}, {"or": [ @@ -3602,13 +3602,13 @@ "canShinechargeMovementComplex", {"or": [ {"and": [ - "canWalljump", + "canWallJump", "canSpeedyJump", {"shineChargeFrames": 80}, {"shinespark": {"frames": 11, "excessFrames": 0}} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 95}, {"shinespark": {"frames": 10, "excessFrames": 0}} ]}, @@ -3670,7 +3670,7 @@ "requires": [ "canShinechargeMovementComplex", "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 135} ], "exitCondition": { @@ -4550,7 +4550,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canSpringBallJumpMidAir" @@ -4703,7 +4703,7 @@ "HiJump", "canSpringBallJumpMidAir", {"and": [ - "canWalljump", + "canWallJump", "canTrickyUseFrozenEnemies" ]}, {"and": [ @@ -4828,7 +4828,7 @@ "canDash", "HiJump", "canCarefulJump", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -4842,7 +4842,7 @@ "canUseFrozenEnemies", "canCarefulJump", {"or": [ - "canWalljump", + "canWallJump", {"and": [ "canTrickyUseFrozenEnemies", {"or": [ @@ -5052,7 +5052,7 @@ {"noBlueSuit": {}}, "ScrewAttack", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"and": [ diff --git a/region/norfair/east/Cathedral Entrance.json b/region/norfair/east/Cathedral Entrance.json index 3d7fc2026..cc5bdaae5 100644 --- a/region/norfair/east/Cathedral Entrance.json +++ b/region/norfair/east/Cathedral Entrance.json @@ -147,7 +147,7 @@ {"or": [ {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"cycleFrames": 450} ]}, {"and": [ @@ -289,7 +289,7 @@ "canTrickyDashJump", {"and": [ "canTrickyUseFrozenEnemies", - "canWalljump" + "canWallJump" ]}, {"and": [ {"canShineCharge": {"usedTiles": 43, "openEnd": 0}}, @@ -887,7 +887,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 180} ]}, {"and": [ @@ -961,7 +961,7 @@ "name": "Frozen Sova", "requires": [ "canTrickyUseFrozenEnemies", - "canWalljump", + "canWallJump", {"heatFrames": 950} ], "flashSuitChecked": true, @@ -1314,7 +1314,7 @@ {"notable": "Speedy Jump (Left to Right)"}, "canTrickyDashJump", {"or": [ - "canWalljump", + "canWallJump", "h_heatProof", "canInsaneJump" ]}, diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json index 2c9e92e5b..62c39f078 100644 --- a/region/norfair/east/Double Chamber.json +++ b/region/norfair/east/Double Chamber.json @@ -383,7 +383,7 @@ "SpaceJump", "canTrickySpringBallJump", {"and": [ - "canWalljump", + "canWallJump", {"or": [ "canDash", "HiJump", @@ -461,11 +461,11 @@ {"and": [ "canDash", "HiJump", - "canWalljump", + "canWallJump", "canTrickyJump" ]}, {"and": [ - "canWalljump", + "canWallJump", "canUseIFrames", {"spikeHits": 1}, "h_spikeJumpWithActiveEnemies" @@ -608,7 +608,7 @@ {"noBlueSuit": {}}, {"enemyDamage": {"enemy": "Ripper 2 (green)", "type": "contact", "hits": 1}}, {"or": [ - "canWalljump", + "canWallJump", "canSpeedyJump" ]} ]}, @@ -1427,7 +1427,7 @@ "requires": [ {"or": [ "SpaceJump", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -1755,7 +1755,7 @@ "SpaceJump", "canTrickySpringBallJump", {"and": [ - "canWalljump", + "canWallJump", {"or": [ "canDash", "HiJump", @@ -1852,11 +1852,11 @@ {"and": [ "canDash", "HiJump", - "canWalljump", + "canWallJump", "canTrickyJump" ]}, {"and": [ - "canWalljump", + "canWallJump", "canUseIFrames", {"spikeHits": 1}, "h_spikeJumpWithActiveEnemies" @@ -2141,7 +2141,7 @@ "name": "HiJump Wall Jump", "requires": [ "HiJump", - "canWalljump", + "canWallJump", "canTrickyJump", {"or": [ {"and": [ @@ -2230,7 +2230,7 @@ "name": "Tricky Dash Jump Wall Jump", "requires": [ "canTrickyDashJump", - "canWalljump", + "canWallJump", {"heatFrames": 300}, {"or": [ {"noFlashSuit": {}}, @@ -2318,7 +2318,7 @@ "requires": [ "canPrepareForNextRoom", "HiJump", - "canWalljump", + "canWallJump", "canTrickyJump", {"heatFrames": 260}, {"or": [ @@ -2385,7 +2385,7 @@ {"or": [ "SpaceJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -2444,7 +2444,7 @@ {"or": [ "SpaceJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -2521,7 +2521,7 @@ {"noBlueSuit": {}}, {"enemyDamage": {"enemy": "Ripper 2 (green)", "type": "contact", "hits": 1}}, {"or": [ - "canWalljump", + "canWallJump", "canSpeedyJump" ]} ]}, @@ -2709,7 +2709,7 @@ "canInsaneWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -2851,7 +2851,7 @@ "canInsaneWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -2979,7 +2979,7 @@ {"or": [ {"and": [ "canTrickyDashJump", - "canWalljump" + "canWallJump" ]}, "SpaceJump" ]}, @@ -3021,7 +3021,7 @@ {"or": [ {"and": [ "canTrickyDashJump", - "canWalljump" + "canWallJump" ]}, "SpaceJump" ]}, @@ -3113,7 +3113,7 @@ "name": "X-Mode with Walljump", "requires": [ "h_spikeXModeShinecharge", - "canWalljump", + "canWallJump", {"heatFrames": 540}, {"shinespark": {"frames": 5}} ], @@ -3138,7 +3138,7 @@ ]}, {"and": [ {"heatFrames": 540}, - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"shineChargeFrames": 160} ]} @@ -3187,7 +3187,7 @@ "canInsaneWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -3482,7 +3482,7 @@ {"heatFrames": 20} ]} ]}, - "canWalljump", + "canWallJump", "HiJump", {"heatFrames": 230} ], @@ -3498,7 +3498,7 @@ "HiJump", "canInsaneJump", "canCrumbleJump", - "canWalljump", + "canWallJump", {"heatFrames": 340} ], "flashSuitChecked": true, @@ -3686,7 +3686,7 @@ "canInsaneWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -3802,7 +3802,7 @@ "canInsaneWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -3983,7 +3983,7 @@ "canInsaneWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -4106,7 +4106,7 @@ "canInsaneWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -4286,7 +4286,7 @@ "name": "Walljump", "requires": [ "canDash", - "canWalljump", + "canWallJump", {"heatFrames": 225} ], "collectsItems": [4], @@ -4301,7 +4301,7 @@ "canCrumbleJump", "canBlueSuitSpikeJump", {"spikeHits": 1}, - "canWalljump", + "canWallJump", {"heatFrames": 420} ], "flashSuitChecked": true, @@ -4351,7 +4351,7 @@ "name": "Wall Jump Leave with Runway", "requires": [ "canDash", - "canWalljump", + "canWallJump", {"heatFrames": 205} ], "exitCondition": { @@ -4726,7 +4726,7 @@ "canSpeedyJump", {"or": [ "Grapple", - "canWalljump" + "canWallJump" ]}, {"cycleFrames": 1190} ]} @@ -4764,7 +4764,7 @@ {"or": [ "SpaceJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -4805,7 +4805,7 @@ {"or": [ "SpaceJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -4887,7 +4887,7 @@ {"or": [ "SpaceJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -4925,7 +4925,7 @@ {"or": [ "SpaceJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpeedyJump" diff --git a/region/norfair/east/Lava Dive Room.json b/region/norfair/east/Lava Dive Room.json index 7a0a3bd9c..22e6bebf7 100644 --- a/region/norfair/east/Lava Dive Room.json +++ b/region/norfair/east/Lava Dive Room.json @@ -302,7 +302,7 @@ {"or": [ "SpaceJump", "canSpringBallJumpMidAir", - "canWalljump", + "canWallJump", {"and": [ "HiJump", {"lavaFrames": 10} @@ -1426,7 +1426,7 @@ {"heatFrames": 100} ]}, {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 60} ]}, {"and": [ diff --git a/region/norfair/east/Norfair Reserve Tank Room.json b/region/norfair/east/Norfair Reserve Tank Room.json index cd90eb57d..f99179854 100644 --- a/region/norfair/east/Norfair Reserve Tank Room.json +++ b/region/norfair/east/Norfair Reserve Tank Room.json @@ -889,7 +889,7 @@ "canPreciseWalljump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]} ]}, {"lavaFrames": 30} @@ -923,7 +923,7 @@ {"heatFrames": 50}, {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"lavaFrames": 30} ]}, {"and": [ diff --git a/region/norfair/east/Red Pirate Shaft.json b/region/norfair/east/Red Pirate Shaft.json index fe6cf7951..25fb3395c 100644 --- a/region/norfair/east/Red Pirate Shaft.json +++ b/region/norfair/east/Red Pirate Shaft.json @@ -151,7 +151,7 @@ {"or": [ "HiJump", {"and": [ - "canWalljump", + "canWallJump", {"cycleFrames": 60} ]}, {"and": [ @@ -374,7 +374,7 @@ {"or": [ "HiJump", {"and": [ - "canWalljump", + "canWallJump", {"cycleFrames": 60} ]}, {"and": [ diff --git a/region/norfair/east/Single Chamber.json b/region/norfair/east/Single Chamber.json index 488cb9016..08fa28edf 100644 --- a/region/norfair/east/Single Chamber.json +++ b/region/norfair/east/Single Chamber.json @@ -258,7 +258,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "h_crouchJumpDownGrab", {"and": [ @@ -553,7 +553,7 @@ "canTrickyJump" ]}, "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canIBJ", @@ -674,7 +674,7 @@ {"or": [ "h_crouchJumpDownGrab", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir" ]}, @@ -1000,7 +1000,7 @@ "canShinechargeMovementComplex", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"shinespark": {"frames": 5, "excessFrames": 0}}, {"heatFrames": 230} @@ -1114,7 +1114,7 @@ {"or": [ "h_crouchJumpDownGrab", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canIBJ" @@ -1181,7 +1181,7 @@ {"or": [ "h_crouchJumpDownGrab", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canIBJ" @@ -1211,7 +1211,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canIBJ", @@ -1356,7 +1356,7 @@ {"or": [ "h_crouchJumpDownGrab", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir" ]}, @@ -1734,7 +1734,7 @@ {"haveBlueSuit": {}} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "h_crouchJumpDownGrab", "SpaceJump" @@ -1932,7 +1932,7 @@ {"or": [ "h_crouchJumpDownGrab", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canIBJ" @@ -1962,7 +1962,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canIBJ", @@ -2036,7 +2036,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 120} ]}, {"and": [ @@ -2188,7 +2188,7 @@ {"or": [ "h_crouchJumpDownGrab", "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir" ]}, @@ -2552,7 +2552,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "h_crouchJumpDownGrab", "SpaceJump" @@ -2651,7 +2651,7 @@ "requires": [ "canComplexGMode", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "h_heatedCrouchJumpDownGrab", @@ -2689,7 +2689,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringBallJumpMidAir", "canIBJ", @@ -2760,7 +2760,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 130} ]}, {"and": [ @@ -3142,11 +3142,11 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 100} ]}, {"and": [ - "canWalljump", + "canWallJump", "ScrewAttack", {"heatFrames": 85} ]}, @@ -3207,11 +3207,11 @@ "canDash", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 80} ]}, {"and": [ - "canWalljump", + "canWallJump", "ScrewAttack", {"heatFrames": 60} ]}, @@ -3511,7 +3511,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 75} ]}, {"and": [ @@ -3543,7 +3543,7 @@ "canDash", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 55} ]}, {"and": [ @@ -3612,7 +3612,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 150} ]}, {"and": [ @@ -3776,11 +3776,11 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 85} ]}, {"and": [ - "canWalljump", + "canWallJump", "ScrewAttack", {"heatFrames": 65} ]}, @@ -3845,11 +3845,11 @@ "canDash", {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 65} ]}, {"and": [ - "canWalljump", + "canWallJump", "ScrewAttack", {"heatFrames": 45} ]}, @@ -3922,11 +3922,11 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 160} ]}, {"and": [ - "canWalljump", + "canWallJump", "ScrewAttack", {"heatFrames": 140} ]}, diff --git a/region/norfair/east/Speed Booster Hall.json b/region/norfair/east/Speed Booster Hall.json index 94fd23408..88d183d50 100644 --- a/region/norfair/east/Speed Booster Hall.json +++ b/region/norfair/east/Speed Booster Hall.json @@ -1235,7 +1235,7 @@ "canInsaneJump", {"and": [ "canTrickyJump", - "canWalljump", + "canWallJump", {"cycleFrames": 60} ]}, {"and": [ diff --git a/region/norfair/east/Spiky Platforms Tunnel.json b/region/norfair/east/Spiky Platforms Tunnel.json index a8b25cf6d..4ff65aa28 100644 --- a/region/norfair/east/Spiky Platforms Tunnel.json +++ b/region/norfair/east/Spiky Platforms Tunnel.json @@ -164,7 +164,7 @@ "h_lavaProof", "Grapple", {"and": [ - "canWalljump", + "canWallJump", {"or": [ "Super", "Ice" @@ -249,7 +249,7 @@ {"heatFrames": 710}, {"lavaFrames": 120}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ {"or": [ "h_underwaterCrouchJump", @@ -333,7 +333,7 @@ }, "requires": [ "canBounceBall", - "canWalljump", + "canWallJump", {"heatFrames": 600}, {"lavaFrames": 60} ], @@ -357,7 +357,7 @@ }, "requires": [ "canBounceBall", - "canWalljump", + "canWallJump", {"heatFrames": 600}, {"lavaFrames": 70} ], @@ -376,7 +376,7 @@ "requires": [ "canBounceBall", "canInsaneJump", - "canWalljump", + "canWallJump", {"heatFrames": 600}, {"lavaFrames": 80} ], @@ -424,7 +424,7 @@ "h_lavaProof", "Grapple", {"and": [ - "canWalljump", + "canWallJump", {"or": [ "Super", "Ice" @@ -478,7 +478,7 @@ {"and": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "Gravity" ]}, {"lavaFrames": 100} @@ -606,7 +606,7 @@ {"heatFrames": 710}, {"lavaFrames": 120}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ {"or": [ "h_underwaterCrouchJump", @@ -705,7 +705,7 @@ }, "requires": [ "canBounceBall", - "canWalljump", + "canWallJump", {"heatFrames": 590}, {"lavaFrames": 60} ], @@ -725,7 +725,7 @@ }, "requires": [ "canBounceBall", - "canWalljump", + "canWallJump", {"heatFrames": 590}, {"lavaFrames": 70} ], @@ -740,7 +740,7 @@ "requires": [ "canInsaneJump", "canBounceBall", - "canWalljump", + "canWallJump", {"heatFrames": 590}, {"lavaFrames": 80} ], @@ -809,7 +809,7 @@ "h_lavaProof", "Grapple", {"and": [ - "canWalljump", + "canWallJump", {"or": [ "Super", "Ice" @@ -863,7 +863,7 @@ {"and": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "Gravity" ]}, {"lavaFrames": 40} @@ -1081,7 +1081,7 @@ "h_lavaProof", "Grapple", {"and": [ - "canWalljump", + "canWallJump", {"or": [ "Super", "Ice" diff --git a/region/norfair/east/Upper Norfair Farming Room.json b/region/norfair/east/Upper Norfair Farming Room.json index 0a9ea680d..ebc791f98 100644 --- a/region/norfair/east/Upper Norfair Farming Room.json +++ b/region/norfair/east/Upper Norfair Farming Room.json @@ -1229,7 +1229,7 @@ "canComplexGMode", {"heatFrames": 480}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "h_crouchJumpDownGrab" @@ -1322,7 +1322,7 @@ "name": "G-Mode Setup - Get Hit By Gamet", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "h_crouchJumpDownGrab" @@ -1346,7 +1346,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 85} ]}, {"and": [ @@ -1457,7 +1457,7 @@ "canFarmWhileShooting", "canBePatient", {"or": [ - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canCameraManip", diff --git a/region/norfair/west/Business Center.json b/region/norfair/west/Business Center.json index 0cf32bcd3..2e36f9ab8 100644 --- a/region/norfair/west/Business Center.json +++ b/region/norfair/west/Business Center.json @@ -647,7 +647,7 @@ "requires": [ {"shineChargeFrames": 110}, "canShinechargeMovementComplex", - "canWalljump" + "canWallJump" ], "exitCondition": { "leaveShinecharged": {} @@ -1859,7 +1859,7 @@ }, "requires": [ "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"shineChargeFrames": 150} ], "exitCondition": { @@ -2982,7 +2982,7 @@ "requires": [ {"shineChargeFrames": 135}, "canShinechargeMovementComplex", - "canWalljump" + "canWallJump" ], "exitCondition": { "leaveShinecharged": {} @@ -3027,7 +3027,7 @@ "requires": [ {"shineChargeFrames": 100}, "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"shinespark": {"frames": 11, "excessFrames": 0}} ], "exitCondition": { @@ -3098,7 +3098,7 @@ }, "requires": [ "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"shineChargeFrames": 135} ], "exitCondition": { @@ -4550,7 +4550,7 @@ {"canShineCharge": {"usedTiles": 12, "openEnd": 0}} ]}, "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"shineChargeFrames": 150} ], "exitCondition": { diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json index c82cf5ae2..1c581a2b1 100644 --- a/region/norfair/west/Crocomire Escape.json +++ b/region/norfair/west/Crocomire Escape.json @@ -171,7 +171,7 @@ "SpaceJump", {"and": [ "HiJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -428,7 +428,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ]}, {"and": [ {"noBlueSuit": {}}, @@ -506,7 +506,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "canBeVeryPatient", @@ -606,7 +606,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -917,7 +917,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -1175,7 +1175,7 @@ "requires": [ "HiJump", "canSpeedyJump", - "canWalljump", + "canWallJump", {"heatFrames": 360}, {"or": [ "canInsaneJump", @@ -1624,7 +1624,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -1747,7 +1747,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canWalljump" + "canWallJump" ]}, {"and": [ "HiJump", @@ -1987,7 +1987,7 @@ "name": "HiJump", "requires": [ "HiJump", - "canWalljump", + "canWallJump", {"heatFrames": 550}, {"or": [ "canDash", diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index fcf7705f7..b0b788383 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -2061,7 +2061,7 @@ }, "requires": [ {"shineChargeFrames": 130}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"heatFrames": 130} ], @@ -2132,7 +2132,7 @@ }, "requires": [ {"shineChargeFrames": 80}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"heatFrames": 120}, {"shinespark": {"frames": 17, "excessFrames": 0}} @@ -3195,7 +3195,7 @@ {"or": [ "HiJump", {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 10} ]}, {"and": [ @@ -3301,7 +3301,7 @@ {"or": [ "HiJump", {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 10} ]}, {"and": [ @@ -3431,7 +3431,7 @@ {"or": [ "HiJump", {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 10} ]}, {"and": [ @@ -3512,7 +3512,7 @@ "requires": [ {"or": [ {"noBlueSuit": {}}, - "canWalljump", + "canWallJump", "SpaceJump", "HiJump", "canSpringBallJumpMidAir" @@ -3634,7 +3634,7 @@ "requires": [ {"or": [ {"noBlueSuit": {}}, - "canWalljump", + "canWallJump", "SpaceJump", "HiJump", "canSpringBallJumpMidAir" @@ -3652,7 +3652,7 @@ "requires": [ "canOffScreenMovement", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump" @@ -3762,7 +3762,7 @@ "requires": [ "canOffScreenMovement", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canSpringBallJumpMidAir", "SpaceJump" diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json index d1d3dc9d2..0ed6b8733 100644 --- a/region/norfair/west/Crumble Shaft.json +++ b/region/norfair/west/Crumble Shaft.json @@ -789,7 +789,7 @@ {"or": [ "canCrumbleJump", "HiJump", - "canWalljump" + "canWallJump" ]} ], "exitCondition": { @@ -961,7 +961,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump", + "canWallJump", "h_useSpringBall", "canCrumbleJump", "canTrickyJump", diff --git a/region/norfair/west/Hi Jump Energy Tank Room.json b/region/norfair/west/Hi Jump Energy Tank Room.json index 7668c9c9c..898902fd6 100644 --- a/region/norfair/west/Hi Jump Energy Tank Room.json +++ b/region/norfair/west/Hi Jump Energy Tank Room.json @@ -310,7 +310,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "SpaceJump" ]} @@ -355,7 +355,7 @@ "requires": [ "Morph", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -456,7 +456,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "SpaceJump" ]} @@ -479,7 +479,7 @@ {"and": [ "canMidAirMorph", {"or": [ - "canWalljump", + "canWallJump", "SpaceJump", "canUseFrozenEnemies" ]} @@ -737,7 +737,7 @@ "Bombs" ]}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpringBallJumpMidAir", diff --git a/region/norfair/west/Ice Beam Gate Room.json b/region/norfair/west/Ice Beam Gate Room.json index 7114ed0cf..1a21bde98 100644 --- a/region/norfair/west/Ice Beam Gate Room.json +++ b/region/norfair/west/Ice Beam Gate Room.json @@ -252,7 +252,7 @@ "canPrepareForNextRoom", {"or": [ "SpaceJump", - "canWalljump" + "canWallJump" ]}, {"doorUnlockedAtNode": 1} ], @@ -565,7 +565,7 @@ ]} ]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", {"and": [ @@ -1740,7 +1740,7 @@ "requires": [ {"obstaclesCleared": ["C"]}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", diff --git a/region/norfair/west/Ice Beam Snake Room.json b/region/norfair/west/Ice Beam Snake Room.json index 46ba9dca0..131a8e787 100644 --- a/region/norfair/west/Ice Beam Snake Room.json +++ b/region/norfair/west/Ice Beam Snake Room.json @@ -256,7 +256,7 @@ "h_heatProof", {"resetRoom": {"nodes": [1]}}, {"or": [ - "canWalljump", + "canWallJump", {"and": [ "HiJump", "canSpringBallJumpMidAir", @@ -410,7 +410,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "SpaceJump", "canIBJ", @@ -1438,7 +1438,7 @@ "Morph", {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canSpringBallJumpMidAir", "SpaceJump", "canIBJ", @@ -1540,7 +1540,7 @@ "canTrickyJump", {"or": [ "HiJump", - "canWalljump" + "canWallJump" ]}, "Plasma", {"cycleFrames": 540} @@ -1690,7 +1690,7 @@ {"heatFrames": 40} ]}, {"and": [ - "canWalljump", + "canWallJump", "canTrivialMidAirMorph" ]}, "canSpringBallJumpMidAir", @@ -1734,7 +1734,7 @@ {"heatFrames": 40} ]}, {"and": [ - "canWalljump", + "canWallJump", "canTrivialMidAirMorph" ]}, "canSpringBallJumpMidAir", @@ -1965,7 +1965,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 80} ]}, {"and": [ @@ -1995,7 +1995,7 @@ "requires": [ {"or": [ {"and": [ - "canWalljump", + "canWallJump", {"heatFrames": 60} ]}, {"and": [ diff --git a/region/norfair/west/Ice Beam Tutorial Room.json b/region/norfair/west/Ice Beam Tutorial Room.json index 5b0d637fe..d81401395 100644 --- a/region/norfair/west/Ice Beam Tutorial Room.json +++ b/region/norfair/west/Ice Beam Tutorial Room.json @@ -148,7 +148,7 @@ "name": "Suitless Tank the Damage", "requires": [ "canMidAirMorph", - "canWalljump", + "canWallJump", {"or": [ {"and": [ "canDash", @@ -210,7 +210,7 @@ "requires": [ "canDash", "canMidAirMorph", - "canWalljump", + "canWallJump", "canCarefulJump", {"enemyKill": { "enemies": [["Boyon", "Boyon", "Boyon"]], @@ -229,7 +229,7 @@ "requires": [ "canDash", "canMidAirMorph", - "canWalljump", + "canWallJump", "canCarefulJump", {"enemyKill": { "enemies": [["Boyon"]], diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json index 6b94e8d44..bef65cf6f 100644 --- a/region/tourian/main/Metroid Room 1.json +++ b/region/tourian/main/Metroid Room 1.json @@ -801,7 +801,7 @@ ]}, {"and": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]}, {"acidFrames": 20} @@ -815,7 +815,7 @@ "canPseudoScrew", {"or": [ "canTrickyJump", - "canWalljumpWithCharge", + "canWallJumpWithCharge", "HiJump", "Gravity" ]} @@ -865,7 +865,7 @@ {"acidFrames": 15} ]}, {"and": [ - "canWalljump", + "canWallJump", {"acidFrames": 20} ]}, {"and": [ @@ -893,7 +893,7 @@ {"acidFrames": 15} ]}, {"and": [ - "canWalljump", + "canWallJump", {"acidFrames": 20} ]}, {"and": [ @@ -1377,7 +1377,7 @@ ]}, {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"acidFrames": 50} ]}, {"and": [ @@ -1439,7 +1439,7 @@ {"acidFrames": 30} ]}, {"and": [ - "canWalljump", + "canWallJump", {"acidFrames": 40} ]}, {"acidFrames": 80} diff --git a/region/tourian/main/Metroid Room 2.json b/region/tourian/main/Metroid Room 2.json index e695cc442..ab4ed737d 100644 --- a/region/tourian/main/Metroid Room 2.json +++ b/region/tourian/main/Metroid Room 2.json @@ -899,7 +899,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canMidairWiggle", "canShinechargeMovementTricky", "f_KilledMetroidRoom2", @@ -1033,7 +1033,7 @@ }, "requires": [ {"shineChargeFrames": 120}, - "canWalljump", + "canWallJump", "canMidairWiggle", "canShinechargeMovementTricky", {"or": [ @@ -1124,7 +1124,7 @@ }, "requires": [ {"shineChargeFrames": 105}, - "canWalljump", + "canWallJump", "canMidairWiggle", "canShinechargeMovementTricky", {"shinespark": {"frames": 5, "excessFrames": 0}}, diff --git a/region/tourian/main/Metroid Room 3.json b/region/tourian/main/Metroid Room 3.json index 37fcce530..ef56c8298 100644 --- a/region/tourian/main/Metroid Room 3.json +++ b/region/tourian/main/Metroid Room 3.json @@ -1219,7 +1219,7 @@ "requires": [ {"or": [ "canDash", - "canWalljump", + "canWallJump", "SpaceJump", "canSpringFling", {"and": [ diff --git a/region/tourian/main/Rinka Shaft.json b/region/tourian/main/Rinka Shaft.json index 675ab9830..3464a6a9e 100644 --- a/region/tourian/main/Rinka Shaft.json +++ b/region/tourian/main/Rinka Shaft.json @@ -340,7 +340,7 @@ }, "requires": [ "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 110} ], @@ -390,7 +390,7 @@ } }, "requires": [ - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 130} ], @@ -414,7 +414,7 @@ "requires": [ {"shineChargeFrames": 95}, "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -436,7 +436,7 @@ }, "requires": [ {"shineChargeFrames": 115}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -503,7 +503,7 @@ }, "requires": [ {"shineChargeFrames": 100}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 4, "excessFrames": 0}} ], @@ -836,7 +836,7 @@ "requires": [ {"shineChargeFrames": 155}, "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 2, "excessFrames": 0}} ], @@ -1004,7 +1004,7 @@ "requires": [ "canShinechargeMovementComplex", "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 135} ], "exitCondition": { @@ -1079,7 +1079,7 @@ "requires": [ "canShinechargeMovementComplex", "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 105} ], "exitCondition": { @@ -1104,7 +1104,7 @@ }, "requires": [ "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", {"shineChargeFrames": 125} ], "exitCondition": { @@ -1176,7 +1176,7 @@ "requires": [ {"shineChargeFrames": 100}, "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1220,7 +1220,7 @@ }, "requires": [ {"shineChargeFrames": 120}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1243,7 +1243,7 @@ "requires": [ {"shineChargeFrames": 80}, "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 5, "excessFrames": 0}} ], @@ -1298,7 +1298,7 @@ }, "requires": [ {"shineChargeFrames": 110}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 6, "excessFrames": 0}} ], diff --git a/region/tourian/main/Seaweed Room.json b/region/tourian/main/Seaweed Room.json index ee17d57fd..aa1ba4f15 100644 --- a/region/tourian/main/Seaweed Room.json +++ b/region/tourian/main/Seaweed Room.json @@ -757,7 +757,7 @@ {"or": [ {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 115} ]}, {"and": [ @@ -765,7 +765,7 @@ {"shineChargeFrames": 125} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 130} ]} ]}, @@ -790,7 +790,7 @@ "requires": [ {"shineChargeFrames": 165}, "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementTricky" ], "exitCondition": { @@ -859,7 +859,7 @@ {"or": [ {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 115} ]}, {"and": [ @@ -867,7 +867,7 @@ {"shineChargeFrames": 125} ]}, {"and": [ - "canWalljump", + "canWallJump", {"shineChargeFrames": 130} ]} ]}, @@ -891,7 +891,7 @@ {"or": [ {"and": [ "HiJump", - "canWalljump", + "canWallJump", {"shineChargeFrames": 100}, {"shinespark": {"frames": 5, "excessFrames": 0}} ]}, @@ -919,7 +919,7 @@ "requires": [ "Wave", {"shineChargeFrames": 120}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 6, "excessFrames": 0}} ], diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json index f3a551257..cc8014080 100644 --- a/region/tourian/main/Tourian Escape Room 2.json +++ b/region/tourian/main/Tourian Escape Room 2.json @@ -314,7 +314,7 @@ "canPrepareForNextRoom", "ScrewAttack", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementTricky", {"shinespark": {"frames": 6, "excessFrames": 0}} ], diff --git a/region/tourian/main/Tourian Escape Room 3.json b/region/tourian/main/Tourian Escape Room 3.json index a72867004..f5c17ee6b 100644 --- a/region/tourian/main/Tourian Escape Room 3.json +++ b/region/tourian/main/Tourian Escape Room 3.json @@ -329,7 +329,7 @@ {"obstaclesCleared": ["A"]}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" @@ -345,7 +345,7 @@ "requires": [ {"or": [ "HiJump", - "canWalljump", + "canWallJump", "SpaceJump", "canIBJ", "canSpringBallJumpMidAir" diff --git a/region/tourian/main/Tourian Escape Room 4.json b/region/tourian/main/Tourian Escape Room 4.json index 3aeeceff3..a14e7ffcf 100644 --- a/region/tourian/main/Tourian Escape Room 4.json +++ b/region/tourian/main/Tourian Escape Room 4.json @@ -264,7 +264,7 @@ "canComplexRModeCrystalFlashInterrupt", {"ammo": {"type": "Missile", "count": 10}}, {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -325,7 +325,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump", + "canWallJump", "canJumpIntoIBJ", {"and": [ "canIBJ", @@ -360,7 +360,7 @@ "canDodgeWhileShooting", {"or": [ "HiJump", - "canWalljump", + "canWallJump", {"and": [ "canTrickyDodgeEnemies", {"or": [ @@ -914,7 +914,7 @@ {"or": [ {"and": [ "canConsecutiveWalljump", - "canWalljumpWithCharge" + "canWallJumpWithCharge" ]}, {"and": [ "SpaceJump", @@ -1292,7 +1292,7 @@ {"or": [ "HiJump", "SpaceJump", - "canWalljump", + "canWallJump", "h_crouchJumpDownGrab", "canJumpIntoIBJ", "canSpringBallJumpMidAir" diff --git a/region/tourian/main/Tourian First Room.json b/region/tourian/main/Tourian First Room.json index 6747afec9..f60063a92 100644 --- a/region/tourian/main/Tourian First Room.json +++ b/region/tourian/main/Tourian First Room.json @@ -166,7 +166,7 @@ }, "requires": [ {"shineChargeFrames": 150}, - "canWalljump", + "canWallJump", "canShinechargeMovementTricky" ], "exitCondition": { @@ -329,7 +329,7 @@ }, "requires": [ {"shineChargeFrames": 135}, - "canWalljump", + "canWallJump", "canShinechargeMovementComplex" ], "exitCondition": { diff --git a/region/wreckedship/main/Bowling Alley.json b/region/wreckedship/main/Bowling Alley.json index dfcfb8c74..db4ee9c03 100644 --- a/region/wreckedship/main/Bowling Alley.json +++ b/region/wreckedship/main/Bowling Alley.json @@ -1524,7 +1524,7 @@ ]}, {"and": [ "canBlueSuitSpikeJump", - "canWalljump", + "canWallJump", "canBeVeryPatient", {"spikeHits": 1} ]}, @@ -1792,7 +1792,7 @@ {"autoReserveTrigger": {}}, "canRModePauseAbuseSparkInterrupt", {"or": [ - "canWalljump", + "canWallJump", "HiJump", "canTrickyDashJump", {"spikeHits": 1} diff --git a/region/wreckedship/main/Sponge Bath.json b/region/wreckedship/main/Sponge Bath.json index 34f6bc735..34958ddc2 100644 --- a/region/wreckedship/main/Sponge Bath.json +++ b/region/wreckedship/main/Sponge Bath.json @@ -119,7 +119,7 @@ ]}, "canStutterWaterShineCharge", "canShinechargeMovementTricky", - "canWalljump", + "canWallJump", {"or": [ "canSpaceJumpWaterBounce", "HiJump" @@ -359,7 +359,7 @@ "name": "HiJump", "requires": [ "HiJump", - "canWalljump" + "canWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -469,7 +469,7 @@ "canCarefulJump", "canSpeedyJump", {"or": [ - "canWalljump", + "canWallJump", "HiJump" ]} ], @@ -660,7 +660,7 @@ "requires": [ "canWaterShineCharge", "HiJump", - "canWalljump", + "canWallJump", "canShinechargeMovementComplex", {"shineChargeFrames": 100} ], @@ -710,7 +710,7 @@ {"shineChargeFrames": 160}, "canShinechargeMovementComplex", "HiJump", - "canWalljump" + "canWallJump" ], "exitCondition": { "leaveShinecharged": {} @@ -757,7 +757,7 @@ ]}, "canStutterWaterShineCharge", "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", "canSpaceJumpWaterBounce", "h_shinechargeMaxRunway", {"shineChargeFrames": 130} @@ -782,7 +782,7 @@ ]}, "canStutterWaterShineCharge", "canShinechargeMovementComplex", - "canWalljump", + "canWallJump", "HiJump", "h_shinechargeMaxRunway", {"shineChargeFrames": 95} diff --git a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json index c0249bb92..521ff3d20 100644 --- a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json +++ b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json @@ -453,7 +453,7 @@ "name": "Wall Jump", "requires": [ "Gravity", - "canWalljump", + "canWallJump", "f_DefeatedPhantoon" ], "flashSuitChecked": true, @@ -783,7 +783,7 @@ ]}, {"thornHits": 1} ]}, - "canWalljump", + "canWallJump", {"not": "f_DefeatedPhantoon"}, {"or": [ "canRiskPermanentLossOfAccess", @@ -1177,7 +1177,7 @@ {"thornHits": 1}, {"or": [ "HiJump", - "canWalljump", + "canWallJump", "canUseIFrames", "Grapple", "canHorizontalDamageBoost", diff --git a/region/wreckedship/main/Wrecked Ship Main Shaft.json b/region/wreckedship/main/Wrecked Ship Main Shaft.json index 963c62ce9..2927fd0cf 100644 --- a/region/wreckedship/main/Wrecked Ship Main Shaft.json +++ b/region/wreckedship/main/Wrecked Ship Main Shaft.json @@ -926,7 +926,7 @@ "name": "Base", "requires": [ {"or": [ - "canWalljump", + "canWallJump", "HiJump", "SpaceJump", "canIBJ", @@ -1614,7 +1614,7 @@ {"cycleFrames": 200} ]}, {"or": [ - "canWalljump", + "canWallJump", "h_crouchJumpDownGrabCycleFrames", "HiJump", "SpaceJump", @@ -1692,7 +1692,7 @@ {"cycleFrames": 200} ]}, {"or": [ - "canWalljump", + "canWallJump", "h_crouchJumpDownGrabCycleFrames", "HiJump", "SpaceJump", diff --git a/schema/m3-string-requirements.schema.json b/schema/m3-string-requirements.schema.json index 3dbeced69..1f5c4b236 100644 --- a/schema/m3-string-requirements.schema.json +++ b/schema/m3-string-requirements.schema.json @@ -144,7 +144,7 @@ "canTrickyJump", "canInsaneJump", "canCWJ", - "canWalljump", + "canWallJump", "canPreciseWalljump", "canTrickyWalljump", "canInsaneWalljump", @@ -194,7 +194,7 @@ "canTrickyEnemyExtendRunway", "canHitbox", "canPseudoScrew", - "canWalljumpWithCharge", + "canWallJumpWithCharge", "canSpecialBeamAttack", "canOffScreenSuperShot", "canGateGlitch", diff --git a/strats.md b/strats.md index 4a34bd558..bd29691b8 100644 --- a/strats.md +++ b/strats.md @@ -446,7 +446,7 @@ A `leaveWithDoorFrameBelow` object has the following property: - _height_: The number of tiles beneath the door transition (not including the transition tiles) usable for wall-jumping. -In a heated room, heat frames must be explicitly included in the strat `requires`, based on an assumption of wall-jumping up through the door. If the strat in the neighboring room has a `comeInWithSpaceJumpBelow` entrance condition, then additional heat frames will be implicitly included to use Space Jump, so that does not need to be included in the `leaveWithDoorFrameBelow` strat. Likewise, requirements for `canWalljump` or `SpaceJump` do not need to included, as these will be implicitly included in the corresponding entrance conditions. If a strat starts at the same (door) node that it ends at, then heat frames should include the time required to fall down from the door, shoot it open, and then wall-jump back out. +In a heated room, heat frames must be explicitly included in the strat `requires`, based on an assumption of wall-jumping up through the door. If the strat in the neighboring room has a `comeInWithSpaceJumpBelow` entrance condition, then additional heat frames will be implicitly included to use Space Jump, so that does not need to be included in the `leaveWithDoorFrameBelow` strat. Likewise, requirements for `canWallJump` or `SpaceJump` do not need to included, as these will be implicitly included in the corresponding entrance conditions. If a strat starts at the same (door) node that it ends at, then heat frames should include the time required to fall down from the door, shoot it open, and then wall-jump back out. #### Example ```json @@ -1388,7 +1388,7 @@ A `comeInWithRMode` entrance condition must match with a `leaveWithGModeSetup` e "comeInWithRMode": {} }, "requires": [ - "canWalljump", + "canWallJump", {"enemyDamage": { "enemy": "Beetom", "type": "contact", @@ -1459,7 +1459,7 @@ A `comeInWithWallJumpBelow` object has the following property: A `comeInWithWallJumpBelow` entrance condition must match with a `leaveWithDoorFrameBelow` exit condition on the other side of the door: - A match is valid provided the `height` property on the `leaveWithDoorFrameBelow` is at least as large as the `minHeight` property on the `comeInWithWallJumpBelow`. -A `comeInWithWallJumpBelow` implicitly includes a `canWalljump` tech requirement. +A `comeInWithWallJumpBelow` implicitly includes a `canWallJump` tech requirement. __Example:__ ```json diff --git a/tech.json b/tech.json index a1e961c17..5e3a67be2 100644 --- a/tech.json +++ b/tech.json @@ -487,7 +487,7 @@ "name": "canWallJumpInstantMorph", "techRequires": [ "canMidAirMorph", - "canWalljump" + "canWallJump" ], "otherRequires": [], "note": [ @@ -1281,7 +1281,7 @@ "techRequires": [ "canDash", "canTrickyJump", - "canWalljump" + "canWallJump" ], "otherRequires": [], "note": [ @@ -1297,7 +1297,7 @@ }, { "id": 76, - "name": "canWalljump", + "name": "canWallJump", "techRequires": [], "otherRequires": [], "note": "Jump off walls, as taught by the Etecoons.", @@ -1306,7 +1306,7 @@ "id": 77, "name": "canPreciseWalljump", "techRequires": [ - "canWalljump" + "canWallJump" ], "otherRequires": [], "note": "A wall jump that needs to be performed at a fairly precise spot in order to yield the desired result.", @@ -1341,7 +1341,7 @@ "id": 80, "name": "canConsecutiveWalljump", "techRequires": [ - "canWalljump" + "canWallJump" ], "otherRequires": [], "note": "Climbing a wall with three or more consecutive wall jumps without a mistake.", @@ -2002,10 +2002,10 @@ "extensionTechs": [ { "id": 124, - "name": "canWalljumpWithCharge", + "name": "canWallJumpWithCharge", "techRequires": [ "canPseudoScrew", - "canWalljump" + "canWallJump" ], "otherRequires": [], "note": [