diff --git a/region/brinstar/red/Beta Power Bomb Room.json b/region/brinstar/red/Beta Power Bomb Room.json index ba159d5a9..a27bf3cee 100644 --- a/region/brinstar/red/Beta Power Bomb Room.json +++ b/region/brinstar/red/Beta Power Bomb Room.json @@ -390,6 +390,29 @@ "clearsObstacles": ["A"], "flashSuitChecked": true }, + { + "link": [1, 1], + "name": "Come in with Blue Speed", + "entranceCondition": { + "comeInGettingBlueSpeed": { + "minExtraRunSpeed": "$1.1", + "length": 21, + "openEnd": 0 + } + }, + "requires": [ + "canShinechargeMovementComplex", + {"canShineCharge": {"usedTiles": 24, "openEnd": 0}}, + {"shinespark": {"frames": 6}}, + {"thornHits": 2} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Run into the leftmost Sidehopper with blue speed.", + "Then turn around and shinespark the remaining hoppers together." + ] + }, { "id": 15, "link": [1, 1], diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json index 43e84f76d..611f84152 100644 --- a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json +++ b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json @@ -579,7 +579,7 @@ "h_navigateHeatRooms", {"or": [ "canDownBack", - "canCarefulJump" + "canTrickyJump" ]}, {"heatFrames": 120} ], @@ -1513,6 +1513,7 @@ {"canShineCharge": {"usedTiles": 27, "gentleUpTiles": 2, "openEnd": 1}}, {"obstaclesCleared": ["A", "C"]}, {"heatFrames": 390}, + "canTrickyJump", "canShinechargeMovementComplex", {"shinespark": {"frames": 30}} ], @@ -1545,6 +1546,7 @@ {"canShineCharge": {"usedTiles": 27, "gentleUpTiles": 2, "openEnd": 1}}, {"obstaclesCleared": ["A"]}, {"heatFrames": 370}, + "canTrickyJump", "canShinechargeMovementComplex", "canHeroShot", {"shinespark": {"frames": 31}}, @@ -1897,7 +1899,7 @@ "h_navigateHeatRooms", {"or": [ "canDownBack", - "canCarefulJump" + "canTrickyJump" ]}, {"heatFrames": 120} ], diff --git a/region/lowernorfair/east/Metal Pirates Room.json b/region/lowernorfair/east/Metal Pirates Room.json index 8c6b4e6f5..50a0af26b 100644 --- a/region/lowernorfair/east/Metal Pirates Room.json +++ b/region/lowernorfair/east/Metal Pirates Room.json @@ -1284,10 +1284,13 @@ "Charge", "Spazer", {"or": [ - {"heatFramesWithEnergyDrops": { - "frames": 4400, - "drops": [{"enemy": "Space Pirate (fighting)", "count": 12}] - }}, + {"and": [ + "canBePatient", + {"heatFramesWithEnergyDrops": { + "frames": 4400, + "drops": [{"enemy": "Space Pirate (fighting)", "count": 12}] + }} + ]}, {"and": [ "Ice", {"heatFramesWithEnergyDrops": { diff --git a/region/lowernorfair/east/Pillar Room.json b/region/lowernorfair/east/Pillar Room.json index 07ad68c05..41129ca68 100644 --- a/region/lowernorfair/east/Pillar Room.json +++ b/region/lowernorfair/east/Pillar Room.json @@ -1040,6 +1040,16 @@ "Gravity", {"heatFrames": 810}, {"acidFrames": 55} + ]}, + {"and": [ + "canSuitlessLavaDive", + "canTrickyJump", + {"heatFrames": 705}, + {"acidFrames": 45} + ]}, + {"and": [ + "canInsaneJump", + {"heatFrames": 620} ]} ]}, {"or": [ diff --git a/region/maridia/inner-yellow/Thread The Needle Room.json b/region/maridia/inner-yellow/Thread The Needle Room.json index b60c27e8b..2c96e949f 100644 --- a/region/maridia/inner-yellow/Thread The Needle Room.json +++ b/region/maridia/inner-yellow/Thread The Needle Room.json @@ -501,16 +501,48 @@ { "id": 22, "link": [1, 2], - "name": "Kill the Enemies", + "name": "Quickly Kill the Enemies", "requires": [ {"or": [ - "h_hasBeamUpgrade", - "canDodgeWhileShooting", + "Wave", + "Spazer", + "Plasma", "canUseGrapple", + {"and": [ + "SpaceJump", + "canCarefulJump", + "ScrewAttack" + ]}, + {"and": [ + "h_usePowerBomb", + {"ammo": {"type": "PowerBomb", "count": 1}} + ]} + ]}, + {"or": [ + "h_navigateUnderwater", + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} + ]} + ], + "flashSuitChecked": true + }, + { + "link": [1, 2], + "name": "Kill the Enemies", + "requires": [ + {"or": [ + "Ice", + "canTrickyJump", "ScrewAttack", "canBePatient", - {"resourceCapacity": [{"type": "Missile", "count": 1}]}, - "h_usePowerBomb" + {"ammo": {"type": "Missile", "count": 6}} + ]}, + {"or": [ + "h_navigateUnderwater", + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} + ]}, + {"or": [ + "canDodgeWhileShooting", + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} ]} ], "flashSuitChecked": true @@ -520,33 +552,28 @@ "link": [1, 2], "name": "Morph Dodge", "requires": [ - "h_navigateUnderwater", + "Gravity", "Morph", - {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}, + "canCarefulJump", {"or": [ - "canCarefulJump", + "canDodgeWhileShooting", {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} ]} ], "flashSuitChecked": true, "note": [ - "Safely kill the first Choot, then roll through the bottom of the room after passing the two Puyos.", - "Expects one to two Puyo hits while crossing the room." + "Roll through the bottom of the room." ] }, { "id": 24, "link": [1, 2], - "name": "Lenient Dodge", + "name": "Tank the Damage", "requires": [ - {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}}, - {"or": [ - "canCarefulJump", - {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} - ]} + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 4}}, + {"enemyDamage": {"enemy": "Choot", "type": "contact", "hits": 1}} ], - "flashSuitChecked": true, - "note": "Dodge the Puyos and kill the Choots. Expects two to three Puyo hits." + "flashSuitChecked": true }, { "id": 25, @@ -632,16 +659,48 @@ { "id": 29, "link": [2, 1], - "name": "Kill the Enemies", + "name": "Quickly Kill the Enemies", "requires": [ {"or": [ - "h_hasBeamUpgrade", - "canDodgeWhileShooting", + "Wave", + "Spazer", + "Plasma", "canUseGrapple", + {"and": [ + "SpaceJump", + "canCarefulJump", + "ScrewAttack" + ]}, + {"and": [ + "h_usePowerBomb", + {"ammo": {"type": "PowerBomb", "count": 1}} + ]} + ]}, + {"or": [ + "h_navigateUnderwater", + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} + ]} + ], + "flashSuitChecked": true + }, + { + "link": [2, 1], + "name": "Kill the Enemies", + "requires": [ + {"or": [ + "Ice", + "canTrickyJump", "ScrewAttack", "canBePatient", - {"resourceCapacity": [{"type": "Missile", "count": 1}]}, - "h_usePowerBomb" + {"ammo": {"type": "Missile", "count": 6}} + ]}, + {"or": [ + "h_navigateUnderwater", + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} + ]}, + {"or": [ + "canDodgeWhileShooting", + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} ]} ], "flashSuitChecked": true @@ -651,33 +710,40 @@ "link": [2, 1], "name": "Morph Dodge", "requires": [ - "h_navigateUnderwater", "Morph", - {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}, + "canCarefulJump", {"or": [ - "canCarefulJump", + "Gravity", + {"and": [ + "canSuitlessMaridia", + {"or": [ + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}}, + {"resourceCapacity": [{"type": "Missile", "count": 1}]}, + {"ammo": {"type": "Super", "count": 1}}, + "canTrickyJump" + ]} + ]} + ]}, + {"or": [ + "canDodgeWhileShooting", {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} ]} ], "flashSuitChecked": true, "note": [ - "Safely kill the first Choot, then roll through the bottom of the room after passing the two Puyos.", - "Expects one to two Puyo hits while crossing the room." + "Roll through the bottom of the room, killing the three Puyos in the middle.", + "It helps to start rolling from as close to the edge of the water as possible to build speed while the Puyos are inactive." ] }, { "id": 31, "link": [2, 1], - "name": "Lenient Dodge", + "name": "Tank the Damage", "requires": [ - {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}}, - {"or": [ - "canCarefulJump", - {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}} - ]} + {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 4}}, + {"enemyDamage": {"enemy": "Choot", "type": "contact", "hits": 1}} ], - "flashSuitChecked": true, - "note": "Dodge the Puyos and kill the Choots. Expects two to three Puyo hits." + "flashSuitChecked": true }, { "id": 32, diff --git a/region/norfair/east/Lava Grapple Tunnel.json b/region/norfair/east/Lava Grapple Tunnel.json index 4a6758d3e..e7b176d6b 100644 --- a/region/norfair/east/Lava Grapple Tunnel.json +++ b/region/norfair/east/Lava Grapple Tunnel.json @@ -707,6 +707,37 @@ "press jump, then release dash to exit X-mode while jumping." ] }, + { + "link": [1, 2], + "name": "Pause Abuse Damage Boosts", + "requires": [ + {"noFlashSuit": {}}, + {"notable": "Pause Abuse Damage Boosts"}, + {"or": [ + {"and": [ + {"disableEquipment": "SpeedBooster"}, + "Gravity" + ]}, + {"and": [ + "canInsaneJump", + {"notable": "Suitless Damage Boosts"} + ]} + ]}, + "canHorizontalDamageBoost", + "canPauseAbuse", + {"resourceAvailable": [{"type": "RegularEnergy", "count": 99}, {"type": "ReserveEnergy", "count": 100}]}, + {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]}, + {"lavaFrames": 30}, + {"heatFrames": 340} + ], + "flashSuitChecked": true, + "note": [ + "Pause abuse the spike and lava damage to cross the room while losing minimal Energy." + ], + "devNote": [ + "Energy ineffeciency is necessary and is represented by extra heatFrames." + ] + }, { "id": 17, "link": [2, 1], @@ -1378,6 +1409,37 @@ "press jump, then release dash to exit X-mode while jumping." ] }, + { + "link": [2, 1], + "name": "Pause Abuse Damage Boosts", + "requires": [ + {"noFlashSuit": {}}, + {"notable": "Pause Abuse Damage Boosts"}, + {"or": [ + {"and": [ + {"disableEquipment": "SpeedBooster"}, + "Gravity" + ]}, + {"and": [ + "canInsaneJump", + {"notable": "Suitless Damage Boosts"} + ]} + ]}, + "canHorizontalDamageBoost", + "canPauseAbuse", + {"resourceAvailable": [{"type": "RegularEnergy", "count": 99}, {"type": "ReserveEnergy", "count": 100}]}, + {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]}, + {"lavaFrames": 30}, + {"heatFrames": 340} + ], + "flashSuitChecked": true, + "note": [ + "Pause abuse the spike and lava damage to cross the room while losing minimal Energy." + ], + "devNote": [ + "Energy ineffeciency is necessary and is represented by extra heatFrames." + ] + }, { "id": 35, "link": [2, 2], @@ -1428,10 +1490,17 @@ "id": 2, "name": "Suitless Damage Boosts", "note": "Delay the damage boost from the spikes slightly in order to rise above the lava before moving." + }, + { + "id": 3, + "name": "Pause Abuse Damage Boosts", + "note": [ + "Pause abuse spike and lava damage to cross the room while losing minimal Energy." + ] } ], "nextStratId": 69, - "nextNotableId": 3, + "nextNotableId": 4, "devNote": [ "Add `comeInSpinning` Space Jump strats, with variants for different run speeds.", "Add more spring ball bounce variants, for different run speeds and combinations of Gravity and/or HiJump."