From 25339a559bf3f1e423998096246b3de591876fd7 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Sat, 25 Apr 2026 09:46:58 -0600 Subject: [PATCH] Capitalize the J in more WallJump tech Applies to the following: - canPreciseWalljump - canTrickyWalljump - canInsaneWalljump - canConsecutiveWalljump - canFastWalljumpClimb - canUnderwaterWalljump - canLongUnderwaterWalljump - canUnderwaterWalljumpBreakFree --- .../blue/Blue Brinstar Boulder Room.json | 8 +-- .../blue/Blue Brinstar Energy Tank Room.json | 34 +++++----- .../green/Green Brinstar Main Shaft.json | 8 +-- region/brinstar/green/Green Hill Zone.json | 4 +- region/brinstar/kraid/Warehouse Entrance.json | 2 +- region/brinstar/pink/Big Pink.json | 6 +- region/brinstar/pink/Dachora Room.json | 14 ++-- .../pink/Mission Impossible Room.json | 2 +- .../brinstar/pink/Spore Spawn Super Room.json | 2 +- .../pink/Waterway Energy Tank Room.json | 8 +-- region/brinstar/red/Below Spazer.json | 2 +- region/brinstar/red/Beta Power Bomb Room.json | 2 +- .../red/Red Brinstar Fireflea Room.json | 6 +- region/brinstar/red/Red Tower.json | 28 ++++---- .../crateria/central/Climb Supers Room.json | 16 ++--- region/crateria/central/Landing Site.json | 6 +- .../crateria/central/Parlor and Alcatraz.json | 8 +-- region/crateria/east/East Ocean.json | 2 +- region/crateria/east/West Ocean.json | 12 ++-- .../west/Gauntlet Energy Tank Room.json | 2 +- region/crateria/west/Gauntlet Entrance.json | 2 +- region/crateria/west/Statues Room.json | 2 +- region/lowernorfair/east/Amphitheatre.json | 20 +++--- .../east/Fast Pillars Setup Room.json | 4 +- .../east/Lower Norfair Fireflea Room.json | 18 ++--- .../lowernorfair/east/Mickey Mouse Room.json | 4 +- region/lowernorfair/east/Pillar Room.json | 6 +- .../lowernorfair/east/Plowerhouse Room.json | 2 +- .../east/The Worst Room In The Game.json | 66 +++++++++---------- .../east/Three Musketeers' Room.json | 14 ++-- region/lowernorfair/east/Wasteland.json | 2 +- .../lowernorfair/west/Acid Statue Room.json | 4 +- .../west/Golden Torizo's Room.json | 26 ++++---- .../lowernorfair/west/Screw Attack Room.json | 4 +- region/maridia/inner-green/Oasis.json | 2 +- region/maridia/inner-green/Pants Room.json | 14 ++-- .../maridia/inner-green/West Sand Hall.json | 2 +- region/maridia/inner-pink/Aqueduct.json | 14 ++-- region/maridia/inner-pink/Colosseum.json | 30 ++++----- region/maridia/inner-pink/Crab Shaft.json | 4 +- region/maridia/inner-pink/Draygon's Room.json | 4 +- .../maridia/inner-pink/East Cactus Alley.json | 28 ++++---- region/maridia/inner-pink/East Sand Pit.json | 8 +-- .../maridia/inner-pink/Halfie Climb Room.json | 22 +++---- .../maridia/inner-pink/The Precious Room.json | 4 +- .../maridia/inner-pink/West Cactus Alley.json | 2 +- region/maridia/inner-pink/West Sand Pit.json | 14 ++-- .../inner-yellow/Maridia Elevator Room.json | 16 ++--- .../Maridia Swiss Cheese Room.json | 2 +- region/maridia/inner-yellow/Plasma Room.json | 10 +-- .../inner-yellow/Plasma Spark Room.json | 18 ++--- region/maridia/inner-yellow/The Beach.json | 10 +-- region/maridia/outer/Fish Tank.json | 20 +++--- region/maridia/outer/Main Street.json | 18 ++--- region/maridia/outer/Mama Turtle Room.json | 8 +-- region/maridia/outer/Mt. Everest.json | 26 ++++---- .../norfair/crocomire/Grapple Beam Room.json | 10 +-- .../crocomire/Grapple Tutorial Room 2.json | 6 +- .../crocomire/Grapple Tutorial Room 3.json | 12 ++-- .../norfair/crocomire/Indiana Jones Room.json | 18 ++--- .../Post Crocomire Farming Room.json | 4 +- .../crocomire/Post Crocomire Shaft.json | 16 ++--- region/norfair/east/Bat Cave.json | 2 +- region/norfair/east/Bubble Mountain.json | 42 ++++++------ region/norfair/east/Cathedral Entrance.json | 18 ++--- region/norfair/east/Double Chamber.json | 54 +++++++-------- region/norfair/east/Lava Dive Room.json | 26 ++++---- .../east/Norfair Reserve Tank Room.json | 4 +- .../norfair/east/Spiky Platforms Tunnel.json | 10 +-- region/norfair/west/Business Center.json | 2 +- region/norfair/west/Crocomire Speedway.json | 2 +- region/norfair/west/Crumble Shaft.json | 22 +++---- region/norfair/west/Ice Beam Snake Room.json | 2 +- .../norfair/west/Ice Beam Tutorial Room.json | 2 +- region/tourian/main/Metroid Room 1.json | 26 ++++---- region/tourian/main/Seaweed Room.json | 4 +- .../tourian/main/Tourian Escape Room 4.json | 8 +-- region/wreckedship/main/Bowling Alley.json | 8 +-- region/wreckedship/main/Sponge Bath.json | 2 +- .../main/Wrecked Ship Energy Tank Room.json | 12 ++-- schema/m3-string-requirements.schema.json | 16 ++--- strats.md | 2 +- tech.json | 34 +++++----- 83 files changed, 493 insertions(+), 493 deletions(-) diff --git a/region/brinstar/blue/Blue Brinstar Boulder Room.json b/region/brinstar/blue/Blue Brinstar Boulder Room.json index a9cc786ea..85f416cdb 100644 --- a/region/brinstar/blue/Blue Brinstar Boulder Room.json +++ b/region/brinstar/blue/Blue Brinstar Boulder Room.json @@ -448,7 +448,7 @@ }, "requires": [ "canTrickyJump", - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -513,7 +513,7 @@ "name": "Doorsill Jump", "requires": [ "canDash", - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", {"or": [ {"spikeHits": 1}, @@ -674,7 +674,7 @@ } }, "requires": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", {"or": [ {"spikeHits": 1}, @@ -995,7 +995,7 @@ "name": "Naked Walljump", "requires": [ "canSuitlessMaridia", - "canInsaneWalljump" + "canInsaneWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json index a6b741f58..59c96bc4f 100644 --- a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json +++ b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json @@ -789,7 +789,7 @@ "requires": [ {"notable": "Taco Tank"}, "canCWJ", - "canInsaneWalljump", + "canInsaneWallJump", "canStationarySpinJump" ], "flashSuitChecked": false, @@ -943,7 +943,7 @@ "HiJump", {"canShineCharge": {"usedTiles": 35, "openEnd": 1}}, "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shinespark": {"frames": 8, "excessFrames": 0}} ], "exitCondition": { @@ -965,7 +965,7 @@ {"obstaclesCleared": ["A"]} ]}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]} @@ -1036,7 +1036,7 @@ {"haveBlueSuit": {}} ]}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "SpaceJump", {"cycleFrames": 250} @@ -1214,7 +1214,7 @@ {"notable": "Return Through Crumble Blocks"}, "Morph", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]}, @@ -1234,7 +1234,7 @@ {"obstaclesCleared": ["C"]} ]}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]}, @@ -1263,7 +1263,7 @@ {"obstaclesCleared": ["C"]} ]}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]} ], @@ -1288,7 +1288,7 @@ ]}, "canLongIBJ", {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canWallJumpInstantMorph" ]} ]} @@ -1406,7 +1406,7 @@ ]}, {"canShineCharge": {"usedTiles": 42, "openEnd": 0}}, "canShinechargeMovementComplex", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"shinespark": {"frames": 17, "excessFrames": 3}} ], "clearsObstacles": ["A", "B", "C"], @@ -1430,7 +1430,7 @@ ]}, {"canShineCharge": {"usedTiles": 42, "openEnd": 0}}, "canShinechargeMovementComplex", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "HiJump", {"shinespark": {"frames": 9, "excessFrames": 9}} ], @@ -1453,7 +1453,7 @@ ]}, {"canShineCharge": {"usedTiles": 42, "openEnd": 0}}, "canShinechargeMovementComplex", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shinespark": {"frames": 9, "excessFrames": 9}} ], "clearsObstacles": ["A", "B", "C"], @@ -1493,7 +1493,7 @@ ]}, {"and": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]}, {"shinespark": {"frames": 9, "excessFrames": 9}} @@ -1521,7 +1521,7 @@ ]}, {"and": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]}, {"shinespark": {"frames": 9, "excessFrames": 9}} @@ -1574,7 +1574,7 @@ "canGMode", "h_artificialMorphIBJ", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ "h_artificialMorphLongIBJ", @@ -1612,7 +1612,7 @@ "canGMode", "Morph", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]}, {"or": [ @@ -1637,7 +1637,7 @@ "h_artificialMorphPowerBomb", "h_artificialMorphMovement", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ {"blueSuitShinecharge": {}}, @@ -1733,7 +1733,7 @@ {"itemNotCollectedAtNode": 4}, "h_artificialMorphSpringBall", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ {"blueSuitShinecharge": {}}, diff --git a/region/brinstar/green/Green Brinstar Main Shaft.json b/region/brinstar/green/Green Brinstar Main Shaft.json index 50354d7a3..bfbb8915e 100644 --- a/region/brinstar/green/Green Brinstar Main Shaft.json +++ b/region/brinstar/green/Green Brinstar Main Shaft.json @@ -4435,7 +4435,7 @@ {"resourceAtMost": [{"type": "ReserveEnergy", "count": 5}]} ]}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canLongIBJ", "SpaceJump" ]}, @@ -4772,7 +4772,7 @@ {"or": [ "SpaceJump", "canLongIBJ", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ] }, @@ -4942,7 +4942,7 @@ "canTrivialMidAirMorph", {"or": [ "SpaceJump", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ]}, {"and": [ @@ -6018,7 +6018,7 @@ "link": [14, 9], "name": "Full Etecoon Wall Jump Climb", "requires": [ - "canConsecutiveWalljump" + "canConsecutiveWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/brinstar/green/Green Hill Zone.json b/region/brinstar/green/Green Hill Zone.json index 6d087b99a..72e3024c3 100644 --- a/region/brinstar/green/Green Hill Zone.json +++ b/region/brinstar/green/Green Hill Zone.json @@ -348,7 +348,7 @@ "name": "Wall Jump to Top Right Door", "requires": [ {"notable": "Wall Jump to Top Right Door"}, - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -1113,7 +1113,7 @@ "link": [2, 2], "name": "Leave With Spark (Far Runway)", "requires": [ - "canPreciseWalljump", + "canPreciseWallJump", {"canShineCharge": {"usedTiles": 17, "openEnd": 1}}, "canShinechargeMovementTricky", {"shinespark": {"frames": 19, "excessFrames": 0}} diff --git a/region/brinstar/kraid/Warehouse Entrance.json b/region/brinstar/kraid/Warehouse Entrance.json index 4b4898fd8..5b7d55824 100644 --- a/region/brinstar/kraid/Warehouse Entrance.json +++ b/region/brinstar/kraid/Warehouse Entrance.json @@ -834,7 +834,7 @@ "name": "Wall Jump", "requires": [ "canDash", - "canPreciseWalljump", + "canPreciseWallJump", {"disableEquipment": "SpeedBooster"} ], "flashSuitChecked": true, diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json index 71ab489b8..5b7321a90 100644 --- a/region/brinstar/pink/Big Pink.json +++ b/region/brinstar/pink/Big Pink.json @@ -4085,7 +4085,7 @@ "name": "Zeb Ice Clip", "requires": [ {"notable": "Zeb Ice Clip"}, - "canTrickyWalljump", + "canTrickyWallJump", "canCameraManip", {"or": [ "Wave", @@ -4111,7 +4111,7 @@ "name": "Blind Zeb Ice Clip (Preserve Flash Suit)", "requires": [ {"notable": "Blind Zeb Ice Clip (Preserve Flash Suit)"}, - "canTrickyWalljump", + "canTrickyWallJump", "canCameraManip", "canOffScreenMovement", {"or": [ @@ -4140,7 +4140,7 @@ {"notable": "Zeb Ice Clip"}, "canSpecialBeamAttack", {"ammo": {"type": "PowerBomb", "count": 1}}, - "canTrickyWalljump", + "canTrickyWallJump", "h_preciseIceClip", {"disableEquipment": "Ice"} ], diff --git a/region/brinstar/pink/Dachora Room.json b/region/brinstar/pink/Dachora Room.json index 6ffd9881d..c8e532783 100644 --- a/region/brinstar/pink/Dachora Room.json +++ b/region/brinstar/pink/Dachora Room.json @@ -698,7 +698,7 @@ }, "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]} ], @@ -796,7 +796,7 @@ {"shinespark": {"frames": 85, "excessFrames": 3}} ]}, {"and": [ - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canMidairShinespark", {"or": [ {"and": [ @@ -870,7 +870,7 @@ "name": "Spark from Fast Wall Jumps", "requires": [ "HiJump", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canShinechargeMovementComplex", "h_shinechargeMaxRunway", {"shinespark": {"frames": 67, "excessFrames": 3}} @@ -884,7 +884,7 @@ "name": "Tankless Bootless Shinespark", "requires": [ {"notable": "Tankless Bootless Shinespark"}, - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canShinechargeMovementComplex", "h_shinechargeMaxRunway", {"shinespark": {"frames": 73, "excessFrames": 3}} @@ -901,7 +901,7 @@ "requires": [ {"haveBlueSuit": {}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ "canLongIBJ", @@ -919,7 +919,7 @@ "requires": [ {"useFlashSuit": {}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ "canLongIBJ", @@ -968,7 +968,7 @@ }, "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]} ], diff --git a/region/brinstar/pink/Mission Impossible Room.json b/region/brinstar/pink/Mission Impossible Room.json index 8b1eed918..b7cb0ee55 100644 --- a/region/brinstar/pink/Mission Impossible Room.json +++ b/region/brinstar/pink/Mission Impossible Room.json @@ -937,7 +937,7 @@ {"notable": "Mission Impossible"}, "canQuickDrop", "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", {"obstaclesCleared": ["A", "B"]} ], "flashSuitChecked": true, diff --git a/region/brinstar/pink/Spore Spawn Super Room.json b/region/brinstar/pink/Spore Spawn Super Room.json index d8bb34dd0..9233f55f2 100644 --- a/region/brinstar/pink/Spore Spawn Super Room.json +++ b/region/brinstar/pink/Spore Spawn Super Room.json @@ -202,7 +202,7 @@ }, "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]} ], diff --git a/region/brinstar/pink/Waterway Energy Tank Room.json b/region/brinstar/pink/Waterway Energy Tank Room.json index 0b1062df2..bc14cf1eb 100644 --- a/region/brinstar/pink/Waterway Energy Tank Room.json +++ b/region/brinstar/pink/Waterway Energy Tank Room.json @@ -101,7 +101,7 @@ {"and": [ "canSuitlessMaridia", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canBombJumpWaterEscape", {"and": [ "h_useSpringBall", @@ -624,7 +624,7 @@ "name": "Precise Wall Jump", "requires": [ "canSuitlessMaridia", - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -690,7 +690,7 @@ "Gravity", {"and": [ {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "SpaceJump", {"and": [ "Ice", @@ -970,7 +970,7 @@ "requires": [ {"or": [ "SpaceJump", - "canPreciseWalljump", + "canPreciseWallJump", "canTrickySpringBallJump", {"and": [ "h_useSpringBall", diff --git a/region/brinstar/red/Below Spazer.json b/region/brinstar/red/Below Spazer.json index 506a8f753..0db89893c 100644 --- a/region/brinstar/red/Below Spazer.json +++ b/region/brinstar/red/Below Spazer.json @@ -425,7 +425,7 @@ "requires": [ {"haveBlueSuit": {}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ "Gravity", diff --git a/region/brinstar/red/Beta Power Bomb Room.json b/region/brinstar/red/Beta Power Bomb Room.json index 1c1cc639e..a09517bf3 100644 --- a/region/brinstar/red/Beta Power Bomb Room.json +++ b/region/brinstar/red/Beta Power Bomb Room.json @@ -871,7 +871,7 @@ {"thornHits": 1} ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTwoTileSqueeze" ]} ]} diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json index 669dcf257..149adcc0d 100644 --- a/region/brinstar/red/Red Brinstar Fireflea Room.json +++ b/region/brinstar/red/Red Brinstar Fireflea Room.json @@ -1601,7 +1601,7 @@ "name": "HiJump and Wall Jump", "requires": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canUseIFrames", {"spikeHits": 2}, {"or": [ @@ -2048,14 +2048,14 @@ "canTrickyJump", {"or": [ {"and": [ - "canInsaneWalljump", + "canInsaneWallJump", "canInsaneJump", "h_backIntoCorner" ]}, {"and": [ {"spikeHits": 1}, "canHorizontalDamageBoost", - "canPreciseWalljump", + "canPreciseWallJump", "canUseIFrames" ]} ]} diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json index 8853af27c..9492dd48b 100644 --- a/region/brinstar/red/Red Tower.json +++ b/region/brinstar/red/Red Tower.json @@ -270,11 +270,11 @@ {"or": [ {"and": [ "ScrewAttack", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"cycleFrames": 1080} ]}, {"and": [ - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 1770} ]} ]} @@ -456,7 +456,7 @@ {"and": [ {"notable": "Hero Shot"}, "canHeroShot", - "canTrickyWalljump" + "canTrickyWallJump" ]}, {"and": [ "SpaceJump", @@ -1775,7 +1775,7 @@ {"and": [ {"notable": "Hero Shot"}, "canHeroShot", - "canTrickyWalljump" + "canTrickyWallJump" ]}, {"and": [ "SpaceJump", @@ -2992,7 +2992,7 @@ {"and": [ {"notable": "Hero Shot"}, "canHeroShot", - "canTrickyWalljump" + "canTrickyWallJump" ]}, {"and": [ "SpaceJump", @@ -3114,7 +3114,7 @@ {"obstaclesCleared": ["B"]} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"obstaclesCleared": ["B"]} ]} ]}, @@ -3288,8 +3288,8 @@ ]}, {"and": [ "HiJump", - "canConsecutiveWalljump", - "canPreciseWalljump" + "canConsecutiveWallJump", + "canPreciseWallJump" ]} ]} ], @@ -3360,7 +3360,7 @@ "requires": [ "canTrickySpringBallJump", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "HiJump", {"and": [ "canTrickyJump", @@ -3467,7 +3467,7 @@ {"shinespark": {"frames": 33, "excessFrames": 6}} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"shinespark": {"frames": 13, "excessFrames": 6}} ]}, {"and": [ @@ -3532,10 +3532,10 @@ "name": "Wall Jump, No Rippers", "requires": [ {"noBlueSuit": {}}, - "canConsecutiveWalljump", + "canConsecutiveWallJump", "h_midAirShootUp", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canSpringwall", "HiJump" ]}, @@ -3565,7 +3565,7 @@ {"notable": "Hero Shot"}, {"noBlueSuit": {}}, "canHeroShot", - "canTrickyWalljump" + "canTrickyWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -3802,7 +3802,7 @@ "ScrewAttack", {"or": [ "SpaceJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "canWallJump", "HiJump" diff --git a/region/crateria/central/Climb Supers Room.json b/region/crateria/central/Climb Supers Room.json index 68690e92b..ee7e316b3 100644 --- a/region/crateria/central/Climb Supers Room.json +++ b/region/crateria/central/Climb Supers Room.json @@ -101,7 +101,7 @@ { "name": "Wall Jump", "requires": [ - "canConsecutiveWalljump" + "canConsecutiveWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -1451,7 +1451,7 @@ "requires": [ "canTrivialUseFrozenEnemies", "canShinechargeMovementComplex", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "h_shinechargeMaxRunway", {"or": [ {"shinespark": {"frames": 93, "excessFrames": 6}}, @@ -1641,7 +1641,7 @@ "canPowerBombItemOverloadPLMs", {"notable": "G-Mode Up with Power Bombs"}, {"itemNotCollectedAtNode": 3}, - "canConsecutiveWalljump", + "canConsecutiveWallJump", "Morph", {"or": [ "canRiskPermanentLossOfAccess", @@ -2141,7 +2141,7 @@ {"noBlueSuit": {}} ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canWallJumpInstantMorph" ]} ]} @@ -2290,7 +2290,7 @@ "requires": [ {"haveBlueSuit": {}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ "canLongIBJ", @@ -2309,7 +2309,7 @@ {"useFlashSuit": {}}, {"shinespark": {"frames": 9, "excessFrames": 7}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ "canLongIBJ", @@ -2375,12 +2375,12 @@ "canSpeedyJump" ]}, {"and": [ - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shinespark": {"frames": 93, "excessFrames": 6}} ]}, {"and": [ "HiJump", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shinespark": {"frames": 83, "excessFrames": 6}} ]} ]} diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json index 9d1752d85..8f4cc611d 100644 --- a/region/crateria/central/Landing Site.json +++ b/region/crateria/central/Landing Site.json @@ -455,7 +455,7 @@ "HiJump", "canSpringBallJumpMidAir" ]}, - "canTrickyWalljump", + "canTrickyWallJump", {"and": [ "canSpeedyJump", {"or": [ @@ -1924,10 +1924,10 @@ "link": [5, 7], "name": "Gauntlet Walljumps", "requires": [ - "canTrickyWalljump", + "canTrickyWallJump", {"or": [ "HiJump", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ], "flashSuitChecked": true, diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json index e58b5bfed..67da1a56a 100644 --- a/region/crateria/central/Parlor and Alcatraz.json +++ b/region/crateria/central/Parlor and Alcatraz.json @@ -2003,11 +2003,11 @@ "name": "Alcatraz Escape", "requires": [ {"notable": "Alcatraz Escape"}, - "canPreciseWalljump", + "canPreciseWallJump", "canWallJumpInstantMorph", {"or": [ "HiJump", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ], "flashSuitChecked": true, @@ -3771,8 +3771,8 @@ ]}, {"and": [ {"notable": "Alcatraz Escape"}, - "canPreciseWalljump", - "canConsecutiveWalljump", + "canPreciseWallJump", + "canConsecutiveWallJump", "canWallJumpInstantMorph" ]}, {"and": [ diff --git a/region/crateria/east/East Ocean.json b/region/crateria/east/East Ocean.json index ae47e3083..ebda41cc3 100644 --- a/region/crateria/east/East Ocean.json +++ b/region/crateria/east/East Ocean.json @@ -1410,7 +1410,7 @@ {"notable": "Precise Space Jump Water Escape"}, "canSpaceJumpWaterBounce", "canPreciseSpaceJump", - "canPreciseWalljump", + "canPreciseWallJump", "canInsaneJump", "canMidairWiggle" ], diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json index e5d602367..097534310 100644 --- a/region/crateria/east/West Ocean.json +++ b/region/crateria/east/West Ocean.json @@ -2724,9 +2724,9 @@ {"or": [ {"and": [ "canUseFrozenEnemies", - "canPreciseWalljump" + "canPreciseWallJump" ]}, - "canTrickyWalljump", + "canTrickyWallJump", {"and": [ "canCameraManip", "canCarefulJump" @@ -2948,7 +2948,7 @@ "name": "Ocean Floor Shinecharge, Fast Wall Jump to Gravity Door", "requires": [ "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "HiJump", "Gravity", "h_shinechargeMaxRunway", @@ -2968,7 +2968,7 @@ "name": "Ocean Floor Shinecharge, Fast Space Jump Wall Jump to Gravity Door", "requires": [ "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "HiJump", "Gravity", "SpaceJump", @@ -3004,7 +3004,7 @@ "canDash", {"or": [ "canCarefulJump", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]}, {"or": [ "canDisableEquipment", @@ -3096,7 +3096,7 @@ "name": "Ocean Floor Precise Wall Jump Shinespark Right", "requires": [ "Gravity", - "canPreciseWalljump", + "canPreciseWallJump", "h_shinechargeMaxRunway", "canShinechargeMovementComplex", {"shinespark": {"frames": 15, "excessFrames": 0}} diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index 8ad0cf876..9286e8be1 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -1384,7 +1384,7 @@ {"or": [ {"and": [ "canTrickyJump", - "canTrickyWalljump" + "canTrickyWallJump" ]}, {"and": [ "canCarefulJump", diff --git a/region/crateria/west/Gauntlet Entrance.json b/region/crateria/west/Gauntlet Entrance.json index a60f24645..78d1dae0b 100644 --- a/region/crateria/west/Gauntlet Entrance.json +++ b/region/crateria/west/Gauntlet Entrance.json @@ -653,7 +653,7 @@ "canChainTemporaryBlue", {"acidFrames": 10}, {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", {"acidFrames": 30} ]} ], diff --git a/region/crateria/west/Statues Room.json b/region/crateria/west/Statues Room.json index e9190b5f0..2e5960b53 100644 --- a/region/crateria/west/Statues Room.json +++ b/region/crateria/west/Statues Room.json @@ -211,7 +211,7 @@ "requires": [ {"notable": "Underwater Walljump"}, "f_TourianOpen", - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/lowernorfair/east/Amphitheatre.json b/region/lowernorfair/east/Amphitheatre.json index 895687205..54593fafe 100644 --- a/region/lowernorfair/east/Amphitheatre.json +++ b/region/lowernorfair/east/Amphitheatre.json @@ -272,7 +272,7 @@ "requires": [ {"or": [ "SpaceJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "canJumpIntoIBJ", "canLongIBJ", @@ -1064,7 +1064,7 @@ {"acidFrames": 195} ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 480}, {"acidFrames": 250} ]}, @@ -1541,7 +1541,7 @@ {"obstaclesCleared": ["A"]}, {"or": [ "canCarefulJump", - "canPreciseWalljump", + "canPreciseWallJump", "ScrewAttack", "canSpringBallJumpMidAir", "SpaceJump", @@ -1719,12 +1719,12 @@ {"or": [ {"and": [ "HiJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 150}, {"acidFrames": 150} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 210}, {"acidFrames": 210} ]} @@ -1745,7 +1745,7 @@ "requires": [ {"notable": "Reverse Acid Dive"}, {"obstaclesNotCleared": ["A"]}, - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ {"and": [ "HiJump", @@ -1774,11 +1774,11 @@ {"obstaclesCleared": ["A"]}, {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 300} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "HiJump", {"heatFrames": 240} ]}, @@ -1897,11 +1897,11 @@ ]}, {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"cycleFrames": 280} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "HiJump", {"cycleFrames": 220} ]}, diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json index ac6723b81..85a58dcfc 100644 --- a/region/lowernorfair/east/Fast Pillars Setup Room.json +++ b/region/lowernorfair/east/Fast Pillars Setup Room.json @@ -463,7 +463,7 @@ "link": [1, 4], "name": "Quick Walljump", "requires": [ - "canPreciseWalljump", + "canPreciseWallJump", "canDash", {"or": [ "canTrickyJump", @@ -3326,7 +3326,7 @@ "requires": [ {"or": [ {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"or": [ "canStationarySpinJump", {"heatFrames": 250} diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json index c65b52ccc..cb8d68668 100644 --- a/region/lowernorfair/east/Lower Norfair Fireflea Room.json +++ b/region/lowernorfair/east/Lower Norfair Fireflea Room.json @@ -515,7 +515,7 @@ "h_usePowerBomb", {"or": [ "SpaceJump", - "canPreciseWalljump", + "canPreciseWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -580,7 +580,7 @@ "canHorizontalDamageBoost", {"enemyDamage": {"enemy": "Fireflea", "type": "contact", "hits": 2}}, {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -594,7 +594,7 @@ ]}, {"or": [ "SpaceJump", - "canPreciseWalljump", + "canPreciseWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -649,7 +649,7 @@ ]}, {"or": [ "SpaceJump", - "canPreciseWalljump", + "canPreciseWallJump", {"and": [ "HiJump", "canSpeedyJump" @@ -731,7 +731,7 @@ {"or": [ "SpaceJump", "HiJump", - "canPreciseWalljump" + "canPreciseWallJump" ]} ]} ]}, @@ -1245,7 +1245,7 @@ "name": "Top to Bottom Itemless Damageless", "requires": [ {"or": [ - "canInsaneWalljump", + "canInsaneWallJump", "canInsaneJump" ]} ], @@ -1740,7 +1740,7 @@ "link": [5, 7], "name": "Wall Jump Damage Boost", "requires": [ - "canTrickyWalljump", + "canTrickyWallJump", "canCarefulJump", "canHorizontalDamageBoost", {"enemyDamage": {"enemy": "Fireflea", "type": "contact", "hits": 1}} @@ -1754,8 +1754,8 @@ "link": [5, 7], "name": "HiJumpless Walljump", "requires": [ - "canConsecutiveWalljump", - "canPreciseWalljump", + "canConsecutiveWallJump", + "canPreciseWallJump", "canCarefulJump", {"or": [ "canTrickyJump", diff --git a/region/lowernorfair/east/Mickey Mouse Room.json b/region/lowernorfair/east/Mickey Mouse Room.json index a87f63256..279d3cbc1 100644 --- a/region/lowernorfair/east/Mickey Mouse Room.json +++ b/region/lowernorfair/east/Mickey Mouse Room.json @@ -1903,7 +1903,7 @@ "canCrumbleJump", {"and": [ "h_trickySpringwall", - "canPreciseWalljump" + "canPreciseWallJump" ]} ]} ], @@ -1924,7 +1924,7 @@ {"obstaclesCleared": ["B"]}, "canCrumbleJump", "canTrickyDashJump", - "canPreciseWalljump", + "canPreciseWallJump", "canInsaneJump", {"heatFrames": 180} ], diff --git a/region/lowernorfair/east/Pillar Room.json b/region/lowernorfair/east/Pillar Room.json index 212cbfb87..daf35eaa1 100644 --- a/region/lowernorfair/east/Pillar Room.json +++ b/region/lowernorfair/east/Pillar Room.json @@ -734,7 +734,7 @@ {"or": [ "canLateralMidAirMorph", {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 20}, {"acidFrames": 10} ]}, @@ -1125,7 +1125,7 @@ {"acidFrames": 10} ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 50}, {"acidFrames": 32} ]}, @@ -1418,7 +1418,7 @@ "canTrickyGMode", {"and": [ "canTrickyJump", - "canPreciseWalljump", + "canPreciseWallJump", {"acidFrames": 10} ]}, {"and": [ diff --git a/region/lowernorfair/east/Plowerhouse Room.json b/region/lowernorfair/east/Plowerhouse Room.json index e8a98d89a..3e6ed2c18 100644 --- a/region/lowernorfair/east/Plowerhouse Room.json +++ b/region/lowernorfair/east/Plowerhouse Room.json @@ -845,7 +845,7 @@ "canTrickyDodgeEnemies", {"or": [ "canInsaneJump", - "canPreciseWalljump" + "canPreciseWallJump" ]}, {"heatFrames": 310} ], 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 b6ac4d1c3..c3d14c38d 100644 --- a/region/lowernorfair/east/The Worst Room In The Game.json +++ b/region/lowernorfair/east/The Worst Room In The Game.json @@ -481,7 +481,7 @@ {"or": [ {"and": [ "HiJump", - "canPreciseWalljump" + "canPreciseWallJump" ]}, "canSpringwall", "canLongIBJ" @@ -529,7 +529,7 @@ ]}, {"haveBlueSuit": {}} ]}, - "canInsaneWalljump", + "canInsaneWallJump", "canInsaneJump", {"or": [ "Wave", @@ -664,7 +664,7 @@ {"or": [ {"and": [ "HiJump", - "canPreciseWalljump" + "canPreciseWallJump" ]}, "canSpringwall", "canLongIBJ" @@ -710,7 +710,7 @@ ]}, {"haveBlueSuit": {}} ]}, - "canInsaneWalljump", + "canInsaneWallJump", "canInsaneJump", {"or": [ "h_heatedGModeOpenDifferentDoor", @@ -743,12 +743,12 @@ ]}, {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "HiJump", {"heatFrames": 190} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 240} ]}, {"and": [ @@ -768,8 +768,8 @@ "requires": [ {"haveBlueSuit": {}}, "HiJump", - "canConsecutiveWalljump", - "canPreciseWalljump", + "canConsecutiveWallJump", + "canPreciseWallJump", {"heatFrames": 185} ], "flashSuitChecked": true, @@ -859,7 +859,7 @@ {"notable": "New Route with HiJump, Speed, and PowerBombs"}, "HiJump", "canSpeedyJump", - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyDodgeEnemies", "h_usePowerBomb", "canTrivialMidAirMorph", @@ -886,8 +886,8 @@ "name": "HiJump, Screw, and Power Bomb", "requires": [ "h_usePowerBomb", - "canPreciseWalljump", - "canConsecutiveWalljump", + "canPreciseWallJump", + "canConsecutiveWallJump", "canTrivialMidAirMorph", "HiJump", "ScrewAttack", @@ -920,7 +920,7 @@ {"or": [ {"and": [ "SpaceJump", - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 490} ]}, {"and": [ @@ -935,7 +935,7 @@ ]}, {"and": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canInsaneJump", {"heatFrames": 470} ]}, @@ -978,7 +978,7 @@ "canDodgeWhileShooting", "Charge", "h_heatProof", - "canTrickyWalljump", + "canTrickyWallJump", {"or": [ "ScrewAttack", {"and": [ @@ -1008,7 +1008,7 @@ {"notable": "Low Ice Pirate Freeze"}, "canTrickyUseFrozenEnemies", "Charge", - "canPreciseWalljump", + "canPreciseWallJump", "canWallJumpWithCharge", "canTrivialMidAirMorph", "canTrickyDodgeEnemies", @@ -1046,7 +1046,7 @@ {"notable": "New Low Ice Pirate Freeze"}, "canTrickyUseFrozenEnemies", "Charge", - "canPreciseWalljump", + "canPreciseWallJump", "canResetFallSpeed", "canWallJumpWithCharge", "h_useMorphBombs", @@ -1083,7 +1083,7 @@ "name": "Power Bomb Diagonal Bomb Jump", "requires": [ {"notable": "Power Bomb Diagonal Bomb Jump"}, - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canWallJumpBombBoost", "canDiagonalBombJump", "h_usePowerBomb", @@ -2253,7 +2253,7 @@ "requires": [ "canWallJumpInstantMorph", "canTrickyJump", - "canInsaneWalljump", + "canInsaneWallJump", {"heatFrames": 290} ], "flashSuitChecked": true, @@ -2400,7 +2400,7 @@ "link": [5, 3], "name": "HiJumpless Pirate Dodge", "requires": [ - "canInsaneWalljump", + "canInsaneWallJump", "canWallJumpInstantMorph", "canTrickyJump", {"heatFrames": 160} @@ -2618,12 +2618,12 @@ "SpaceJump", {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "HiJump", {"heatFrames": 160} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 210} ]}, {"and": [ @@ -2648,7 +2648,7 @@ "name": "Springwall", "requires": [ "h_heatedSpringwall", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 220}, {"or": [ {"obstaclesCleared": ["A"]}, @@ -2665,11 +2665,11 @@ "name": "HiJump Walljump", "requires": [ "HiJump", - "canPreciseWalljump", - "canConsecutiveWalljump", + "canPreciseWallJump", + "canConsecutiveWallJump", {"heatFrames": 180}, {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", {"heatFrames": 300} ]}, {"or": [ @@ -2686,8 +2686,8 @@ "link": [6, 4], "name": "HiJumpless Walljump", "requires": [ - "canInsaneWalljump", - "canConsecutiveWalljump", + "canInsaneWallJump", + "canConsecutiveWallJump", "h_heatProof", {"or": [ {"obstaclesCleared": ["A"]}, @@ -2707,9 +2707,9 @@ "h_heatProof", "HiJump", "ScrewAttack", - "canInsaneWalljump", + "canInsaneWallJump", "canInsaneJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canMidairWiggle" ], "clearsObstacles": ["A"], @@ -2781,7 +2781,7 @@ {"and": [ "HiJump", "SpaceJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 440} ]}, {"and": [ @@ -2791,7 +2791,7 @@ ]}, {"and": [ "SpaceJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 520} ]}, {"and": [ @@ -2871,13 +2871,13 @@ "name": "Break Bomb Blocks with Bombs (Delayed Wall Jump Morph)", "requires": [ "HiJump", - "canTrickyWalljump", + "canTrickyWallJump", "canWallJumpInstantMorph", "canTrickyJump", "h_useMorphBombs", {"heatFrames": 520}, {"or": [ - "canInsaneWalljump", + "canInsaneWallJump", {"heatFrames": 500} ]} ], diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index f5478e55e..de334b3d4 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -509,13 +509,13 @@ "requires": [ {"heatFrames": 660}, {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", {"hibashiHits": 1}, "canTrickyDodgeEnemies", {"haveBlueSuit": {}} ]}, {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", {"acidFrames": 50}, {"and": [ "HiJump", @@ -565,7 +565,7 @@ "canCarefulJump", "canWallJump", {"or": [ - "canInsaneWalljump", + "canInsaneWallJump", {"acidFrames": 30} ]}, {"heatFrames": 310}, @@ -630,7 +630,7 @@ "Morph", {"or": [ "SpaceJump", - "canTrickyWalljump", + "canTrickyWallJump", {"and": [ "canDash", "HiJump" @@ -831,7 +831,7 @@ {"or": [ {"and": [ "canWallJumpInstantMorph", - "canPreciseWalljump" + "canPreciseWallJump" ]}, {"and": [ "canSpeedyJump", @@ -1270,7 +1270,7 @@ "requires": [ {"obstaclesNotCleared": ["B"]}, "Morph", - "canTrickyWalljump", + "canTrickyWallJump", {"heatFrames": 600}, {"or": [ "canDash", @@ -1465,7 +1465,7 @@ {"or": [ {"and": [ "canWallJumpInstantMorph", - "canPreciseWalljump" + "canPreciseWallJump" ]}, {"and": [ "canSpeedyJump", diff --git a/region/lowernorfair/east/Wasteland.json b/region/lowernorfair/east/Wasteland.json index 5b979baf5..901c55862 100644 --- a/region/lowernorfair/east/Wasteland.json +++ b/region/lowernorfair/east/Wasteland.json @@ -342,7 +342,7 @@ {"heatFrames": 390} ]}, {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canCarefulJump", {"heatFrames": 330} ]}, diff --git a/region/lowernorfair/west/Acid Statue Room.json b/region/lowernorfair/west/Acid Statue Room.json index 41e9445a1..978aeb287 100644 --- a/region/lowernorfair/west/Acid Statue Room.json +++ b/region/lowernorfair/west/Acid Statue Room.json @@ -667,7 +667,7 @@ "canXRayClimb", "canOffScreenMovement", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "SpaceJump", "HiJump", "canTrickySpringBallJump" @@ -704,7 +704,7 @@ "canXRayClimb", "canOffScreenMovement", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "SpaceJump", "HiJump", "canTrickySpringBallJump" diff --git a/region/lowernorfair/west/Golden Torizo's Room.json b/region/lowernorfair/west/Golden Torizo's Room.json index 773f16d9a..6484795d4 100644 --- a/region/lowernorfair/west/Golden Torizo's Room.json +++ b/region/lowernorfair/west/Golden Torizo's Room.json @@ -1561,7 +1561,7 @@ ]}, {"or": [ {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 230} ]}, {"and": [ @@ -1631,7 +1631,7 @@ "name": "Screw Walljump Wiggle", "requires": [ "ScrewAttack", - "canPreciseWalljump", + "canPreciseWallJump", "canMidairWiggle", {"heatFrames": 160}, {"or": [ @@ -1651,7 +1651,7 @@ {"haveBlueSuit": {}}, {"or": [ {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 150} ]}, {"and": [ @@ -1686,8 +1686,8 @@ {"notable": "Right Item Double Shinespark"}, "f_DefeatedGoldenTorizo", "canShinechargeMovementComplex", - "canPreciseWalljump", - "canConsecutiveWalljump", + "canPreciseWallJump", + "canConsecutiveWallJump", {"canShineCharge": {"usedTiles": 28, "openEnd": 0}}, {"heatFrames": 900}, {"shinespark": {"frames": 12, "excessFrames": 2}} @@ -1810,7 +1810,7 @@ "requires": [ "h_useMorphBombs", "can3HighWallMidAirMorph", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"heatFrames": 650} ], "flashSuitChecked": true, @@ -2192,7 +2192,7 @@ {"and": [ "HiJump", {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", "canSpringBallJumpMidAir", "canSpeedyJump" ]} @@ -2212,8 +2212,8 @@ ]}, {"and": [ "f_DefeatedGoldenTorizo", - "canConsecutiveWalljump", - "canInsaneWalljump" + "canConsecutiveWallJump", + "canInsaneWallJump" ]}, {"and": [ "f_DefeatedGoldenTorizo", @@ -2258,7 +2258,7 @@ {"and": [ "HiJump", {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", "canSpringBallJumpMidAir", "canSpeedyJump" ]} @@ -2278,8 +2278,8 @@ ]}, {"and": [ "f_DefeatedGoldenTorizo", - "canConsecutiveWalljump", - "canInsaneWalljump" + "canConsecutiveWallJump", + "canInsaneWallJump" ]}, {"and": [ "f_DefeatedGoldenTorizo", @@ -2344,7 +2344,7 @@ ]}, {"and": [ "f_DefeatedGoldenTorizo", - "canPreciseWalljump" + "canPreciseWallJump" ]}, {"and": [ "f_DefeatedGoldenTorizo", diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json index fe992496e..dc62e8228 100644 --- a/region/lowernorfair/west/Screw Attack Room.json +++ b/region/lowernorfair/west/Screw Attack Room.json @@ -1514,7 +1514,7 @@ {"obstaclesCleared": ["A"]}, "HiJump", "canSpeedyJump", - "canPreciseWalljump", + "canPreciseWallJump", "canCarefulJump", {"or": [ "canTrickyJump", @@ -1596,7 +1596,7 @@ "canCWJ", "canStationarySpinJump", "canInsaneJump", - "canInsaneWalljump", + "canInsaneWallJump", {"doorUnlockedAtNode": 2} ], "unlocksDoors": [ diff --git a/region/maridia/inner-green/Oasis.json b/region/maridia/inner-green/Oasis.json index 05bb353a0..8d076a9e3 100644 --- a/region/maridia/inner-green/Oasis.json +++ b/region/maridia/inner-green/Oasis.json @@ -3649,7 +3649,7 @@ {"or": [ "canDownGrab", "canSpringBallJumpMidAir", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ]}, "h_underwaterMaxHeightSpringBallJump" diff --git a/region/maridia/inner-green/Pants Room.json b/region/maridia/inner-green/Pants Room.json index 342087c9e..549dfbc6c 100644 --- a/region/maridia/inner-green/Pants Room.json +++ b/region/maridia/inner-green/Pants Room.json @@ -566,10 +566,10 @@ {"enemyDamage": {"enemy": "Menu", "type": "contact", "hits": 1}}, "SpaceJump", {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ "ScrewAttack", - "canTrickyWalljump" + "canTrickyWallJump" ]} ]}, "h_pauseAbuseMinimalReserveRefill", @@ -805,11 +805,11 @@ "name": "Wall Jump", "requires": [ "Gravity", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ "ScrewAttack", {"haveBlueSuit": {}}, - "canTrickyWalljump", + "canTrickyWallJump", "canWallJumpWithCharge", {"enemyDamage": {"enemy": "Menu", "type": "contact", "hits": 1}} ]} @@ -835,7 +835,7 @@ {"or": [ {"enemyDamage": {"enemy": "Menu", "type": "contact", "hits": 1}}, "ScrewAttack", - "canTrickyWalljump", + "canTrickyWallJump", "canPseudoScrew", {"haveBlueSuit": {}}, "h_pauseAbuseMinimalReserveRefill" @@ -883,7 +883,7 @@ "link": [5, 2], "name": "Underwater Walljump Break Free", "requires": [ - "canUnderwaterWalljumpBreakFree" + "canUnderwaterWallJumpBreakFree" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -954,7 +954,7 @@ "ScrewAttack", {"haveBlueSuit": {}} ]}, - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"cycleFrames": 1120} ], "farmCycleDrops": [{"enemy": "Menu", "count": 6}], diff --git a/region/maridia/inner-green/West Sand Hall.json b/region/maridia/inner-green/West Sand Hall.json index 8206476a8..de7705673 100644 --- a/region/maridia/inner-green/West Sand Hall.json +++ b/region/maridia/inner-green/West Sand Hall.json @@ -1563,7 +1563,7 @@ "Gravity", {"or": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canPlayInSand" ]}, {"or": [ diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json index 0833ece87..6a1c39b5f 100644 --- a/region/maridia/inner-pink/Aqueduct.json +++ b/region/maridia/inner-pink/Aqueduct.json @@ -446,8 +446,8 @@ ]}, {"and": [ "HiJump", - "canConsecutiveWalljump", - "canPreciseWalljump" + "canConsecutiveWallJump", + "canPreciseWallJump" ]}, "h_artificialMorphDoubleSpringBallJump", {"and": [ @@ -526,8 +526,8 @@ ]}, {"and": [ "HiJump", - "canConsecutiveWalljump", - "canPreciseWalljump" + "canConsecutiveWallJump", + "canPreciseWallJump" ]}, "h_artificialMorphDoubleSpringBallJump", {"and": [ @@ -662,7 +662,7 @@ "requires": [ "canSuitlessMaridia", "HiJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ {"obstaclesCleared": ["A"]}, "h_usePowerBomb" @@ -1750,7 +1750,7 @@ {"or": [ "SpaceJump", "Grapple", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ], "flashSuitChecked": true, @@ -3711,7 +3711,7 @@ "Gravity", {"or": [ "SpaceJump", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ]} ]} diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json index c87e7c423..6d40a842f 100644 --- a/region/maridia/inner-pink/Colosseum.json +++ b/region/maridia/inner-pink/Colosseum.json @@ -519,12 +519,12 @@ "canWallJump", {"or": [ "canPlayInSand", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ]}, {"and": [ - "canTrickyWalljump", - "canConsecutiveWalljump" + "canTrickyWallJump", + "canConsecutiveWallJump" ]}, {"and": [ "canPreciseGrapple", @@ -569,7 +569,7 @@ {"notable": "Blue Suit Sand Traversal"}, {"haveBlueSuit": {}}, "Gravity", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -2054,7 +2054,7 @@ "link": [2, 3], "name": "Underwater Wall Jump", "requires": [ - "canUnderwaterWalljump", + "canUnderwaterWallJump", "canSpaceJumpWaterBounce" ], "flashSuitChecked": true, @@ -2065,7 +2065,7 @@ "link": [2, 3], "name": "Underwater Wall Jump Break Free", "requires": [ - "canUnderwaterWalljumpBreakFree" + "canUnderwaterWallJumpBreakFree" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -2211,7 +2211,7 @@ "canShinechargeMovementComplex", {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"shineChargeFrames": 120} ]}, {"and": [ @@ -2243,7 +2243,7 @@ "canShinechargeMovementComplex", {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"shineChargeFrames": 120} ]}, {"and": [ @@ -2281,7 +2281,7 @@ "canShinechargeMovementComplex", {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"shineChargeFrames": 100}, {"shinespark": {"frames": 6, "excessFrames": 0}} ]}, @@ -2336,7 +2336,7 @@ "canShinechargeMovementComplex", {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"shineChargeFrames": 100}, {"shinespark": {"frames": 6, "excessFrames": 0}} ]}, @@ -2386,7 +2386,7 @@ "requires": [ "Gravity", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "Grapple", {"and": [ "canWallJump", @@ -2431,7 +2431,7 @@ {"notable": "Blue Suit Sand Traversal"}, {"haveBlueSuit": {}}, "Gravity", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -2628,7 +2628,7 @@ {"notable": "Bomb Jump Water Escape"}, "canDash", "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canUseIFrames", {"spikeHits": 1}, "canNeutralDamageBoost", @@ -2675,7 +2675,7 @@ "requires": [ {"notable": "Spike Platforming with No Equipment"}, "canDash", - "canPreciseWalljump", + "canPreciseWallJump", "canInsaneJump", "canUseIFrames", {"spikeHits": 3}, @@ -2868,7 +2868,7 @@ {"or": [ {"shinespark": {"frames": 121, "excessFrames": 4}}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"shinespark": {"frames": 110, "excessFrames": 4}} ]} ]} diff --git a/region/maridia/inner-pink/Crab Shaft.json b/region/maridia/inner-pink/Crab Shaft.json index 1edacae18..6ba619f84 100644 --- a/region/maridia/inner-pink/Crab Shaft.json +++ b/region/maridia/inner-pink/Crab Shaft.json @@ -732,7 +732,7 @@ {"notable": "Suitless Walljump Climb with HiJump"}, "canSuitlessMaridia", "HiJump", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -2487,7 +2487,7 @@ "canPrepareForNextRoom", {"or": [ "canResetFallSpeed", - "canPreciseWalljump" + "canPreciseWallJump" ]}, "canFarmWhileShooting", "h_underwaterCrouchJump" diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json index d92e59063..824bacd67 100644 --- a/region/maridia/inner-pink/Draygon's Room.json +++ b/region/maridia/inner-pink/Draygon's Room.json @@ -633,7 +633,7 @@ "canSpikeSuit", {"or": [ "h_breakOneDraygonTurret", - "canTrickyWalljump" + "canTrickyWallJump" ]}, {"shinespark": {"frames": 2, "excessFrames": 2}} ], @@ -911,7 +911,7 @@ "requires": [ "Gravity", "canTrickyDashJump", - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json index 3851ed477..80cc09d61 100644 --- a/region/maridia/inner-pink/East Cactus Alley.json +++ b/region/maridia/inner-pink/East Cactus Alley.json @@ -157,7 +157,7 @@ {"cycleFrames": 360} ]}, {"and": [ - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 380} ]}, {"and": [ @@ -186,7 +186,7 @@ "HiJump", "canTrickyJump", "canMidairWiggle", - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 360} ]}, {"and": [ @@ -263,12 +263,12 @@ ]}, {"and": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", {"shineChargeFrames": 160} ]}, {"and": [ "SpaceJump", - "canPreciseWalljump", + "canPreciseWallJump", {"shineChargeFrames": 160} ]} ]} @@ -297,8 +297,8 @@ "canTrickyDashJump" ]}, {"and": [ - "canFastWalljumpClimb", - "canPreciseWalljump" + "canFastWallJumpClimb", + "canPreciseWallJump" ]}, {"and": [ "SpaceJump", @@ -1358,7 +1358,7 @@ "link": [2, 4], "name": "Underwater Walljump Break Free", "requires": [ - "canUnderwaterWalljumpBreakFree", + "canUnderwaterWallJumpBreakFree", {"spikeHits": 2} ], "flashSuitChecked": true, @@ -1489,8 +1489,8 @@ "Gravity", {"or": [ {"and": [ - "canPreciseWalljump", - "canConsecutiveWalljump" + "canPreciseWallJump", + "canConsecutiveWallJump" ]}, {"and": [ "HiJump", @@ -1564,14 +1564,14 @@ "requires": [ "canSuitlessMaridia", "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", {"or": [ "canTrickyJump", "canMidairWiggle" ]}, {"or": [ - "canConsecutiveWalljump", - "canTrickyWalljump" + "canConsecutiveWallJump", + "canTrickyWallJump" ]} ], "flashSuitChecked": true, @@ -1887,7 +1887,7 @@ "link": [5, 4], "name": "Underwater Walljump", "requires": [ - "canUnderwaterWalljump", + "canUnderwaterWallJump", "canSpaceJumpWaterBounce" ], "flashSuitChecked": true, @@ -1937,7 +1937,7 @@ "link": [5, 4], "name": "Underwater Walljump Break Free", "requires": [ - "canUnderwaterWalljumpBreakFree" + "canUnderwaterWallJumpBreakFree" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/maridia/inner-pink/East Sand Pit.json b/region/maridia/inner-pink/East Sand Pit.json index da96b2246..aa55c170b 100644 --- a/region/maridia/inner-pink/East Sand Pit.json +++ b/region/maridia/inner-pink/East Sand Pit.json @@ -231,7 +231,7 @@ {"notable": "Underwater Wall Jump"}, "Morph", "canPlayInSand", - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -244,10 +244,10 @@ "requires": [ {"notable": "Insane Walljump Morph"}, "canSuitlessMaridia", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canPlayInSand", "HiJump", - "canInsaneWalljump", + "canInsaneWallJump", "can3HighWallMidAirMorph" ], "flashSuitChecked": true, @@ -429,7 +429,7 @@ "canSuitlessMaridia", "HiJump", "canTrickyJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canWallJumpInstantMorph" ], "flashSuitChecked": true, diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json index 599ceed29..e6130d405 100644 --- a/region/maridia/inner-pink/Halfie Climb Room.json +++ b/region/maridia/inner-pink/Halfie Climb Room.json @@ -816,7 +816,7 @@ "canWallJump" ]} ]}, - "canConsecutiveWalljump" + "canConsecutiveWallJump" ]} ], "flashSuitChecked": true, @@ -911,7 +911,7 @@ "link": [1, 4], "name": "Underwater Wall Jump Break Free", "requires": [ - "canUnderwaterWalljumpBreakFree" + "canUnderwaterWallJumpBreakFree" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -1344,7 +1344,7 @@ "requires": [ {"shineChargeFrames": 95}, "Gravity", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 19, "excessFrames": 0}} ], @@ -1689,7 +1689,7 @@ "link": [2, 1], "name": "Very Long Underwater Walljump Climb", "requires": [ - "canLongUnderwaterWalljump" + "canLongUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -1786,7 +1786,7 @@ "requires": [ "Gravity", "canWallJump", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canShinechargeMovementComplex", {"shineChargeFrames": 145} ], @@ -1862,7 +1862,7 @@ "requires": [ {"shineChargeFrames": 120}, "Gravity", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canShinechargeMovementComplex" ], "exitCondition": { @@ -1885,7 +1885,7 @@ "requires": [ {"shineChargeFrames": 100}, "Gravity", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canShinechargeMovementComplex", {"shinespark": {"frames": 4, "excessFrames": 0}} ], @@ -2035,7 +2035,7 @@ ]} ]}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "SpaceJump", {"cycleFrames": 40} @@ -2771,7 +2771,7 @@ } }, "requires": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", "canCrossRoomJumpIntoWater" ], @@ -3147,7 +3147,7 @@ "Gravity", "HiJump", "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shineChargeFrames": 165} ], "exitCondition": { @@ -3173,7 +3173,7 @@ "requires": [ "Gravity", "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shineChargeFrames": 150}, {"or": [ "HiJump", diff --git a/region/maridia/inner-pink/The Precious Room.json b/region/maridia/inner-pink/The Precious Room.json index f4cb33b58..68f38ffe2 100644 --- a/region/maridia/inner-pink/The Precious Room.json +++ b/region/maridia/inner-pink/The Precious Room.json @@ -181,7 +181,7 @@ "name": "Delayed Wall Jump", "requires": [ "Gravity", - "canTrickyWalljump" + "canTrickyWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -693,7 +693,7 @@ "name": "Long Underwater Wall Jump, Use Stored Spark", "requires": [ "canTrickyCarryFlashSuit", - "canLongUnderwaterWalljump", + "canLongUnderwaterWallJump", "h_storedSpark", {"shinespark": {"frames": 12, "excessFrames": 8}} ], diff --git a/region/maridia/inner-pink/West Cactus Alley.json b/region/maridia/inner-pink/West Cactus Alley.json index 9896af891..926d169f9 100644 --- a/region/maridia/inner-pink/West Cactus Alley.json +++ b/region/maridia/inner-pink/West Cactus Alley.json @@ -518,7 +518,7 @@ "link": [1, 2], "name": "Underwater Wall Jumps", "requires": [ - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/maridia/inner-pink/West Sand Pit.json b/region/maridia/inner-pink/West Sand Pit.json index 4eca17e32..e52d7a927 100644 --- a/region/maridia/inner-pink/West Sand Pit.json +++ b/region/maridia/inner-pink/West Sand Pit.json @@ -207,8 +207,8 @@ "canSuitlessMaridia", "canPlayInSand", "HiJump", - "canConsecutiveWalljump", - "canPreciseWalljump" + "canConsecutiveWallJump", + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -224,7 +224,7 @@ "requires": [ "canPlayInSand", "HiJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canSpaceJumpWaterBounce" ], "flashSuitChecked": true, @@ -524,7 +524,7 @@ "h_complexToCarryFlashSuit" ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canWallJumpInstantMorph" ]} ]} @@ -662,7 +662,7 @@ "canSuitlessMaridia", "HiJump", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canSpaceJumpWaterBounce" ]} ], @@ -726,7 +726,7 @@ {"or": [ {"and": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canWallJumpInstantMorph" ]}, {"and": [ @@ -734,7 +734,7 @@ "canSpaceJumpWaterEscape" ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canSpaceJumpWaterBounce" ]} ]} diff --git a/region/maridia/inner-yellow/Maridia Elevator Room.json b/region/maridia/inner-yellow/Maridia Elevator Room.json index 9472f9c19..e4b943302 100644 --- a/region/maridia/inner-yellow/Maridia Elevator Room.json +++ b/region/maridia/inner-yellow/Maridia Elevator Room.json @@ -233,7 +233,7 @@ {"and": [ {"resetRoom": {"nodes": [3]}}, {"cycleFrames": 1680}, - "canTrickyWalljump", + "canTrickyWallJump", "canTrickyJump" ]} ]}, @@ -494,7 +494,7 @@ {"shineChargeFrames": 130} ]}, {"and": [ - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shineChargeFrames": 150} ]} ]} @@ -524,7 +524,7 @@ {"shineChargeFrames": 125} ]}, {"and": [ - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shineChargeFrames": 145} ]} ]} @@ -771,7 +771,7 @@ "requires": [ {"or": [ "canTrivialUseFrozenEnemies", - "canTrickyWalljump" + "canTrickyWallJump" ]} ], "flashSuitChecked": true, @@ -1017,7 +1017,7 @@ "name": "Kill Rippers", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "HiJump", "canWallJump" @@ -1073,7 +1073,7 @@ "link": [2, 3], "name": "Staggered Wall Climb", "requires": [ - "canTrickyWalljump", + "canTrickyWallJump", {"or": [ "canTrickyJump", {"enemyDamage": {"enemy": "Ripper", "type": "contact", "hits": 2}} @@ -1354,7 +1354,7 @@ "requires": [ {"or": [ "canTrivialUseFrozenEnemies", - "canTrickyWalljump", + "canTrickyWallJump", {"and": [ "SpaceJump", "canTrickyJump" @@ -1520,7 +1520,7 @@ ]} ]}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "SpaceJump", {"cycleFrames": 240} diff --git a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json index dd8f7ba7a..34173f93f 100644 --- a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json +++ b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json @@ -885,7 +885,7 @@ "requires": [ "canTrickyJump", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickySpringBallJump" ]} ], diff --git a/region/maridia/inner-yellow/Plasma Room.json b/region/maridia/inner-yellow/Plasma Room.json index a53946a22..5b4e11e8f 100644 --- a/region/maridia/inner-yellow/Plasma Room.json +++ b/region/maridia/inner-yellow/Plasma Room.json @@ -300,7 +300,7 @@ ]}, {"and": [ "HiJump", - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 960} ]}, {"and": [ @@ -874,7 +874,7 @@ "name": "HiJump Wall Jump", "requires": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", {"or": [ "canDodgeWhileShooting", {"obstaclesCleared": ["B"]} @@ -975,7 +975,7 @@ "requires": [ "canTrickyUseFrozenEnemies", "canDodgeWhileShooting", - "canPreciseWalljump", + "canPreciseWallJump", {"or": [ {"obstaclesCleared": ["B"]}, "canTrickyDodgeEnemies" @@ -997,8 +997,8 @@ "link": [3, 1], "name": "HiJumpless Wall Jump", "requires": [ - "canInsaneWalljump", - "canConsecutiveWalljump" + "canInsaneWallJump", + "canConsecutiveWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/maridia/inner-yellow/Plasma Spark Room.json b/region/maridia/inner-yellow/Plasma Spark Room.json index 6f94789c2..aa76e758d 100644 --- a/region/maridia/inner-yellow/Plasma Spark Room.json +++ b/region/maridia/inner-yellow/Plasma Spark Room.json @@ -1874,8 +1874,8 @@ {"cycleFrames": 230} ]}, {"and": [ - "canTrickyWalljump", - "canConsecutiveWalljump", + "canTrickyWallJump", + "canConsecutiveWallJump", {"cycleFrames": 310} ]}, {"and": [ @@ -1963,7 +1963,7 @@ "name": "Base", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]} @@ -2218,7 +2218,7 @@ "name": "Base", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]}, @@ -2233,7 +2233,7 @@ "name": "Screw Kill", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]}, {"or": [ @@ -2245,7 +2245,7 @@ {"or": [ "SpaceJump", {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canWallJumpWithCharge" ]} ]}, @@ -2265,7 +2265,7 @@ "name": "Carefully Kill Choot", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]}, @@ -2293,7 +2293,7 @@ "name": "Kill Choot and Reclimb", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]}, @@ -2798,7 +2798,7 @@ "link": [5, 4], "name": "Base", "requires": [ - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true diff --git a/region/maridia/inner-yellow/The Beach.json b/region/maridia/inner-yellow/The Beach.json index 5f6096191..3e3dfaa77 100644 --- a/region/maridia/inner-yellow/The Beach.json +++ b/region/maridia/inner-yellow/The Beach.json @@ -1085,7 +1085,7 @@ "link": [2, 4], "name": "Underwater Walljump", "requires": [ - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -1736,7 +1736,7 @@ }, "requires": [ "canCrossRoomJumpIntoWater", - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -1762,9 +1762,9 @@ "requires": [ "canCrossRoomJumpIntoWater", {"or": [ - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canMomentumConservingTurnaround" ]} ]} @@ -1897,7 +1897,7 @@ "name": "Wall Jump Escape", "requires": [ "canSuitlessMaridia", - "canTrickyWalljump" + "canTrickyWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json index 4054336a1..1f18fda75 100644 --- a/region/maridia/outer/Fish Tank.json +++ b/region/maridia/outer/Fish Tank.json @@ -1589,7 +1589,7 @@ "link": [1, 5], "name": "Very Long Underwater Walljump Climb", "requires": [ - "canLongUnderwaterWalljump", + "canLongUnderwaterWallJump", {"or": [ "h_midAirShootUp", "canBeExtremelyPatient" @@ -3177,7 +3177,7 @@ {"and": [ "Gravity", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ", {"and": [ @@ -3402,7 +3402,7 @@ "requires": [ {"notable": "Wall Jump Entry"}, "canSuitlessMaridia", - "canPreciseWalljump", + "canPreciseWallJump", "canPrepareForNextRoom", "canMidairWiggle", "canCarefulJump" @@ -3433,7 +3433,7 @@ "requires": [ {"notable": "Wall Jump Entry"}, "canSuitlessMaridia", - "canPreciseWalljump", + "canPreciseWallJump", "canPrepareForNextRoom", "canTrickyJump" ], @@ -3611,8 +3611,8 @@ "canWallJump" ]}, {"and": [ - "canPreciseWalljump", - "canConsecutiveWalljump" + "canPreciseWallJump", + "canConsecutiveWallJump" ]}, "SpaceJump", "canUseFrozenEnemies" @@ -3805,7 +3805,7 @@ "name": "Skultera Farm (All Skulteras)", "requires": [ "Gravity", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ {"and": [ {"resetRoom": {"nodes": [3]}}, @@ -3817,7 +3817,7 @@ ]}, {"and": [ {"resetRoom": {"nodes": [4]}}, - "canPreciseWalljump", + "canPreciseWallJump", {"cycleFrames": 1690} ]}, {"and": [ @@ -3874,12 +3874,12 @@ ]}, {"and": [ {"resetRoom": {"nodes": [4]}}, - "canPreciseWalljump", + "canPreciseWallJump", {"cycleFrames": 1440} ]}, {"and": [ {"resetRoom": {"nodes": [1]}}, - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"cycleFrames": 1600} ]} ]}, diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json index bd4dfb3a2..fb611d4e1 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -1121,7 +1121,7 @@ {"or": [ {"and": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]}, "canSpringBallJumpMidAir", {"and": [ @@ -1176,7 +1176,7 @@ {"or": [ {"and": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]}, "canSpringBallJumpMidAir", {"and": [ @@ -2278,7 +2278,7 @@ {"or": [ {"and": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]}, "canSpringBallJumpMidAir", {"and": [ @@ -2332,7 +2332,7 @@ {"or": [ {"and": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]}, "canSpringBallJumpMidAir", {"and": [ @@ -3449,7 +3449,7 @@ "name": "Underwater Walljump (Middle)", "requires": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -5328,7 +5328,7 @@ "name": "Underwater Walljump (Bottom)", "requires": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -5677,7 +5677,7 @@ "name": "Underwater Walljump (Top)", "requires": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -6149,7 +6149,7 @@ "canSpringBallJumpMidAir", {"and": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]} ]} ]}, @@ -6198,7 +6198,7 @@ "canSpringBallJumpMidAir", {"and": [ {"notable": "Underwater Walljumps"}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]} ]} ]}, diff --git a/region/maridia/outer/Mama Turtle Room.json b/region/maridia/outer/Mama Turtle Room.json index 460882ddc..ee181a0d3 100644 --- a/region/maridia/outer/Mama Turtle Room.json +++ b/region/maridia/outer/Mama Turtle Room.json @@ -1007,7 +1007,7 @@ "requires": [ "Gravity", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "canWallJump", "HiJump" @@ -1058,7 +1058,7 @@ "requires": [ "Gravity", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "canWallJump", "HiJump" @@ -1666,7 +1666,7 @@ "HiJump", "canInsaneJump", "canStationarySpinJump", - "canInsaneWalljump", + "canInsaneWallJump", "canCWJ" ], "clearsObstacles": ["B"], @@ -1775,7 +1775,7 @@ "requires": [ {"notable": "Shoot Down and Grab Right Item"}, {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", {"and": [ "canTrickyJump", "SpaceJump" diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index e0f6d1f98..213180cae 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -269,7 +269,7 @@ "HiJump", "canSpringBallJumpMidAir", "canGravityJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canSpeedyJump" ]} ]} @@ -481,7 +481,7 @@ "HiJump", "canSpringBallJumpMidAir", "canGravityJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canSpeedyJump" ]} ]} @@ -1513,7 +1513,7 @@ "link": [2, 7], "name": "Underwater Walljump", "requires": [ - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -2020,7 +2020,7 @@ "requires": [ "canCrossRoomJumpIntoWater", "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canDownGrab", "canTrickyJump" ], @@ -2169,7 +2169,7 @@ "HiJump", "canSpringBallJumpMidAir" ]}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]} ]} ]} @@ -2526,7 +2526,7 @@ "link": [3, 7], "name": "Underwater Walljump", "requires": [ - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -2955,7 +2955,7 @@ "HiJump", "canSpringBallJumpMidAir" ]}, - "canUnderwaterWalljump" + "canUnderwaterWallJump" ]} ]}, {"and": [ @@ -4861,7 +4861,7 @@ {"cycleFrames": 1510}, "h_doubleEquipmentScreenCycleFrames", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "h_doubleEquipmentScreenCycleFrames" ]} ]}, @@ -5191,7 +5191,7 @@ "name": "Insane Walljump", "requires": [ "Gravity", - "canInsaneWalljump" + "canInsaneWallJump" ], "clearsObstacles": ["A", "B"], "flashSuitChecked": true, @@ -5398,7 +5398,7 @@ "canTrickyJump", "canCameraManip", {"or": [ - "canUnderwaterWalljump", + "canUnderwaterWallJump", "h_underwaterCrouchJumpDownGrab", "canFlatleyJump", "canInsaneJump" @@ -5654,7 +5654,7 @@ "link": [8, 11], "name": "Underwater Walljump", "requires": [ - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true @@ -6111,10 +6111,10 @@ "requires": [ "Gravity", {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", {"and": [ "HiJump", - "canPreciseWalljump" + "canPreciseWallJump" ]}, {"and": [ "HiJump", diff --git a/region/norfair/crocomire/Grapple Beam Room.json b/region/norfair/crocomire/Grapple Beam Room.json index 0d880d8cf..f923cada9 100644 --- a/region/norfair/crocomire/Grapple Beam Room.json +++ b/region/norfair/crocomire/Grapple Beam Room.json @@ -183,7 +183,7 @@ "name": "Base", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]} @@ -240,7 +240,7 @@ "requires": [ "HiJump", "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shinespark": {"frames": 5, "excessFrames": 0}} ], "exitCondition": { @@ -266,7 +266,7 @@ "requires": [ "HiJump", "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canInsaneJump", {"shinespark": {"frames": 5, "excessFrames": 0}} ], @@ -292,7 +292,7 @@ }, "requires": [ "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canInsaneJump", {"shinespark": {"frames": 5, "excessFrames": 0}} ], @@ -586,7 +586,7 @@ "requires": [ {"or": [ "Grapple", - "canPreciseWalljump" + "canPreciseWallJump" ]} ], "flashSuitChecked": true, diff --git a/region/norfair/crocomire/Grapple Tutorial Room 2.json b/region/norfair/crocomire/Grapple Tutorial Room 2.json index b65475ec0..f6a9c829c 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 2.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 2.json @@ -229,7 +229,7 @@ "requires": [ "HiJump", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canSpeedyJump" ]} ], @@ -297,7 +297,7 @@ "requires": [ "HiJump", "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"shinespark": {"frames": 19, "excessFrames": 0}} ], "exitCondition": { @@ -322,7 +322,7 @@ }, "requires": [ "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canInsaneJump", {"shinespark": {"frames": 20, "excessFrames": 0}} ], diff --git a/region/norfair/crocomire/Grapple Tutorial Room 3.json b/region/norfair/crocomire/Grapple Tutorial Room 3.json index 644c8810f..963452da4 100644 --- a/region/norfair/crocomire/Grapple Tutorial Room 3.json +++ b/region/norfair/crocomire/Grapple Tutorial Room 3.json @@ -311,7 +311,7 @@ ]}, {"and": [ "Gravity", - "canTrickyWalljump" + "canTrickyWallJump" ]}, {"and": [ "HiJump", @@ -770,7 +770,7 @@ "link": [1, 4], "name": "Underwater Walljump Break Free", "requires": [ - "canUnderwaterWalljumpBreakFree" + "canUnderwaterWallJumpBreakFree" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -819,7 +819,7 @@ "requires": [ {"or": [ "canSpeedyJump", - "canPreciseWalljump" + "canPreciseWallJump" ]} ], "note": ["This applies to Big Boy Room and Mickey Mouse Room."] @@ -1107,7 +1107,7 @@ ]}, {"and": [ "Gravity", - "canTrickyWalljump" + "canTrickyWallJump" ]} ]} ], @@ -1423,10 +1423,10 @@ "canTrickyJump", {"or": [ "canLateralMidAirMorph", - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "h_speedJump", - "canPreciseWalljump" + "canPreciseWallJump" ]} ]} ], diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json index ab95dba79..de4e0c18c 100644 --- a/region/norfair/crocomire/Indiana Jones Room.json +++ b/region/norfair/crocomire/Indiana Jones Room.json @@ -291,8 +291,8 @@ "requires": [ {"shineChargeFrames": 110}, "canShinechargeMovementComplex", - "canPreciseWalljump", - "canConsecutiveWalljump", + "canPreciseWallJump", + "canConsecutiveWallJump", {"shinespark": {"frames": 78}} ], "flashSuitChecked": true, @@ -311,8 +311,8 @@ }, "requires": [ "canShinechargeMovementComplex", - "canPreciseWalljump", - "canConsecutiveWalljump", + "canPreciseWallJump", + "canConsecutiveWallJump", {"shinespark": {"frames": 78}} ], "flashSuitChecked": true, @@ -419,7 +419,7 @@ {"and": [ "canSpeedyJump", "HiJump", - "canTrickyWalljump" + "canTrickyWallJump" ]}, "h_trickySpringwall" ]} @@ -2003,7 +2003,7 @@ "requires": [ "canSpeedyJump", "HiJump", - "canTrickyWalljump" + "canTrickyWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -2092,7 +2092,7 @@ {"and": [ "HiJump", "canSpeedyJump", - "canTrickyWalljump" + "canTrickyWallJump" ]} ]}, {"or": [ @@ -2223,7 +2223,7 @@ {"notable": "Springwall"}, "HiJump", "h_trickySpringwall", - "canPreciseWalljump", + "canPreciseWallJump", "can3HighWallMidAirMorph" ], "flashSuitChecked": true, @@ -2307,7 +2307,7 @@ "canManipulateMellas", "h_preciseIceClip", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "HiJump", "canWallJump" diff --git a/region/norfair/crocomire/Post Crocomire Farming Room.json b/region/norfair/crocomire/Post Crocomire Farming Room.json index d90174c28..0a49f2ae4 100644 --- a/region/norfair/crocomire/Post Crocomire Farming Room.json +++ b/region/norfair/crocomire/Post Crocomire Farming Room.json @@ -1426,7 +1426,7 @@ }, "requires": [ "canWallJump", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canShinechargeMovementComplex", {"shineChargeFrames": 165} ], @@ -1607,7 +1607,7 @@ {"notable": "Damage Boost"}, "canInsaneJump", {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", "canDash" ]}, "canHorizontalDamageBoost", diff --git a/region/norfair/crocomire/Post Crocomire Shaft.json b/region/norfair/crocomire/Post Crocomire Shaft.json index adb7511de..7b7ad341a 100644 --- a/region/norfair/crocomire/Post Crocomire Shaft.json +++ b/region/norfair/crocomire/Post Crocomire Shaft.json @@ -119,7 +119,7 @@ "h_frozenEnemyRunway", {"ammo": {"type": "Super", "count": 1}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ", "canBePatient" @@ -153,7 +153,7 @@ "h_enemyDrops", "h_CrystalSparkWithoutLenience", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump" ]} ]} @@ -401,7 +401,7 @@ "requires": [ {"ammo": {"type": "Super", "count": 1}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ", {"and": [ @@ -591,7 +591,7 @@ {"resetRoom": {"nodes": [1, 4]}}, {"cycleFrames": 760}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "SpaceJump", {"cycleFrames": 300} @@ -677,7 +677,7 @@ "name": "Base", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]} @@ -801,7 +801,7 @@ {"ammo": {"type": "Super", "count": 2}}, "h_XRayMorphIceClip", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ", "canBePatient" @@ -822,7 +822,7 @@ "name": "Stored Spark Ice Clip Door Lock Skip", "requires": [ {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ", "canBePatient" @@ -852,7 +852,7 @@ {"ammo": {"type": "Super", "count": 1}}, "canUpwardGModeSetup", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ", "canBePatient" diff --git a/region/norfair/east/Bat Cave.json b/region/norfair/east/Bat Cave.json index 32f30a181..db20192a0 100644 --- a/region/norfair/east/Bat Cave.json +++ b/region/norfair/east/Bat Cave.json @@ -189,7 +189,7 @@ "name": "Precise Walljump", "requires": [ "canDash", - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", {"heatFrames": 220} ], diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json index 4e042df21..af438800a 100644 --- a/region/norfair/east/Bubble Mountain.json +++ b/region/norfair/east/Bubble Mountain.json @@ -544,7 +544,7 @@ "canCarefulJump", {"or": [ "canCameraManip", - "canTrickyWalljump", + "canTrickyWallJump", {"and": [ "canNeutralDamageBoost", {"enemyDamage": {"enemy": "Cacatac", "type": "contact", "hits": 1}} @@ -1075,7 +1075,7 @@ "requires": [ {"shineChargeFrames": 125}, "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canShinechargeMovementTricky", {"shinespark": {"frames": 18, "excessFrames": 0}} ], @@ -1125,7 +1125,7 @@ }, "requires": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canShinechargeMovementTricky", {"shineChargeFrames": 160} ], @@ -1746,10 +1746,10 @@ }, "requires": [ "canTrickyJump", - "canConsecutiveWalljump", - "canPreciseWalljump", + "canConsecutiveWallJump", + "canPreciseWallJump", {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", "ScrewAttack", "canWallJumpWithCharge", {"and": [ @@ -1773,9 +1773,9 @@ }, "requires": [ "canCarefulJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", "ScrewAttack", "canWallJumpWithCharge", {"and": [ @@ -1799,9 +1799,9 @@ }, "requires": [ "canCarefulJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ - "canTrickyWalljump", + "canTrickyWallJump", "ScrewAttack", "canWallJumpWithCharge", {"and": [ @@ -4402,7 +4402,7 @@ {"and": [ "canDash", "HiJump", - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 690} ]} ]} @@ -4675,7 +4675,7 @@ "name": "HiJump Walljump (Left)", "requires": [ "HiJump", - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -4686,8 +4686,8 @@ "link": [9, 1], "name": "HiJumpless Walljump (Left)", "requires": [ - "canConsecutiveWalljump", - "canInsaneWalljump" + "canConsecutiveWallJump", + "canInsaneWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -4874,8 +4874,8 @@ "name": "Right Side Delayed Walljumps", "requires": [ {"notable": "Right Side Delayed Walljumps"}, - "canTrickyWalljump", - "canConsecutiveWalljump" + "canTrickyWallJump", + "canConsecutiveWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -4952,7 +4952,7 @@ {"and": [ "canDash", "HiJump", - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 1320} ]}, {"and": [ @@ -4987,7 +4987,7 @@ {"and": [ "canDash", "HiJump", - "canTrickyWalljump" + "canTrickyWallJump" ]} ]} ]}, @@ -4999,7 +4999,7 @@ {"and": [ "canDash", "HiJump", - "canTrickyWalljump" + "canTrickyWallJump" ]} ]} ]} @@ -5031,7 +5031,7 @@ {"and": [ "canDash", "HiJump", - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 660} ]} ]} @@ -5076,7 +5076,7 @@ {"and": [ "canDash", "HiJump", - "canTrickyWalljump", + "canTrickyWallJump", {"cycleFrames": 970} ]}, {"and": [ diff --git a/region/norfair/east/Cathedral Entrance.json b/region/norfair/east/Cathedral Entrance.json index cc5bdaae5..7a4cc4876 100644 --- a/region/norfair/east/Cathedral Entrance.json +++ b/region/norfair/east/Cathedral Entrance.json @@ -151,7 +151,7 @@ {"cycleFrames": 450} ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"cycleFrames": 600} ]}, {"and": [ @@ -296,7 +296,7 @@ {"shinespark": {"frames": 9, "excessFrames": 5}} ]}, {"and": [ - "canInsaneWalljump", + "canInsaneWallJump", "canWallJumpInstantMorph", "canUnmorphBombBoost", "canDownGrab" @@ -878,7 +878,7 @@ "requires": [ {"or": [ {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 150} ]}, {"and": [ @@ -974,7 +974,7 @@ "name": "Sova Morph Only Boost", "requires": [ {"notable": "Sova Morph Only Boost"}, - "canInsaneWalljump", + "canInsaneWallJump", "canMidAirMorph", "canNeutralDamageBoost", {"enemyDamage": {"enemy": "Sova", "type": "contact", "hits": 1}}, @@ -1194,7 +1194,7 @@ "canShinechargeMovementComplex", {"canShineCharge": {"usedTiles": 43, "openEnd": 0}}, {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", "SpaceJump" ]}, @@ -1236,7 +1236,7 @@ ]}, {"canShineCharge": {"usedTiles": 43, "openEnd": 0}}, {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canInsaneJump", "SpaceJump" ]}, @@ -1267,7 +1267,7 @@ "canHeroShot", {"canShineCharge": {"usedTiles": 43, "openEnd": 0}}, {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", "SpaceJump" ]}, @@ -1567,7 +1567,7 @@ "name": "Walljump into Unmorph Bomb Boost", "requires": [ "h_heatProof", - "canInsaneWalljump", + "canInsaneWallJump", "canWallJumpInstantMorph", "canUnmorphBombBoost", "canDownGrab", @@ -1588,7 +1588,7 @@ "name": "Sova Boost (Walljump)", "requires": [ {"notable": "Sova Boost"}, - "canInsaneWalljump", + "canInsaneWallJump", "canWallJumpInstantMorph", "canNeutralDamageBoost", "canCameraManip", diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json index 62c39f078..5ed9afa78 100644 --- a/region/norfair/east/Double Chamber.json +++ b/region/norfair/east/Double Chamber.json @@ -601,7 +601,7 @@ "HiJump", "canSpringBallJumpMidAir" ]}, - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canUseIFrames", @@ -683,8 +683,8 @@ "name": "Walljump Climb Using the Kamer", "requires": [ {"notable": "Walljump Climb Using the Kamer"}, - "canTrickyWalljump", - "canConsecutiveWalljump", + "canTrickyWallJump", + "canConsecutiveWallJump", "canUseEnemies", {"or": [ {"and": [ @@ -728,7 +728,7 @@ {"notable": "Walljump Climb Using the Kamer"}, "HiJump", "canUseEnemies", - "canPreciseWalljump", + "canPreciseWallJump", {"or": [ {"heatFrames": 360}, {"and": [ @@ -769,8 +769,8 @@ "link": [2, 1], "name": "Delayed Wall Jump", "requires": [ - "canTrickyWalljump", - "canConsecutiveWalljump", + "canTrickyWallJump", + "canConsecutiveWallJump", "canTrickyJump", "canUseEnemies", {"or": [ @@ -801,10 +801,10 @@ }, "requires": [ "canPrepareForNextRoom", - "canTrickyWalljump", - "canConsecutiveWalljump", + "canTrickyWallJump", + "canConsecutiveWallJump", "canTrickyJump", - "canFastWalljumpClimb", + "canFastWallJumpClimb", "canUseEnemies", {"heatFrames": 120}, {"or": [ @@ -817,7 +817,7 @@ "note": "Wall jump up the left wall, perform a delayed wall jump on the Fune to reach the door.", "devNote": [ "This differs from the canPrepareForNextRoom option of the previous strat only in requiring an air entry.", - "FIXME: canFastWalljumpClimb is for difficulty placement." + "FIXME: canFastWallJumpClimb is for difficulty placement." ] }, { @@ -1163,7 +1163,7 @@ {"or": [ "SpaceJump", {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump" ]} ]}, @@ -1366,7 +1366,7 @@ {"or": [ "SpaceJump", {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump" ]} ]}, @@ -1978,8 +1978,8 @@ "link": [2, 4], "name": "Delayed Wall Jump", "requires": [ - "canTrickyWalljump", - "canConsecutiveWalljump", + "canTrickyWallJump", + "canConsecutiveWallJump", "canTrickyJump", "canUseEnemies", "canPrepareForNextRoom", @@ -2014,8 +2014,8 @@ }, "requires": [ "canPrepareForNextRoom", - "canTrickyWalljump", - "canConsecutiveWalljump", + "canTrickyWallJump", + "canConsecutiveWallJump", "canTrickyJump", "canUseEnemies", "canPrepareForNextRoom", @@ -2147,7 +2147,7 @@ {"and": [ "canHeroShot", {"heatFrames": 270}, - "canInsaneWalljump", + "canInsaneWallJump", "h_trickyToCarryFlashSuit", "canBeVeryPatient" ]}, @@ -2514,7 +2514,7 @@ "HiJump", "canSpringBallJumpMidAir" ]}, - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canUseIFrames", @@ -2706,7 +2706,7 @@ "canInsaneJump" ]} ]}, - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canWallJump" @@ -2848,7 +2848,7 @@ "canInsaneJump" ]} ]}, - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canWallJump" @@ -3184,7 +3184,7 @@ "canUseEnemies" ]}, "canSpringBallJumpMidAir", - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canWallJump" @@ -3576,7 +3576,7 @@ ]}, "canUseIFrames", "canTrickyDashJump", - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 260} ], "flashSuitChecked": true, @@ -3627,7 +3627,7 @@ "canDash", {"notable": "HiJumpless Wall Jump"}, "h_heatProof", - "canInsaneWalljump", + "canInsaneWallJump", "canHorizontalDamageBoost", {"or": [ "canUseIFrames", @@ -3683,7 +3683,7 @@ "canDash", {"or": [ "canTrickySpringBallJump", - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canWallJump" @@ -3799,7 +3799,7 @@ "canDash", {"or": [ "canTrickySpringBallJump", - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canWallJump" @@ -3980,7 +3980,7 @@ "canDash", {"or": [ "canTrickySpringBallJump", - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canWallJump" @@ -4103,7 +4103,7 @@ "canDash", {"or": [ "canTrickySpringBallJump", - "canInsaneWalljump", + "canInsaneWallJump", {"and": [ "HiJump", "canWallJump" diff --git a/region/norfair/east/Lava Dive Room.json b/region/norfair/east/Lava Dive Room.json index 22e6bebf7..f91831d74 100644 --- a/region/norfair/east/Lava Dive Room.json +++ b/region/norfair/east/Lava Dive Room.json @@ -666,7 +666,7 @@ {"gravitylessLavaFrames": 115} ]}, {"and": [ - "canTrickyWalljump", + "canTrickyWallJump", "canTrickyJump", {"gravitylessLavaFrames": 175} ]} @@ -935,8 +935,8 @@ "HiJump", "canBounceBall", "canMidairWiggle", - "canConsecutiveWalljump", - "canInsaneWalljump", + "canConsecutiveWallJump", + "canInsaneWallJump", {"gravitylessLavaFrames": 392}, {"heatFrames": 515} ], @@ -1188,7 +1188,7 @@ "HiJump", "canSuitlessLavaDive", "canUseEnemies", - "canTrickyWalljump", + "canTrickyWallJump", {"heatFrames": 270}, {"gravitylessLavaFrames": 240} ], @@ -1237,7 +1237,7 @@ "canUseEnemies", "canDoubleSpringBallJumpMidAir", "canSpringwall", - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 270}, {"gravitylessLavaFrames": 240} ], @@ -1253,11 +1253,11 @@ {"notable": "HiJumpless Nahime Morph Kago"}, {"noBlueSuit": {}}, "canSuitlessLavaDive", - "canInsaneWalljump", + "canInsaneWallJump", "canInsaneJump", "canUseIFrames", - "canTrickyWalljump", - "canFastWalljumpClimb", + "canTrickyWallJump", + "canFastWallJumpClimb", "canUseEnemies", "canKago", {"heatFrames": 510}, @@ -1460,7 +1460,7 @@ "requires": [ "canSuitlessLavaDive", "canGravityJump", - "canTrickyWalljump", + "canTrickyWallJump", "canTrickyJump", {"heatFrames": 290}, {"gravitylessLavaFrames": 230}, @@ -1506,8 +1506,8 @@ {"noBlueSuit": {}}, "canSuitlessLavaDive", "canUseIFrames", - "canTrickyWalljump", - "canFastWalljumpClimb", + "canTrickyWallJump", + "canFastWallJumpClimb", "canUseEnemies", "canCameraManip", {"heatFrames": 600}, @@ -1531,8 +1531,8 @@ {"noBlueSuit": {}}, "canSuitlessLavaDive", "canUseIFrames", - "canTrickyWalljump", - "canFastWalljumpClimb", + "canTrickyWallJump", + "canFastWallJumpClimb", "canUseEnemies", "canCameraManip", {"heatFrames": 175}, diff --git a/region/norfair/east/Norfair Reserve Tank Room.json b/region/norfair/east/Norfair Reserve Tank Room.json index f99179854..b2f106734 100644 --- a/region/norfair/east/Norfair Reserve Tank Room.json +++ b/region/norfair/east/Norfair Reserve Tank Room.json @@ -286,7 +286,7 @@ "explicitWeapons": ["PowerBomb"] }}, "canMockball", - "canPreciseWalljump", + "canPreciseWallJump", "canInsaneJump", "canPauseAbuse", "canFarmWhileShooting", @@ -886,7 +886,7 @@ {"or": [ {"and": [ {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", {"and": [ "HiJump", "canWallJump" diff --git a/region/norfair/east/Spiky Platforms Tunnel.json b/region/norfair/east/Spiky Platforms Tunnel.json index 4ff65aa28..cdd8713e3 100644 --- a/region/norfair/east/Spiky Platforms Tunnel.json +++ b/region/norfair/east/Spiky Platforms Tunnel.json @@ -310,7 +310,7 @@ "requires": [ "h_heatProof", "canTrickyJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"lavaFrames": 20} ], "flashSuitChecked": true, @@ -485,7 +485,7 @@ ]}, {"and": [ "canTrickyJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"lavaFrames": 25} ]}, {"and": [ @@ -682,7 +682,7 @@ "requires": [ "h_heatProof", "canTrickyJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"lavaFrames": 20} ], "flashSuitChecked": true, @@ -870,7 +870,7 @@ ]}, {"and": [ "canTrickyJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"lavaFrames": 25} ]}, {"and": [ @@ -882,7 +882,7 @@ {"lavaFrames": 60}, {"and": [ "canTrickyJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"lavaFrames": 35} ]}, {"and": [ diff --git a/region/norfair/west/Business Center.json b/region/norfair/west/Business Center.json index 2e36f9ab8..4505397ac 100644 --- a/region/norfair/west/Business Center.json +++ b/region/norfair/west/Business Center.json @@ -848,7 +848,7 @@ "requires": [ {"shineChargeFrames": 125}, "canShinechargeMovementTricky", - "canPreciseWalljump" + "canPreciseWallJump" ], "exitCondition": { "leaveShinecharged": {} diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index b0b788383..aeab4cd5c 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -1981,7 +1981,7 @@ {"heatFrames": 120} ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"heatFrames": 130} ]} ]}, diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json index 0ed6b8733..39409c3c4 100644 --- a/region/norfair/west/Crumble Shaft.json +++ b/region/norfair/west/Crumble Shaft.json @@ -109,11 +109,11 @@ "canDodgeWhileShooting", {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ "canCrumbleJump", "SpaceJump", - "canPreciseWalljump" + "canPreciseWallJump" ]}, {"cycleFrames": 930} ]}, @@ -375,7 +375,7 @@ "name": "Tricky Wall Jump", "requires": [ "canDash", - "canTrickyWalljump", + "canTrickyWallJump", "canTrickyJump", "canCameraManip", {"heatFrames": 230} @@ -445,8 +445,8 @@ "link": [2, 1], "name": "Wall Jump Climb", "requires": [ - "canPreciseWalljump", - "canConsecutiveWalljump", + "canPreciseWallJump", + "canConsecutiveWallJump", {"or": [ {"and": [ "HiJump", @@ -514,7 +514,7 @@ "name": "Wall Jump with Space Jump", "requires": [ "SpaceJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ {"and": [ "HiJump", @@ -661,7 +661,7 @@ {"or": [ "h_useSpringBall", {"and": [ - "canTrickyWalljump", + "canTrickyWallJump", {"heatFrames": 100} ]}, {"and": [ @@ -992,7 +992,7 @@ "link": [2, 3], "name": "Base", "requires": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ "canDash", {"heatFrames": 30} @@ -1012,12 +1012,12 @@ "ScrewAttack", {"haveBlueSuit": {}}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", {"heatFrames": 30} ]}, {"and": [ - "canTrickyWalljump", + "canTrickyWallJump", {"heatFrames": 80} ]}, {"heatFrames": 330} @@ -1117,7 +1117,7 @@ "name": "Precise Walljump", "requires": [ {"obstaclesCleared": ["A"]}, - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump", {"heatFrames": 210} ], diff --git a/region/norfair/west/Ice Beam Snake Room.json b/region/norfair/west/Ice Beam Snake Room.json index 131a8e787..2960b157f 100644 --- a/region/norfair/west/Ice Beam Snake Room.json +++ b/region/norfair/west/Ice Beam Snake Room.json @@ -1798,7 +1798,7 @@ "canMidAirMorph", "canTrickyDodgeEnemies", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "HiJump" ]}, {"enemyKill": { diff --git a/region/norfair/west/Ice Beam Tutorial Room.json b/region/norfair/west/Ice Beam Tutorial Room.json index d81401395..27f70b18e 100644 --- a/region/norfair/west/Ice Beam Tutorial Room.json +++ b/region/norfair/west/Ice Beam Tutorial Room.json @@ -729,7 +729,7 @@ "h_lavaProof", {"and": [ "canFarmWhileShooting", - "canPreciseWalljump", + "canPreciseWallJump", {"cycleFrames": 15} ]}, {"and": [ diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json index 8258cf3e2..3fe402def 100644 --- a/region/tourian/main/Metroid Room 1.json +++ b/region/tourian/main/Metroid Room 1.json @@ -632,7 +632,7 @@ "requires": [ {"notable": "Acid Skip CWJ"}, "canCWJ", - "canInsaneWalljump", + "canInsaneWallJump", {"or": [ {"obstaclesCleared": ["A", "B"]}, "canDodgeWhileShooting" @@ -801,7 +801,7 @@ ]}, {"and": [ {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "HiJump" ]}, {"acidFrames": 20} @@ -839,7 +839,7 @@ {"acidFrames": 30} ]}, {"and": [ - "canPreciseWalljump", + "canPreciseWallJump", {"acidFrames": 60} ]}, {"and": [ @@ -995,7 +995,7 @@ "link": [1, 2], "name": "Walljump Bomb Boost", "requires": [ - "canInsaneWalljump", + "canInsaneWallJump", "canWallJumpBombBoost", "canHBJ", {"or": [ @@ -1252,7 +1252,7 @@ "h_speedJump", "canCarefulJump", {"or": [ - "canPreciseWalljump", + "canPreciseWallJump", "canTrickyJump" ]}, {"or": [ @@ -1266,7 +1266,7 @@ {"acidFrames": 27}, {"and": [ {"acidFrames": 16}, - "canPreciseWalljump" + "canPreciseWallJump" ]}, {"and": [ {"acidFrames": 16}, @@ -1372,7 +1372,7 @@ "requires": [ {"or": [ {"and": [ - "canTrickyWalljump", + "canTrickyWallJump", {"acidFrames": 20} ]}, {"and": [ @@ -1382,7 +1382,7 @@ ]}, {"and": [ "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", {"acidFrames": 20} ]}, {"and": [ @@ -1409,7 +1409,7 @@ ]}, {"and": [ "canTrickyJump", - "canPreciseWalljump", + "canPreciseWallJump", {"acidFrames": 16} ]}, {"and": [ @@ -1534,7 +1534,7 @@ ]}, {"and": [ "canTrickyJump", - "canPreciseWalljump", + "canPreciseWallJump", {"acidFrames": 16} ]}, {"and": [ @@ -1577,7 +1577,7 @@ "link": [2, 1], "name": "Walljump Bomb Boost", "requires": [ - "canInsaneWalljump", + "canInsaneWallJump", "canWallJumpBombBoost", "canHBJ", {"or": [ @@ -1630,7 +1630,7 @@ ]}, {"and": [ "canTrickyJump", - "canPreciseWalljump", + "canPreciseWallJump", {"acidFrames": 16} ]}, {"and": [ @@ -1665,7 +1665,7 @@ ]}, {"and": [ "canTrickyJump", - "canPreciseWalljump", + "canPreciseWallJump", {"acidFrames": 16} ]}, {"and": [ diff --git a/region/tourian/main/Seaweed Room.json b/region/tourian/main/Seaweed Room.json index aa1ba4f15..82631c155 100644 --- a/region/tourian/main/Seaweed Room.json +++ b/region/tourian/main/Seaweed Room.json @@ -810,7 +810,7 @@ } }, "requires": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canShinechargeMovementTricky", {"shineChargeFrames": 170}, {"shinespark": {"frames": 6, "excessFrames": 0}} @@ -834,7 +834,7 @@ } }, "requires": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canShinechargeMovementTricky", {"shineChargeFrames": 176}, {"shinespark": {"frames": 5, "excessFrames": 0}} diff --git a/region/tourian/main/Tourian Escape Room 4.json b/region/tourian/main/Tourian Escape Room 4.json index a14e7ffcf..62db9eeda 100644 --- a/region/tourian/main/Tourian Escape Room 4.json +++ b/region/tourian/main/Tourian Escape Room 4.json @@ -892,7 +892,7 @@ "requires": [ "ScrewAttack", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "SpaceJump", "HiJump" @@ -913,7 +913,7 @@ "requires": [ {"or": [ {"and": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canWallJumpWithCharge" ]}, {"and": [ @@ -946,7 +946,7 @@ {"notable": "Dodge While Climbing"}, "canCarefulJump", {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"and": [ "HiJump", "SpaceJump" @@ -1247,7 +1247,7 @@ "link": [3, 1], "name": "Leave With Temporary Blue (Race the Acid)", "requires": [ - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"canShineCharge": {"usedTiles": 21, "openEnd": 1}}, "canChainTemporaryBlue" ], diff --git a/region/wreckedship/main/Bowling Alley.json b/region/wreckedship/main/Bowling Alley.json index db4ee9c03..b3803bf48 100644 --- a/region/wreckedship/main/Bowling Alley.json +++ b/region/wreckedship/main/Bowling Alley.json @@ -2105,7 +2105,7 @@ ]} ]}, "canShinechargeMovementComplex", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"or": [ {"shinespark": {"frames": 17, "excessFrames": 2}}, {"and": [ @@ -2114,7 +2114,7 @@ ]}, {"and": [ "canShinechargeMovementTricky", - "canFastWalljumpClimb", + "canFastWallJumpClimb", {"or": [ {"shinespark": {"frames": 10, "excessFrames": 2}}, {"and": [ @@ -2141,7 +2141,7 @@ ]}, {"haveBlueSuit": {}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", "canLongIBJ" ]} @@ -2166,7 +2166,7 @@ {"useFlashSuit": {}}, {"shinespark": {"frames": 5, "excessFrames": 3}}, {"or": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "SpaceJump", {"and": [ "canLongIBJ", diff --git a/region/wreckedship/main/Sponge Bath.json b/region/wreckedship/main/Sponge Bath.json index 34958ddc2..d8420bb4f 100644 --- a/region/wreckedship/main/Sponge Bath.json +++ b/region/wreckedship/main/Sponge Bath.json @@ -524,7 +524,7 @@ "requires": [ "canSuitlessMaridia", "canTrickyDashJump", - "canTrickyWalljump" + "canTrickyWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, diff --git a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json index 521ff3d20..3c78a7cde 100644 --- a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json +++ b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json @@ -831,7 +831,7 @@ "requires": [ "h_speedJump", "canCarefulJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"not": "f_DefeatedPhantoon"}, {"or": [ {"disableEquipment": "HiJump"}, @@ -862,7 +862,7 @@ "requires": [ "h_speedJump", "canTrickyJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, @@ -885,7 +885,7 @@ "requires": [ "h_speedJump", "canInsaneJump", - "canConsecutiveWalljump", + "canConsecutiveWallJump", {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, @@ -1260,7 +1260,7 @@ "name": "Insane Wall Jump", "requires": [ "Gravity", - "canInsaneWalljump" + "canInsaneWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -1275,7 +1275,7 @@ "requires": [ "Gravity", "HiJump", - "canPreciseWalljump" + "canPreciseWallJump" ], "flashSuitChecked": true, "blueSuitChecked": true, @@ -1288,7 +1288,7 @@ "link": [2, 1], "name": "Gravity Jump Wall Jump", "requires": [ - "canPreciseWalljump", + "canPreciseWallJump", "canGravityJump", "canTrickyJump" ], diff --git a/schema/m3-string-requirements.schema.json b/schema/m3-string-requirements.schema.json index 1f5c4b236..0261889bb 100644 --- a/schema/m3-string-requirements.schema.json +++ b/schema/m3-string-requirements.schema.json @@ -145,14 +145,14 @@ "canInsaneJump", "canCWJ", "canWallJump", - "canPreciseWalljump", - "canTrickyWalljump", - "canInsaneWalljump", - "canConsecutiveWalljump", - "canFastWalljumpClimb", - "canUnderwaterWalljump", - "canLongUnderwaterWalljump", - "canUnderwaterWalljumpBreakFree", + "canPreciseWallJump", + "canTrickyWallJump", + "canInsaneWallJump", + "canConsecutiveWallJump", + "canFastWallJumpClimb", + "canUnderwaterWallJump", + "canLongUnderwaterWallJump", + "canUnderwaterWallJumpBreakFree", "canBootless2WideUWJ", "canJumpIntoRespawningBlock", "canUnmorphBombBoost", diff --git a/strats.md b/strats.md index bd29691b8..4fc332de1 100644 --- a/strats.md +++ b/strats.md @@ -1720,7 +1720,7 @@ Inside an `entranceCondition` object, a `comesThroughToilet` property indicates "requires": [ "canCrossRoomJumpIntoWater", "HiJump", - "canPreciseWalljump", + "canPreciseWallJump", "canDownGrab" ] } diff --git a/tech.json b/tech.json index 5e3a67be2..2be0cc5a6 100644 --- a/tech.json +++ b/tech.json @@ -97,7 +97,7 @@ "name": "canSunkenTileWideWallClimb", "techRequires": [ "canSuitlessMaridia", - "canConsecutiveWalljump" + "canConsecutiveWallJump" ], "otherRequires": [], "note": [ @@ -500,7 +500,7 @@ "id": 34, "name": "can3HighWallMidAirMorph", "techRequires": [ - "canPreciseWalljump", + "canPreciseWallJump", "canWallJumpInstantMorph", "canDisableEquipment" ], @@ -1304,7 +1304,7 @@ "extensionTechs": [ { "id": 77, - "name": "canPreciseWalljump", + "name": "canPreciseWallJump", "techRequires": [ "canWallJump" ], @@ -1313,9 +1313,9 @@ "extensionTechs": [ { "id": 78, - "name": "canTrickyWalljump", + "name": "canTrickyWallJump", "techRequires": [ - "canPreciseWalljump" + "canPreciseWallJump" ], "otherRequires": [], "note": [ @@ -1326,9 +1326,9 @@ "extensionTechs": [ { "id": 79, - "name": "canInsaneWalljump", + "name": "canInsaneWallJump", "techRequires": [ - "canTrickyWalljump" + "canTrickyWallJump" ], "otherRequires": [], "note": "A wall jump with extreme precision, in the vicinity of pixel and frame perfect precision. These jumps are typically delayed wall jumps." @@ -1339,7 +1339,7 @@ }, { "id": 80, - "name": "canConsecutiveWalljump", + "name": "canConsecutiveWallJump", "techRequires": [ "canWallJump" ], @@ -1348,18 +1348,18 @@ "extensionTechs": [ { "id": 81, - "name": "canFastWalljumpClimb", + "name": "canFastWallJumpClimb", "techRequires": [ - "canConsecutiveWalljump" + "canConsecutiveWallJump" ], "otherRequires": [], "note": "Climbing a wall with consecutive wall jumps very quickly, e.g. for setting up a full halfie." }, { "id": 83, - "name": "canUnderwaterWalljump", + "name": "canUnderwaterWallJump", "techRequires": [ - "canConsecutiveWalljump", + "canConsecutiveWallJump", "canSuitlessMaridia", "canMidairWiggle" ], @@ -1375,9 +1375,9 @@ "extensionTechs": [ { "id": 187, - "name": "canLongUnderwaterWalljump", + "name": "canLongUnderwaterWallJump", "techRequires": [ - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "otherRequires": [], "note": [ @@ -1387,9 +1387,9 @@ }, { "id": 186, - "name": "canUnderwaterWalljumpBreakFree", + "name": "canUnderwaterWallJumpBreakFree", "techRequires": [ - "canUnderwaterWalljump" + "canUnderwaterWallJump" ], "otherRequires": [], "note": [ @@ -1400,7 +1400,7 @@ "id": 201, "name": "canBootless2WideUWJ", "techRequires": [ - {"tech": "canUnderwaterWalljump"} + {"tech": "canUnderwaterWallJump"} ], "otherRequires": [], "note": [