diff --git a/region/crateria/east/West Ocean.json b/region/crateria/east/West Ocean.json index 6a7bde33ef..e16e8e9cd6 100644 --- a/region/crateria/east/West Ocean.json +++ b/region/crateria/east/West Ocean.json @@ -280,7 +280,7 @@ [2, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1] ], - "note": "Represents being at the Moat door with G-Mode and morph or artificial morph" + "note": "Represents being at the left door with G-Mode and morph or artificial morph" }, { "id": 16, @@ -295,7 +295,7 @@ [2, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1] ], - "note": "Represents being at the Moat door with G-Mode, PLMs overloaded, and morph or artificial morph" + "note": "Represents being at the left door with G-Mode, PLMs overloaded, and morph or artificial morph" }, { "id": 17, @@ -310,7 +310,7 @@ [2, 1, 1, 1, 1, 1, 1, 1], [1, 1, 1, 1, 1, 1, 1, 1] ], - "note": "Represents being at the Moat door with G-Mode and morph or artificial morph, in direct G-Mode" + "note": "Represents being at the left door with G-Mode and morph or artificial morph, in direct G-Mode" } ], "obstacles": [ @@ -504,7 +504,7 @@ { "from": 17, "to": [ - {"id": 10}, + {"id": 1}, {"id": 16} ] } @@ -1532,14 +1532,7 @@ "Gravity", "h_canArtificialMorphIBJ" ]}, - {"and": [ - "h_canArtificialMorphSpringBall", - {"or": [ - "Gravity", - "HiJump", - "canCarefulJump" - ]} - ]}, + "h_canArtificialMorphSpringBall", "h_canArtificialMorphHBJ", "h_canArtificialMorphDiagonalBombJump" ]} @@ -1563,14 +1556,7 @@ "Gravity", "h_canArtificialMorphIBJ" ]}, - {"and": [ - "h_canArtificialMorphSpringBall", - {"or": [ - "Gravity", - "HiJump", - "canCarefulJump" - ]} - ]}, + "h_canArtificialMorphSpringBall", "h_canArtificialMorphHBJ", "h_canArtificialMorphDiagonalBombJump" ]} @@ -1955,14 +1941,7 @@ "Gravity", "h_canArtificialMorphIBJ" ]}, - {"and": [ - "h_canArtificialMorphSpringBall", - {"or": [ - "Gravity", - "HiJump", - "canCarefulJump" - ]} - ]}, + "h_canArtificialMorphSpringBall", "h_canArtificialMorphHBJ", "h_canArtificialMorphDiagonalBombJump" ]} @@ -1986,14 +1965,7 @@ "Gravity", "h_canArtificialMorphIBJ" ]}, - {"and": [ - "h_canArtificialMorphSpringBall", - {"or": [ - "Gravity", - "HiJump", - "canCarefulJump" - ]} - ]}, + "h_canArtificialMorphSpringBall", "h_canArtificialMorphHBJ", "h_canArtificialMorphDiagonalBombJump" ]} @@ -2223,33 +2195,23 @@ "requires": [ "canXRayStandUp", "canPartialFloorClip", + "canInsaneJump", "canDownGrab", {"or": [ "h_canArtificialMorphSpringBall", - {"and": [ - "h_canArtificialMorphBombs", - {"or": [ - "canTrickyJump", - {"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 1}} - ]} - ]}, {"and": [ "h_canArtificialMorphBombHorizontally", - {"or": [ - {"and": [ - "canTrickyJump", - "h_canArtificialMorphPowerBomb" - ]}, - {"and": [ - "canNeutralDamageBoost", - {"enemyDamage": {"enemy": "Zeb", "type": "contact", "hits": 3}} - ]} - ]} + "h_additionalBomb" ]} ]} ], "flashSuitChecked": true, - "note": "Unmorph and cancel g-mode, shoot the shot block, then x-ray standup, partial floor clip, and down grab to the ledge. Wiggle to escape." + "note": [ + "It is possible to bomb boost from the door runway over the Zeb and onto the first step.", + "Without doing this, the Zeb will likely touch Samus, as it will start moving if Samus goes down a single step.", + "At the left end of the tunnel, roll against the lower left corner, exit G-mode, and X-Ray standup, shoot the block, partial floor clip, then jump and down grab to the ledge.", + "Wiggle to escape. A failed jump will result in a forced crouch, which is likely a soft lock." + ] }, { "id": 87, @@ -2935,10 +2897,7 @@ "canEnterGMode", "h_canUseMorphBombs", "SpaceJump", - {"or": [ - "canCeilingBombJump", - "canBeVeryPatient" - ]} + "canBeVeryPatient" ], "flashSuitChecked": true, "note": "The crumble block is the leftmost flat ceiling tile." @@ -2979,12 +2938,11 @@ }, { "id": 134, - "link": [17, 10], - "name": "G-mode Overload PLMs by PBing Missile Item", + "link": [17, 1], + "name": "G-mode Overload PLMs by Power Bombing Morph Maze Item", "requires": [ - {"notable": "G-mode Overload PLMs by PBing Missile Item"}, + {"notable": "G-mode Overload PLMs by Power Bombing Morph Maze Item"}, "canEnterGMode", - {"itemNotCollectedAtNode": 10}, "h_canUsePowerBombs", {"or": [ "SpaceJump", @@ -2996,20 +2954,20 @@ ]} ]} ], - "clearsObstacles": ["B"], + "collectsItems": [10], "flashSuitChecked": true, "note": [ - "To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the door to the Moat.", - "This is at the max jump height without HiJump. Placing the PB higher or lower will not overload the PLMs without many PBs." + "To overload the PLMs, place a Power Bomb precisely to the right of the bottom of the second overhang above the bottom left door.", + "This is at the max jump height without HiJump. Placing the Power Bomb higher or lower will not overload the PLMs without many Power Bombs." ], - "devNote": "This link is used to get the item and return, so there is no canRiskPermanentLossOfAccess." + "devNote": "This requires the item to not be collected, but there is no reason to do this without it being there, so there is no canRiskPermanentLossOfAccess." }, { "id": 135, "link": [17, 16], - "name": "G-mode Overload PLMs by PBing Missile Item Softlock Risk", + "name": "G-mode Overload PLMs by Power Bombing Morph Maze Item, Permanent Softlock Risk", "requires": [ - {"notable": "G-mode Overload PLMs by PBing Missile Item"}, + {"notable": "G-mode Overload PLMs by Power Bombing Morph Maze Item"}, "canEnterGMode", {"itemNotCollectedAtNode": 10}, "canRiskPermanentLossOfAccess", @@ -3028,8 +2986,8 @@ ], "flashSuitChecked": true, "note": [ - "To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the door to the Moat.", - "This is at the max jump height without HiJump. Placing the PB higher or lower will not overload the PLMs without many PBs." + "To overload the PLMs, place a Power Bomb precisely to the right of the bottom of the second overhang above the bottom left door.", + "This is at the max jump height without HiJump. Placing the Power Bomb higher or lower will not overload the PLMs without many Power Bombs." ] } ], @@ -3136,9 +3094,9 @@ }, { "id": 12, - "name": "G-mode Overload PLMs by PBing Missile Item", + "name": "G-mode Overload PLMs by Power Bombing Morph Maze Item", "note": [ - "To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the door to the Moat.", + "To overload the PLMs, place a PB precisely to the right of the bottom of the second overhang above the bottom left door.", "This is at the max jump height without HiJump. Placing the PB higher or lower will not overload the PLMs without many PBs." ] }, diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index fd64495a55..dcb2924823 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/region/crateria/west/Gauntlet Energy Tank Room.json @@ -825,6 +825,38 @@ "Use Spring Ball to bounce through the morph tunnel at the beginning, and across the final stretch at the end." ] }, + { + "link": [2, 1], + "name": "G-Mode Morph, Overload PLMs with the Item, Blind Movement", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": true + } + }, + "requires": [ + {"itemNotCollectedAtNode": 3}, + "canRiskPermanentLossOfAccess", + "h_canArtificialMorphMovement", + "canInsaneJump", + "canOffScreenMovement", + "SpaceJump", + "ScrewAttack" + ], + "exitCondition": { + "leaveNormally": {} + }, + "unlocksDoors": [ + {"types": ["ammo"], "requires": []} + ], + "collectsItems": [3], + "flashSuitChecked": true, + "note": [ + "Roll through the item to overload PLMs then quickly fall into the morph tunnel, unmorph at the correct spot and jump out before the acid touches Samus.", + "With a careful, blind, Space Jump with Screw Attack, move through the bomb walls while avoiding the spikes." + ], + "devNote": "This strat leaves the room, as it would be unreasonable and may not be possible to do anything at 1 with the broken camera movement." + }, { "id": 29, "link": [2, 2], @@ -946,6 +978,33 @@ "Moonfall against the Chozo statue to clip into the Morph Tunnel, past the Bomb block." ] }, + { + "link": [2, 4], + "name": "G-Mode, Overload PLMs with the Item, Fix Camera", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": true + } + }, + "requires": [ + {"itemNotCollectedAtNode": 3}, + "canRiskPermanentLossOfAccess", + "Morph", + "canInsaneJump", + "canOffScreenMovement" + ], + "collectsItems": [3], + "flashSuitChecked": true, + "note": [ + "Roll through the item to overload PLMs then fall into the morph tunnel, unmorph at the correct spot and quickly jump out before the acid touches Samus.", + "Exit G-mode and roll back into the tunnel to fix the camera and return avoiding the acid again." + ], + "devNote": [ + "Acid damage wasn't considered, as Samus needs to be in direct G-mode", + "FIXME: This could be done with a CF after overloading PLMs with the item." + ] + }, { "id": 37, "link": [3, 1], diff --git a/region/crateria/west/Green Pirates Shaft.json b/region/crateria/west/Green Pirates Shaft.json index db7d69c1e4..631a371e9f 100644 --- a/region/crateria/west/Green Pirates Shaft.json +++ b/region/crateria/west/Green Pirates Shaft.json @@ -847,6 +847,15 @@ "h_canArtificialMorphSpringBallBombJump", {"tech": "canJumpIntoIBJ"} ]} + ]}, + {"and": [ + "h_canArtificialMorphSpringBall", + "HiJump", + {"enemyDamage": { + "enemy": "Green Space Pirate (standing)", + "type": "contact", + "hits": 5 + }} ]} ]} ], @@ -970,6 +979,30 @@ "Climb up 2 screens, and perform a turnaround buffered spin-jump away from the door to trigger the transition, bypassing any lock on the door." ] }, + { + "link": [4, 2], + "name": "Very Deep Stuck X-Ray Climb, Morphed Pirate Kill", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": true + } + }, + "requires": [ + "canXRayClimb", + {"or": [ + "h_canArtificialMorphPowerBomb", + "h_canArtificialMorphIBJ" + ]} + ], + "bypassesDoorShell": true, + "flashSuitChecked": true, + "note": [ + "Enter with G-mode direct and kill the bottom Pirate with Bombs or a Power Bomb.", + "Back up to between 1 and 6 pixels from the door transition, and activate X-ray to get very deep stuck in the door.", + "Climb up 2 screens, and perform a turnaround buffered spin-jump away from the door to trigger the transition, bypassing any lock on the door." + ] + }, { "id": 40, "link": [4, 2], @@ -1211,6 +1244,15 @@ "h_canArtificialMorphSpringBallBombJump", {"tech": "canJumpIntoIBJ"} ]} + ]}, + {"and": [ + "h_canArtificialMorphSpringBall", + "HiJump", + {"enemyDamage": { + "enemy": "Green Space Pirate (standing)", + "type": "contact", + "hits": 5 + }} ]} ]} ], @@ -1473,7 +1515,7 @@ {"or": [ {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 8}}, {"and": [ - "canTrickyJump", + "canTrickyDodgeEnemies", "canEscapeEnemyGrab", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 5}} ]} @@ -1496,8 +1538,11 @@ }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], "flashSuitChecked": true, - "note": "It is possible to shake the beetom off near the right door, then lure it down to the bottom without taking more hits (or to kill the Pirates with Bombs).", - "devNote": "If starting the room at the bottom, this requires killing the pirates twice, but it's probably not worth fixing." + "note": "It is possible to shake the Beetom off near the right door while facing left, then lure it down to the bottom without taking more hits (or to kill the Pirates with Bombs).", + "devNote": [ + "FIXME: If starting the room at the bottom, the way it is written requires killing the pirates twice.", + "If starting from the top of the room, it's going to take more hits and wiggling the Beetom off above if the only way to kill the pirates is with Power Bombs." + ] }, { "id": 68, @@ -1565,7 +1610,7 @@ {"or": [ {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 8}}, {"and": [ - "canTrickyJump", + "canTrickyDodgeEnemies", "canEscapeEnemyGrab", {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 5}} ]} @@ -1588,8 +1633,11 @@ }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], "flashSuitChecked": true, - "note": "It is possible to shake the beetom off near the right door, then lure it down to the bottom without taking more hits (or to kill the Pirates with Bombs).", - "devNote": "If starting the room at the bottom, this requires killing the pirates twice, but it's probably not worth fixing." + "note": "It is possible to shake the Beetom off near the right door while facing left, then lure it down to the bottom without taking more hits (or to kill the Pirates with Bombs).", + "devNote": [ + "FIXME: If starting the room at the bottom, the way it is written requires killing the pirates twice.", + "If starting from the top of the room, it's going to take more hits and wiggling the Beetom off above if the only way to kill the pirates is with Power Bombs." + ] }, { "id": 71, diff --git a/region/crateria/west/Statues Room.json b/region/crateria/west/Statues Room.json index 4ed271eb71..4852c0c134 100644 --- a/region/crateria/west/Statues Room.json +++ b/region/crateria/west/Statues Room.json @@ -166,7 +166,9 @@ "morphed": false } }, - "requires": [], + "requires": [ + "f_TourianOpen" + ], "exitCondition": { "leaveWithGMode": { "morphed": false