From 81dfabc941634a4520dd5a3b0c2689b5b7c7425a Mon Sep 17 00:00:00 2001 From: blkerby <17501370+blkerby@users.noreply.github.com> Date: Mon, 21 Jul 2025 19:01:08 +0000 Subject: [PATCH] Run Strat ID, Tech ID, and Notable ID Generator & Autoformatter --- .../blue/Blue Brinstar Energy Tank Room.json | 10 +--- region/brinstar/blue/Construction Zone.json | 8 +-- region/brinstar/blue/Morph Ball Room.json | 6 +- .../brinstar/green/Brinstar Pre-Map Room.json | 16 ++--- region/brinstar/green/Early Supers Room.json | 16 ++--- .../green/Etecoon Energy Tank Room.json | 20 +++---- .../green/Green Brinstar Beetom Room.json | 10 +--- .../green/Green Brinstar Fireflea Room.json | 12 +--- .../green/Green Brinstar Main Shaft.json | 38 ++++-------- region/brinstar/green/Green Hill Zone.json | 8 +-- region/brinstar/green/Noob Bridge.json | 8 +-- .../green/Spore Spawn Kihunter Room.json | 8 +-- region/brinstar/kraid/Baby Kraid Room.json | 32 ++++------ .../kraid/Warehouse Energy Tank Room.json | 20 +++---- .../kraid/Warehouse Kihunter Room.json | 24 +++----- .../brinstar/kraid/Warehouse Zeela Room.json | 12 +--- region/brinstar/pink/Big Pink.json | 2 +- region/brinstar/pink/Dachora Room.json | 8 +-- .../pink/Mission Impossible Room.json | 6 +- .../pink/Pink Brinstar Wave Gate Room.json | 60 +++++++++---------- .../pink/Waterway Energy Tank Room.json | 16 ++--- .../brinstar/red/Alpha Power Bomb Room.json | 4 +- region/brinstar/red/Below Spazer.json | 14 ++--- region/brinstar/red/Beta Power Bomb Room.json | 4 +- region/brinstar/red/Caterpillar Room.json | 40 ++++--------- .../red/Red Brinstar Fireflea Room.json | 10 +--- region/brinstar/red/Red Tower.json | 24 +++----- region/brinstar/red/Skree Boost Room.json | 8 +-- region/crateria/central/Climb.json | 20 ++----- .../central/Crateria Power Bomb Room.json | 4 +- region/crateria/central/Flyway.json | 8 +-- .../crateria/central/Parlor and Alcatraz.json | 16 ++--- region/crateria/central/Pit Room.json | 16 ++--- region/crateria/central/Pre-Map Flyway.json | 8 +-- region/crateria/east/Crab Maze.json | 12 +--- .../crateria/east/Crateria Kihunter Room.json | 8 +-- .../east/Forgotten Highway Elbow.json | 6 +- .../east/Forgotten Highway Kago Room.json | 8 +-- .../east/Pancakes and Wavers Room.json | 12 +--- region/crateria/east/West Ocean.json | 38 ++++-------- .../west/Gauntlet Energy Tank Room.json | 8 +-- region/crateria/west/Gauntlet Entrance.json | 14 ++--- region/crateria/west/Green Pirates Shaft.json | 30 +++------- region/crateria/west/Lower Mushrooms.json | 4 +- region/crateria/west/Terminator Room.json | 8 +-- .../east/Fast Pillars Setup Room.json | 8 +-- .../east/Lower Norfair Farming Room.json | 52 +++++++--------- .../east/Lower Norfair Fireflea Room.json | 8 +-- .../east/Lower Norfair Spring Ball Maze.json | 4 +- region/lowernorfair/east/Main Hall.json | 8 +-- region/lowernorfair/east/Pillar Room.json | 8 +-- .../lowernorfair/east/Plowerhouse Room.json | 13 ++-- .../lowernorfair/east/Red Kihunter Shaft.json | 4 +- region/lowernorfair/east/Ridley's Room.json | 18 +++--- .../east/The Worst Room In The Game.json | 8 +-- .../east/Three Musketeers' Room.json | 4 +- region/lowernorfair/east/Wasteland.json | 6 +- .../lowernorfair/west/Acid Statue Room.json | 8 +-- .../lowernorfair/west/Fast Ripper Room.json | 6 +- .../west/Golden Torizo's Room.json | 16 ++--- .../lowernorfair/west/Screw Attack Room.json | 22 +++---- .../maridia/inner-green/East Pants Room.json | 8 +-- .../maridia/inner-green/Lonely Crab Room.json | 4 +- region/maridia/inner-pink/Aqueduct.json | 30 ++++++++-- .../inner-pink/Below Botwoon Energy Tank.json | 2 +- .../inner-pink/Botwoon Energy Tank Room.json | 4 +- .../maridia/inner-pink/Botwoon Hallway.json | 4 +- region/maridia/inner-pink/Colosseum.json | 4 +- region/maridia/inner-pink/Crab Shaft.json | 8 +-- region/maridia/inner-pink/Draygon's Room.json | 4 +- .../maridia/inner-pink/East Cactus Alley.json | 13 ++-- .../maridia/inner-pink/Halfie Climb Room.json | 8 +-- .../maridia/inner-pink/The Precious Room.json | 4 +- .../maridia/inner-pink/West Cactus Alley.json | 16 ++--- region/maridia/inner-yellow/Kassiuz Room.json | 4 +- .../inner-yellow/Maridia Elevator Room.json | 8 +-- region/maridia/inner-yellow/Plasma Room.json | 4 +- .../inner-yellow/Plasma Spark Room.json | 12 ++-- .../inner-yellow/Plasma Tutorial Room.json | 20 ++----- region/maridia/inner-yellow/The Beach.json | 8 +-- .../inner-yellow/Thread The Needle Room.json | 24 ++------ region/maridia/outer/Boyon Gate Hall.json | 15 ++--- region/maridia/outer/Crab Gate Room.json | 16 ++--- region/maridia/outer/Crab Hole.json | 38 ++++-------- region/maridia/outer/Fish Tank.json | 14 ++--- region/maridia/outer/Main Street.json | 28 ++++----- region/maridia/outer/Mt. Everest.json | 12 +--- region/norfair/crocomire/Cosine Room.json | 12 ++-- .../norfair/crocomire/Indiana Jones Room.json | 22 +++---- .../crocomire/Post Crocomire Shaft.json | 12 +--- region/norfair/east/Bubble Mountain.json | 16 ++--- region/norfair/east/Cathedral Entrance.json | 8 +-- region/norfair/east/Cathedral.json | 4 +- region/norfair/east/Double Chamber.json | 8 +-- region/norfair/east/Frog Speedway.json | 16 ++--- region/norfair/east/Kronic Boost Room.json | 4 +- region/norfair/east/Rising Tide.json | 12 ++-- region/norfair/east/Single Chamber.json | 4 +- region/norfair/east/Speed Booster Hall.json | 4 +- .../east/Upper Norfair Farming Room.json | 8 +-- region/norfair/east/Volcano Room.json | 38 ++++++------ region/norfair/west/Crocomire Escape.json | 15 +++-- region/norfair/west/Crocomire Speedway.json | 47 +++++++-------- region/norfair/west/Crumble Shaft.json | 41 +++++-------- .../west/Hi Jump Energy Tank Room.json | 8 ++- region/norfair/west/Ice Beam Gate Room.json | 51 +++++++++------- region/norfair/west/Ice Beam Snake Room.json | 16 ++--- .../norfair/west/Ice Beam Tutorial Room.json | 4 +- region/tourian/main/Metroid Room 4.json | 4 +- region/wreckedship/main/Attic.json | 8 +-- region/wreckedship/main/Basement.json | 20 +++---- region/wreckedship/main/Bowling Alley.json | 6 +- region/wreckedship/main/Sponge Bath.json | 10 +--- .../main/Wrecked Ship East Super Room.json | 4 +- .../main/Wrecked Ship Main Shaft.json | 12 +--- tech.json | 3 +- 116 files changed, 583 insertions(+), 1003 deletions(-) diff --git a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json index c947364f74..dfbc1d8a2b 100644 --- a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json +++ b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json @@ -500,9 +500,7 @@ "name": "Geemer, Skree, and Reo Farm", "requires": [ "h_ZebesIsAwake", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 400} ], "resetsObstacles": ["A", "B", "C", "D"], @@ -903,13 +901,11 @@ "canConsecutiveWalljump", "SpaceJump" ]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 1350} ], - "resetsObstacles": ["C", "D"], "clearsObstacles": ["A", "B"], + "resetsObstacles": ["C", "D"], "farmCycleDrops": [ {"enemy": "Geemer (blue)", "count": 2}, {"enemy": "Skree", "count": 2}, diff --git a/region/brinstar/blue/Construction Zone.json b/region/brinstar/blue/Construction Zone.json index 31c4e65478..198566186a 100644 --- a/region/brinstar/blue/Construction Zone.json +++ b/region/brinstar/blue/Construction Zone.json @@ -108,16 +108,12 @@ "h_ZebesIsAwake", {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"cycleFrames": 150} ]}, {"and": [ "Morph", - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"or": [ {"cycleFrames": 510}, {"and": [ diff --git a/region/brinstar/blue/Morph Ball Room.json b/region/brinstar/blue/Morph Ball Room.json index 617b459985..da6b51b86a 100644 --- a/region/brinstar/blue/Morph Ball Room.json +++ b/region/brinstar/blue/Morph Ball Room.json @@ -370,9 +370,7 @@ "requires": [ "h_ZebesIsAwake", "canPrepareForNextRoom", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "Plasma", @@ -427,8 +425,8 @@ ]} ]} ], - "resetsObstacles": ["A", "B", "D"], "clearsObstacles": ["C"], + "resetsObstacles": ["A", "B", "D"], "farmCycleDrops": [{"enemy": "Sidehopper", "count": 3}] }, { diff --git a/region/brinstar/green/Brinstar Pre-Map Room.json b/region/brinstar/green/Brinstar Pre-Map Room.json index 410adeaab7..4ad1919f50 100644 --- a/region/brinstar/green/Brinstar Pre-Map Room.json +++ b/region/brinstar/green/Brinstar Pre-Map Room.json @@ -132,13 +132,11 @@ "link": [1, 1], "name": "Zeela Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 120} ], - "farmCycleDrops": [{"enemy": "Zeela", "count": 1}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Zeela", "count": 1}] }, { "id": 2, @@ -443,9 +441,7 @@ "link": [2, 2], "name": "Zeela & Sidehopper Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 320}, {"or": [ "canDodgeWhileShooting", @@ -465,11 +461,11 @@ ]} ], "resetsObstacles": ["A"], - "flashSuitChecked": true, "farmCycleDrops": [ {"enemy": "Zeela", "count": 2}, {"enemy": "Sm. Sidehopper", "count": 1} - ] + ], + "flashSuitChecked": true }, { "id": 24, diff --git a/region/brinstar/green/Early Supers Room.json b/region/brinstar/green/Early Supers Room.json index 00a20641c0..91e66c671d 100644 --- a/region/brinstar/green/Early Supers Room.json +++ b/region/brinstar/green/Early Supers Room.json @@ -398,9 +398,7 @@ "canSpringBallJumpMidAir", "h_crouchJumpDownGrab" ]}, - {"resetRoom": { - "nodes": [1] - }} + {"resetRoom": {"nodes": [1]}} ] } ], @@ -435,9 +433,7 @@ "canSpringBallJumpMidAir", "h_crouchJumpDownGrab" ]}, - {"resetRoom": { - "nodes": [1] - }} + {"resetRoom": {"nodes": [1]}} ] } ], @@ -809,9 +805,7 @@ "link": [2, 2], "name": "Waver and Sidehopper Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ "canWalljump", "canCrouchJump" @@ -838,12 +832,12 @@ ]} ]} ], + "clearsObstacles": ["A"], + "resetsObstacles": ["B"], "farmCycleDrops": [ {"enemy": "Waver", "count": 4}, {"enemy": "Sm. Sidehopper", "count": 3} ], - "clearsObstacles": ["A"], - "resetsObstacles": ["B"], "flashSuitChecked": true }, { diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json index 516ea3d491..919e9ee4ec 100644 --- a/region/brinstar/green/Etecoon Energy Tank Room.json +++ b/region/brinstar/green/Etecoon Energy Tank Room.json @@ -1047,9 +1047,7 @@ "name": "Zebbo and Beetom Farm", "requires": [ "Morph", - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"cycleFrames": 630}, {"or": [ {"enemyKill": { @@ -1068,11 +1066,11 @@ ], "clearsObstacles": ["A"], "resetsObstacles": ["B"], - "flashSuitChecked": true, "farmCycleDrops": [ {"enemy": "Beetom", "count": 2}, {"enemy": "Zebbo", "count": 1} - ] + ], + "flashSuitChecked": true }, { "id": 75, @@ -1580,9 +1578,7 @@ "link": [4, 4], "name": "Zebbo and Beetom Farm", "requires": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"cycleFrames": 530}, {"or": [ {"enemyKill": { @@ -1600,11 +1596,11 @@ ], "clearsObstacles": ["A"], "resetsObstacles": ["B"], - "flashSuitChecked": true, "farmCycleDrops": [ {"enemy": "Beetom", "count": 2}, {"enemy": "Zebbo", "count": 2} - ] + ], + "flashSuitChecked": true }, { "id": 52, @@ -1615,8 +1611,8 @@ {"simpleCycleFrames": 85}, {"cycleFrames": 30} ], - "flashSuitChecked": true, - "farmCycleDrops": [{"enemy": "Zebbo", "count": 1}] + "farmCycleDrops": [{"enemy": "Zebbo", "count": 1}], + "flashSuitChecked": true }, { "id": 80, diff --git a/region/brinstar/green/Green Brinstar Beetom Room.json b/region/brinstar/green/Green Brinstar Beetom Room.json index 6e091eab6b..47c3af149d 100644 --- a/region/brinstar/green/Green Brinstar Beetom Room.json +++ b/region/brinstar/green/Green Brinstar Beetom Room.json @@ -178,9 +178,7 @@ "link": [1, 1], "name": "Beetom Farm", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"or": [ {"and": [ "ScrewAttack", @@ -207,8 +205,8 @@ ]} ], "clearsObstacles": ["A"], - "flashSuitChecked": true, "farmCycleDrops": [{"enemy": "Beetom", "count": 4}], + "flashSuitChecked": true, "note": "Kill the Beetoms with Screw Attack or by freezing them and using Bombs or Power Bombs.", "devNote": [ "Using an adjacent 2-tile runway doesn't seem workable since heat frames may be too much to maintain energy.", @@ -312,9 +310,7 @@ "link": [1, 1], "name": "10 Power Bomb Crystal Flash", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"or": [ {"obstaclesCleared": ["A"]}, {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}} diff --git a/region/brinstar/green/Green Brinstar Fireflea Room.json b/region/brinstar/green/Green Brinstar Fireflea Room.json index c3223a41ef..f65685c390 100644 --- a/region/brinstar/green/Green Brinstar Fireflea Room.json +++ b/region/brinstar/green/Green Brinstar Fireflea Room.json @@ -172,15 +172,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 630} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 900} ]} ]} @@ -275,9 +271,7 @@ {"thornHits": 1}, {"or": [ "h_spikeSuitThornHitLeniency", - {"resetRoom": { - "nodes": [1, 2] - }} + {"resetRoom": {"nodes": [1, 2]}} ]}, "canSpikeSuit", {"shinespark": {"frames": 5, "excessFrames": 5}} diff --git a/region/brinstar/green/Green Brinstar Main Shaft.json b/region/brinstar/green/Green Brinstar Main Shaft.json index bff36a06ab..53c51f58be 100644 --- a/region/brinstar/green/Green Brinstar Main Shaft.json +++ b/region/brinstar/green/Green Brinstar Main Shaft.json @@ -4845,8 +4845,8 @@ "name": "Cross-Room Spring Ball Bounce", "entranceCondition": { "comeInWithSpringBallBounce": { - "movementType": "any", "speedBooster": true, + "movementType": "any", "remoteAndLandingMinTiles": [[42, 0]] } }, @@ -5011,21 +5011,15 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [2, 3, 4] - }}, + {"resetRoom": {"nodes": [2, 3, 4]}}, {"cycleFrames": 660} ]}, {"and": [ - {"resetRoom": { - "nodes": [5, 6] - }}, + {"resetRoom": {"nodes": [5, 6]}}, {"cycleFrames": 760} ]}, {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 1700} ]} ]}, @@ -5048,27 +5042,19 @@ "ScrewAttack", {"or": [ {"and": [ - {"resetRoom": { - "nodes": [2, 3] - }}, + {"resetRoom": {"nodes": [2, 3]}}, {"cycleFrames": 375} ]}, {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"cycleFrames": 445} ]}, {"and": [ - {"resetRoom": { - "nodes": [5, 6] - }}, + {"resetRoom": {"nodes": [5, 6]}}, {"cycleFrames": 600} ]}, {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 1530} ]} ]} @@ -5190,15 +5176,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [7] - }}, + {"resetRoom": {"nodes": [7]}}, {"cycleFrames": 270} ]}, {"and": [ - {"resetRoom": { - "nodes": [8] - }}, + {"resetRoom": {"nodes": [8]}}, {"cycleFrames": 620} ]} ]} diff --git a/region/brinstar/green/Green Hill Zone.json b/region/brinstar/green/Green Hill Zone.json index 6b488341a3..d5ee4a5449 100644 --- a/region/brinstar/green/Green Hill Zone.json +++ b/region/brinstar/green/Green Hill Zone.json @@ -1519,9 +1519,7 @@ "link": [3, 3], "name": "Sidehopper Farm", "requires": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"or": [ {"and": [ "Plasma", @@ -1541,8 +1539,8 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Sm. Sidehopper", "count": 3}], - "resetsObstacles": ["B"] + "resetsObstacles": ["B"], + "farmCycleDrops": [{"enemy": "Sm. Sidehopper", "count": 3}] }, { "id": 65, diff --git a/region/brinstar/green/Noob Bridge.json b/region/brinstar/green/Noob Bridge.json index 560d7bc1d0..5186ba3c88 100644 --- a/region/brinstar/green/Noob Bridge.json +++ b/region/brinstar/green/Noob Bridge.json @@ -219,9 +219,7 @@ "link": [1, 1], "name": "Cacatac and Zeela Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 560}, {"or": [ "Plasma", @@ -343,9 +341,7 @@ "link": [2, 2], "name": "Cacatac and Zeela Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 1000}, {"or": [ "Plasma", diff --git a/region/brinstar/green/Spore Spawn Kihunter Room.json b/region/brinstar/green/Spore Spawn Kihunter Room.json index eaf8e27d4f..d961f2c7b3 100644 --- a/region/brinstar/green/Spore Spawn Kihunter Room.json +++ b/region/brinstar/green/Spore Spawn Kihunter Room.json @@ -214,13 +214,9 @@ "name": "Kihunter Farm", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 90} ]} ]}, diff --git a/region/brinstar/kraid/Baby Kraid Room.json b/region/brinstar/kraid/Baby Kraid Room.json index b82bb373ee..12797d44cf 100644 --- a/region/brinstar/kraid/Baby Kraid Room.json +++ b/region/brinstar/kraid/Baby Kraid Room.json @@ -267,9 +267,7 @@ "link": [1, 1], "name": "Pirate Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "Plasma", @@ -307,17 +305,15 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Green Space Pirate (standing)", "count": 3}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Green Space Pirate (standing)", "count": 3}] }, { "id": 39, "link": [1, 1], "name": "Pirate and Mini-Kraid Farm (Blue Speed)", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"enemyDamage": { "enemy": "Green Space Pirate (standing)", "type": "contact", @@ -328,11 +324,11 @@ "h_getBlueSpeedMaxRunway", {"cycleFrames": 720} ], + "clearsObstacles": ["A"], "farmCycleDrops": [ {"enemy": "Green Space Pirate (standing)", "count": 3}, {"enemy": "Mini-Kraid", "count": 1} - ], - "clearsObstacles": ["A"] + ] }, { "id": 8, @@ -670,9 +666,7 @@ "link": [2, 2], "name": "Mini-Kraid Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ {"and": [ {"or": [ @@ -716,17 +710,15 @@ "canTrickyDodgeEnemies" ]} ], - "farmCycleDrops": [{"enemy": "Mini-Kraid", "count": 1}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Mini-Kraid", "count": 1}] }, { "id": 26, "link": [2, 2], "name": "Green Pirates and Mini-Kraid Farm", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"or": [ "ScrewAttack", {"ammo": {"type": "Super", "count": 1}}, @@ -912,9 +904,7 @@ "canSpikeSuit", {"or": [ "h_spikeSuitThornHitLeniency", - {"resetRoom": { - "nodes": [1, 2] - }} + {"resetRoom": {"nodes": [1, 2]}} ]}, {"shinespark": {"frames": 1, "excessFrames": 1}} ], diff --git a/region/brinstar/kraid/Warehouse Energy Tank Room.json b/region/brinstar/kraid/Warehouse Energy Tank Room.json index 4add7f0ecd..c2e93ea1e1 100644 --- a/region/brinstar/kraid/Warehouse Energy Tank Room.json +++ b/region/brinstar/kraid/Warehouse Energy Tank Room.json @@ -87,9 +87,7 @@ "link": [1, 1], "name": "Beetom Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "ScrewAttack", @@ -342,9 +340,7 @@ "canPrepareForNextRoom", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}} ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, "h_10PowerBombCrystalFlash" ], "clearsObstacles": ["A"], @@ -405,13 +401,13 @@ "canTrickyJump", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}} ], - "note": [ - "Wait by the door briefly before spin jumping over and grabbing the item.", - "It is also possible to do this instead by entering with run speed and quickly grabbing the item." - ], "unlocksDoors": [ {"nodeId": 1, "types": ["super"], "requires": []}, {"nodeId": 1, "types": ["missiles", "powerbomb"], "requires": ["never"]} + ], + "note": [ + "Wait by the door briefly before spin jumping over and grabbing the item.", + "It is also possible to do this instead by entering with run speed and quickly grabbing the item." ] }, { @@ -426,11 +422,11 @@ "canTrickyDodgeEnemies", "canInsaneJump" ], - "note": ["Carefully manipulate the Beetoms to avoid all damage."], "unlocksDoors": [ {"nodeId": 1, "types": ["super"], "requires": []}, {"nodeId": 1, "types": ["missiles", "powerbomb"], "requires": ["never"]} - ] + ], + "note": ["Carefully manipulate the Beetoms to avoid all damage."] }, { "id": 16, diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json index 3e22dc4a7e..4c26a650d8 100644 --- a/region/brinstar/kraid/Warehouse Kihunter Room.json +++ b/region/brinstar/kraid/Warehouse Kihunter Room.json @@ -252,9 +252,7 @@ "link": [1, 1], "name": "Kihunter Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "ScrewAttack", @@ -288,9 +286,9 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}], + "clearsObstacles": ["C"], "resetsObstacles": ["A", "B", "D"], - "clearsObstacles": ["C"] + "farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}] }, { "id": 6, @@ -423,9 +421,7 @@ "link": [2, 2], "name": "Kihunter Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, "canDodgeWhileShooting", {"or": [ "HiJump", @@ -464,9 +460,9 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}], - "resetsObstacles": ["A", "B"], "clearsObstacles": ["C", "D"], + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}], "note": [ "If Samus runs into the room and quickly destroys the shot block, a Kihunter will immediately fall down.", "To avoid this, either spin jump into the room, or wait a moment before shooting the block." @@ -585,9 +581,7 @@ "link": [3, 3], "name": "Kihunter Farm", "requires": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, "h_useMorphBombs", {"or": [ {"and": [ @@ -620,9 +614,9 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}], + "clearsObstacles": ["B", "C"], "resetsObstacles": ["A", "D"], - "clearsObstacles": ["B", "C"] + "farmCycleDrops": [{"enemy": "Kihunter (green)", "count": 4}] }, { "id": 22, diff --git a/region/brinstar/kraid/Warehouse Zeela Room.json b/region/brinstar/kraid/Warehouse Zeela Room.json index 12af571726..6a939f29d9 100644 --- a/region/brinstar/kraid/Warehouse Zeela Room.json +++ b/region/brinstar/kraid/Warehouse Zeela Room.json @@ -120,22 +120,16 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 200} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 380} ]}, {"and": [ "h_useMorphBombs", - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"cycleFrames": 900} ]} ]} diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json index 70e26cf8af..ebb19aa919 100644 --- a/region/brinstar/pink/Big Pink.json +++ b/region/brinstar/pink/Big Pink.json @@ -2157,9 +2157,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 2]], "minTiles": 39.4375, "speedBooster": true, + "obstructions": [[3, 2]], "requires": [ {"or": [ "h_heatProof", diff --git a/region/brinstar/pink/Dachora Room.json b/region/brinstar/pink/Dachora Room.json index 8e0f5b368c..3c146b3bcc 100644 --- a/region/brinstar/pink/Dachora Room.json +++ b/region/brinstar/pink/Dachora Room.json @@ -189,13 +189,9 @@ "name": "Zeela and Reo Farm", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ {"and": [ "h_getBlueSpeedMaxRunway", diff --git a/region/brinstar/pink/Mission Impossible Room.json b/region/brinstar/pink/Mission Impossible Room.json index b4561324ee..377c829b17 100644 --- a/region/brinstar/pink/Mission Impossible Room.json +++ b/region/brinstar/pink/Mission Impossible Room.json @@ -305,9 +305,7 @@ "link": [1, 1], "name": "Sidehopper Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "ScrewAttack", @@ -782,13 +780,13 @@ "canCrumbleJump", {"obstaclesCleared": ["A", "B"]} ], + "wallJumpAvoid": true, "failures": [ { "name": "Crumble Failure", "note": "Failure leaves you at 3 with a solid crumble block above." } ], - "wallJumpAvoid": true, "note": [ "Perform a quick-drop through the Crumble block, and grab the item.", "During the item message box, buffer the inputs to turn around to the right and jump.", diff --git a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json index b5579142cb..cb8087d98a 100644 --- a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json +++ b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json @@ -571,9 +571,7 @@ "name": "Sidehopper Farm", "requires": [ "canPrepareForNextRoom", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "ScrewAttack", @@ -585,12 +583,12 @@ ]} ]} ], + "clearsObstacles": ["A"], + "resetsObstacles": ["B", "C"], "farmCycleDrops": [ {"enemy": "Sidehopper", "count": 1}, {"enemy": "Sm. Sidehopper", "count": 2} - ], - "clearsObstacles": ["A"], - "resetsObstacles": ["B", "C"] + ] }, { "id": 17, @@ -1225,9 +1223,7 @@ "requires": [ "canWalljump", "canTrickyJump", - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ {"and": [ "ScrewAttack", @@ -1243,12 +1239,12 @@ ]} ]} ], + "clearsObstacles": ["A", "B"], + "resetsObstacles": ["C"], "farmCycleDrops": [ {"enemy": "Sidehopper", "count": 1}, {"enemy": "Sm. Sidehopper", "count": 2} - ], - "clearsObstacles": ["A", "B"], - "resetsObstacles": ["C"] + ] }, { "id": 43, @@ -1618,9 +1614,9 @@ { "minHeight": 1, "maxHeight": 1, - "obstructions": [[3, 0]], "minTiles": 36.3703, "speedBooster": true, + "obstructions": [[3, 0]], "environment": "water", "requires": [ "canTrickyDashJump", @@ -1652,9 +1648,9 @@ { "minHeight": 1, "maxHeight": 1, - "obstructions": [[1, 0]], "minTiles": 16, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump" ], @@ -1664,17 +1660,17 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[1, 0]], "minTiles": 27.4375, "speedBooster": true, + "obstructions": [[1, 0]], "note": ["This applies to Dust Torizo Room and Noob Bridge"] }, { "minHeight": 3, "maxHeight": 3, - "obstructions": [[1, 0]], "minTiles": 22, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump" ], @@ -1687,9 +1683,9 @@ { "minHeight": 1, "maxHeight": 1, - "obstructions": [[3, 0]], "minTiles": 23.8731, "speedBooster": true, + "obstructions": [[3, 0]], "environment": "water", "requires": [ "canGravityJump", @@ -1704,9 +1700,9 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[3, 0]], "minTiles": 31, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canMomentumConservingMorph", "canInsaneJump" @@ -1716,9 +1712,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 0]], "minTiles": 41.4375, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canMomentumConservingMorph", "canInsaneJump" @@ -1730,9 +1726,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 2]], "minTiles": 39.4375, "speedBooster": true, + "obstructions": [[3, 2]], "requires": [ "canInsaneJump" ], @@ -1741,9 +1737,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[5, 2]], "minTiles": 37.4375, "speedBooster": true, + "obstructions": [[5, 2]], "requires": [ "canMomentumConservingMorph", "canInsaneJump" @@ -1770,9 +1766,9 @@ { "minHeight": 1, "maxHeight": 1, - "obstructions": [[1, 0]], "minTiles": 16, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump" ], @@ -1785,9 +1781,9 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[1, 0]], "minTiles": 9.4375, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump" ], @@ -1800,17 +1796,17 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[1, 0]], "minTiles": 27.4375, "speedBooster": true, + "obstructions": [[1, 0]], "note": ["This applies to Dust Torizo Room and Noob Bridge."] }, { "minHeight": 3, "maxHeight": 3, - "obstructions": [[1, 0]], "minTiles": 9.4375, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump" ], @@ -1825,18 +1821,18 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[1, 0]], "minTiles": 28.2472, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [], "note": ["This applies to Double Chamber."] }, { "minHeight": 1, "maxHeight": 1, - "obstructions": [[3, 0]], "minTiles": 23.8731, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canMomentumConservingMorph" ], @@ -1850,9 +1846,9 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[3, 0]], "minTiles": 31, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canMomentumConservingMorph", "canTrickyDashJump" @@ -1866,9 +1862,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 0]], "minTiles": 21.4375, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canMomentumConservingMorph", "canTrickyDashJump" @@ -1884,25 +1880,25 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 2]], "minTiles": 39.4375, "speedBooster": true, + "obstructions": [[3, 2]], "note": ["This applies to Metal Pirates Room."] }, { "minHeight": 3, "maxHeight": 3, - "obstructions": [[5, 0]], "minTiles": 45, "speedBooster": true, + "obstructions": [[5, 0]], "note": ["This applies to Basement."] }, { "minHeight": 3, "maxHeight": 3, - "obstructions": [[5, 2]], "minTiles": 37.4375, "speedBooster": true, + "obstructions": [[5, 2]], "requires": [ "canMomentumConservingMorph" ], diff --git a/region/brinstar/pink/Waterway Energy Tank Room.json b/region/brinstar/pink/Waterway Energy Tank Room.json index 5d0c8be572..ddfc0159e4 100644 --- a/region/brinstar/pink/Waterway Energy Tank Room.json +++ b/region/brinstar/pink/Waterway Energy Tank Room.json @@ -167,9 +167,7 @@ "link": [1, 1], "name": "Zero Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "Gravity", @@ -205,17 +203,15 @@ {"cycleFrames": 780} ]} ], - "farmCycleDrops": [{"enemy": "Zero", "count": 2}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Zero", "count": 2}] }, { "id": 37, "link": [1, 1], "name": "Zero, Puyo, and Skultera Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, "Gravity", "h_getBlueSpeedMaxRunway", {"or": [ @@ -230,12 +226,12 @@ {"cycleFrames": 510} ]} ], + "resetsObstacles": ["A"], "farmCycleDrops": [ {"enemy": "Zero", "count": 2}, {"enemy": "Puyo", "count": 3}, {"enemy": "Skultera", "count": 2} - ], - "resetsObstacles": ["A"] + ] }, { "id": 5, diff --git a/region/brinstar/red/Alpha Power Bomb Room.json b/region/brinstar/red/Alpha Power Bomb Room.json index 6d94d727cc..3e0ba47cd5 100644 --- a/region/brinstar/red/Alpha Power Bomb Room.json +++ b/region/brinstar/red/Alpha Power Bomb Room.json @@ -309,9 +309,7 @@ "requires": [ "canBePatient", "h_useMorphBombs", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 4930} ], "clearsObstacles": ["A"], diff --git a/region/brinstar/red/Below Spazer.json b/region/brinstar/red/Below Spazer.json index 9e419a3a1c..e73641dcb9 100644 --- a/region/brinstar/red/Below Spazer.json +++ b/region/brinstar/red/Below Spazer.json @@ -510,15 +510,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 300} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 240} ]} ]} @@ -777,9 +773,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 2]], "minTiles": 39.4375, "speedBooster": true, + "obstructions": [[3, 2]], "note": ["This applies to Metal Pirates."] } ] @@ -816,9 +812,9 @@ "name": "CWJ Jump Shot Speedball", "entranceCondition": { "comeInBlueSpinning": { - "unusableTiles": 0, "minExtraRunSpeed": "$1.3", - "maxExtraRunSpeed": "$1.8" + "maxExtraRunSpeed": "$1.8", + "unusableTiles": 0 } }, "requires": [ diff --git a/region/brinstar/red/Beta Power Bomb Room.json b/region/brinstar/red/Beta Power Bomb Room.json index 85ad639156..dc78bfd110 100644 --- a/region/brinstar/red/Beta Power Bomb Room.json +++ b/region/brinstar/red/Beta Power Bomb Room.json @@ -356,9 +356,7 @@ "link": [1, 1], "name": "Sidehopper Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "ScrewAttack", diff --git a/region/brinstar/red/Caterpillar Room.json b/region/brinstar/red/Caterpillar Room.json index 2a63c575f1..06117c8f11 100644 --- a/region/brinstar/red/Caterpillar Room.json +++ b/region/brinstar/red/Caterpillar Room.json @@ -732,15 +732,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 460} ]}, {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"cycleFrames": 660}, {"or": [ "canWalljump", @@ -757,9 +753,7 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 840}, {"or": [ "canWalljump", @@ -788,9 +782,7 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [6] - }}, + {"resetRoom": {"nodes": [6]}}, {"cycleFrames": 1900}, {"or": [ "canWalljump", @@ -1473,9 +1465,7 @@ "link": [3, 3], "name": "Zero Farm", "requires": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"or": [ {"and": [ "Grapple", @@ -1828,29 +1818,21 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"cycleFrames": 210} ]}, {"and": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"cycleFrames": 400} ]}, {"and": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"cycleFrames": 860} ]}, {"and": [ - {"resetRoom": { - "nodes": [6] - }}, + {"resetRoom": {"nodes": [6]}}, {"cycleFrames": 1470} ]} ]}, @@ -2103,9 +2085,7 @@ "requires": [ {"ammo": {"type": "Super", "count": 1}}, "Morph", - {"resetRoom": { - "nodes": [5] - }}, + {"resetRoom": {"nodes": [5]}}, {"cycleFrames": 1340}, {"or": [ "canWalljump", diff --git a/region/brinstar/red/Red Brinstar Fireflea Room.json b/region/brinstar/red/Red Brinstar Fireflea Room.json index 30fcf1842e..8f59c9d1c6 100644 --- a/region/brinstar/red/Red Brinstar Fireflea Room.json +++ b/region/brinstar/red/Red Brinstar Fireflea Room.json @@ -170,9 +170,7 @@ "link": [1, 1], "name": "Waver Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 1150} ], "resetsObstacles": ["A"], @@ -649,9 +647,7 @@ "link": [2, 2], "name": "Firefleas and Waver Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 630}, {"or": [ "canDodgeWhileShooting", @@ -990,13 +986,13 @@ "exitCondition": { "leaveShinecharged": {} }, + "unlocksDoors": [{"types": ["ammo"], "requires": [], "useImplicitRequires": false}], "flashSuitChecked": true, "note": [ "Use the spikes in the center of the room to gain a shinecharge with X-Mode.", "Then arm pump until Samus reaches the middle Yapping Maw.", "Exit X-mode, gain run speed, and use Space Jump to reach the door." ], - "unlocksDoors": [{"types": ["ammo"], "requires": [], "useImplicitRequires": false}], "devNote": "Unlocking the door is free since obstacle A being cleared implies it was already unlocked earlier if needed." }, { diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json index 61efef95a4..f998244393 100644 --- a/region/brinstar/red/Red Tower.json +++ b/region/brinstar/red/Red Tower.json @@ -346,30 +346,22 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 570} ]}, {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, "ScrewAttack", {"cycleFrames": 480} ]}, {"and": [ - {"resetRoom": { - "nodes": [3, 4] - }}, + {"resetRoom": {"nodes": [3, 4]}}, "HiJump", "canWalljump", {"cycleFrames": 800} ]}, {"and": [ - {"resetRoom": { - "nodes": [5] - }}, + {"resetRoom": {"nodes": [5]}}, {"notable": "Hero Shot"}, {"or": [ {"and": [ @@ -397,8 +389,8 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Beetom", "count": 1}], "resetsObstacles": ["A", "B"], + "farmCycleDrops": [{"enemy": "Beetom", "count": 1}], "devNote": [ "Using a Power Bomb to farm the Beetom is only useful if Power Bomb drops are modified to give more than 1.", "FIXME: Other options for resetting the room at the top and bottom nodes are possible." @@ -1310,15 +1302,13 @@ "link": [2, 2], "name": "Beetom Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 300}, "h_usePowerBomb" ], - "farmCycleDrops": [{"enemy": "Beetom", "count": 1}], "clearsObstacles": ["A"], "resetsObstacles": ["B"], + "farmCycleDrops": [{"enemy": "Beetom", "count": 1}], "devNote": [ "This strat is only useful if Power Bomb drops are modified to give more than 1." ] diff --git a/region/brinstar/red/Skree Boost Room.json b/region/brinstar/red/Skree Boost Room.json index 7e3114adc0..2be3a1804c 100644 --- a/region/brinstar/red/Skree Boost Room.json +++ b/region/brinstar/red/Skree Boost Room.json @@ -418,15 +418,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 380} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 220} ]} ]} diff --git a/region/crateria/central/Climb.json b/region/crateria/central/Climb.json index d75a0ed2fd..f9d695eccf 100644 --- a/region/crateria/central/Climb.json +++ b/region/crateria/central/Climb.json @@ -2247,15 +2247,11 @@ ]}, {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 2350} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ "h_useMorphBombs", "ScrewAttack" @@ -2263,23 +2259,17 @@ {"cycleFrames": 2270} ]}, {"and": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, "h_useMorphBombs", {"cycleFrames": 2695} ]}, {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, "h_useMorphBombs", {"cycleFrames": 2480} ]}, {"and": [ - {"resetRoom": { - "nodes": [5] - }}, + {"resetRoom": {"nodes": [5]}}, {"cycleFrames": 1905} ]} ]} diff --git a/region/crateria/central/Crateria Power Bomb Room.json b/region/crateria/central/Crateria Power Bomb Room.json index e8be944057..9dcb982926 100644 --- a/region/crateria/central/Crateria Power Bomb Room.json +++ b/region/crateria/central/Crateria Power Bomb Room.json @@ -95,9 +95,7 @@ "link": [1, 1], "name": "Alcoon Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ {"or": [ diff --git a/region/crateria/central/Flyway.json b/region/crateria/central/Flyway.json index c799589e9b..e7c98ec65f 100644 --- a/region/crateria/central/Flyway.json +++ b/region/crateria/central/Flyway.json @@ -229,13 +229,9 @@ "name": "Mellow Farm", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 50} ]} ]}, diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json index 33d88f6625..94964d6d6e 100644 --- a/region/crateria/central/Parlor and Alcatraz.json +++ b/region/crateria/central/Parlor and Alcatraz.json @@ -2933,13 +2933,9 @@ "h_ZebesIsAwake", {"cycleFrames": 1860}, {"or": [ - {"resetRoom": { - "nodes": [3, 4, 6, 7] - }}, + {"resetRoom": {"nodes": [3, 4, 6, 7]}}, {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 420}, {"or": [ "ScrewAttack", @@ -2956,17 +2952,13 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 240}, "Morph" ]}, {"and": [ "Morph", - {"resetRoom": { - "nodes": [5] - }}, + {"resetRoom": {"nodes": [5]}}, {"cycleFrames": 420}, {"or": [ "h_bombThings", diff --git a/region/crateria/central/Pit Room.json b/region/crateria/central/Pit Room.json index 4283348298..20fd7e530e 100644 --- a/region/crateria/central/Pit Room.json +++ b/region/crateria/central/Pit Room.json @@ -437,12 +437,8 @@ "requires": [ "Morph", "Missile", - {"resetRoom": { - "nodes": [1] - }}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [1]}}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 930} ], "resetsObstacles": ["A"], @@ -459,12 +455,8 @@ "Morph", "Missile", {"or": [ - {"resetRoom": { - "nodes": [1] - }}, - {"resetRoom": { - "nodes": [2] - }} + {"resetRoom": {"nodes": [1]}}, + {"resetRoom": {"nodes": [2]}} ]}, {"cycleFrames": 930} ], diff --git a/region/crateria/central/Pre-Map Flyway.json b/region/crateria/central/Pre-Map Flyway.json index ca87793876..3a35f1fe95 100644 --- a/region/crateria/central/Pre-Map Flyway.json +++ b/region/crateria/central/Pre-Map Flyway.json @@ -156,13 +156,9 @@ "name": "Mellow and Reo Farm", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 60} ]} ]}, diff --git a/region/crateria/east/Crab Maze.json b/region/crateria/east/Crab Maze.json index 5fa8e26dbf..d81df72aeb 100644 --- a/region/crateria/east/Crab Maze.json +++ b/region/crateria/east/Crab Maze.json @@ -137,9 +137,7 @@ "link": [1, 1], "name": "Sciser Farm (One Sciser)", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 1080} ], "farmCycleDrops": [{"enemy": "Sciser", "count": 1}] @@ -150,9 +148,7 @@ "name": "Sciser Farm (Full Clear)", "requires": [ "Morph", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 2700}, {"or": [ "Gravity", @@ -523,9 +519,7 @@ "link": [2, 2], "name": "Sciser Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 270}, {"or": [ "Gravity", diff --git a/region/crateria/east/Crateria Kihunter Room.json b/region/crateria/east/Crateria Kihunter Room.json index 12e56b4ac6..bceaf2a07a 100644 --- a/region/crateria/east/Crateria Kihunter Room.json +++ b/region/crateria/east/Crateria Kihunter Room.json @@ -361,14 +361,10 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, "canCameraManip" ]}, - {"resetRoom": { - "nodes": [3] - }} + {"resetRoom": {"nodes": [3]}} ]}, {"or": [ {"and": [ diff --git a/region/crateria/east/Forgotten Highway Elbow.json b/region/crateria/east/Forgotten Highway Elbow.json index 17dd56d61d..316cf8ab1d 100644 --- a/region/crateria/east/Forgotten Highway Elbow.json +++ b/region/crateria/east/Forgotten Highway Elbow.json @@ -151,6 +151,8 @@ "requires": [ "canMoonfall" ], + "bypassesDoorShell": true, + "flashSuitChecked": true, "note": [ "Enter the room with enough stored fall speed to clip through 2 tiles.", "Perform a moonfall right-to-left near the edge of the ledge, to reach the slope below.", @@ -162,9 +164,7 @@ "in this case, be careful to release left quickly after initiating the moonfall, to avoid tripping on the slope;", "it is safest to stand up by holding right, then moonwalk while traversing the slope.", "Performing the final moonfall while over the edge of door can be useful to avoid carrying stored fall speed into the next room." - ], - "bypassesDoorShell": true, - "flashSuitChecked": true + ] }, { "id": 6, diff --git a/region/crateria/east/Forgotten Highway Kago Room.json b/region/crateria/east/Forgotten Highway Kago Room.json index d0ff1cd9d0..89c5b1acb7 100644 --- a/region/crateria/east/Forgotten Highway Kago Room.json +++ b/region/crateria/east/Forgotten Highway Kago Room.json @@ -91,15 +91,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 1230} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 1710} ]} ]} diff --git a/region/crateria/east/Pancakes and Wavers Room.json b/region/crateria/east/Pancakes and Wavers Room.json index a377c1944d..cacb7d960b 100644 --- a/region/crateria/east/Pancakes and Wavers Room.json +++ b/region/crateria/east/Pancakes and Wavers Room.json @@ -239,12 +239,8 @@ "link": [1, 1], "name": "Waver and Choot Farm (Both Doors)", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [1]}}, + {"resetRoom": {"nodes": [2]}}, {"or": [ {"and": [ "ScrewAttack", @@ -285,9 +281,7 @@ "link": [1, 1], "name": "Waver and Choot Farm (Single Door)", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"cycleFrames": 100}, {"or": [ {"and": [ diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json index 1fb05e5661..96efbab665 100644 --- a/region/crateria/east/West Ocean.json +++ b/region/crateria/east/West Ocean.json @@ -1885,10 +1885,6 @@ ], "exitCondition": { "leaveWithSpringBallBounce": { - "blue": "any", - "movementType": "controlled", - "minExtraRunSpeed": "$1.2", - "maxExtraRunSpeed": "$4.8", "remoteRunway": { "length": 22, "openEnd": 1 @@ -1897,7 +1893,11 @@ "length": 9, "openEnd": 1, "steepUpTiles": 2 - } + }, + "minExtraRunSpeed": "$1.2", + "maxExtraRunSpeed": "$4.8", + "blue": "any", + "movementType": "controlled" } }, "note": [ @@ -2867,15 +2867,11 @@ "canCarefulJump", {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 1000} ]}, {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"or": [ {"and": [ "canWalljump", @@ -2888,9 +2884,7 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [5] - }}, + {"resetRoom": {"nodes": [5]}}, {"cycleFrames": 480} ]} ]} @@ -2905,9 +2899,7 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "Gravity", @@ -2917,9 +2909,7 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"or": [ {"and": [ "Gravity", @@ -2942,9 +2932,7 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [5] - }}, + {"resetRoom": {"nodes": [5]}}, {"or": [ {"and": [ "Gravity", @@ -2992,8 +2980,8 @@ {"cycleFrames": 500} ]} ], - "farmCycleDrops": [{"enemy": "Skultera", "count": 2}], - "resetsObstacles": ["A", "B"] + "resetsObstacles": ["A", "B"], + "farmCycleDrops": [{"enemy": "Skultera", "count": 2}] }, { "id": 126, diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index 845919dcff..392d223bc6 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -421,16 +421,16 @@ {"doorUnlockedAtNode": 1}, {"canShineCharge": { "usedTiles": 19, - "openEnd": 0, "steepUpTiles": 1, - "steepDownTiles": 1 + "steepDownTiles": 1, + "openEnd": 0 }} ]}, {"canShineCharge": { "usedTiles": 18, - "openEnd": 0, "steepUpTiles": 1, - "steepDownTiles": 1 + "steepDownTiles": 1, + "openEnd": 0 }} ]}, "h_runOverRespawningEnemies", diff --git a/region/crateria/west/Gauntlet Entrance.json b/region/crateria/west/Gauntlet Entrance.json index 76ddc27146..6fc940eba0 100644 --- a/region/crateria/west/Gauntlet Entrance.json +++ b/region/crateria/west/Gauntlet Entrance.json @@ -85,9 +85,7 @@ "link": [1, 1], "name": "Waver Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ {"and": [ "ScrewAttack", @@ -101,8 +99,8 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Waver", "count": 2}], "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Waver", "count": 2}], "devNote": [ "There is a third Waver on the right side of the room,", "but generally it would not be worthwhile to cross the room for it." @@ -876,9 +874,7 @@ "link": [2, 2], "name": "Waver Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, "canDodgeWhileShooting", {"or": [ {"and": [ @@ -892,8 +888,8 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Waver", "count": 1}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Waver", "count": 1}] }, { "id": 38, diff --git a/region/crateria/west/Green Pirates Shaft.json b/region/crateria/west/Green Pirates Shaft.json index 216d163878..d670289c94 100644 --- a/region/crateria/west/Green Pirates Shaft.json +++ b/region/crateria/west/Green Pirates Shaft.json @@ -392,9 +392,7 @@ "name": "Pirate Farm", "requires": [ {"and": [ - {"resetRoom": { - "nodes": [2, 3, 4] - }}, + {"resetRoom": {"nodes": [2, 3, 4]}}, {"cycleFrames": 850} ]}, {"or": [ @@ -417,8 +415,8 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Green Space Pirate (standing)", "count": 5}], "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Green Space Pirate (standing)", "count": 5}], "devNote": [ "A two-way farm strat could be added for if the room can be reset at both the top and bottom." ] @@ -429,20 +427,18 @@ "name": "Beetom Farm", "requires": [ {"cycleFrames": 650}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, "h_usePowerBomb", {"or": [ "canMidAirMorph", "h_useSpringBall" ]} ], + "clearsObstacles": ["A"], "farmCycleDrops": [ {"enemy": "Beetom", "count": 2}, {"enemy": "Green Space Pirate (standing)", "count": 2} ], - "clearsObstacles": ["A"], "note": [ "Jump to lay a Power Bomb above ground height, to both break the Power Bomb blocks and kill the Beetoms.", "The top two Space Pirates will also be killed." @@ -455,15 +451,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 1150} ]}, {"and": [ - {"resetRoom": { - "nodes": [3, 4] - }}, + {"resetRoom": {"nodes": [3, 4]}}, {"cycleFrames": 1400} ]} ]}, @@ -488,11 +480,11 @@ "h_useSpringBall" ]} ], + "resetsObstacles": ["A"], "farmCycleDrops": [ {"enemy": "Green Space Pirate (standing)", "count": 5}, {"enemy": "Beetom", "count": 2} ], - "resetsObstacles": ["A"], "devNote": [ "This strat mainly exists as a way to farm Beetoms in case the room cannot be reset at node 2;", "in this case, the Pirate along the way comes almost for free, and it also works at node 2." @@ -512,9 +504,7 @@ "link": [2, 2], "name": "10 Power Bomb Crystal Flash", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}, "h_10PowerBombCrystalFlash" ], @@ -1390,9 +1380,7 @@ "canWallIceClip", "canBeVeryPatient", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 9}}, - {"resetRoom": { - "nodes": [2, 3, 4] - }} + {"resetRoom": {"nodes": [2, 3, 4]}} ], "resetsObstacles": ["A"], "flashSuitChecked": true, diff --git a/region/crateria/west/Lower Mushrooms.json b/region/crateria/west/Lower Mushrooms.json index 821c5356d9..559a852110 100644 --- a/region/crateria/west/Lower Mushrooms.json +++ b/region/crateria/west/Lower Mushrooms.json @@ -85,9 +85,7 @@ "link": [1, 1], "name": "Kago Farm", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"cycleFrames": 1200} ], "farmCycleDrops": [{"enemy": "Kago", "count": 2}] diff --git a/region/crateria/west/Terminator Room.json b/region/crateria/west/Terminator Room.json index bffb1b6385..a9c5705547 100644 --- a/region/crateria/west/Terminator Room.json +++ b/region/crateria/west/Terminator Room.json @@ -128,13 +128,9 @@ "name": "Geemer and Waver Farm", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 60} ]} ]}, diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json index 5aa93db042..c20ef4da70 100644 --- a/region/lowernorfair/east/Fast Pillars Setup Room.json +++ b/region/lowernorfair/east/Fast Pillars Setup Room.json @@ -598,8 +598,8 @@ "name": "Come in Running, Tricky Dash Jump", "entranceCondition": { "comeInRunning": { - "minTiles": 1, - "speedBooster": true + "speedBooster": true, + "minTiles": 1 } }, "requires": [ @@ -2366,9 +2366,7 @@ "name": "Viola Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [2, 3] - }}, + {"resetRoom": {"nodes": [2, 3]}}, {"refill": ["PowerBomb"]} ], "resetsObstacles": ["A"], diff --git a/region/lowernorfair/east/Lower Norfair Farming Room.json b/region/lowernorfair/east/Lower Norfair Farming Room.json index 1c83ca2a7a..06accfcb03 100644 --- a/region/lowernorfair/east/Lower Norfair Farming Room.json +++ b/region/lowernorfair/east/Lower Norfair Farming Room.json @@ -218,8 +218,8 @@ "name": "Spring Ball Bounce (Come in Jumping, 5-tile runway)", "entranceCondition": { "comeInJumping": { - "minTiles": 5, - "speedBooster": false + "speedBooster": false, + "minTiles": 5 } }, "requires": [ @@ -233,8 +233,8 @@ "name": "Spring Ball Bounce (Come in Jumping, 4-tile runway)", "entranceCondition": { "comeInJumping": { - "minTiles": 4, - "speedBooster": false + "speedBooster": false, + "minTiles": 4 } }, "requires": [ @@ -248,8 +248,8 @@ "name": "Spring Ball Bounce (Come in Jumping, 3-tile runway)", "entranceCondition": { "comeInJumping": { - "minTiles": 3, - "speedBooster": false + "speedBooster": false, + "minTiles": 3 } }, "requires": [ @@ -263,9 +263,9 @@ "name": "Spring Ball Bounce (Come in with Spring Ball Bounce)", "entranceCondition": { "comeInWithSpringBallBounce": { - "remoteAndLandingMinTiles": [[7, 0]], "speedBooster": "any", - "movementType": "controlled" + "movementType": "controlled", + "remoteAndLandingMinTiles": [[7, 0]] } }, "requires": [ @@ -279,9 +279,9 @@ "name": "Speedy Spring Ball Bounce into Spring Fling", "entranceCondition": { "comeInWithSpringBallBounce": { - "remoteAndLandingMinTiles": [[30, 1]], "speedBooster": false, - "movementType": "controlled" + "movementType": "controlled", + "remoteAndLandingMinTiles": [[30, 1]] } }, "requires": [ @@ -366,8 +366,8 @@ "name": "Spring Ball Bounce (Come in Running, 4-tile runway)", "entranceCondition": { "comeInRunning": { - "minTiles": 3, - "speedBooster": false + "speedBooster": false, + "minTiles": 3 } }, "requires": [ @@ -381,8 +381,8 @@ "name": "Spring Ball Bounce (Come in Running, 3-tile runway)", "entranceCondition": { "comeInRunning": { - "minTiles": 3, - "speedBooster": false + "speedBooster": false, + "minTiles": 3 } }, "requires": [ @@ -396,9 +396,9 @@ "name": "Spring Ball Bounce (Come in with Spring Ball Bounce)", "entranceCondition": { "comeInWithSpringBallBounce": { - "remoteAndLandingMinTiles": [[7, 0]], "speedBooster": "any", - "movementType": "controlled" + "movementType": "controlled", + "remoteAndLandingMinTiles": [[7, 0]] } }, "requires": [ @@ -412,9 +412,9 @@ "name": "Speedy Spring Ball Bounce into Spring Fling", "entranceCondition": { "comeInWithSpringBallBounce": { - "remoteAndLandingMinTiles": [[33, 1]], "speedBooster": true, - "movementType": "any" + "movementType": "any", + "remoteAndLandingMinTiles": [[33, 1]] } }, "requires": [ @@ -658,9 +658,7 @@ "name": "Heat-proof Viola Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["PowerBomb"]} ] }, @@ -673,9 +671,7 @@ "canPauseAbuse", "Grapple", "canBeVeryPatient", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Energy", "Super", "PowerBomb"]} ] }, @@ -763,9 +759,7 @@ "name": "Heat-proof Viola Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"refill": ["PowerBomb"]} ] }, @@ -778,9 +772,7 @@ "canPauseAbuse", "Grapple", "canBeVeryPatient", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Energy", "Super", "PowerBomb"]} ] }, diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json index 64d54271d9..3a662da066 100644 --- a/region/lowernorfair/east/Lower Norfair Fireflea Room.json +++ b/region/lowernorfair/east/Lower Norfair Fireflea Room.json @@ -419,9 +419,7 @@ "h_spikeSuitSpikeHitLeniency", {"and": [ {"resourceCapacity": [{"type": "PowerBomb", "count": 1}]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ "SpaceJump", "HiJump", @@ -1204,9 +1202,9 @@ "requires": [ {"canShineCharge": { "usedTiles": 17, - "openEnd": 1, "gentleUpTiles": 6, - "steepUpTiles": 1 + "steepUpTiles": 1, + "openEnd": 1 }}, {"or": [ {"and": [ diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json index ac2c6ddc3a..2948af8322 100644 --- a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json +++ b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json @@ -243,11 +243,11 @@ "h_heatedDirectGModeLeaveSameDoor" ], "collectsItems": [4], + "flashSuitChecked": true, "note": [ "Wait at least 35 seconds for the Alcoon to jump back down before returning to the door, or kill it with a Power Bomb or SBA.", "Stand close to the transition and use X-Ray then hold left to leave the room before the door closes." - ], - "flashSuitChecked": true + ] }, { "id": 76, diff --git a/region/lowernorfair/east/Main Hall.json b/region/lowernorfair/east/Main Hall.json index c21e49dbd7..31805c713b 100644 --- a/region/lowernorfair/east/Main Hall.json +++ b/region/lowernorfair/east/Main Hall.json @@ -326,8 +326,8 @@ "name": "Spring Ball Bounce (Come in Running)", "entranceCondition": { "comeInRunning": { - "minTiles": 3, - "speedBooster": "any" + "speedBooster": "any", + "minTiles": 3 } }, "requires": [ @@ -341,9 +341,9 @@ "name": "Come in With Spring Ball Bounce", "entranceCondition": { "comeInWithSpringBallBounce": { - "remoteAndLandingMinTiles": [[6.4725, 0]], + "speedBooster": "any", "movementType": "controlled", - "speedBooster": "any" + "remoteAndLandingMinTiles": [[6.4725, 0]] } }, "requires": [ diff --git a/region/lowernorfair/east/Pillar Room.json b/region/lowernorfair/east/Pillar Room.json index 8699893cd9..001c388e33 100644 --- a/region/lowernorfair/east/Pillar Room.json +++ b/region/lowernorfair/east/Pillar Room.json @@ -109,9 +109,7 @@ }, "requires": [ "h_heatedCrystalFlash", - {"resetRoom": { - "nodes": [1] - }} + {"resetRoom": {"nodes": [1]}} ], "unlocksDoors": [ { @@ -1285,9 +1283,7 @@ }, "requires": [ "h_heatedCrystalFlash", - {"resetRoom": { - "nodes": [2] - }} + {"resetRoom": {"nodes": [2]}} ], "unlocksDoors": [ { diff --git a/region/lowernorfair/east/Plowerhouse Room.json b/region/lowernorfair/east/Plowerhouse Room.json index 6e58b8ef56..9a346fdfe0 100644 --- a/region/lowernorfair/east/Plowerhouse Room.json +++ b/region/lowernorfair/east/Plowerhouse Room.json @@ -247,6 +247,7 @@ ] }, { + "id": 52, "link": [1, 2], "name": "Cross While Farming", "requires": [ @@ -265,7 +266,7 @@ "frames": 140, "drops": [{"enemy": "Zebbo", "count": 1}] }}, - {"heatFrames": 100} + {"heatFrames": 100} ]}, {"and": [ {"or": [ @@ -285,7 +286,7 @@ "frames": 130, "drops": [{"enemy": "Zebbo", "count": 1}] }}, - {"heatFrames": 100} + {"heatFrames": 100} ]} ]} ] @@ -522,6 +523,7 @@ "flashSuitChecked": true }, { + "id": 53, "link": [2, 1], "name": "Tricky Dodge", "requires": [ @@ -534,6 +536,7 @@ ] }, { + "id": 54, "link": [2, 1], "name": "Cross While Farming", "requires": [ @@ -1109,9 +1112,7 @@ "Wave" ]} ]}, - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"refill": ["PowerBomb"]} ], "flashSuitChecked": true @@ -1128,6 +1129,6 @@ } ], "notables": [], - "nextStratId": 52, + "nextStratId": 55, "nextNotableId": 1 } \ No newline at end of file diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json index 194d01d60d..99f8980faa 100644 --- a/region/lowernorfair/east/Red Kihunter Shaft.json +++ b/region/lowernorfair/east/Red Kihunter Shaft.json @@ -750,9 +750,7 @@ "Ice" ]} ]}, - {"resetRoom": { - "nodes": [1, 3, 4] - }}, + {"resetRoom": {"nodes": [1, 3, 4]}}, {"partialRefill": {"type": "Energy", "limit": 200}}, {"partialRefill": {"type": "Missile", "limit": 10}}, {"partialRefill": {"type": "Super", "limit": 4}} diff --git a/region/lowernorfair/east/Ridley's Room.json b/region/lowernorfair/east/Ridley's Room.json index fac0f0f9a6..5c37646d52 100644 --- a/region/lowernorfair/east/Ridley's Room.json +++ b/region/lowernorfair/east/Ridley's Room.json @@ -193,8 +193,8 @@ "minHeight": 1, "maxHeight": 1, "minTiles": 17, - "obstructions": [[1, 0]], "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ {"or": [ {"and": [ @@ -218,8 +218,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 11.4375, - "obstructions": [[1, 0]], "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump", "canTrickySpringBallJump", @@ -235,8 +235,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 12.4375, - "obstructions": [[1, 0]], "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "HiJump", {"heatFrames": 95} @@ -247,8 +247,8 @@ "minHeight": 3, "maxHeight": 3, "minTiles": 10.4375, - "obstructions": [[1, 0]], "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump", "canTrickySpringBallJump", @@ -264,8 +264,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 45, - "obstructions": [[2, 0]], "speedBooster": true, + "obstructions": [[2, 0]], "requires": [ "canInsaneJump", {"heatFrames": 85} @@ -276,8 +276,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 45, - "obstructions": [[3, 0]], "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canInsaneJump", "canMomentumConservingMorph", @@ -299,8 +299,8 @@ "minHeight": 3, "maxHeight": 3, "minTiles": 37.4375, - "obstructions": [[3, 0]], "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canInsaneJump", "canMomentumConservingMorph", @@ -321,8 +321,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 45, - "obstructions": [[4, 0]], "speedBooster": true, + "obstructions": [[4, 0]], "requires": [ "canInsaneJump", "canMomentumConservingMorph", @@ -336,8 +336,8 @@ "minHeight": 3, "maxHeight": 3, "minTiles": 39.4375, - "obstructions": [[3, 2]], "speedBooster": true, + "obstructions": [[3, 2]], "requires": [ "canTrickyJump", {"or": [ 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 f7cd41ea11..e04a066306 100644 --- a/region/lowernorfair/east/The Worst Room In The Game.json +++ b/region/lowernorfair/east/The Worst Room In The Game.json @@ -541,9 +541,7 @@ {"heatFrames": 60}, "h_heatedCrystalFlash", {"heatFrames": 90}, - {"resetRoom": { - "nodes": [2] - }} + {"resetRoom": {"nodes": [2]}} ], "resetsObstacles": ["A"], "flashSuitChecked": true, @@ -1815,9 +1813,7 @@ "Ice" ]} ]}, - {"resetRoom": { - "nodes": [1, 3] - }}, + {"resetRoom": {"nodes": [1, 3]}}, {"partialRefill": {"type": "Energy", "limit": 199}}, {"partialRefill": {"type": "Missile", "limit": 10}} ], diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index 99e6f9e668..31c01f1460 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -181,9 +181,7 @@ "Ice" ]} ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"partialRefill": {"type": "Energy", "limit": 200}}, {"partialRefill": {"type": "Missile", "limit": 10}}, {"partialRefill": {"type": "Super", "limit": 4}} diff --git a/region/lowernorfair/east/Wasteland.json b/region/lowernorfair/east/Wasteland.json index aaa6b09c91..8b0edd09d0 100644 --- a/region/lowernorfair/east/Wasteland.json +++ b/region/lowernorfair/east/Wasteland.json @@ -390,13 +390,13 @@ "h_usePowerBomb", {"heatFrames": 0} ], + "clearsObstacles": ["A", "B"], "flashSuitChecked": true, "note": "Climb the room and place a Power Bomb near the top before exiting G-mode.", "devNote": [ "It is possible to do this with artificial morph, but progressing anywhere else in the room requires Morph.", "FIXME: It looks like the heat frames going up from 5 don't take into account that the Power Bomb blocks could already be broken." - ], - "clearsObstacles": ["A", "B"] + ] }, { "id": 9, @@ -1948,8 +1948,8 @@ {"obstaclesCleared": ["E"]} ]} ], - "collectsItems": [3], "clearsObstacles": ["B"], + "collectsItems": [3], "note": [ "Use Speedbooster to break the bomb block near the item to collect it and then again to speedball back to the door." ] diff --git a/region/lowernorfair/west/Acid Statue Room.json b/region/lowernorfair/west/Acid Statue Room.json index b65c8751c9..fa4218a561 100644 --- a/region/lowernorfair/west/Acid Statue Room.json +++ b/region/lowernorfair/west/Acid Statue Room.json @@ -207,8 +207,8 @@ "name": "Speedy Jump Morph", "entranceCondition": { "comeInJumping": { - "minTiles": 19, - "speedBooster": true + "speedBooster": true, + "minTiles": 19 } }, "requires": [ @@ -239,9 +239,9 @@ "name": "Cross Room Spring Ball Bounce", "entranceCondition": { "comeInSpinning": { - "minExtraRunSpeed": "$1.7", + "speedBooster": "any", "unusableTiles": 0, - "speedBooster": "any" + "minExtraRunSpeed": "$1.7" } }, "requires": [ diff --git a/region/lowernorfair/west/Fast Ripper Room.json b/region/lowernorfair/west/Fast Ripper Room.json index be7851f069..bebd72924b 100644 --- a/region/lowernorfair/west/Fast Ripper Room.json +++ b/region/lowernorfair/west/Fast Ripper Room.json @@ -117,9 +117,7 @@ "requires": [ "h_heatProof", "ScrewAttack", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Energy", "Super"]} ], "resetsObstacles": ["A"] @@ -902,7 +900,6 @@ {"obstaclesCleared": ["A"]} ]} ], - "clearsObstacles": ["A"], "unlocksDoors": [ { "types": ["missiles"], @@ -914,6 +911,7 @@ "requires": [{"heatFrames": 40}] } ], + "clearsObstacles": ["A"], "devNote": ["FIXME: The gate can be opened from a distance to save some health."] }, { diff --git a/region/lowernorfair/west/Golden Torizo's Room.json b/region/lowernorfair/west/Golden Torizo's Room.json index 14dec33208..9342adef66 100644 --- a/region/lowernorfair/west/Golden Torizo's Room.json +++ b/region/lowernorfair/west/Golden Torizo's Room.json @@ -767,8 +767,8 @@ "morphed": false } }, - "setsFlags": ["f_DefeatedGoldenTorizo"], "bypassesDoorShell": "free", + "setsFlags": ["f_DefeatedGoldenTorizo"], "flashSuitChecked": true, "note": [ "Start the fight with 31 Missiles or fewer in order to prevent GT from using its laser attack, which will enable Samus to stand next to it.", @@ -914,25 +914,25 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[1, 0]], "minTiles": 27.4375, "speedBooster": true, + "obstructions": [[1, 0]], "note": ["This applies to Dust Torizo Room and Noob Bridge."] }, { "minHeight": 3, "maxHeight": 3, - "obstructions": [[1, 0]], "minTiles": 28.2472, "speedBooster": true, + "obstructions": [[1, 0]], "note": ["This applies to Double Chamber."] }, { "minHeight": 1, "maxHeight": 1, - "obstructions": [[3, 0]], "minTiles": 28.2472, "speedBooster": true, + "obstructions": [[3, 0]], "environment": "water", "requires": [ "canGravityJump" @@ -942,9 +942,9 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[3, 0]], "minTiles": 31, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canInsaneMidAirMorph" ], @@ -953,9 +953,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 0]], "minTiles": 41.4375, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "canInsaneMidAirMorph" ], @@ -966,17 +966,17 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 2]], "minTiles": 39.4375, "speedBooster": true, + "obstructions": [[3, 2]], "note": ["This applies to Metal Pirates Room."] }, { "minHeight": 3, "maxHeight": 3, - "obstructions": [[5, 2]], "minTiles": 37.4375, "speedBooster": true, + "obstructions": [[5, 2]], "requires": [ "canInsaneMidAirMorph" ], diff --git a/region/lowernorfair/west/Screw Attack Room.json b/region/lowernorfair/west/Screw Attack Room.json index 3c6913c54d..1bc74289ad 100644 --- a/region/lowernorfair/west/Screw Attack Room.json +++ b/region/lowernorfair/west/Screw Attack Room.json @@ -1408,9 +1408,9 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[1, 0]], "minTiles": 27.4375, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "HiJump", {"heatFrames": 110} @@ -1420,9 +1420,9 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[1, 0]], "minTiles": 45, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canTrickyDashJump", "canInsaneJump", @@ -1433,9 +1433,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[1, 0]], "minTiles": 28.2472, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "HiJump", {"heatFrames": 110} @@ -1445,9 +1445,9 @@ { "minHeight": 1, "maxHeight": 1, - "obstructions": [[3, 0]], "minTiles": 23.8731, "speedBooster": true, + "obstructions": [[3, 0]], "environment": "water", "requires": [ "HiJump", @@ -1463,9 +1463,9 @@ { "minHeight": 1, "maxHeight": 1, - "obstructions": [[3, 0]], "minTiles": 36.3703, "speedBooster": true, + "obstructions": [[3, 0]], "environment": "water", "requires": [ "canTrickyDashJump", @@ -1482,9 +1482,9 @@ { "minHeight": 2, "maxHeight": 2, - "obstructions": [[3, 0]], "minTiles": 31, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "HiJump", "canInsaneJump", @@ -1495,9 +1495,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 0]], "minTiles": 30.4375, "speedBooster": true, + "obstructions": [[3, 0]], "requires": [ "HiJump", "canInsaneJump", @@ -1510,9 +1510,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 2]], "minTiles": 32.4375, "speedBooster": true, + "obstructions": [[3, 2]], "requires": [ "HiJump", {"heatFrames": 110} @@ -1522,9 +1522,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[5, 2]], "minTiles": 31.4375, "speedBooster": true, + "obstructions": [[5, 2]], "requires": [ "HiJump", "canInsaneJump", @@ -1868,9 +1868,9 @@ { "minHeight": 1, "maxHeight": 1, - "obstructions": [[1, 0]], "minTiles": 16, "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "HiJump", {"getBlueSpeed": {"usedTiles": 14, "openEnd": 1}}, @@ -1885,9 +1885,9 @@ { "minHeight": 3, "maxHeight": 3, - "obstructions": [[3, 0]], "minTiles": 21.4375, "speedBooster": true, + "obstructions": [[3, 0]], "environment": "water", "requires": [ "HiJump", diff --git a/region/maridia/inner-green/East Pants Room.json b/region/maridia/inner-green/East Pants Room.json index 6e4c17c786..40a4b3c687 100644 --- a/region/maridia/inner-green/East Pants Room.json +++ b/region/maridia/inner-green/East Pants Room.json @@ -122,9 +122,7 @@ "name": "Puyo Farm", "requires": [ "canDodgeWhileShooting", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"partialRefill": {"type": "Energy", "limit": 160}}, {"partialRefill": {"type": "Missile", "limit": 6}}, {"partialRefill": {"type": "PowerBomb", "limit": 2}} @@ -480,9 +478,7 @@ {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 6}}, {"and": [ "canBePatient", - {"resetRoom": { - "nodes": [1] - }} + {"resetRoom": {"nodes": [1]}} ]} ]}, {"or": [ diff --git a/region/maridia/inner-green/Lonely Crab Room.json b/region/maridia/inner-green/Lonely Crab Room.json index db0db8a16c..ec1d1e43ac 100644 --- a/region/maridia/inner-green/Lonely Crab Room.json +++ b/region/maridia/inner-green/Lonely Crab Room.json @@ -131,9 +131,7 @@ "name": "Sciser Farm", "requires": [ "h_navigateUnderwater", - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"partialRefill": {"type": "Energy", "limit": 100}}, {"partialRefill": {"type": "PowerBomb", "limit": 3}} ], diff --git a/region/maridia/inner-pink/Aqueduct.json b/region/maridia/inner-pink/Aqueduct.json index 4dab635a4e..e8e25bc337 100644 --- a/region/maridia/inner-pink/Aqueduct.json +++ b/region/maridia/inner-pink/Aqueduct.json @@ -1015,8 +1015,8 @@ "name": "Water Shinecharge, Hero Shot Leave With Spark", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -1281,8 +1281,8 @@ "name": "Water Shinecharge, Leave With Temporary Blue", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -1726,6 +1726,7 @@ "flashSuitChecked": true }, { + "id": 165, "link": [2, 12], "name": "G-Mode", "entranceCondition": { @@ -1738,6 +1739,7 @@ "flashSuitChecked": true }, { + "id": 166, "link": [2, 13], "name": "Direct G-Mode Morph", "entranceCondition": { @@ -2398,7 +2400,6 @@ "It may be helpful to turn around before sparking so the snail doesn't hit Samus." ] }, - { "id": 91, "link": [5, 8], @@ -2481,6 +2482,7 @@ "flashSuitChecked": true }, { + "id": 167, "link": [5, 11], "name": "G-Mode Morph Overload PLMs - Power Bomb the Items", "entranceCondition": { @@ -2512,6 +2514,7 @@ ] }, { + "id": 168, "link": [5, 12], "name": "G-Mode", "entranceCondition": { @@ -2524,6 +2527,7 @@ "flashSuitChecked": true }, { + "id": 169, "link": [5, 13], "name": "Direct G-Mode Morph", "entranceCondition": { @@ -2851,6 +2855,7 @@ "flashSuitChecked": true }, { + "id": 170, "link": [6, 12], "name": "G-Mode", "entranceCondition": { @@ -2864,6 +2869,7 @@ "flashSuitChecked": true }, { + "id": 171, "link": [6, 13], "name": "Direct G-Mode Morph", "entranceCondition": { @@ -3085,6 +3091,7 @@ "flashSuitChecked": true }, { + "id": 172, "link": [10, 1], "name": "G-Mode Bomb the Block - Morphed Suitless Snail Climb", "requires": [ @@ -3100,6 +3107,7 @@ "flashSuitChecked": true }, { + "id": 173, "link": [10, 1], "name": "G-Mode Bomb the Block - Morphed Suitless Snail Climb, No Jump Assist", "requires": [ @@ -3129,6 +3137,7 @@ "note": "Place a Power Bomb, then exit G-Mode to break the blocks." }, { + "id": 174, "link": [10, 10], "name": "Power Bomb the Power Bomb Blocks - Break Later", "requires": [ @@ -3202,6 +3211,7 @@ ] }, { + "id": 175, "link": [10, 12], "name": "G-Mode", "requires": [ @@ -3264,6 +3274,7 @@ "note": "After PLMs are overloaded, use a snail to climb to the right then bootless UWJ to the items." }, { + "id": 176, "link": [12, 3], "name": "Leave with G-Mode Snail Moonfall", "requires": [ @@ -3291,6 +3302,7 @@ ] }, { + "id": 177, "link": [12, 4], "name": "Leave with G-Mode Snail Moonfall", "requires": [ @@ -3318,6 +3330,7 @@ ] }, { + "id": 178, "link": [12, 11], "name": "G-Mode Overload PLMs with Grapple", "requires": [ @@ -3329,6 +3342,7 @@ "note": "Overload PLMs using the Grapple Blocks." }, { + "id": 179, "link": [12, 11], "name": "G-Mode - Snail Moonfall, Touch the Sand, High Pixel Clip Return", "requires": [ @@ -3437,6 +3451,7 @@ "devNote": "This does not include canRiskPermanentLossOfAccess, as it is only worth doing this strat if the items are there." }, { + "id": 180, "link": [13, 7], "name": "G-Mode Overload PLMs - Power Bomb the Items, Bootless UWJ", "requires": [ @@ -3461,6 +3476,7 @@ "devNote": "This does not include canRiskPermanentLossOfAccess, as it is only worth doing this strat if the items are there." }, { + "id": 181, "link": [13, 7], "name": "G-Mode Morph Overload PLMs - Power Bomb the Items, Bootless UWJ", "requires": [ @@ -3489,6 +3505,7 @@ "devNote": "This does not include canRiskPermanentLossOfAccess, as it is only worth doing this strat if the items are there." }, { + "id": 182, "link": [13, 10], "name": "G-Mode", "requires": [ @@ -3497,6 +3514,7 @@ "flashSuitChecked": true }, { + "id": 183, "link": [13, 13], "name": "Power Bomb the Power Bomb Blocks - Break Later", "requires": [ @@ -3598,7 +3616,7 @@ ] } ], - "nextStratId": 165, + "nextStratId": 184, "nextNotableId": 10, "devNote": [ "FIXME: An obstacle or two could be added to represent the bomb blocks and crumble blocks, and simple 1->9 strats could be added;", diff --git a/region/maridia/inner-pink/Below Botwoon Energy Tank.json b/region/maridia/inner-pink/Below Botwoon Energy Tank.json index 4cbbe0bfae..a5f363af88 100644 --- a/region/maridia/inner-pink/Below Botwoon Energy Tank.json +++ b/region/maridia/inner-pink/Below Botwoon Energy Tank.json @@ -199,8 +199,8 @@ "runway": { "length": 23, "openEnd": 1, - "gentleDownTiles": 2, "gentleUpTiles": 2, + "gentleDownTiles": 2, "steepUpTiles": 1 }, "obstruction": [3, 0] diff --git a/region/maridia/inner-pink/Botwoon Energy Tank Room.json b/region/maridia/inner-pink/Botwoon Energy Tank Room.json index 40db1da0cb..58961157f4 100644 --- a/region/maridia/inner-pink/Botwoon Energy Tank Room.json +++ b/region/maridia/inner-pink/Botwoon Energy Tank Room.json @@ -245,9 +245,7 @@ "link": [1, 1], "name": "Puyo Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "Spazer", "Wave", diff --git a/region/maridia/inner-pink/Botwoon Hallway.json b/region/maridia/inner-pink/Botwoon Hallway.json index 9da0dfcdb1..c9b6b1155a 100644 --- a/region/maridia/inner-pink/Botwoon Hallway.json +++ b/region/maridia/inner-pink/Botwoon Hallway.json @@ -106,9 +106,7 @@ "link": [1, 1], "name": "Mochtroid Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "canDodgeWhileShooting", "Wave", diff --git a/region/maridia/inner-pink/Colosseum.json b/region/maridia/inner-pink/Colosseum.json index 14e11d7a1f..8cf70a42a8 100644 --- a/region/maridia/inner-pink/Colosseum.json +++ b/region/maridia/inner-pink/Colosseum.json @@ -140,9 +140,7 @@ "link": [1, 1], "name": "Mochtroid Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, "SpaceJump", "ScrewAttack", {"partialRefill": {"type": "Super", "limit": 4}}, diff --git a/region/maridia/inner-pink/Crab Shaft.json b/region/maridia/inner-pink/Crab Shaft.json index 9e496b916c..1dfe1af1f2 100644 --- a/region/maridia/inner-pink/Crab Shaft.json +++ b/region/maridia/inner-pink/Crab Shaft.json @@ -405,9 +405,7 @@ "link": [1, 1], "name": "Sciser Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"partialRefill": {"type": "Energy", "limit": 240}}, {"partialRefill": {"type": "PowerBomb", "limit": 6}}, {"or": [ @@ -1360,9 +1358,7 @@ "link": [2, 2], "name": "Sciser Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ {"and": [ {"partialRefill": {"type": "Energy", "limit": 240}}, diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json index 11ac4e4c58..a439c5d748 100644 --- a/region/maridia/inner-pink/Draygon's Room.json +++ b/region/maridia/inner-pink/Draygon's Room.json @@ -659,9 +659,7 @@ "requires": [ "Gravity", "canSpringwall", - {"resetRoom": { - "nodes": [1] - }} + {"resetRoom": {"nodes": [1]}} ], "devNote": "The turret cannot be broken." }, diff --git a/region/maridia/inner-pink/East Cactus Alley.json b/region/maridia/inner-pink/East Cactus Alley.json index 7178db1765..a58ef541c2 100644 --- a/region/maridia/inner-pink/East Cactus Alley.json +++ b/region/maridia/inner-pink/East Cactus Alley.json @@ -194,9 +194,7 @@ "canWalljump" ]} ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Super"]} ] }, @@ -362,6 +360,7 @@ "note": "Hug the right wall after killing the first Cacatac in order to avoid its invisible, stationary projectiles." }, { + "id": 75, "link": [2, 1], "name": "G-Mode Morph, Spring Ball Gravity Jump", "entranceCondition": { @@ -416,6 +415,7 @@ "note": "This requires multiple HBJ to get over spike pits. The first one, by the right door, must be started at the top of an IBJ." }, { + "id": 76, "link": [2, 1], "name": "G-Mode Morph, Very Precise Gravity Jump Spring Ball Jump", "entranceCondition": { @@ -572,9 +572,7 @@ "canWalljump" ]} ]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"refill": ["Energy", "Super"]} ] }, @@ -1374,6 +1372,7 @@ ] }, { + "id": 77, "link": [5, 4], "name": "Gravity Jump", "requires": [ @@ -1701,6 +1700,6 @@ ] } ], - "nextStratId": 75, + "nextStratId": 78, "nextNotableId": 8 } \ No newline at end of file diff --git a/region/maridia/inner-pink/Halfie Climb Room.json b/region/maridia/inner-pink/Halfie Climb Room.json index ebe124388d..33e690d7cb 100644 --- a/region/maridia/inner-pink/Halfie Climb Room.json +++ b/region/maridia/inner-pink/Halfie Climb Room.json @@ -1036,8 +1036,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 45, - "obstructions": [[2, 0]], "speedBooster": true, + "obstructions": [[2, 0]], "requires": [ "canInsaneJump" ], @@ -1757,9 +1757,7 @@ "Plasma", "Grapple" ]}, - {"resetRoom": { - "nodes": [1, 2, 4] - }}, + {"resetRoom": {"nodes": [1, 2, 4]}}, {"partialRefill": {"type": "Super", "limit": 4}}, {"partialRefill": {"type": "Energy", "limit": 200}}, {"partialRefill": {"type": "Missile", "limit": 10}} @@ -2505,8 +2503,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 45, - "obstructions": [[2, 0]], "speedBooster": true, + "obstructions": [[2, 0]], "requires": [ "canInsaneJump", "canMomentumConservingMorph" diff --git a/region/maridia/inner-pink/The Precious Room.json b/region/maridia/inner-pink/The Precious Room.json index 09b72bc823..42b5d53071 100644 --- a/region/maridia/inner-pink/The Precious Room.json +++ b/region/maridia/inner-pink/The Precious Room.json @@ -59,12 +59,12 @@ "name": "Bottom Right Shinecharged", "nodeType": "junction", "nodeSubType": "junction", - "note": "Gaining a shinecharge at the bottom-right of the room.", "mapTileMask": [ [1, 1], [1, 0], [2, 0] - ] + ], + "note": "Gaining a shinecharge at the bottom-right of the room." } ], "enemies": [], diff --git a/region/maridia/inner-pink/West Cactus Alley.json b/region/maridia/inner-pink/West Cactus Alley.json index 3ddd2686cc..d8560f40ea 100644 --- a/region/maridia/inner-pink/West Cactus Alley.json +++ b/region/maridia/inner-pink/West Cactus Alley.json @@ -96,9 +96,7 @@ "link": [1, 1], "name": "Single Cacatac Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"partialRefill": {"type": "Energy", "limit": 140}}, {"partialRefill": {"type": "Super", "limit": 8}} ] @@ -109,9 +107,7 @@ "name": "Cacatac Farm", "requires": [ "HiJump", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"partialRefill": {"type": "Energy", "limit": 300}}, {"partialRefill": {"type": "Super", "limit": 16}} ] @@ -121,9 +117,7 @@ "link": [1, 1], "name": "Cacatac Farm (Gravity)", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, "Gravity", {"or": [ "h_crouchJumpDownGrab", @@ -1087,9 +1081,7 @@ "link": [2, 2], "name": "Cacatac Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"partialRefill": {"type": "Energy", "limit": 300}}, {"partialRefill": {"type": "Super", "limit": 16}} ] diff --git a/region/maridia/inner-yellow/Kassiuz Room.json b/region/maridia/inner-yellow/Kassiuz Room.json index 3c0380e292..668964c04a 100644 --- a/region/maridia/inner-yellow/Kassiuz Room.json +++ b/region/maridia/inner-yellow/Kassiuz Room.json @@ -109,9 +109,7 @@ "link": [1, 1], "name": "Puyo Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "Spazer", "Wave", diff --git a/region/maridia/inner-yellow/Maridia Elevator Room.json b/region/maridia/inner-yellow/Maridia Elevator Room.json index e7fe975147..7f71b38dba 100644 --- a/region/maridia/inner-yellow/Maridia Elevator Room.json +++ b/region/maridia/inner-yellow/Maridia Elevator Room.json @@ -1049,32 +1049,32 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 45, - "obstructions": [[1, 0]], "speedBooster": true, + "obstructions": [[1, 0]], "note": ["This applies to Noob Bridge."] }, { "minHeight": 2, "maxHeight": 2, "minTiles": 45, - "obstructions": [[3, 0]], "speedBooster": true, + "obstructions": [[3, 0]], "note": ["This applies to Statues Hallway and Baby Kraid Room."] }, { "minHeight": 3, "maxHeight": 3, "minTiles": 45, - "obstructions": [[3, 0]], "speedBooster": true, + "obstructions": [[3, 0]], "note": ["This applies to Bowling Alley (middle, power off) and Basement (power on)."] }, { "minHeight": 3, "maxHeight": 3, "minTiles": 39.4375, - "obstructions": [[3, 2]], "speedBooster": true, + "obstructions": [[3, 2]], "note": ["This applies to Metal Pirates Room."] } ] diff --git a/region/maridia/inner-yellow/Plasma Room.json b/region/maridia/inner-yellow/Plasma Room.json index 7f9ea6136c..48eb2dc5d0 100644 --- a/region/maridia/inner-yellow/Plasma Room.json +++ b/region/maridia/inner-yellow/Plasma Room.json @@ -235,9 +235,7 @@ "ScrewAttack", "Plasma" ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"partialRefill": {"type": "Energy", "limit": 200}}, {"partialRefill": {"type": "Missile", "limit": 12}} ], diff --git a/region/maridia/inner-yellow/Plasma Spark Room.json b/region/maridia/inner-yellow/Plasma Spark Room.json index ad959b5b25..aa16d8c0c7 100644 --- a/region/maridia/inner-yellow/Plasma Spark Room.json +++ b/region/maridia/inner-yellow/Plasma Spark Room.json @@ -641,8 +641,8 @@ "name": "Water Shinecharge, Hero Shot Leave With Spark", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -907,8 +907,8 @@ "name": "Water Shinecharge, Leave With Temporary Blue", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -1394,9 +1394,7 @@ "name": "Choot Farm", "requires": [ "canBePatient", - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"partialRefill": {"type": "Super", "limit": 5}}, {"partialRefill": {"type": "Missile", "limit": 10}}, {"partialRefill": {"type": "Energy", "limit": 140}} diff --git a/region/maridia/inner-yellow/Plasma Tutorial Room.json b/region/maridia/inner-yellow/Plasma Tutorial Room.json index 7e228182b9..dcfed2c98e 100644 --- a/region/maridia/inner-yellow/Plasma Tutorial Room.json +++ b/region/maridia/inner-yellow/Plasma Tutorial Room.json @@ -94,9 +94,7 @@ "link": [1, 1], "name": "Puyo Farm", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"refill": ["Energy", "Missile", "PowerBomb"]} ] }, @@ -125,12 +123,8 @@ "types": ["powerbomb"], "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, - {"resetRoom": { - "nodes": [2] - }} + {"resetRoom": {"nodes": [1]}}, + {"resetRoom": {"nodes": [2]}} ]} ] } @@ -643,12 +637,8 @@ "types": ["powerbomb"], "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, - {"resetRoom": { - "nodes": [2] - }} + {"resetRoom": {"nodes": [1]}}, + {"resetRoom": {"nodes": [2]}} ]} ] } diff --git a/region/maridia/inner-yellow/The Beach.json b/region/maridia/inner-yellow/The Beach.json index 575e8bb039..b383131c2b 100644 --- a/region/maridia/inner-yellow/The Beach.json +++ b/region/maridia/inner-yellow/The Beach.json @@ -298,9 +298,7 @@ "link": [1, 1], "name": "Choot Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"partialRefill": {"type": "Energy", "limit": 140}}, {"partialRefill": {"type": "Super", "limit": 4}}, {"partialRefill": {"type": "Missile", "limit": 20}} @@ -311,9 +309,7 @@ "link": [1, 1], "name": "Fast Choot Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "Wave", "Spazer", diff --git a/region/maridia/inner-yellow/Thread The Needle Room.json b/region/maridia/inner-yellow/Thread The Needle Room.json index 6c5b5e816e..247e06edcd 100644 --- a/region/maridia/inner-yellow/Thread The Needle Room.json +++ b/region/maridia/inner-yellow/Thread The Needle Room.json @@ -427,9 +427,7 @@ "Grapple", "ScrewAttack" ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Energy", "Missile"]} ] }, @@ -445,9 +443,7 @@ "Grapple", "ScrewAttack" ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Energy", "Missile", "Super", "PowerBomb"]} ] }, @@ -462,9 +458,7 @@ "Charge", "Ice" ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Super", "PowerBomb"]} ] }, @@ -956,9 +950,7 @@ "Grapple", "ScrewAttack" ]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"refill": ["Energy", "Missile"]} ] }, @@ -974,9 +966,7 @@ "Grapple", "ScrewAttack" ]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"refill": ["Energy", "Missile", "Super", "PowerBomb"]} ] }, @@ -991,9 +981,7 @@ "Charge", "Ice" ]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"refill": ["Super", "PowerBomb"]} ] }, diff --git a/region/maridia/outer/Boyon Gate Hall.json b/region/maridia/outer/Boyon Gate Hall.json index 25031546f2..3ee55a6c7c 100644 --- a/region/maridia/outer/Boyon Gate Hall.json +++ b/region/maridia/outer/Boyon Gate Hall.json @@ -1082,11 +1082,10 @@ {"simpleCycleFrames": 120}, {"cycleFrames": 30} ], - "farmCycleDrops": [ - {"enemy": "Zebbo", "count": 1} - ] + "farmCycleDrops": [{"enemy": "Zebbo", "count": 1}] }, { + "id": 67, "link": [3, 3], "name": "Double Zebbo Farm", "requires": [ @@ -1104,9 +1103,7 @@ ]} ]} ], - "farmCycleDrops": [ - {"enemy": "Zebbo", "count": 2} - ] + "farmCycleDrops": [{"enemy": "Zebbo", "count": 2}] }, { "id": 50, @@ -1277,12 +1274,10 @@ {"simpleCycleFrames": 120}, {"cycleFrames": 30} ], - "farmCycleDrops": [ - {"enemy": "Zebbo", "count": 1} - ] + "farmCycleDrops": [{"enemy": "Zebbo", "count": 1}] } ], "notables": [], - "nextStratId": 67, + "nextStratId": 68, "nextNotableId": 1 } \ No newline at end of file diff --git a/region/maridia/outer/Crab Gate Room.json b/region/maridia/outer/Crab Gate Room.json index 3c91ce056c..077e48e332 100644 --- a/region/maridia/outer/Crab Gate Room.json +++ b/region/maridia/outer/Crab Gate Room.json @@ -379,9 +379,7 @@ "name": "Sciser Farm", "requires": [ "h_navigateUnderwater", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "Gravity", {"cycleFrames": 20} @@ -421,9 +419,7 @@ ]} ], "resetsObstacles": ["A"], - "farmCycleDrops": [ - {"enemy": "Sciser", "count": 1} - ] + "farmCycleDrops": [{"enemy": "Sciser", "count": 1}] }, { "id": 6, @@ -700,9 +696,7 @@ "link": [2, 2], "name": "Sciser Farm", "requires": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ "Gravity", {"cycleFrames": 500} @@ -742,9 +736,7 @@ ]} ], "resetsObstacles": ["A"], - "farmCycleDrops": [ - {"enemy": "Sciser", "count": 5} - ] + "farmCycleDrops": [{"enemy": "Sciser", "count": 5}] }, { "id": 23, diff --git a/region/maridia/outer/Crab Hole.json b/region/maridia/outer/Crab Hole.json index 40c049687f..4481c53c62 100644 --- a/region/maridia/outer/Crab Hole.json +++ b/region/maridia/outer/Crab Hole.json @@ -169,13 +169,9 @@ "requires": [ "h_navigateUnderwater", {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"cycleFrames": 50} ]} ]}, @@ -217,9 +213,7 @@ {"cycleFrames": 1500} ]} ], - "farmCycleDrops": [ - {"enemy": "Sciser", "count": 3} - ], + "farmCycleDrops": [{"enemy": "Sciser", "count": 3}], "devNote": [ "One more Sciser could be farmed, but in most scenarios it seems not worth it.", "Gravity can also slightly speed up some other variants but not enough to be worth modeling." @@ -1831,13 +1825,9 @@ "requires": [ "h_navigateUnderwater", {"or": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"and": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"cycleFrames": 80} ]} ]}, @@ -1875,9 +1865,7 @@ {"cycleFrames": 300} ]} ], - "farmCycleDrops": [ - {"enemy": "Sciser", "count": 1} - ], + "farmCycleDrops": [{"enemy": "Sciser", "count": 1}], "devNote": [ "More than one Sciser could be farmed, but in most scenarios it seems not worth it.", "Gravity can also slightly speed up some other variants but not enough to be worth modeling." @@ -2971,8 +2959,8 @@ "minHeight": 1, "maxHeight": 1, "minTiles": 9, - "obstructions": [[1, 0]], "speedBooster": "any", + "obstructions": [[1, 0]], "requires": [ "canMomentumConservingTurnaround" ], @@ -2986,8 +2974,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 9.4375, - "obstructions": [[1, 0]], "speedBooster": "any", + "obstructions": [[1, 0]], "requires": [ "canMomentumConservingTurnaround" ], @@ -2999,8 +2987,8 @@ "minHeight": 3, "maxHeight": 3, "minTiles": 9.4375, - "obstructions": [[1, 0]], "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canMomentumConservingTurnaround" ], @@ -3012,8 +3000,8 @@ "minHeight": 3, "maxHeight": 3, "minTiles": 14.4375, - "obstructions": [[3, 2]], "speedBooster": true, + "obstructions": [[3, 2]], "requires": [ "canMomentumConservingTurnaround" ], @@ -3042,8 +3030,8 @@ "minHeight": 1, "maxHeight": 1, "minTiles": 4, - "obstructions": [[1, 0]], "speedBooster": true, + "obstructions": [[1, 0]], "requires": [ "canMomentumConservingTurnaround" ], @@ -3053,8 +3041,8 @@ "minHeight": 2, "maxHeight": 2, "minTiles": 5.4375, - "obstructions": [[1, 0]], "speedBooster": "any", + "obstructions": [[1, 0]], "requires": [ "canMomentumConservingTurnaround" ], @@ -3067,8 +3055,8 @@ "minHeight": 3, "maxHeight": 3, "minTiles": 14.4375, - "obstructions": [[3, 2]], "speedBooster": "any", + "obstructions": [[3, 2]], "requires": [ {"or": [ "canMomentumConservingTurnaround", diff --git a/region/maridia/outer/Fish Tank.json b/region/maridia/outer/Fish Tank.json index 9fe03f3d3c..56e67cba20 100644 --- a/region/maridia/outer/Fish Tank.json +++ b/region/maridia/outer/Fish Tank.json @@ -253,9 +253,9 @@ "runway": { "length": 12, "openEnd": 0, - "steepDownTiles": 1, "gentleUpTiles": 1, "gentleDownTiles": 1, + "steepDownTiles": 1, "startingDownTiles": 1 }, "obstruction": [1, 0] @@ -1404,8 +1404,8 @@ "name": "Water Shinecharge, Hero Shot Leave With Spark", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -1670,8 +1670,8 @@ "name": "Water Shinecharge, Leave With Temporary Blue", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -2851,9 +2851,7 @@ "Plasma", "ScrewAttack" ]}, - {"resetRoom": { - "nodes": [2, 3] - }}, + {"resetRoom": {"nodes": [2, 3]}}, {"partialRefill": {"type": "Energy", "limit": 200}}, {"partialRefill": {"type": "Missile", "limit": 8}} ] diff --git a/region/maridia/outer/Main Street.json b/region/maridia/outer/Main Street.json index 00f08d79f8..b31c4b8456 100644 --- a/region/maridia/outer/Main Street.json +++ b/region/maridia/outer/Main Street.json @@ -1301,8 +1301,8 @@ "entranceCondition": { "comeInShinecharging": { "length": 4, - "steepDownTiles": 1, - "openEnd": 1 + "openEnd": 1, + "steepDownTiles": 1 } }, "requires": [ @@ -1326,8 +1326,8 @@ "entranceCondition": { "comeInShinecharging": { "length": 1, - "steepDownTiles": 1, - "openEnd": 1 + "openEnd": 1, + "steepDownTiles": 1 } }, "requires": [ @@ -2516,8 +2516,8 @@ "name": "Water Shinecharge, Hero Shot Leave With Spark", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -2782,8 +2782,8 @@ "name": "Water Shinecharge, Leave With Temporary Blue", "entranceCondition": { "comeInRunning": { - "minTiles": 0.4375, - "speedBooster": true + "speedBooster": true, + "minTiles": 0.4375 } }, "requires": [ @@ -2807,9 +2807,7 @@ "name": "Sciser Farm", "requires": [ "h_navigateUnderwater", - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"partialRefill": {"type": "Energy", "limit": 100}}, {"partialRefill": {"type": "PowerBomb", "limit": 4}} ], @@ -3680,9 +3678,7 @@ "link": [4, 4], "name": "Sciser Farm", "requires": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"partialRefill": {"type": "Energy", "limit": 100}}, {"partialRefill": {"type": "PowerBomb", "limit": 4}} ], @@ -4384,9 +4380,7 @@ "link": [8, 8], "name": "Sciser Farm", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"partialRefill": {"type": "Energy", "limit": 100}}, {"partialRefill": {"type": "PowerBomb", "limit": 4}} ], diff --git a/region/maridia/outer/Mt. Everest.json b/region/maridia/outer/Mt. Everest.json index 2c9a6cc6e2..c2ad384626 100644 --- a/region/maridia/outer/Mt. Everest.json +++ b/region/maridia/outer/Mt. Everest.json @@ -1122,9 +1122,7 @@ "Spazer", "Plasma" ]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"partialRefill": {"type": "Energy", "limit": 140}}, {"partialRefill": {"type": "PowerBomb", "limit": 6}} ], @@ -2065,9 +2063,7 @@ "h_navigateUnderwater", "canTrickyUseFrozenEnemies", {"or": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, "canPrepareForNextRoom" ]}, {"or": [ @@ -3950,9 +3946,7 @@ "SpaceJump", "Grapple" ]}, - {"resetRoom": { - "nodes": [1, 2, 3] - }}, + {"resetRoom": {"nodes": [1, 2, 3]}}, {"partialRefill": {"type": "Super", "limit": 10}} ], "resetsObstacles": ["A", "B"] diff --git a/region/norfair/crocomire/Cosine Room.json b/region/norfair/crocomire/Cosine Room.json index c92845dd2b..e91b053743 100644 --- a/region/norfair/crocomire/Cosine Room.json +++ b/region/norfair/crocomire/Cosine Room.json @@ -114,11 +114,11 @@ "requires": [ {"canShineCharge": { "usedTiles": 33, - "openEnd": 0, "gentleUpTiles": 8, "gentleDownTiles": 8, "steepUpTiles": 2, - "steepDownTiles": 2 + "steepDownTiles": 2, + "openEnd": 0 }}, {"spikeHits": 1}, "canSpikeSuit", @@ -132,15 +132,13 @@ "link": [1, 1], "name": "Metaree Farm", "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, "ScrewAttack", {"cycleFrames": 255}, {"obstaclesNotCleared": ["A"]} ], - "farmCycleDrops": [{"enemy": "Metaree", "count": 2}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Metaree", "count": 2}] }, { "id": 3, diff --git a/region/norfair/crocomire/Indiana Jones Room.json b/region/norfair/crocomire/Indiana Jones Room.json index 1a96eaf2ee..3ad293af29 100644 --- a/region/norfair/crocomire/Indiana Jones Room.json +++ b/region/norfair/crocomire/Indiana Jones Room.json @@ -210,15 +210,11 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 880} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, "Morph", {"cycleFrames": 1640} ]} @@ -226,8 +222,8 @@ "SpaceJump", "ScrewAttack" ], - "farmCycleDrops": [{"enemy": "Ripper 2 (green)", "count": 4}], - "resetsObstacles": ["A", "B", "C", "D", "E"] + "resetsObstacles": ["A", "B", "C", "D", "E"], + "farmCycleDrops": [{"enemy": "Ripper 2 (green)", "count": 4}] }, { "id": 3, @@ -705,9 +701,7 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"cycleFrames": 1020}, "Morph", {"or": [ @@ -731,9 +725,7 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 240} ]} ]}, @@ -756,8 +748,8 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Mella", "count": 5}], "resetsObstacles": ["A", "B", "C", "D", "E"], + "farmCycleDrops": [{"enemy": "Mella", "count": 5}], "note": "Shoot the Mellas when they first begin to come on screen, and they will not move." }, { diff --git a/region/norfair/crocomire/Post Crocomire Shaft.json b/region/norfair/crocomire/Post Crocomire Shaft.json index daeab0ea3a..52a63bab98 100644 --- a/region/norfair/crocomire/Post Crocomire Shaft.json +++ b/region/norfair/crocomire/Post Crocomire Shaft.json @@ -543,9 +543,7 @@ "requires": [ {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1, 4] - }}, + {"resetRoom": {"nodes": [1, 4]}}, {"cycleFrames": 760}, {"or": [ "canConsecutiveWalljump", @@ -560,15 +558,11 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 400} ]}, {"and": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"cycleFrames": 320} ]} ]}, diff --git a/region/norfair/east/Bubble Mountain.json b/region/norfair/east/Bubble Mountain.json index 9ce81f5e29..59b3581ec4 100644 --- a/region/norfair/east/Bubble Mountain.json +++ b/region/norfair/east/Bubble Mountain.json @@ -2423,9 +2423,7 @@ "requires": [ "h_frozenEnemyRunway", {"or": [ - {"resetRoom": { - "nodes": [4, 5] - }}, + {"resetRoom": {"nodes": [4, 5]}}, {"ammo": {"type": "Super", "count": 1}} ]} ], @@ -2460,9 +2458,7 @@ "name": "G-Mode Setup - Get Hit By Sova", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [4, 5] - }}, + {"resetRoom": {"nodes": [4, 5]}}, {"ammo": {"type": "Super", "count": 1}} ]} ], @@ -3804,9 +3800,7 @@ "link": [7, 7], "name": "Cacatac and Waver Farm", "requires": [ - {"resetRoom": { - "nodes": [6, 7] - }}, + {"resetRoom": {"nodes": [6, 7]}}, {"partialRefill": {"type": "Energy", "limit": 160}}, {"partialRefill": {"type": "Super", "limit": 5}}, {"partialRefill": {"type": "Missile", "limit": 6}} @@ -4158,9 +4152,7 @@ "link": [9, 9], "name": "Waver Farm", "requires": [ - {"resetRoom": { - "nodes": [2, 3] - }}, + {"resetRoom": {"nodes": [2, 3]}}, {"partialRefill": {"type": "Energy", "limit": 100}}, {"partialRefill": {"type": "Missile", "limit": 6}} ], diff --git a/region/norfair/east/Cathedral Entrance.json b/region/norfair/east/Cathedral Entrance.json index f281fc9e6f..30d61de996 100644 --- a/region/norfair/east/Cathedral Entrance.json +++ b/region/norfair/east/Cathedral Entrance.json @@ -706,9 +706,7 @@ ]}, {"or": [ {"and": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "canWalljump", "SpaceJump", @@ -716,9 +714,7 @@ ]} ]}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"or": [ "HiJump", "SpaceJump" diff --git a/region/norfair/east/Cathedral.json b/region/norfair/east/Cathedral.json index a6f7654abc..836d3d59ea 100644 --- a/region/norfair/east/Cathedral.json +++ b/region/norfair/east/Cathedral.json @@ -765,9 +765,7 @@ "link": [4, 4], "name": "Sova Farm", "requires": [ - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, "h_heatProof", {"partialRefill": {"type": "Energy", "limit": 300}}, {"partialRefill": {"type": "Super", "limit": 6}}, diff --git a/region/norfair/east/Double Chamber.json b/region/norfair/east/Double Chamber.json index 2a35e52e56..37c9326f4c 100644 --- a/region/norfair/east/Double Chamber.json +++ b/region/norfair/east/Double Chamber.json @@ -1105,8 +1105,8 @@ "runway": { "length": 28, "openEnd": 0, - "gentleDownTiles": 3, - "gentleUpTiles": 3 + "gentleUpTiles": 3, + "gentleDownTiles": 3 }, "obstruction": [1, 0] } @@ -3083,9 +3083,7 @@ "requires": [ "h_heatProof", "Morph", - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"partialRefill": {"type": "PowerBomb", "limit": 4}}, {"partialRefill": {"type": "Super", "limit": 4}}, {"refill": ["Energy", "Missile"]} diff --git a/region/norfair/east/Frog Speedway.json b/region/norfair/east/Frog Speedway.json index 8e7cbf2edd..8e2d19e6d7 100644 --- a/region/norfair/east/Frog Speedway.json +++ b/region/norfair/east/Frog Speedway.json @@ -88,13 +88,9 @@ "name": "Beetom Farm", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, "SpeedBooster" ]} ]}, @@ -138,14 +134,10 @@ "name": "10 Power Bomb Crystal Flash", "requires": [ {"or": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"and": [ "h_getBlueSpeedMaxRunway", - {"resetRoom": { - "nodes": [2] - }} + {"resetRoom": {"nodes": [2]}} ]} ]}, "h_10PowerBombCrystalFlash" diff --git a/region/norfair/east/Kronic Boost Room.json b/region/norfair/east/Kronic Boost Room.json index 5047ff1975..9e97f48aef 100644 --- a/region/norfair/east/Kronic Boost Room.json +++ b/region/norfair/east/Kronic Boost Room.json @@ -707,9 +707,7 @@ "name": "Viola Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [1, 3, 4] - }}, + {"resetRoom": {"nodes": [1, 3, 4]}}, {"refill": ["PowerBomb"]} ], "resetsObstacles": ["A"], diff --git a/region/norfair/east/Rising Tide.json b/region/norfair/east/Rising Tide.json index 6f1fd151eb..0e592ae522 100644 --- a/region/norfair/east/Rising Tide.json +++ b/region/norfair/east/Rising Tide.json @@ -94,9 +94,7 @@ "name": "Sova Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"partialRefill": {"type": "Energy", "limit": 200}}, {"partialRefill": {"type": "Super", "limit": 3}}, {"partialRefill": {"type": "Missile", "limit": 10}} @@ -343,8 +341,8 @@ "name": "Spring Ball Bounce", "entranceCondition": { "comeInRunning": { - "minTiles": 4, - "speedBooster": false + "speedBooster": false, + "minTiles": 4 } }, "requires": [ @@ -656,8 +654,8 @@ "name": "Spring Ball Bounce", "entranceCondition": { "comeInRunning": { - "minTiles": 4, - "speedBooster": false + "speedBooster": false, + "minTiles": 4 } }, "requires": [ diff --git a/region/norfair/east/Single Chamber.json b/region/norfair/east/Single Chamber.json index 36221e6216..693d0e67d3 100644 --- a/region/norfair/east/Single Chamber.json +++ b/region/norfair/east/Single Chamber.json @@ -2309,9 +2309,7 @@ "HiJump", "h_crouchJumpDownGrab" ]}, - {"resetRoom": { - "nodes": [1, 2, 3, 4] - }}, + {"resetRoom": {"nodes": [1, 2, 3, 4]}}, {"partialRefill": {"type": "Missile", "limit": 12}}, {"refill": ["PowerBomb"]} ] diff --git a/region/norfair/east/Speed Booster Hall.json b/region/norfair/east/Speed Booster Hall.json index 407196a21f..b6497659ab 100644 --- a/region/norfair/east/Speed Booster Hall.json +++ b/region/norfair/east/Speed Booster Hall.json @@ -122,9 +122,7 @@ "name": "Geruta Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "ScrewAttack", "Ice", diff --git a/region/norfair/east/Upper Norfair Farming Room.json b/region/norfair/east/Upper Norfair Farming Room.json index a09effbd25..2ccce374b7 100644 --- a/region/norfair/east/Upper Norfair Farming Room.json +++ b/region/norfair/east/Upper Norfair Farming Room.json @@ -213,9 +213,7 @@ "unlocksDoors": [ { "types": ["ammo"], - "requires": [ - {"obstaclesCleared": ["A"]} - ] + "requires": [{"obstaclesCleared": ["A"]}] } ], "flashSuitChecked": true @@ -793,9 +791,7 @@ "unlocksDoors": [ { "types": ["ammo"], - "requires": [ - {"obstaclesCleared": ["A"]} - ] + "requires": [{"obstaclesCleared": ["A"]}] } ], "flashSuitChecked": true diff --git a/region/norfair/east/Volcano Room.json b/region/norfair/east/Volcano Room.json index 34c2a90066..a47328c3fd 100644 --- a/region/norfair/east/Volcano Room.json +++ b/region/norfair/east/Volcano Room.json @@ -122,9 +122,7 @@ "comeInNormally": {} }, "requires": [ - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, "h_CrystalFlash" ], "flashSuitChecked": true, @@ -275,6 +273,9 @@ ]}, {"heatFrames": 420} ], + "exitCondition": { + "leaveNormally": {} + }, "unlocksDoors": [ { "types": ["missiles"], @@ -285,10 +286,7 @@ "types": ["powerbomb"], "requires": [{"heatFrames": 60}] } - ], - "exitCondition": { - "leaveNormally": {} - } + ] }, { "id": 6, @@ -334,6 +332,9 @@ ]}, {"heatFrames": 405} ], + "exitCondition": { + "leaveNormally": {} + }, "unlocksDoors": [ { "types": ["missiles"], @@ -344,10 +345,7 @@ "types": ["powerbomb"], "requires": [{"heatFrames": 60}] } - ], - "exitCondition": { - "leaveNormally": {} - } + ] }, { "id": 14, @@ -355,8 +353,8 @@ "name": "Come in Running, Space Jump", "entranceCondition": { "comeInRunning": { - "minTiles": 2, - "speedBooster": "any" + "speedBooster": "any", + "minTiles": 2 } }, "requires": [ @@ -365,6 +363,9 @@ "canMockball", {"heatFrames": 390} ], + "exitCondition": { + "leaveNormally": {} + }, "unlocksDoors": [ { "types": ["missiles"], @@ -375,10 +376,7 @@ "types": ["powerbomb"], "requires": [{"heatFrames": 60}] } - ], - "exitCondition": { - "leaveNormally": {} - } + ] }, { "id": 10, @@ -477,6 +475,9 @@ ]}, {"heatFrames": 1000} ], + "exitCondition": { + "leaveNormally": {} + }, "unlocksDoors": [ { "types": ["missiles"], @@ -488,9 +489,6 @@ "requires": [{"heatFrames": 60}] } ], - "exitCondition": { - "leaveNormally": {} - }, "flashSuitChecked": true, "note": [ "Enter the morph tunnel then exit G-mode. Shooting the shot block off screen can be done by jumping and shooting up or with Grapple or a Power Bomb.", diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json index 2371b22e0b..78856709b6 100644 --- a/region/norfair/west/Crocomire Escape.json +++ b/region/norfair/west/Crocomire Escape.json @@ -800,6 +800,7 @@ "flashSuitChecked": true }, { + "id": 66, "link": [2, 2], "name": "Geruta Farm", "requires": [ @@ -815,10 +816,11 @@ {"cycleFrames": 90} ]} ], - "farmCycleDrops": [{"enemy": "Geruta", "count": 1}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Geruta", "count": 1}] }, { + "id": 67, "link": [2, 2], "name": "Dragon Farm (Lava Dive)", "requires": [ @@ -840,10 +842,11 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Dragon", "count": 5}], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Dragon", "count": 5}] }, { + "id": 68, "link": [2, 2], "name": "Dragon Farm (Avoid Lava)", "requires": [ @@ -878,8 +881,8 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Dragon", "count": 5}], "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Dragon", "count": 5}], "note": "Jump and aim down to make the Dragons active by bringing them on camera." }, { @@ -1666,6 +1669,6 @@ ] } ], - "nextStratId": 66, + "nextStratId": 69, "nextNotableId": 8 } \ No newline at end of file diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index 7d77a4d94a..6f909733e7 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -549,6 +549,7 @@ "devNote": "FIXME: R-Mode can be used instead of a Crystal Flash but that depends on having more Reserve Energy than Regular Energy." }, { + "id": 96, "link": [2, 2], "name": "Multiviola Pirate Farm", "requires": [ @@ -571,13 +572,14 @@ ]} ]} ], + "resetsObstacles": ["A"], "farmCycleDrops": [ {"enemy": "Multiviola", "count": 4}, {"enemy": "Red Space Pirate (standing)", "count": 3} - ], - "resetsObstacles": ["A"] + ] }, { + "id": 97, "link": [2, 2], "name": "Multiviola Pirate SpeedBooster Farm", "requires": [ @@ -585,16 +587,17 @@ {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 60}, {"simpleCycleFrames": 560}, - "SpeedBooster" + "SpeedBooster" ], + "resetsObstacles": ["A"], "farmCycleDrops": [ {"enemy": "Multiviola", "count": 1}, {"enemy": "Red Space Pirate (standing)", "count": 4} ], - "resetsObstacles": ["A"], "note": "Drops do not linger long enough to kill every single Pirate." }, { + "id": 98, "link": [2, 2], "name": "Cacatac Farm", "requires": [ @@ -620,10 +623,8 @@ {"cycleFrames": 120} ]} ], - "farmCycleDrops": [ - {"enemy": "Cacatac", "count": 2} - ], "clearsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Cacatac", "count": 2}], "devNote": "Some frames added to account for spike RNG." }, { @@ -922,10 +923,10 @@ "name": "Cross Room Jump Into Speedball (HiJump)", "entranceCondition": { "comeInWithPlatformBelow": { - "maxLeftPosition": 0, - "minRightPosition": 22, "minHeight": 9, - "maxHeight": 10 + "maxHeight": 10, + "maxLeftPosition": 0, + "minRightPosition": 22 }, "comesThroughToilet": "any" }, @@ -946,10 +947,10 @@ "name": "Cross Room Jump Into Speedball (Tricky Dash Jump)", "entranceCondition": { "comeInWithPlatformBelow": { - "maxLeftPosition": 0, - "minRightPosition": 41.5, "minHeight": 10, - "maxHeight": 10 + "maxHeight": 10, + "maxLeftPosition": 0, + "minRightPosition": 41.5 }, "comesThroughToilet": "any" }, @@ -1105,8 +1106,8 @@ "name": "Full Speed Reverse Speedball", "entranceCondition": { "comeInBlueSpinning": { - "unusableTiles": 1, - "minExtraRunSpeed": "$7.0" + "minExtraRunSpeed": "$7.0", + "unusableTiles": 1 } }, "requires": [ @@ -1126,8 +1127,8 @@ "name": "High Speed Reverse Speedball", "entranceCondition": { "comeInBlueSpinning": { - "unusableTiles": 1, - "minExtraRunSpeed": "$6.5" + "minExtraRunSpeed": "$6.5", + "unusableTiles": 1 } }, "requires": [ @@ -1974,15 +1975,15 @@ ]}, {"and": [ {"resetRoom": {"nodes": [3]}}, - {"cycleFrames": 300} + {"cycleFrames": 300} ]}, {"and": [ {"resetRoom": {"nodes": [4]}}, - {"cycleFrames": 360} + {"cycleFrames": 360} ]}, {"and": [ {"resetRoom": {"nodes": [5]}}, - {"cycleFrames": 200} + {"cycleFrames": 200} ]} ]}, {"or": [ @@ -2002,10 +2003,8 @@ {"cycleFrames": 120} ]} ], - "farmCycleDrops": [ - {"enemy": "Cacatac", "count": 2} - ], "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Cacatac", "count": 2}], "devNote": "Some frames added to account for spike RNG." }, { @@ -2454,7 +2453,7 @@ ] } ], - "nextStratId": 96, + "nextStratId": 99, "nextNotableId": 5, "devNote": [ "FIXME: A moonfall using Multiviolas might be possible to bypass the door shell below." diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json index 9de01ad699..43eb649f77 100644 --- a/region/norfair/west/Crumble Shaft.json +++ b/region/norfair/west/Crumble Shaft.json @@ -169,9 +169,7 @@ "canCrumbleJump", {"cycleFrames": 300} ]}, - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"or": [ "Wave", "Spazer", @@ -180,30 +178,25 @@ {"cycleFrames": 120} ]} ], - "farmCycleDrops": [ - {"enemy": "Sova", "count": 6} - ], "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Sova", "count": 6}], "note": "Break each of the crumble platforms to group the Sovas at the bottom of the room.", "devNote": "Climb from 2 to 1 if resetting with 2." }, { + "id": 49, "link": [1, 1], "name": "Sova Grapple Farm", "requires": [ "h_heatProof", "canUseGrapple", "canCameraManip", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"simpleCycleFrames": 105}, {"cycleFrames": 25} ], - "farmCycleDrops": [ - {"enemy": "Sova", "count": 1} - ], "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "note": [ "Jump and aim down to bring the Sova on camera.", "Farm with Grapple while crouched and touching the crumble platform." @@ -735,35 +728,29 @@ "devNote": "Max extra run speed $1.5" }, { + "id": 50, "link": [2, 2], "name": "Sova Grapple Farm", "requires": [ "h_heatProof", "canUseGrapple", - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 250} ], - "farmCycleDrops": [ - {"enemy": "Sova", "count": 2} - ], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Sova", "count": 2}] }, { + "id": 51, "link": [2, 2], "name": "Sova Single Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 160} ], - "farmCycleDrops": [ - {"enemy": "Sova", "count": 1} - ], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Sova", "count": 1}] }, { "id": 30, @@ -930,6 +917,6 @@ ] } ], - "nextStratId": 49, + "nextStratId": 52, "nextNotableId": 2 } \ No newline at end of file diff --git a/region/norfair/west/Hi Jump Energy Tank Room.json b/region/norfair/west/Hi Jump Energy Tank Room.json index 5228b4f753..5a574c0b1a 100644 --- a/region/norfair/west/Hi Jump Energy Tank Room.json +++ b/region/norfair/west/Hi Jump Energy Tank Room.json @@ -204,6 +204,7 @@ "flashSuitChecked": true }, { + "id": 43, "link": [1, 1], "name": "Sova Farm", "requires": [ @@ -220,8 +221,8 @@ {"cycleFrames": 530} ]} ], - "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "resetsObstacles": ["A", "B", "C", "D"], + "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "flashSuitChecked": true }, { @@ -625,6 +626,7 @@ "flashSuitChecked": true }, { + "id": 44, "link": [2, 2], "name": "Sova Farm", "requires": [ @@ -673,8 +675,8 @@ {"cycleFrames": 2160} ]} ], - "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "resetsObstacles": ["A", "B", "C", "D"], + "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "flashSuitChecked": true }, { @@ -907,6 +909,6 @@ "note": "The crumble blocks do not respawn, so it is possible to enter from the right, obtain the left item and return, without needing to break the bomb blocks." } ], - "nextStratId": 43, + "nextStratId": 45, "nextNotableId": 3 } \ No newline at end of file diff --git a/region/norfair/west/Ice Beam Gate Room.json b/region/norfair/west/Ice Beam Gate Room.json index 5c81bef745..70493de98c 100644 --- a/region/norfair/west/Ice Beam Gate Room.json +++ b/region/norfair/west/Ice Beam Gate Room.json @@ -465,6 +465,7 @@ "flashSuitChecked": true }, { + "id": 79, "link": [2, 2], "name": "Sova Farm", "requires": [ @@ -485,24 +486,21 @@ {"cycleFrames": 610} ]} ], - "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "clearsObstacles": ["A", "B"], "resetsObstacles": ["C", "D"], + "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "flashSuitChecked": true }, { + "id": 80, "link": [2, 2], "name": "Mella and Sm. Dessgeega Farm", "requires": [ "h_usePowerBomb", {"or": [ - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"and": [ - {"resetRoom": { - "nodes": [4] - }}, + {"resetRoom": {"nodes": [4]}}, {"or": [ {"and": [ "SpeedBooster", @@ -549,8 +547,11 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Mella", "count": 6}, {"enemy": "Sm. Dessgeega", "count": 3}], - "clearsObstacles": ["A", "B", "C", "D"] + "clearsObstacles": ["A", "B", "C", "D"], + "farmCycleDrops": [ + {"enemy": "Mella", "count": 6}, + {"enemy": "Sm. Dessgeega", "count": 3} + ] }, { "id": 13, @@ -694,8 +695,8 @@ "name": "Come In Blue Spinning, Speedball, Leave With Temporary Blue", "entranceCondition": { "comeInBlueSpinning": { - "unusableTiles": 0, - "minExtraRunSpeed": "$3.8" + "minExtraRunSpeed": "$3.8", + "unusableTiles": 0 } }, "requires": [ @@ -888,9 +889,7 @@ "link": [3, 3], "name": "Mella and Sm. Dessgeega Farm", "requires": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"or": [ {"and": [ "ScrewAttack", @@ -910,25 +909,30 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Mella", "count": 6}, {"enemy": "Sm. Dessgeega", "count": 3}], "clearsObstacles": ["D"], - "resetsObstacles": ["A", "B", "C"] + "resetsObstacles": ["A", "B", "C"], + "farmCycleDrops": [ + {"enemy": "Mella", "count": 6}, + {"enemy": "Sm. Dessgeega", "count": 3} + ] }, { + "id": 81, "link": [3, 3], "name": "Mella and Sm. Dessgeega Power Bomb Farm", "requires": [ - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, "h_usePowerBomb", "canTrickyJump", "canLateralMidAirMorph", {"cycleFrames": 450} ], - "farmCycleDrops": [{"enemy": "Mella", "count": 4}, {"enemy": "Sm. Dessgeega", "count": 3}], "clearsObstacles": ["D"], - "resetsObstacles": ["A", "B", "C"] + "resetsObstacles": ["A", "B", "C"], + "farmCycleDrops": [ + {"enemy": "Mella", "count": 4}, + {"enemy": "Sm. Dessgeega", "count": 3} + ] }, { "id": 29, @@ -1313,6 +1317,7 @@ "flashSuitChecked": true }, { + "id": 82, "link": [4, 4], "name": "Sova Farm", "requires": [ @@ -1337,9 +1342,9 @@ ]} ]} ], - "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "clearsObstacles": ["A", "B"], "resetsObstacles": ["C", "D"], + "farmCycleDrops": [{"enemy": "Sova", "count": 1}], "flashSuitChecked": true }, { @@ -1641,6 +1646,6 @@ ] } ], - "nextStratId": 79, + "nextStratId": 83, "nextNotableId": 5 } \ No newline at end of file diff --git a/region/norfair/west/Ice Beam Snake Room.json b/region/norfair/west/Ice Beam Snake Room.json index adfc37c398..110c207de1 100644 --- a/region/norfair/west/Ice Beam Snake Room.json +++ b/region/norfair/west/Ice Beam Snake Room.json @@ -211,13 +211,12 @@ "flashSuitChecked": true }, { + "id": 71, "link": [1, 1], "name": "Sova Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"or": [ "canWalljump", {"and": [ @@ -686,9 +685,7 @@ "name": "Sova Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"cycleFrames": 120}, {"or": [ "Wave", @@ -1193,13 +1190,12 @@ "note": "Kill the Fune before Crystal Flashing." }, { + "id": 72, "link": [3, 3], "name": "Sova Farm", "requires": [ "h_heatProof", - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"or": [ {"and": [ "canMidAirMorph", @@ -1585,6 +1581,6 @@ } ], "notables": [], - "nextStratId": 71, + "nextStratId": 73, "nextNotableId": 1 } \ No newline at end of file diff --git a/region/norfair/west/Ice Beam Tutorial Room.json b/region/norfair/west/Ice Beam Tutorial Room.json index 92a4f9d761..3830d7d212 100644 --- a/region/norfair/west/Ice Beam Tutorial Room.json +++ b/region/norfair/west/Ice Beam Tutorial Room.json @@ -91,6 +91,7 @@ "flashSuitChecked": true }, { + "id": 25, "link": [1, 1], "name": "Boyon Farm", "requires": [ @@ -576,6 +577,7 @@ "flashSuitChecked": true }, { + "id": 26, "link": [2, 2], "name": "Ripper Farm", "requires": [ @@ -613,6 +615,6 @@ "note": "Unmorph with the right timing to damage boost using the Boyon who is closest to the Morph tunnel in order to avoid taking any lava damage." } ], - "nextStratId": 25, + "nextStratId": 27, "nextNotableId": 2 } \ No newline at end of file diff --git a/region/tourian/main/Metroid Room 4.json b/region/tourian/main/Metroid Room 4.json index c0639b962c..c87951655c 100644 --- a/region/tourian/main/Metroid Room 4.json +++ b/region/tourian/main/Metroid Room 4.json @@ -416,9 +416,7 @@ }}, {"or": [ "canPrepareForNextRoom", - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"and": [ "h_useMorphBombs", "canDodgeWhileShooting", diff --git a/region/wreckedship/main/Attic.json b/region/wreckedship/main/Attic.json index f37331ae86..83f6e3ad33 100644 --- a/region/wreckedship/main/Attic.json +++ b/region/wreckedship/main/Attic.json @@ -520,9 +520,7 @@ "Plasma", "Wave" ]}, - {"resetRoom": { - "nodes": [1, 2, 3] - }}, + {"resetRoom": {"nodes": [1, 2, 3]}}, {"refill": ["Energy", "Missile", "Super"]} ], "clearsObstacles": ["A"] @@ -546,9 +544,7 @@ ]} ]} ]}, - {"resetRoom": { - "nodes": [1, 2, 3] - }}, + {"resetRoom": {"nodes": [1, 2, 3]}}, {"refill": ["Energy", "Missile"]} ], "clearsObstacles": ["A"], diff --git a/region/wreckedship/main/Basement.json b/region/wreckedship/main/Basement.json index c07f41bd8a..79f50e4276 100644 --- a/region/wreckedship/main/Basement.json +++ b/region/wreckedship/main/Basement.json @@ -551,9 +551,7 @@ "Spazer", "Plasma" ]}, - {"resetRoom": { - "nodes": [1, 2] - }}, + {"resetRoom": {"nodes": [1, 2]}}, {"partialRefill": {"type": "Energy", "limit": 400}}, {"partialRefill": {"type": "Missile", "limit": 10}} ], @@ -1037,9 +1035,6 @@ ], "exitCondition": { "leaveWithSpringBallBounce": { - "blue": "any", - "movementType": "controlled", - "maxExtraRunSpeed": "$2.C", "remoteRunway": { "length": 35, "openEnd": 1 @@ -1047,7 +1042,10 @@ "landingRunway": { "length": 2, "openEnd": 1 - } + }, + "maxExtraRunSpeed": "$2.C", + "blue": "any", + "movementType": "controlled" } } }, @@ -1066,9 +1064,6 @@ ], "exitCondition": { "leaveWithSpringBallBounce": { - "blue": "any", - "movementType": "controlled", - "maxExtraRunSpeed": "$5.C", "remoteRunway": { "length": 35, "openEnd": 1 @@ -1076,7 +1071,10 @@ "landingRunway": { "length": 1, "openEnd": 1 - } + }, + "maxExtraRunSpeed": "$5.C", + "blue": "any", + "movementType": "controlled" } }, "note": [ diff --git a/region/wreckedship/main/Bowling Alley.json b/region/wreckedship/main/Bowling Alley.json index ae95935580..fe6af6149c 100644 --- a/region/wreckedship/main/Bowling Alley.json +++ b/region/wreckedship/main/Bowling Alley.json @@ -440,6 +440,7 @@ "note": "The camera will not follow Samus after clipping." }, { + "id": 69, "link": [2, 1], "name": "Shinespark Slope Clip X-Ray Climb (Power Off)", "requires": [ @@ -472,6 +473,7 @@ ] }, { + "id": 70, "link": [2, 1], "name": "Shinespark Slope Clip X-Ray Climb (Come in Shinecharged)", "entranceCondition": { @@ -1613,6 +1615,7 @@ "devNote": "FIXME: This may be possible without a spike hit." }, { + "id": 71, "link": [6, 1], "name": "Grapple Fling into Grapple Block, Crystal Flash, X-Ray Climb", "requires": [ @@ -1647,6 +1650,7 @@ ] }, { + "id": 72, "link": [6, 1], "name": "Shinespark Slope Clip X-Ray Climb (X-Mode)", "requires": [ @@ -1788,6 +1792,6 @@ ] } ], - "nextStratId": 69, + "nextStratId": 73, "nextNotableId": 7 } \ No newline at end of file diff --git a/region/wreckedship/main/Sponge Bath.json b/region/wreckedship/main/Sponge Bath.json index 5117ee11ac..f5843a0762 100644 --- a/region/wreckedship/main/Sponge Bath.json +++ b/region/wreckedship/main/Sponge Bath.json @@ -189,9 +189,7 @@ "Plasma", "Grapple" ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["PowerBomb"]}, {"partialRefill": {"type": "Energy", "limit": 100}} ] @@ -1202,7 +1200,7 @@ "link": [2, 2], "name": "Leave Shinecharged (Gravity or Phantoon Alive)", "requires": [ - {"canShineCharge": {"usedTiles": 19, "openEnd": 0, "steepDownTiles": 3}}, + {"canShineCharge": {"usedTiles": 19, "steepDownTiles": 3, "openEnd": 0}}, {"or": [ "Gravity", {"and": [ @@ -1237,9 +1235,7 @@ "Plasma", "Grapple" ]}, - {"resetRoom": { - "nodes": [2] - }}, + {"resetRoom": {"nodes": [2]}}, {"refill": ["PowerBomb"]}, {"partialRefill": {"type": "Energy", "limit": 100}} ] diff --git a/region/wreckedship/main/Wrecked Ship East Super Room.json b/region/wreckedship/main/Wrecked Ship East Super Room.json index 59af4b6a81..8d64897bcf 100644 --- a/region/wreckedship/main/Wrecked Ship East Super Room.json +++ b/region/wreckedship/main/Wrecked Ship East Super Room.json @@ -418,9 +418,7 @@ "Spazer", "Plasma" ]}, - {"resetRoom": { - "nodes": [1] - }}, + {"resetRoom": {"nodes": [1]}}, {"refill": ["Energy", "Missile", "Super"]} ], "resetsObstacles": ["A"], diff --git a/region/wreckedship/main/Wrecked Ship Main Shaft.json b/region/wreckedship/main/Wrecked Ship Main Shaft.json index 5f8ab4c497..8c71e98375 100644 --- a/region/wreckedship/main/Wrecked Ship Main Shaft.json +++ b/region/wreckedship/main/Wrecked Ship Main Shaft.json @@ -727,9 +727,7 @@ "Spazer", "Plasma" ]}, - {"resetRoom": { - "nodes": [3] - }}, + {"resetRoom": {"nodes": [3]}}, {"partialRefill": {"type": "Energy", "limit": 400}}, {"partialRefill": {"type": "Missile", "limit": 10}} ], @@ -1315,9 +1313,7 @@ "Spazer", "Plasma" ]}, - {"resetRoom": { - "nodes": [1, 2, 4, 5] - }}, + {"resetRoom": {"nodes": [1, 2, 4, 5]}}, {"partialRefill": {"type": "Energy", "limit": 400}}, {"partialRefill": {"type": "Missile", "limit": 10}} ], @@ -1980,9 +1976,7 @@ "ScrewAttack" ]} ]}, - {"resetRoom": { - "nodes": [7] - }}, + {"resetRoom": {"nodes": [7]}}, {"refill": ["Energy", "Missile", "Super"]} ], "resetsObstacles": ["A", "B", "C"], diff --git a/tech.json b/tech.json index ed3ec1a51e..ebe8f38a94 100644 --- a/tech.json +++ b/tech.json @@ -2098,6 +2098,7 @@ ] }, { + "id": 203, "name": "canShinesparkSlopeClip", "techRequires": [ "canShinespark" @@ -2899,5 +2900,5 @@ ] } ], - "nextTechId": 203 + "nextTechId": 204 } \ No newline at end of file