diff --git a/region/brinstar/green/Brinstar Reserve Tank Room.json b/region/brinstar/green/Brinstar Reserve Tank Room.json index 9c93522bfe..393140b6bb 100644 --- a/region/brinstar/green/Brinstar Reserve Tank Room.json +++ b/region/brinstar/green/Brinstar Reserve Tank Room.json @@ -362,24 +362,17 @@ { "id": 16, "link": [3, 4], - "name": "Hole-in-One", + "name": "Screw Attack, Tunnel Crawl", "requires": [ - {"notable": "Hole-in-One"}, "Morph", "ScrewAttack", - {"or": [ - "canTunnelCrawl", - {"and": [ - "canTwoTileSqueeze", - "canTrickyJump" - ]} - ]} + "canTunnelCrawl" ], "collectsItems": [3], "flashSuitChecked": true, "note": [ - "A single very precise jump into the bomb blocks can break both sets of blocks with screw attack. Obtaining the item requires morph, so this strat has no soft lock risk.", - "Alternatively, tunnel crawl through to break both blocks with multiple, less precise jumps." + "Tunnel crawl with Screw Attack to break the bomb blocks.", + "With a very precise jump and aim down, it is possible to jump deep enough into where the first block was in order to only require a turnaround jump, but it's not easier." ] }, { @@ -392,16 +385,7 @@ "flashSuitChecked": true } ], - "notables": [ - { - "id": 1, - "name": "Hole-in-One", - "note": [ - "A single very precise jump into the bomb blocks can break both sets of blocks with screw attack. Obtaining the item requires morph, so this strat has no soft lock risk.", - "Alternatively, tunnel crawl through to break both blocks with multiple, less precise jumps." - ] - } - ], + "notables": [], "nextStratId": 19, "nextNotableId": 2 } \ No newline at end of file diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json index 2d55dec0a7..d7839e0ef4 100644 --- a/region/brinstar/green/Etecoon Energy Tank Room.json +++ b/region/brinstar/green/Etecoon Energy Tank Room.json @@ -1363,7 +1363,7 @@ "name": "Beetom Tricky Dodge (Right to Left)", "requires": [ {"notable": "Beetom Tricky Dodge"}, - "canTrickyJump" + "canTrickyDodgeEnemies" ], "clearsObstacles": ["A"], "flashSuitChecked": true, @@ -1555,7 +1555,7 @@ "name": "Beetom Tricky Dodge (Left to Right)", "requires": [ {"notable": "Beetom Tricky Dodge"}, - "canTrickyJump", + "canTrickyDodgeEnemies", {"obstaclesNotCleared": ["B"]} ], "clearsObstacles": ["A"], diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json index 78a024cc74..68c44bde08 100644 --- a/region/brinstar/kraid/Warehouse Kihunter Room.json +++ b/region/brinstar/kraid/Warehouse Kihunter Room.json @@ -698,7 +698,6 @@ "link": [5, 2], "name": "Bottom Spark Out", "requires": [ - {"notable": "Bottom Spark Out"}, "canShinechargeMovementComplex", {"obstaclesCleared": ["C"]}, {"obstaclesNotCleared": ["D"]}, @@ -864,11 +863,6 @@ "name": "Tunnel Charge", "note": "Generate a charge on the left side and carry it through the morph tunnel and out the right door." }, - { - "id": 2, - "name": "Bottom Spark Out", - "note": "Charge a spark, then break the shot blocks, drop through, and spark out the bottom right door." - }, { "id": 3, "name": "Bottom Leave Shinecharged", diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json index e01747df90..7d0cd52377 100644 --- a/region/brinstar/pink/Big Pink.json +++ b/region/brinstar/pink/Big Pink.json @@ -2766,7 +2766,6 @@ "link": [13, 7], "name": "Crystal Flash Standup - Super Block", "requires": [ - {"notable": "Crystal Flash Standup - Super Block"}, "h_canBombThings", "h_canCrystalFlash", {"ammo": {"type": "Super", "count": 1}} @@ -3282,11 +3281,6 @@ "Requires pixel precision, although there are several pixels that work. The camera must be fully scrolled to the right, which may require going far left and back." ] }, - { - "id": 12, - "name": "Crystal Flash Standup - Super Block", - "note": "Crystal Flash in the morph tunnel to force a standup, making it possible to shoot the super block from the left while it's on-screen." - }, { "id": 13, "name": "Wall Ice Clip X-Ray Climb", diff --git a/region/brinstar/pink/Pink Brinstar Hopper Room.json b/region/brinstar/pink/Pink Brinstar Hopper Room.json index 75c9d8eaf3..ff261869b8 100644 --- a/region/brinstar/pink/Pink Brinstar Hopper Room.json +++ b/region/brinstar/pink/Pink Brinstar Hopper Room.json @@ -1308,6 +1308,7 @@ "requires": [ {"notable": "Shinespark to Ride the Elevator"}, "canHorizontalShinespark", + "canUseSpeedEchoes", {"shinespark": {"frames": 1, "excessFrames": 1}} ], "clearsObstacles": ["B"], @@ -1324,6 +1325,7 @@ {"shineChargeFrames": 45}, {"notable": "Shinespark to Ride the Elevator"}, "canHorizontalShinespark", + "canUseSpeedEchoes", {"shinespark": {"frames": 1, "excessFrames": 1}} ], "clearsObstacles": ["B"], @@ -1340,6 +1342,7 @@ "requires": [ {"notable": "Shinespark to Ride the Elevator"}, "canHorizontalShinespark", + "canUseSpeedEchoes", {"shinespark": {"frames": 15, "excessFrames": 6}} ], "clearsObstacles": ["B"], @@ -1352,6 +1355,7 @@ "requires": [ {"notable": "Shinespark to Ride the Elevator"}, "canHorizontalShinespark", + "canUseSpeedEchoes", {"useFlashSuit": {}}, {"shinespark": {"frames": 1, "excessFrames": 1}} ], diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json index 8a651fef98..972cad03e1 100644 --- a/region/brinstar/red/Red Tower.json +++ b/region/brinstar/red/Red Tower.json @@ -2463,18 +2463,45 @@ { "id": 113, "link": [9, 5], - "name": "Fast Climb with Space Jump", + "name": "Fast Climb with Space Jump, No Rippers", + "requires": [ + {"notable": "Fast Climb with Space Jump"}, + "SpaceJump", + "canTrickyJump", + {"obstaclesCleared": ["B"]} + ], + "wallJumpAvoid": true, + "note": [ + "Climb the top of Red Tower with just Space Jump.", + "This can be done by shooting the block as Samus is going upward, so she goes through the block as it breaks.", + "Alternatively, this can be done by shooting the block while falling right as it goes off screen,", + "then using well-timed short space jumps to go up as rapidly as possible before the block respawns." + ] + }, + { + "link": [9, 5], + "name": "HiJump, Space Jump Climb Between the Rippers", "requires": [ - {"notable": "Climb with Space Jump"}, "SpaceJump", + "HiJump", "canTrickyJump" ], + "note": [ + "Climb the top of Red Tower with just HiJump and Space Jump.", + "This can be done by dodging the Rippers and shooting the block as Samus is going upward, so she goes through the block as it breaks." + ] + }, + { + "link": [9, 5], + "name": "Bootless Space Jump Climb Between the Rippers", + "requires": [ + "canPreciseSpaceJump", + "canTrickyDodgeEnemies" + ], "note": [ "Climb the top of Red Tower with just Space Jump.", "This can be done by dodging the Rippers and shooting the block as Samus is going upward, so she goes through the block as it breaks.", - "HiJump or killing the Rippers can help but are not required.", - "If the Rippers are killed, this can instead be done by shooting the block while falling right as it goes off screen,", - "then using well-timed short space jumps to go up as rapidly as possible before the block respawns." + "The positioning and timing of the final jump and shot is more precise without HiJump." ] }, { @@ -2732,12 +2759,12 @@ }, { "id": 9, - "name": "Climb with Space Jump", + "name": "Fast Climb with Space Jump", + "wallJumpAvoid": true, "note": [ "Climb the top of Red Tower with just Space Jump.", - "This can be done by dodging the Rippers and shooting the block as Samus is going upward, so she goes through the block as it breaks.", - "HiJump or killing the Rippers can help but are not required.", - "If the Rippers are killed, this can instead be done by shooting the block while falling right as it goes off screen,", + "This can be done by shooting the block as Samus is going upward, so she goes through the block as it breaks.", + "Alternatively, this can be done by shooting the block while falling right as it goes off screen,", "then using well-timed short space jumps to go up as rapidly as possible before the block respawns." ] } diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json index 09e078f37e..d45bd3ac83 100644 --- a/region/crateria/central/Landing Site.json +++ b/region/crateria/central/Landing Site.json @@ -1172,9 +1172,8 @@ { "id": 46, "link": [4, 1], - "name": "Blue Space Jump (Bottom)", + "name": "Blue Space Jump", "requires": [ - {"notable": "Blue Space Jump (Bottom)"}, "canBlueSpaceJump", "HiJump", {"getBlueSpeed": {"usedTiles": 38, "steepDownTiles": 3, "openEnd": 1}} @@ -1859,14 +1858,6 @@ "The jump can be set up by using the full runway with a one-tap shortcharge, with the tap being at the top of the lowest slope." ] }, - { - "id": 4, - "name": "Blue Space Jump (Bottom)", - "note": [ - "Starting near the right runway, run through the bomb block passage, then jump right after exiting.", - "Using HiJump and space jump, Samus is able to elevate enough to break through the bomb blocks blocking the Gauntlet entrance." - ] - }, { "id": 5, "name": "Crystal Flash X-Ray Climb", diff --git a/region/crateria/east/The Moat.json b/region/crateria/east/The Moat.json index 494519431c..b3fd04cb3c 100644 --- a/region/crateria/east/The Moat.json +++ b/region/crateria/east/The Moat.json @@ -243,7 +243,6 @@ } }, "requires": [ - {"notable": "SpringBall Bounce"}, "canSpringBallBounce", "canDisableEquipment", {"or": [ @@ -259,7 +258,6 @@ "link": [1, 2], "name": "SpringBall Bounce, Open Doorway", "requires": [ - {"notable": "SpringBall Bounce"}, "canSpringBallBounce", "canDisableEquipment", {"doorUnlockedAtNode": 1}, @@ -1137,11 +1135,6 @@ } ], "notables": [ - { - "id": 1, - "name": "SpringBall Bounce", - "note": "From an open doorway or adjacent room, run, jump, lateral midair morph on the way down, then bounce off the pedestal to get to the other side." - }, { "id": 2, "name": "Leave With Grapple Teleport", diff --git a/region/crateria/west/Gauntlet Entrance.json b/region/crateria/west/Gauntlet Entrance.json index 5c684a9b85..c0710fb773 100644 --- a/region/crateria/west/Gauntlet Entrance.json +++ b/region/crateria/west/Gauntlet Entrance.json @@ -914,6 +914,7 @@ {"obstaclesCleared": ["A"]}, "canMidairShinespark", "canCameraManip", + "canTrickyDodgeEnemies", {"canShineCharge": { "usedTiles": 22, "steepUpTiles": 2, @@ -929,9 +930,9 @@ } }, "note": [ - "Jump towards the yapping maw before it is on screen so it moves up.", + "Jump towards the Yapping Maw before it is on screen so it moves up.", "Quickly move it off camera so it will be `frozen` in place.", - "Shortcharge like normal. If the Yapping Maw is returning to its hole, it will usually not grab Samus." + "Shortcharge like normal. If the Yapping Maw is returning to its hole, it will usually not grab Samus." ] }, { diff --git a/region/lowernorfair/east/Lower Norfair Fireflea Room.json b/region/lowernorfair/east/Lower Norfair Fireflea Room.json index 3b6ee2bf7f..b962873922 100644 --- a/region/lowernorfair/east/Lower Norfair Fireflea Room.json +++ b/region/lowernorfair/east/Lower Norfair Fireflea Room.json @@ -898,11 +898,10 @@ { "id": 37, "link": [4, 5], - "name": "Ice Bridge (Right to Left)", + "name": "Ice Bridge", "requires": [ - {"notable": "Ice Bridge"}, "canTrickyUseFrozenEnemies", - "canCarefulJump" + "canTrickyJump" ], "note": [ "Avoid killing the Firefleas and instead freeze them as a way accross the spikes.", @@ -938,11 +937,10 @@ { "id": 41, "link": [5, 4], - "name": "Ice Bridge (Left to Right)", + "name": "Ice Bridge", "requires": [ - {"notable": "Ice Bridge"}, "canTrickyUseFrozenEnemies", - "canCarefulJump" + "canTrickyJump" ], "note": [ "Avoid killing the Firefleas and instead freeze them as a way accross the spikes.", @@ -1189,14 +1187,6 @@ } ], "notables": [ - { - "id": 1, - "name": "Ice Bridge", - "note": [ - "Avoid killing the Firefleas and instead freeze them as a way accross the spikes.", - "It helps to freeze them low, closer to the spikes." - ] - }, { "id": 2, "name": "G-Mode Morph Blind Top to Bottom", diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json index 47c8f56274..2ea3bba1e9 100644 --- a/region/lowernorfair/east/Red Kihunter Shaft.json +++ b/region/lowernorfair/east/Red Kihunter Shaft.json @@ -813,7 +813,7 @@ "requires": [ {"notable": "KiHunter Dodge"}, "h_canNavigateHeatRooms", - "canTrickyJump", + "canTrickyDodgeEnemies", {"heatFrames": 100} ], "note": "The KiHunter can be baited by jumping into the door then walking left." @@ -826,8 +826,7 @@ {"notable": "Kihunter Manipulation from Middle Door"}, "h_canNavigateHeatRooms", "canStopOnADime", - "canCarefulJump", - "Morph", + "canTrickyDodgeEnemies", {"or": [ "HiJump", "canWalljump" @@ -837,7 +836,7 @@ "note": [ "Manipulate the Three KiHunters to avoid all of them when entering the room from the Save room door.", "Stop on a dime on entry for positioning, because it is precise.", - "Wait 1 second then Morph and roll left, past the swooping kihunter.", + "Wait 1 second then run or Morph and roll left, past the swooping kihunter.", "Quickly jump to the higher level and run into the left wall.", "Wait there for half a second; it helps to jump into the wall.", "The 2 KiHunters should be grouped above Samus and out of the way." @@ -1509,7 +1508,7 @@ "requires": [ {"notable": "KiHunter Dodge"}, "h_canNavigateHeatRooms", - "canTrickyJump", + "canTrickyDodgeEnemies", {"heatFrames": 710} ], "note": [ @@ -1560,7 +1559,7 @@ "note": [ "Manipulate the Three KiHunters to avoid all of them when entering the room from the Save room door.", "Stop on a dime on entry for positioning, because it is precise.", - "Wait 1 second then Morph and roll left, past the swooping kihunter.", + "Wait 1 second then run or Morph and roll left, past the swooping kihunter.", "Quickly jump to the higher level and run into the left wall.", "Wait there for half a second; it helps to jump into the wall.", "The 2 KiHunters should be grouped above Samus and out of the way." 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 4102ba1261..ffb0350b18 100644 --- a/region/lowernorfair/east/The Worst Room In The Game.json +++ b/region/lowernorfair/east/The Worst Room In The Game.json @@ -589,7 +589,7 @@ "HiJump", "SpeedBooster", "canPreciseWalljump", - "canCarefulJump", + "canTrickyDodgeEnemies", "h_canUsePowerBombs", "canTrivialMidAirMorph", "canHitbox", @@ -702,6 +702,7 @@ "canPreciseWalljump", "canWalljumpWithCharge", "canTrivialMidAirMorph", + "canTrickyDodgeEnemies", {"ammo": {"type": "Missile", "count": 1}}, {"ammo": {"type": "Super", "count": 1}}, {"ammo": {"type": "PowerBomb", "count": 1}}, @@ -739,6 +740,7 @@ "canWalljumpWithCharge", "h_canUseMorphBombs", "canWallJumpInstantMorph", + "canTrickyDodgeEnemies", {"ammo": {"type": "Missile", "count": 4}}, {"ammo": {"type": "PowerBomb", "count": 1}}, {"heatFrames": 900}, diff --git a/region/maridia/inner-pink/Draygon's Room.json b/region/maridia/inner-pink/Draygon's Room.json index 8efd81aa18..e53ca6d073 100644 --- a/region/maridia/inner-pink/Draygon's Room.json +++ b/region/maridia/inner-pink/Draygon's Room.json @@ -674,9 +674,9 @@ "link": [1, 2], "name": "Shinespark out the Right with a Gravity Jump", "requires": [ - {"notable": "Shinespark out the Right with a Gravity Jump"}, "canGravityJump", "canShinechargeMovementComplex", + "canTrickyJump", "canMidairShinespark", {"canShineCharge": {"usedTiles": 20, "openEnd": 1}}, {"shinespark": {"frames": 14}} @@ -1184,11 +1184,6 @@ "name": "Turret Grapple Jump", "note": "Performing a grapple jump off of a Draygon turret. Usually done by bouncing off the wall for momentum." }, - { - "id": 2, - "name": "Shinespark out the Right with a Gravity Jump", - "note": "Charge a shinespark in the bottom of the room, then Gravity jump up in order to shinespark out of the right door." - }, { "id": 3, "name": "Suitless Fight", diff --git a/region/maridia/inner-yellow/Butterfly Room.json b/region/maridia/inner-yellow/Butterfly Room.json index bce83f21d2..9bc5299c70 100644 --- a/region/maridia/inner-yellow/Butterfly Room.json +++ b/region/maridia/inner-yellow/Butterfly Room.json @@ -239,9 +239,9 @@ { "id": 10, "link": [1, 2], - "name": "Careful Jump (Left to Right)", + "name": "Doorway Jump or Precise Jump", "requires": [ - {"notable": "Careful Jump"}, + {"notable": "Doorway Jump or Precise Jump"}, "canSuitlessMaridia", "canCarefulJump", {"or": [ @@ -453,9 +453,9 @@ { "id": 21, "link": [2, 1], - "name": "Careful Jump (Right to Left)", + "name": "Doorway Jump or Precise Jump", "requires": [ - {"notable": "Careful Jump"}, + {"notable": "Doorway Jump or Precise Jump"}, "canSuitlessMaridia", "canCarefulJump", {"or": [ @@ -806,7 +806,7 @@ "notables": [ { "id": 1, - "name": "Careful Jump", + "name": "Doorway Jump or Precise Jump", "note": [ "Kill all the Zoas and don't pick up their drops. If the door is unlocked, stand in the doorframe and jump across the room.", "Otherwise, jump across the sand, starting 1.5 tiles away from the sandfall. Hold jump and forward the whole time. Samus will dip into the sand, but still make it to the other side." diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json index c6d87ec115..5b004b97b8 100644 --- a/region/norfair/west/Crumble Shaft.json +++ b/region/norfair/west/Crumble Shaft.json @@ -281,6 +281,10 @@ "note": [ "Jump and aim down to lower the camera so the middle platform Sova starts moving.", "Then freeze it by aiming down, shoot the shot block, and use the Sova as a stable platform." + ], + "devNote": [ + "Wall jumping and using the same frozen Sova, or falling onto the Sova just below the item and then jumping to the top Sova could be added,", + "but this would require an obstacle to ensure they haven't fallen or died, and is not really easier than a crumble jump." ] }, { @@ -761,19 +765,6 @@ {"heatFrames": 200} ] }, - { - "id": 37, - "link": [3, 1], - "name": "Frozen Sova", - "requires": [ - "canTrickyUseFrozenEnemies", - {"heatFrames": 400} - ], - "note": [ - "Expects to freeze and use two Sovas back-to-back, as leniency to account for position variations.", - "Also has an extra buffer for possibly needing to wait beforehand for the left Sova to position itself right." - ] - }, { "id": 38, "link": [3, 1],