diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json index 7120f16e5..000f33776 100644 --- a/region/brinstar/green/Etecoon Energy Tank Room.json +++ b/region/brinstar/green/Etecoon Energy Tank Room.json @@ -117,6 +117,11 @@ "id": "R-Mode", "name": "Entered with R-Mode", "obstacleType": "abstract" + }, + { + "id": "C", + "name":"Beetom above the crumbles", + "obstacleType": "abstract" } ], "enemies": [ @@ -308,6 +313,47 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [1, 1], + "name": "Leave with Moondance", + "requires": [ + {"obstaclesCleared": ["C"]}, + "canMoondance", + "canCount", + "canTrickyUseFrozenEnemies", + {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}} + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "fallSpeedInTiles": 1 + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing." + }, + { + "link": [1, 1], + "name": "Leave with Extended Moondance", + "requires": [ + {"obstaclesCleared": ["C"]}, + "canExtendedMoondance", + "canTrickyUseFrozenEnemies", + {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}, + "h_extendedMoondanceBeetomLeniency" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "fallSpeedInTiles": 2 + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.", + "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing." + ] + }, { "id": 118, "link": [1, 1], @@ -338,6 +384,21 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [1, 1], + "name": "G-Mode Setup - Get Hit By Beetom", + "requires":[ + "canComplexGMode", + {"obstaclesCleared": ["C"]} + ], + "exitCondition": { + "leaveWithGModeSetup": { + "knockback": false + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 8, "link": [1, 5], @@ -549,6 +610,47 @@ "flashSuitChecked": true, "blueSuitChecked": true }, +{ + "link": [2, 2], + "name": "Leave with Moondance", + "requires": [ + {"obstaclesCleared": ["C"]}, + "canMoondance", + "canCount", + "canTrickyUseFrozenEnemies", + {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}} + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "fallSpeedInTiles": 1 + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing." + }, + { + "link": [2, 2], + "name": "Leave with Extended Moondance", + "requires": [ + {"obstaclesCleared": ["C"]}, + "canExtendedMoondance", + "canTrickyUseFrozenEnemies", + {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}}, + "h_extendedMoondanceBeetomLeniency" + ], + "exitCondition": { + "leaveWithStoredFallSpeed": { + "fallSpeedInTiles": 2 + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Freeze a Beetom at head height where Samus can Spinjump into it and begin Moondancing.", + "After 195 moonfalls, reposition the Beetom to chest height, then continue dancing." + ] + }, { "id": 15, "link": [2, 2], @@ -588,6 +690,21 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [2, 2], + "name": "G-Mode Setup - Get Hit By Beetom", + "requires":[ + "canComplexGMode", + {"obstaclesCleared": ["C"]} + ], + "exitCondition": { + "leaveWithGModeSetup": { + "knockback": false + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 16, "link": [2, 3], @@ -953,10 +1070,46 @@ "Two Beetom hits are assumed, but with failed attempts it could take more, possibly requiring leaving the Beetom and going back to the right to farm." ], "devNote": [ - "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required.", - "FIXME: An ice clip would allow for Moondance strats at 1 and 2 using a second Beetom." + "Morph is required to lure a Beetom. Morphless tunnel crawl should not be required." ] }, + { + "link": [3, 2], + "name": "Bring a Beetom Through the Crumble Blocks", + "requires": [ + {"obstaclesNotCleared": ["A"]}, + {"notable": "Beetom Clip"}, + {"noBlueSuit": {}}, + {"or": [ + "h_XRayMorphIceClip", + "h_preciseIceClip" + ]}, + "Morph", + {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}}, + {"or": [ + "h_preciseIceClip", + "canWallJump", + "HiJump", + "SpaceJump", + {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 2}} + ]}, + {"or": [ + "canCrumbleJump", + "canWallJump", + "HiJump", + "SpaceJump" + ]} + ], + "clearsObstacles": ["C"], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Bring two Beetoms through the morph tunnel, damage can be limited by carefully manipulating the Beetoms.", + "Freeze both and allow one to unfreeze and refreeze it in position to clip. Allow the second Beetom to unfreeze and latch onto Samus.", + "Perform the crumble block clip with the Beetom attached to bring it up to the top two doors." + ], + "devNote": "This strat is for bringing a Beetom above the crumble blocks in order to be used for a Moondance or G-Mode setup from either of the top two doors." + }, { "id": 29, "link": [3, 2], @@ -1054,6 +1207,7 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { "id": 121, "link": [3, 3], @@ -1122,6 +1276,28 @@ "Alternatively, bring two Beetoms and stand on one while freezing the other at chest height.", "Freezing the lower one may be made easier or damageless by scrolling the camera when the Beetom is in the correct position and freezing it with a hero shot from the right." ] + }, + { + "link": [3, 3], + "name": "Leave With Runway - Two Frozen Beetoms", + "requires": [ + {"noBlueSuit": {}}, + "Morph", + "h_trickyFrozenEnemyRunway", + {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 3}} + ], + "exitCondition": { + "leaveWithRunway": { + "length": 9, + "openEnd": 0 + } + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "An easy setup for this runway is to freeze one Beetom on the ground and then stand on it to freeze two other Beetoms at chest height.", + "It is possible to leave the Beetoms and refill using the Zebbos." + ] }, { "id": 107, @@ -1420,7 +1596,7 @@ ]} ], "clearsObstacles": ["A"], - "resetsObstacles": ["B", "R-Mode"], + "resetsObstacles": ["B", "R-Mode", "C"], "farmCycleDrops": [ {"enemy": "Beetom", "count": 2}, {"enemy": "Zebbo", "count": 1} @@ -2168,7 +2344,7 @@ ]} ], "clearsObstacles": ["A"], - "resetsObstacles": ["B", "R-Mode"], + "resetsObstacles": ["B", "R-Mode", "C"], "farmCycleDrops": [ {"enemy": "Beetom", "count": 2}, {"enemy": "Zebbo", "count": 2} diff --git a/region/brinstar/kraid/Warehouse Kihunter Room.json b/region/brinstar/kraid/Warehouse Kihunter Room.json index 3b136bccb..53bc01e13 100644 --- a/region/brinstar/kraid/Warehouse Kihunter Room.json +++ b/region/brinstar/kraid/Warehouse Kihunter Room.json @@ -465,6 +465,25 @@ "flashSuitChecked": true, "blueSuitChecked": true }, + { + "link": [2, 2], + "name": "G-Mode Setup - Get Hit By KiHunter", + "requires": [ + {"enemyDamage": {"enemy": "Kihunter (green)", "type": "contact", "hits": 1}}, + {"noBlueSuit": {}}, + "canComplexGMode" + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Quickly spinjump up into the tunnel to shoot the shotblocks before the KiHunter can swoop down.", + "Stand level with the tunnel and wait for the KiHunter to come down. Once it is in the tunnel, move to the wall to lure it down full.", + "Don't shoot the wings off it or it will spit projectiles at Samus. Instead take a contact hit when it is at the bottom and move towards to door to lure it along." + ] + }, { "id": 48, "link": [2, 2], diff --git a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json index 045bc78f8..28e642f4e 100644 --- a/region/brinstar/pink/Pink Brinstar Wave Gate Room.json +++ b/region/brinstar/pink/Pink Brinstar Wave Gate Room.json @@ -768,7 +768,9 @@ "blueSuitChecked": true, "note": [ "This is possible to do without taking a second hit:", - "Enter the room in a jump, then shoot down to open the door and land in the doorsill." + "Enter the room in a jump, then shoot down to open the door and land in the doorsill.", + "If the adjact room is water and Samus lacks Gravity suit, jumping high into the door and hold left before the transition,", + "Shoot the door open when Samus is near the top of the door and land back in the frame, let the Hopper bounce twice." ] }, { diff --git a/region/tourian/main/Tourian Escape Room 2.json b/region/tourian/main/Tourian Escape Room 2.json index cc8014080..5e50c3658 100644 --- a/region/tourian/main/Tourian Escape Room 2.json +++ b/region/tourian/main/Tourian Escape Room 2.json @@ -209,6 +209,29 @@ ], "devNote": "This is only for indirect G-Mode, because it is trivial while in direct, and would use a different strat." }, + { + "link": [1, 1], + "name": "G-Mode Setup - Get Hit By Space Pirate", + "requires": [ + "canUpwardGModeSetup", + "canTrickyUseFrozenEnemies", + "canTrickyGMode" + ], + "exitCondition": { + "leaveWithGModeSetup": {} + }, + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Pirates will typically climb up the left wall and down the right wall.", + "Freeze the pirate as it jumps across so it is partially in the door.", + "This GMode setup is more easily performed on the left side." + ], + "detailNote": [ + "They may (50% chance) change direction after climbing a distance of about 5 tiles.", + "Can randomly fail depending on the height the pirate is frozen and the direction Samus is facing." + ] + }, { "id": 6, "link": [1, 2],