diff --git a/region/norfair/west/Crocomire Escape.json b/region/norfair/west/Crocomire Escape.json index 78856709b6..132245ae32 100644 --- a/region/norfair/west/Crocomire Escape.json +++ b/region/norfair/west/Crocomire Escape.json @@ -526,6 +526,7 @@ }, "requires": [ "canTrickyUseFrozenEnemies", + "canTrickyDodgeEnemies", {"or": [ "HiJump", "canSpringBallJumpMidAir" @@ -566,12 +567,23 @@ "canInsaneJump", "h_additionalBomb" ]} + ]}, + {"and": [ + "canHorizontalShinespark", + {"canShineCharge": {"usedTiles": 15, "openEnd": 2}}, + {"shinespark": {"frames": 40, "excessFrames": 18}} + ]}, + {"and": [ + {"notable": "Ceiling Mockball Spring Fling"}, + "SpeedBooster", + "canInsaneJump", + "canMomentumConservingMorph", + "canSpringFling" ]} ]}, "h_heatedGModeOpenDifferentDoor" ], - "flashSuitChecked": true, - "devNote": "FIXME: A variant with shinesparking can be added. (Energy from immobile, CF, or energy free sparks)" + "flashSuitChecked": true }, { "id": 52, @@ -729,6 +741,7 @@ }, "requires": [ "canTrickyUseFrozenEnemies", + "canTrickyDodgeEnemies", {"or": [ "HiJump", "canSpringBallJumpMidAir" @@ -767,6 +780,18 @@ "canUnmorphBombBoost", "h_crouchJumpDownGrab", "canInsaneJump" + ]}, + {"and": [ + "canHorizontalShinespark", + {"canShineCharge": {"usedTiles": 15, "openEnd": 2}}, + {"shinespark": {"frames": 40, "excessFrames": 18}} + ]}, + {"and": [ + {"notable": "Ceiling Mockball Spring Fling"}, + "SpeedBooster", + "canInsaneJump", + "canMomentumConservingMorph", + "canSpringFling" ]} ]}, "h_heatedDirectGModeLeaveSameDoor" @@ -1213,6 +1238,7 @@ "requires": [ "h_heatedGMode", "canTrickyUseFrozenEnemies", + "canTrickyDodgeEnemies", {"or": [ "HiJump", "canSpringBallJumpMidAir" @@ -1255,6 +1281,11 @@ "h_additionalBomb" ]} ]}, + {"and": [ + "canHorizontalShinespark", + {"canShineCharge": {"usedTiles": 15, "openEnd": 2}}, + {"shinespark": {"frames": 40, "excessFrames": 18}} + ]}, {"and": [ {"notable": "Ceiling Mockball Spring Fling"}, "SpeedBooster", @@ -1266,7 +1297,7 @@ {"heatFrames": 0} ], "flashSuitChecked": true, - "devNote": "FIXME: Variants with shinesparking or Geruta damage boost can be added. (Energy from immobile, CF, or energy free sparks)" + "devNote": "FIXME: Variants with Geruta damage boost can be added. (Energy from immobile or CF)" }, { "id": 58, @@ -1301,6 +1332,7 @@ "requires": [ "h_heatedGMode", "canTrickyUseFrozenEnemies", + "canTrickyDodgeEnemies", {"or": [ "HiJump", "canSpringBallJumpMidAir" @@ -1347,6 +1379,11 @@ "h_additionalBomb" ]} ]}, + {"and": [ + "canHorizontalShinespark", + {"canShineCharge": {"usedTiles": 15, "openEnd": 2}}, + {"shinespark": {"frames": 40, "excessFrames": 18}} + ]}, {"and": [ {"notable": "Ceiling Mockball Spring Fling"}, "SpeedBooster", @@ -1556,6 +1593,20 @@ ], "note": "This strat just waits out the Dragon." }, + { + "link": [3, 2], + "name": "Frozen Geruta Platform", + "requires": [ + "h_heatProof", + "canTrickyUseFrozenEnemies", + {"or": [ + "HiJump", + "canTrickyDodgeEnemies" + ]} + ], + "flashSuitChecked": true, + "note": "It is possible to lure the Geruta to be used as a platform with nothing but Ice." + }, { "id": 38, "link": [3, 2], diff --git a/region/norfair/west/Crocomire Speedway.json b/region/norfair/west/Crocomire Speedway.json index 6f909733e7..52e6df4f32 100644 --- a/region/norfair/west/Crocomire Speedway.json +++ b/region/norfair/west/Crocomire Speedway.json @@ -790,27 +790,14 @@ } }, "requires": [ - "canTrickyJump", + "canTrickyDodgeEnemies", {"or": [ {"ammo": {"type": "PowerBomb", "count": 6}}, {"and": [ + "h_artificialMorphMovement", {"or": [ - {"and": [ - "h_artificialMorphSpringBall", - "canTrickyDodgeEnemies" - ]}, - {"and": [ - "h_artificialMorphIBJ", - "canInsaneJump" - ]}, - {"and": [ - {"ammo": {"type": "PowerBomb", "count": 1}}, - "h_artificialMorphSpringBall" - ]}, - {"and": [ - {"ammo": {"type": "PowerBomb", "count": 2}}, - "h_artificialMorphIBJ" - ]} + "canInsaneJump", + "h_artificialMorphPowerBomb" ]}, {"or": [ "h_artificialMorphPowerBomb", @@ -2203,6 +2190,7 @@ "link": [7, 2], "name": "G-Mode, Heatproof, Fix Camera", "requires": [ + "canEnterGMode", "h_heatProof", {"or": [ "h_bombThings", @@ -2230,6 +2218,7 @@ "link": [7, 2], "name": "G-Mode, Fix Camera, Speedy Exit", "requires": [ + "h_heatedGMode", "h_getBlueSpeedMaxRunway", {"heatFrames": 375} ], diff --git a/region/norfair/west/Crumble Shaft.json b/region/norfair/west/Crumble Shaft.json index a7d1e7545b..b5d1c53fd1 100644 --- a/region/norfair/west/Crumble Shaft.json +++ b/region/norfair/west/Crumble Shaft.json @@ -293,26 +293,25 @@ } }, "requires": [ + "h_heatedGMode", {"or": [ + {"heatFrames": 45}, {"and": [ - "h_heatedGMode", - {"heatFrames": 45} - ]}, - {"and": [ - {"ammo": {"type": "Super", "count": 1}}, - "h_heatedGModePauseAbuse" - ]}, - {"and": [ - "canTrickyGMode", - "h_heatedGModePauseAbuse" + "h_heatedGModePauseAbuse", + {"or": [ + "canTrickyGMode", + {"ammo": {"type": "Super", "count": 2}} + ]} ]} ]} ], "flashSuitChecked": true, "note": [ - "Climb the solid crumble blocks.", - "It is possible to use a Super to knock a Sova off and kill it by the door and pause abuse to grab its Energy drop on G-mode exit.", - "It is also possible to do it without a Super if the Sova drops a large Energy drop." + "Climb down using the solid crumble blocks.", + "It is possible to use a Super to knock a Sova off and kill it by the door and pause abuse to grab its Energy drop on G-mode exit with a very precise positioning jump or large Energy drop.", + "With a second Super it is recommended to bring down the other clockwise Sova as well (at the top of the room), and stack their drops.", + "It is also possible to do it without a Super if the Sova drops a large Energy drop. There is a way to do this with two Sova, and if either drops a large Energy, Samus can survive:", + "kill both of the bottom two Sova at the bottom right corner of their platforms, stand on the middle of the platform with the second lowest Sova, and hold right when exiting G-mode." ] }, { @@ -658,8 +657,9 @@ "flashSuitChecked": true, "note": [ "Climb the solid crumble blocks.", - "It is possible to use a Super to knock a Sova off and follow it to the door and pause abuse to grab its Energy drop on G-mode exit." - ] + "It is possible to use a Super to knock one or two Sova off and follow it to the door and pause abuse to grab its Energy drop on G-mode exit." + ], + "devNote": "FIXME: It is possible to use grapple to grab the drop from the top Sova from the doorway, but it is fairly precise and requires a large Energy drop." }, { "id": 25, diff --git a/region/norfair/west/Hi Jump Energy Tank Room.json b/region/norfair/west/Hi Jump Energy Tank Room.json index 5a574c0b1a..f514f084a9 100644 --- a/region/norfair/west/Hi Jump Energy Tank Room.json +++ b/region/norfair/west/Hi Jump Energy Tank Room.json @@ -251,6 +251,24 @@ "flashSuitChecked": true, "note": "It takes the Sova about 25 seconds to hit Samus." }, + { + "link": [1, 1], + "name": "G-Mode Morph Remote Acquire Left Item", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": true + } + }, + "requires": [ + "h_artificialMorphSpringBallBombJump", + "h_additionalBomb" + ], + "collectsItems": [4], + "flashSuitChecked": true, + "note": "Get to the item with two Spring Ball bomb jumps and remote acquire the item back by the left door.", + "devNote": "The Power Bombs will solidify the bomb block, preventing remote acquiring on the right. The Power Bombs are not going to overload many PLMs." + }, { "id": 5, "link": [1, 3], @@ -418,7 +436,7 @@ ], "clearsObstacles": ["D"], "flashSuitChecked": true, - "note": "Get to the item without overloading PLMs by avoiding entering the morph tunnel at the bottom of the room or using Power Bombs near the items." + "note": "Get to the item without overloading PLMs by avoiding entering the morph tunnel at the bottom of the room." }, { "id": 11, @@ -458,11 +476,13 @@ } }, "requires": [ - "h_artificialMorphMovement", - "canOffScreenMovement" + "h_artificialMorphMovement" ], "flashSuitChecked": true, - "note": "Overload PLMs using scroll blocks in the morph tunnel. The camera will not scroll to the left side of the room." + "note": [ + "Overload PLMs using the camera scroll blocks in the morph tunnel. Samus can fix the camera after exiting G-mode on the left.", + "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it." + ] }, { "id": 13, @@ -477,22 +497,21 @@ "requires": [ {"itemNotCollectedAtNode": 4}, "canRiskPermanentLossOfAccess", - "h_artificialMorphPowerBomb", - "canOffScreenMovement" + "h_artificialMorphPowerBomb" ], - "collectsItems": [4], + "collectsItems": [3], "flashSuitChecked": true, "note": [ "Placing a Power Bomb a 0.5 to 1 tile away from the item plinth to bounce Samus onto it (where the right item usually is) while also overloading PLMs as the explosion hits the left item.", "Wait for the explosion to completely finish before touching the crumble blocks or they will remain solid.", - "The camera will not scroll to the left side of the room." + "The camera will not scroll to the left side of the room, but it is possible to kill the Sova with the Power Bomb boost." ], - "devNote": "FIXME: This item will be remote acquired, but it is ignored here since the strat is canRiskPermanentLossOfAccess." + "devNote": "FIXME: It is possible to avoid collecting 3 by using a second Power Bomb to boost through the item after PLMs are overloaded." }, { "id": 14, "link": [2, 1], - "name": "G-Mode Overload PLMs with the Right Item", + "name": "G-Mode Remote Acquire the Right Item", "entranceCondition": { "comeInWithGMode": { "mode": "direct", @@ -503,15 +522,19 @@ {"itemNotCollectedAtNode": 3}, "canRiskPermanentLossOfAccess", {"or": [ - "h_artificialMorphBombThings", - "h_artificialMorphMovement" - ]}, - "canOffScreenMovement" + "h_artificialMorphMovement", + "h_artificialMorphPowerBomb" + ]} ], "collectsItems": [3], "flashSuitChecked": true, - "note": "Overload PLMs by rolling through the item then go through the crumble blocks. The camera will not scroll to the left side of the room.", - "devNote": "FIXME: This item will be remote acquired, but it is ignored here since will require an obstacle and the strat is canRiskPermanentLossOfAccess." + "note": [ + "Touch both the item and the camera scroll blocks in the morph tunnel before PLMs are overloaded, then use either to finish overloading them.", + "This will make it so that Samus can fix the camera after exiting G-mode on the left.", + "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it.", + "With only a Power Bomb boost to touch the item, it is not possible to fix the camera, but it is possible to kill the Sova." + ], + "devNote": "The only loss of access here is the camera fix, but there is another strat that can be used without." }, { "id": 15, @@ -743,12 +766,35 @@ } }, "requires": [ - "h_artificialMorphMovement", - "canOffScreenMovement" + "h_artificialMorphMovement" ], "flashSuitChecked": true, - "note": "Overload PLMs using scroll blocks in the morph tunnel. The camera will not scroll to the left side of the room.", - "devNote": "This is only useful morphless if the item is Morph." + "note": [ + "Overload PLMs using the camera scroll blocks in the morph tunnel. Samus can fix the camera after exiting G-mode on the left.", + "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it." + ], + "devNote": "This is only useful if the item is Morph or if Samus has Morph but no way up to this item location." + }, + { + "link": [2, 4], + "name": "G-Mode through Bomb Blocks, Remote Acquire Right Item", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": true + } + }, + "requires": [ + "h_artificialMorphMovement" + ], + "collectsItems": [3], + "flashSuitChecked": true, + "note": [ + "Touch both the item and the camera scroll blocks in the morph tunnel before PLMs are overloaded, then use either to finish overloading them.", + "This will make it so that Samus can fix the camera after exiting G-mode on the left.", + "It is possible to wait for the Sova to appear on screen before going to the left, in order to ensure Samus won't touch it." + ], + "devNote": "This is only useful if the item is Morph or if Samus has Morph but no way up to this item location." }, { "id": 25, diff --git a/region/norfair/west/Ice Beam Gate Room.json b/region/norfair/west/Ice Beam Gate Room.json index 70493de98c..4a98c63dd6 100644 --- a/region/norfair/west/Ice Beam Gate Room.json +++ b/region/norfair/west/Ice Beam Gate Room.json @@ -1037,7 +1037,7 @@ "requires": [ "h_artificialMorphMovement", {"or": [ - "canTrickyJump", + "canTrickyDodgeEnemies", {"and": [ "h_artificialMorphPowerBomb", "h_artificialMorphPowerBomb" @@ -1050,7 +1050,7 @@ "flashSuitChecked": true, "note": [ "It is tricky but possible to cross the room without any damage by rolling through the room.", - "The enemies can be killed with extra Power Bombs, but without them, it's arguably easier to roll through the room without the use a Spring Ball or Bombs.", + "The enemies can be killed with extra Power Bombs, but without them, it's arguably easier to roll through the room without the use of Spring Ball or Bombs.", "After crossing the room, use a Power Bomb then quickly exit G-Mode before it explodes in order to break the bomb and Power Bomb blocks above.", "Without Spring Ball, it is still possible to place the Power Bomb high enough to break all the blocks above from an IBJ and still exit G-Mode before it explodes." ] @@ -1069,10 +1069,10 @@ "h_artificialMorphMovement", {"or": [ {"and": [ - "canTrickyJump", - "h_artificialMorphSpringBall", - "h_artificialMorphPowerBomb" + "h_artificialMorphPowerBomb", + "canInsaneJump" ]}, + "canTrickyGMode", {"enemyDamage": {"enemy": "Sm. Dessgeega", "type": "contact", "hits": 2}} ]}, "h_artificialMorphPowerBomb" @@ -1080,7 +1080,9 @@ "clearsObstacles": ["A", "B", "C"], "flashSuitChecked": true, "note": [ - "It is tricky but possible to cross the room without any damage by jumping over the Small Dessgeega on room entry then using a Power Bomb to kill several enemies.", + "It is tricky but possible to cross the room without any damage by utilizing Samus' i-frames on room entry.", + "After morphing, immediately roll to the right, through the Small Dessgeega.", + "Either precisely dodge all of the enemies or quickly place a Power Bomb to kill several of them.", "Note that crossing the room damageless is easier in indirect G-Mode.", "After crossing the room, use a Power Bomb then quickly exit G-Mode before it explodes in order to break the bomb and Power Bomb blocks above.", "Without Spring Ball, it is still possible to place the Power Bomb high enough to break all the blocks above from an IBJ and still exit G-Mode before it explodes." diff --git a/region/norfair/west/Ice Beam Snake Room.json b/region/norfair/west/Ice Beam Snake Room.json index 110c207de1..d9db1918be 100644 --- a/region/norfair/west/Ice Beam Snake Room.json +++ b/region/norfair/west/Ice Beam Snake Room.json @@ -389,7 +389,10 @@ "HiJump", "h_artificialMorphSpringBall" ]}, - "h_artificialMorphSpringBallBombJump" + {"and": [ + "h_artificialMorphSpringBallBombJump", + "h_additionalBomb" + ]} ]}, "h_heatedGModeOffCameraDoor" ], @@ -1138,7 +1141,10 @@ "HiJump", "h_artificialMorphSpringBall" ]}, - "h_artificialMorphSpringBallBombJump" + {"and": [ + "h_artificialMorphSpringBallBombJump", + "h_additionalBomb" + ]} ]}, "h_heatedGModeOffCameraDoor" ],