From 1e4e15d5c4c85a133c2eaed61730ba472de215d0 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Tue, 8 Apr 2025 11:03:39 -0600 Subject: [PATCH 1/5] pillar room --- region/lowernorfair/east/Pillar Room.json | 75 +++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/region/lowernorfair/east/Pillar Room.json b/region/lowernorfair/east/Pillar Room.json index 2b1d6e9dc9..64d9ef68ca 100644 --- a/region/lowernorfair/east/Pillar Room.json +++ b/region/lowernorfair/east/Pillar Room.json @@ -558,6 +558,39 @@ "Acid damage is expected, but any mistakes greatly increases the time spent in acid." ] }, + { + "link": [1, 2], + "name": "G-Mode, Screw Attack", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": false + } + }, + "requires": [ + "ScrewAttack", + {"or": [ + "SpaceJump", + "canTrickyJump" + ]}, + "h_HeatedGModeOpenDifferentDoor" + ], + "exitCondition": { + "leaveNormally": {} + }, + "unlocksDoors": [ + { + "types": ["missiles"], + "requires": [{"heatFrames": 50}, {"acidFrames": 50}] + }, + {"types": ["super"], "requires": []}, + { + "types": ["powerbomb"], + "requires": [{"heatFrames": 110}, {"acidFrames": 110}] + } + ], + "flashSuitChecked": true + }, { "id": 12, "link": [2, 1], @@ -1161,6 +1194,48 @@ }, "bypassesDoorShell": true }, + { + "link": [2, 1], + "name": "G-Mode, Screw Attack", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": false + } + }, + "requires": [ + "ScrewAttack", + {"or": [ + "SpaceJump", + "canTrickyGMode", + {"and": [ + "canTrickyJump", + "canPreciseWalljump", + {"acidFrames": 10} + ]}, + {"and": [ + "canTrickyJump", + {"acidFrames": 24} + ]} + ]}, + "h_HeatedGModeOpenDifferentDoor" + ], + "exitCondition": { + "leaveNormally": {} + }, + "unlocksDoors": [ + { + "types": ["missiles"], + "requires": [{"heatFrames": 50}, {"acidFrames": 50}] + }, + {"types": ["super"], "requires": []}, + { + "types": ["powerbomb"], + "requires": [{"heatFrames": 110}, {"acidFrames": 110}] + } + ], + "flashSuitChecked": true + }, { "id": 26, "link": [2, 2], From 1e7dbd4bdebc2749f2edb2ebc2615a8031154730 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Tue, 8 Apr 2025 17:33:43 -0600 Subject: [PATCH 2/5] fast pillars --- .../east/Fast Pillars Setup Room.json | 223 ++++++++++++++++++ 1 file changed, 223 insertions(+) diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json index 338bb3b83e..7c8f7f4ec6 100644 --- a/region/lowernorfair/east/Fast Pillars Setup Room.json +++ b/region/lowernorfair/east/Fast Pillars Setup Room.json @@ -886,6 +886,91 @@ "canBeExtremelyPatient" ] }, + { + "link": [1, 4], + "name": "G-Mode", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": false + } + }, + "requires": [ + "h_heatedGMode", + {"or": [ + "SpaceJump", + "canWalljump", + "HiJump", + "canSpringBallJumpMidAir", + {"and": [ + "Charge", + "canUseFrozenEnemies" + ]}, + {"and": [ + "canTrickyDodgeEnemies", + "canJumpIntoIBJ" + ]} + ]}, + {"heatFrames": 80} + ], + "flashSuitChecked": true, + "note": "After climbing the room, it is possible to shoot at the door and then use X-Ray, so the shot hits immediately afterwards.", + "devNote": [ + "FIXME: It may be possible to kill the upper pirates in a way where Samus can collect their drops on the path to the door.", + "FIXME: It is possible to kill the pirates then IBJ or tricky dash jump, but using the runway will require at least one laser hit." + ] + }, + { + "link": [1, 4], + "name": "G-Mode Morph, Power Bomb the Pirate", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_heatedGMode", + {"ammo": { "type": "PowerBomb", "count": 3}}, + "h_canArtificialMorphIBJ", + "canInsaneJump", + {"heatFrames": 80} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Use 3 Power Bombs to kill the pirate. If done quickly, it is possible to also kill one of the wall pirates.", + "IBJ up the room while avoiding any of the invisible, stationary lasers that the pirates have placed;", + "it is also possible to manipulate the bottom pirate to place several lasers before killing it, in order to overload them", + "and prevent the wall pirates from placing one when they jump. Abort the IBJ and fall if necessary to avoid a pirate hit.", + "It is then possible to shoot at the door and then use X-Ray, so the shot hits immediately afterwards." + ], + "devNote": "FIXME: It may be possible to kill the upper pirates in a way where Samus can collect their drops on the path to the door." + }, + { + "link": [1, 4], + "name": "G-Mode Morph, IBJ Pirate Avoid", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_heatedGMode", + "h_canArtificialMorphIBJ", + "canTrickyGMode", + {"heatFrames": 80} + ], + "flashSuitChecked": true, + "note": [ + "IBJ up the room while avoiding any of the invisible, stationary lasers that the pirates have placed;", + "it is possible to manipulate the bottom pirate to place several lasers, in order to overload them,", + "and then IBJ over the pirate and IBJ again from the right corner.", + "OVerloading the lasers can prevent the wall pirates from placing one when they jump. Abort the IBJ and fall if necessary to avoid a pirate hit.", + "It is then possible to shoot at the door and then use X-Ray, so the shot hits immediately afterwards." + ] + }, { "id": 15, "link": [1, 5], @@ -922,6 +1007,28 @@ "Then clip through the Power Bomb blocks with a moonfall." ] }, + { + "link": [1, 5], + "name": "G-Mode Morph, Power Bomb the Blocks", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_heatedGMode", + "h_canArtificialMorphPowerBomb", + {"heatFrames": 120} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Place a Power Bomb then exit G-mode to break the blocks.", + "If entering in indirect, without Morph, quickly place the Power Bomb and unmorph and start shooting the pirate,", + "in order to prevent it from moving forward or placing invisible, stationary lasers over the way down." + ] + }, { "id": 17, "link": [2, 1], @@ -1146,6 +1253,24 @@ ], "flashSuitChecked": true }, + { + "link": [2, 5], + "name": "G-Mode Morph, Power Bomb the Blocks", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_heatedGMode", + "h_canArtificialMorphMovement", + "h_canArtificialMorphPowerBomb" + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": "Place a Power Bomb at the top of the room, then exit G-mode to have the blocks above break." + }, { "id": 27, "link": [3, 1], @@ -1483,6 +1608,24 @@ ], "flashSuitChecked": true }, + { + "link": [2, 5], + "name": "G-Mode Morph, Power Bomb the Blocks", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_heatedGMode", + "h_canArtificialMorphMovement", + "h_canArtificialMorphPowerBomb" + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": "Place a Power Bomb at the top of the room, then exit G-mode to have the blocks above break." + }, { "id": 63, "link": [4, 1], @@ -1652,6 +1795,63 @@ "bypassesDoorShell": true, "flashSuitChecked": true }, + { + "link": [4, 1], + "name": "G-Mode", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_HeatedGModeOpenDifferentDoor" + ], + "flashSuitChecked": true, + "note": "Avoid getting hit by one of the pirate's stationary, invisible lasers on G-mode exit." + }, + { + "link": [4, 1], + "name": "G-Mode, Pirate Kill, Pause Abuse", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "canTrickyGMode", + {"enemyKill": { + "enemies": [["Yellow Space Pirate (standing)"]] + }}, + "h_heatedGModePauseAbuse" + ], + "flashSuitChecked": true, + "note": [ + "Fall behind the standing pirate and avoid getting hit by one of its stationary, invisible lasers, or the wall pirate.", + "Crouch so that it can walk to the left door and kill it. Exit G-mode and pause abuse to pick up it's drops before going through the door." + ] + }, + { + "link": [4, 1], + "name": "G-Mode Morph, Pirate Kill, Pause Abuse", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "canTrickyGMode", + {"ammo": {"type": "PowerBomb","count": 3}}, + "h_heatedGModePauseAbuse" + ], + "flashSuitChecked": true, + "note": [ + "Fall behind the standing pirate and avoid getting hit by one of its stationary, invisible lasers, or the wall pirate.", + "Kill the pirate while it is by the left door, which requires 3 Power Bombs. Exit G-mode and pause abuse to pick up it's drops before going through the door." + ] + }, { "id": 48, "link": [4, 2], @@ -1795,6 +1995,29 @@ "flashSuitChecked": true, "note": "Fall onto the platform, then wait for the pirate to jump back to the right before returning through the door." }, + { + "link": [4, 5], + "name": "G-Mode Morph, Power Bomb the Blocks", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_heatedGMode", + "h_canArtificialMorphPowerBomb", + {"heatFrames": 120} + ], + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "note": [ + "Fall behind the standing pirate in order to prevent it from placing invisible, stationary lasers over the way down.", + "If entering in direct G-mode, it is possible to fall through the wall pirate, using the i-frames from the G-mode setup.", + "If entering with Morph or a way to move while morphed, it is possible to land on the floating platform and manipulate the wall pirate into overloading the shots, making it safer to go down below.", + "Place a Power Bomb then exit G-mode to break the blocks." + ] + }, { "id": 54, "link": [5, 1], From 56ee54ac1599b95025ba87fd50744c59773f90b2 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Tue, 8 Apr 2025 18:20:09 -0600 Subject: [PATCH 3/5] fix error --- region/lowernorfair/east/Fast Pillars Setup Room.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json index 7c8f7f4ec6..4eb439f000 100644 --- a/region/lowernorfair/east/Fast Pillars Setup Room.json +++ b/region/lowernorfair/east/Fast Pillars Setup Room.json @@ -146,7 +146,8 @@ "to": [ {"id": 1}, {"id": 2}, - {"id": 4} + {"id": 4}, + {"id": 5} ] }, { @@ -1265,7 +1266,8 @@ "requires": [ "h_heatedGMode", "h_canArtificialMorphMovement", - "h_canArtificialMorphPowerBomb" + "h_canArtificialMorphPowerBomb", + {"heatFrames": 0} ], "clearsObstacles": ["A"], "flashSuitChecked": true, @@ -1609,7 +1611,7 @@ "flashSuitChecked": true }, { - "link": [2, 5], + "link": [3, 5], "name": "G-Mode Morph, Power Bomb the Blocks", "entranceCondition": { "comeInWithGMode": { From 01ff0456fdb23447e49108a6983a8c49d77bfedd Mon Sep 17 00:00:00 2001 From: kjbranch Date: Tue, 8 Apr 2025 18:21:39 -0600 Subject: [PATCH 4/5] fix error --- region/lowernorfair/east/Fast Pillars Setup Room.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/region/lowernorfair/east/Fast Pillars Setup Room.json b/region/lowernorfair/east/Fast Pillars Setup Room.json index 4eb439f000..58a195afc7 100644 --- a/region/lowernorfair/east/Fast Pillars Setup Room.json +++ b/region/lowernorfair/east/Fast Pillars Setup Room.json @@ -1622,7 +1622,8 @@ "requires": [ "h_heatedGMode", "h_canArtificialMorphMovement", - "h_canArtificialMorphPowerBomb" + "h_canArtificialMorphPowerBomb", + {"heatFrames": 0} ], "clearsObstacles": ["A"], "flashSuitChecked": true, From 3d2982d18a6566cea3da129bffc4a71234812fd6 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Wed, 9 Apr 2025 10:26:17 -0600 Subject: [PATCH 5/5] feedback update --- region/lowernorfair/east/Pillar Room.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/region/lowernorfair/east/Pillar Room.json b/region/lowernorfair/east/Pillar Room.json index 64d9ef68ca..e6ac1b93da 100644 --- a/region/lowernorfair/east/Pillar Room.json +++ b/region/lowernorfair/east/Pillar Room.json @@ -581,12 +581,18 @@ "unlocksDoors": [ { "types": ["missiles"], - "requires": [{"heatFrames": 50}, {"acidFrames": 50}] + "requires": [{"heatFrames": 50}] }, {"types": ["super"], "requires": []}, { "types": ["powerbomb"], - "requires": [{"heatFrames": 110}, {"acidFrames": 110}] + "requires": [ + {"or": [ + "SpaceJump", + "canInsaneJump", + {"acidFrames": 15} + ]} + ] } ], "flashSuitChecked": true