From 95fe31af40e43d734da21bbf67001349872e2b43 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Sun, 30 Mar 2025 00:32:50 -0600 Subject: [PATCH 1/4] climb --- region/crateria/central/Climb.json | 91 ++++++++++++++++++++++++------ 1 file changed, 73 insertions(+), 18 deletions(-) diff --git a/region/crateria/central/Climb.json b/region/crateria/central/Climb.json index fe59ffaaf9..8128d9592f 100644 --- a/region/crateria/central/Climb.json +++ b/region/crateria/central/Climb.json @@ -692,6 +692,10 @@ }, "requires": [ {"notable": "G-Mode Morph Blind Climb to the Top"}, + {"or": [ + "canTrickyGMode", + "Morph" + ]}, "h_canArtificialMorphMovement", "canOffScreenMovement", {"or": [ @@ -810,7 +814,17 @@ "requires": [ "h_canArtificialMorphMovement", "canOffScreenMovement", - "h_ClimbWithoutLava" + {"or": [ + "h_ClimbWithoutLava", + {"and": [ + "h_lavaProof", + {"or": [ + "h_canArtificialMorphSpringBall", + "Morph", + "Gravity" + ]} + ]} + ]} ], "clearsObstacles": ["B"], "flashSuitChecked": true, @@ -1032,8 +1046,7 @@ "requires": [ {"or": [ "h_ClimbWithoutLava", - "h_lavaProof", - {"obstaclesNotCleared": ["B"]} + "h_lavaProof" ]} ], "clearsObstacles": ["B"], @@ -1310,20 +1323,40 @@ }, "requires": [ {"or": [ - "h_canArtificialMorphSpringBall", - "Morph" + {"and": [ + "h_canArtificialMorphSpringBall", + {"or": [ + "HiJump", + "canTrickyDodgeEnemies" + ]} + ]}, + {"and": [ + "Morph", + {"or": [ + "h_canArtificialMorphSpringBall", + "h_canArtificialMorphBombs", + "h_canFourTileJumpMorph" + ]} + ]}, + {"and": [ + "h_ZebesNotAwake", + {"or": [ + "h_canArtificialMorphSpringBall", + "h_canArtificialMorphBombs" + ]} + ]} ]} ], "flashSuitChecked": true, "note": [ "Overload PLMs using the scroll block at the top of the stairs next to the bomb blocks.", - "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit or unmorphing." + "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit from a pirate or its stationary, invisible lasers." ] }, { "id": 56, "link": [4, 3], - "name": "G-Mode Morph Insane IBJ to Top (from Crateria Supers Bottom)", + "name": "G-Mode Morph Insane IBJ to Top", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1332,6 +1365,7 @@ }, "requires": [ {"notable": "G-Mode Morph Insane IBJ to Top"}, + "canTrickyGMode", "h_canArtificialMorphIBJ", "canBeExtremelyPatient" ], @@ -1344,7 +1378,7 @@ { "id": 57, "link": [4, 3], - "name": "G-Mode Morph IBJ with PBs", + "name": "G-Mode Morph with Power Bombs", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1352,7 +1386,10 @@ } }, "requires": [ - "h_canArtificialMorphIBJ", + {"or": [ + "h_canArtificialMorphSpringBall", + "h_canArtificialMorphIBJ" + ]}, {"ammo": {"type": "PowerBomb", "count": 7}} ], "flashSuitChecked": true, @@ -1746,20 +1783,30 @@ }, "requires": [ {"or": [ - "h_canArtificialMorphSpringBall", - "Morph" + "Morph", + {"and": [ + "h_canArtificialMorphSpringBall", + {"or": [ + "HiJump", + "canTrickyDodgeEnemies" + ]} + ]}, + {"and": [ + "h_ZebesNotAwake", + "h_canArtificialMorphMovement" + ]} ]} ], "flashSuitChecked": true, "note": [ "Overload PLMs using the scroll block next to any of the bomb blocks in the room, allowing passage through the bomb blocks at the top by making them become air.", - "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit or unmorphing." + "If Morph is not available, careful movement is needed with SpringBall to reach the top without taking a hit from the pirates or their stationary, invisible lasers." ] }, { "id": 79, "link": [5, 3], - "name": "G-Mode Morph Insane IBJ to Top (from Pit Room)", + "name": "G-Mode Morph Insane IBJ to Top", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1768,6 +1815,7 @@ }, "requires": [ {"notable": "G-Mode Morph Insane IBJ to Top"}, + "canTrickyGMode", "h_canArtificialMorphIBJ", "canBeExtremelyPatient" ], @@ -1780,7 +1828,7 @@ { "id": 80, "link": [5, 3], - "name": "G-Mode Morph IBJ with PBs", + "name": "G-Mode Morph with Power Bombs", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1788,7 +1836,10 @@ } }, "requires": [ - "h_canArtificialMorphIBJ", + {"or": [ + "h_canArtificialMorphSpringBall", + "h_canArtificialMorphIBJ" + ]}, {"ammo": {"type": "PowerBomb", "count": 8}} ], "flashSuitChecked": true, @@ -1852,23 +1903,27 @@ "h_canArtificialMorphSpringBall", {"or": [ "HiJump", - "canCarefulJump" + "canTrickyDodgeEnemies" ]} ]}, {"and": [ "h_canArtificialMorphIBJ", - "canTrickyJump" + "canTrickyGMode" ]}, {"and": [ "h_canArtificialMorphMovement", "h_canArtificialMorphPowerBomb" + ]}, + {"and": [ + "h_ZebesNotAwake", + "h_canArtificialMorphMovement" ]} ]} ], "flashSuitChecked": true, "note": [ "Overload PLMs using the scroll block next to the bottom right bomb blocks, allowing passage through them by making them become air.", - "If Morph is unavailable, then careful movement will be required to get past the Pirates without taking a hit.", + "If Morph is unavailable, then careful movement will be required to get past the Pirates without taking a hit from them or their stationary, invisible lasers.", "If using a PB to kill the pirates, overload the PLMs at the bottom. If the top bomb block is hit with a PB before PLMs are overloaded, they will remain solid." ] }, From 8fce265e134b44164ab86b35ad3d2af82854c74e Mon Sep 17 00:00:00 2001 From: kjbranch Date: Sun, 30 Mar 2025 01:30:47 -0600 Subject: [PATCH 2/4] A couple more rooms --- .../crateria/central/Crateria Super Room.json | 72 ++++++++++++++++--- region/crateria/central/Landing Site.json | 26 ++++--- 2 files changed, 82 insertions(+), 16 deletions(-) diff --git a/region/crateria/central/Crateria Super Room.json b/region/crateria/central/Crateria Super Room.json index a1d16fa066..b867c7ca3f 100644 --- a/region/crateria/central/Crateria Super Room.json +++ b/region/crateria/central/Crateria Super Room.json @@ -548,7 +548,7 @@ "Morph", "Grapple", {"or": [ - "canCarefulJump", + "canTrickyJump", {"spikeHits": 1} ]}, {"or": [ @@ -564,12 +564,12 @@ ], "flashSuitChecked": true, "note": "Quickly grapple to then release grapple on the grapple blocks a few times until they stop working. Be careful not to fall into the spikes.", - "devNote": "FIXME: Grapple will quickly overload PLMS. It is barely possible to cross the gap using short grapples, canResetFallSpeed, and ending with a swing." + "devNote": "FIXME: Grapple will quickly overload PLMS. It is barely possible to cross the gap using short grapples, canResetFallSpeed, and ending with a swing." }, { "id": 16, "link": [1, 5], - "name": "G-Mode Morph Overload PLMs by PBing Super Item", + "name": "G-Mode Morph Overload PLMs by Power Bombing Item", "entranceCondition": { "comeInWithGMode": { "mode": "direct", @@ -606,9 +606,62 @@ ]} ], "flashSuitChecked": true, - "note": "Place the PBs exactly two tiles left of the Morph tunnel. Be sure not to touch the item if this strat will be needed again in the future.", - "devNote": [ - "FIXME Add strat for going down without PBs, by using the uncollected item to overload PLMs. This can only be done once, as it forces item pickup." + "note": "Place the PBs exactly two tiles left of the Morph tunnel. Be sure not to touch the item if this strat will be needed again in the future." + }, + { + "link": [1, 5], + "name": "G-Mode Morph Overload PLMs Collect the Item", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": true + } + }, + "requires": [ + {"or": [ + {"and": [ + {"itemNotCollectedAtNode": 3}, + "canRiskPermanentLossOfAccess" + ]}, + {"and": [ + "Morph", + "Grapple", + {"or": [ + "canTrickyJump", + {"spikeHits": 1} + ]} + ]} + ]}, + {"or": [ + {"and": [ + "h_canArtificialMorphSpringBall", + {"spikeHits": 3}, + {"or": [ + "h_canArtificialMorphBombHorizontally", + {"spikeHits": 1} + ]} + ]}, + {"and": [ + "Morph", + {"or": [ + "SpaceJump", + {"and": [ + {"spikeHits": 1}, + {"or": [ + "canUseIFrames", + {"spikeHits": 1} + ]} + ]} + ]} + ]} + ]} + ], + "collectsItems": [3], + "flashSuitChecked": true, + "note": [ + "Roll through the item to overload PLMs, then go down through the speed blocks and exit G-mode to collect the item.", + "Note that if the item has already been collected, Samus can overload PLMs with Grapple.", + "Quickly grapple to then release grapple on the grapple blocks a few times until they stop working. Be careful not to fall into the spikes." ] }, { @@ -1158,7 +1211,10 @@ ], "flashSuitChecked": true, "note": "Wall jump up 9 times, placing a PB at the top. Only works in direct g-mode with the item still uncollected.", - "devNote": "FIXME: Using this strat won't risk canRiskPermanentLossOfAccess if the player could x-ray climb instead. However if the adjacent room is heated and Samus is really low energy, this could be a problem." + "devNote": [ + "FIXME: Using this strat won't risk canRiskPermanentLossOfAccess if the player could x-ray climb instead. However if the adjacent room is heated and Samus is really low energy, this could be a problem.", + "Placing the Power Bombs lower, on the magic tile, could overload PLMs with fewer, likely with as low as 2 Power Bombs." + ] }, { "id": 42, @@ -1172,7 +1228,7 @@ }, "requires": [ {"notable": "G-Mode Morph Long Ceiling Bomb Jump"}, - "canLongIBJ", + "h_canArtificialMorphLongIBJ", "h_canArtificialMorphCeilingBombJump", "canBeVeryPatient" ], diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json index 9feed5202c..0652a977e9 100644 --- a/region/crateria/central/Landing Site.json +++ b/region/crateria/central/Landing Site.json @@ -503,10 +503,7 @@ "Then pass through the bomb blocks (which will have become air).", "If needed, continue on through the next set of bomb blocks (which will also be air) to reach the bottom right door." ], - "devNote": [ - "FIXME: add something to indicate we can refill at the Ship on the way (e.g. if we add a logical requirement type for this).", - "This only affects the logic in the case where we can't walljump or get over the top in some other way." - ] + "devNote": "FIXME: It is possible to refill at the Ship on the way." }, { "id": 89, @@ -610,15 +607,12 @@ } }, "requires": [ - "h_canArtificialMorphBombs" + "h_canArtificialMorphMovement" ], "flashSuitChecked": true, "note": [ "Overload the scroll PLMs which are one tile to the left of the bomb blocks leading to Gauntlet.", "Then pass through the bomb blocks (which will have become air)." - ], - "devNote": [ - "Other items (SpringBall or Power Bombs) could be used to get through but these cases are not relevant, as Bombs are needed to do anything useful with G-Mode Morph after this point." ] }, { @@ -1394,6 +1388,22 @@ "Without, the runway is not as long, but it's much longer than it takes to get max run speed." ] }, + { + "link": [4, 4], + "name": "G-Mode Morph, Power Bomb the Blocks", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": true + } + }, + "requires": [ + "h_canArtificialMorphPowerBomb" + ], + "clearsObstacles": ["B"], + "flashSuitChecked": true, + "note": "Power Bomb the blocks then exit G-mode for them to break." + }, { "id": 62, "link": [4, 5], From 252ddb229c57133e1486cfd1bffd82d9036a0e67 Mon Sep 17 00:00:00 2001 From: kjbranch Date: Sun, 30 Mar 2025 13:57:37 -0600 Subject: [PATCH 3/4] Pit, Parlor --- .../crateria/central/Crateria Super Room.json | 63 ++++++++++++++ region/crateria/central/Landing Site.json | 61 +++++++++++-- .../crateria/central/Parlor and Alcatraz.json | 85 +++++++++++-------- region/crateria/central/Pit Room.json | 11 +-- 4 files changed, 174 insertions(+), 46 deletions(-) diff --git a/region/crateria/central/Crateria Super Room.json b/region/crateria/central/Crateria Super Room.json index b867c7ca3f..fa09031886 100644 --- a/region/crateria/central/Crateria Super Room.json +++ b/region/crateria/central/Crateria Super Room.json @@ -1017,6 +1017,40 @@ ], "clearsObstacles": ["A"] }, + { + "link": [2, 2], + "name": "Direct G-Mode, CF, Shinespark, Return", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": true + } + }, + "requires": [ + "h_canArtificialMorphCrystalFlash", + {"or": [ + {"and": [ + "canTrivialUseFrozenEnemies", + "h_canShineChargeMaxRunway", + "canMidairShinespark", + {"shinespark": {"frames": 118, "excessFrames": 6}} + ]}, + {"and": [ + "canShinechargeMovementComplex", + {"canShineCharge": {"usedTiles": 34, "openEnd": 0}}, + {"shinespark": {"frames": 128, "excessFrames": 6}} + ]} + ]}, + {"autoReserveTrigger": {"minReserveEnergy": 1}} + ], + "collectsItems": [3], + "flashSuitChecked": true, + "note": [ + "Crystal Flash then Shinespark up to the item, touch it, and return through the speed block that is now air.", + "Use the Boyons and acid to reserve trigger to exit G-mode below to collect the item." + ], + "devNote": "These shinespark frames could be reduced with more items or tech, but in direct G-mode, Samus will need to CF and reserve trigger to collect the item." + }, { "id": 35, "link": [2, 3], @@ -1301,6 +1335,35 @@ ], "devNote": "It's not really insane jump difficult, but that is where you think about needing to avoid the damage. And failing the jump is still very punishing due to falling into the acid." }, + { + "link": [2, 5], + "name": "Direct G-Mode, Shinespark, Return", + "entranceCondition": { + "comeInWithGMode": { + "mode": "direct", + "morphed": false + } + }, + "requires": [ + {"or": [ + {"and": [ + "canTrivialUseFrozenEnemies", + "h_canShineChargeMaxRunway", + "canMidairShinespark", + {"shinespark": {"frames": 118, "excessFrames": 6}} + ]}, + {"and": [ + "canShinechargeMovementComplex", + {"canShineCharge": {"usedTiles": 34, "openEnd": 0}}, + {"shinespark": {"frames": 128, "excessFrames": 6}} + ]} + ]} + ], + "collectsItems": [3], + "flashSuitChecked": true, + "note": "Shinespark up to the item, touch it, and return through the speed block that is now air. Exit G-mode below to collect the item.", + "devNote": "These shinespark frames could be reduced with more items or tech, but in direct G-mode, Samus will be at low Energy and need an energy free shinespark." + }, { "id": 48, "link": [3, 4], diff --git a/region/crateria/central/Landing Site.json b/region/crateria/central/Landing Site.json index 0652a977e9..09e078f37e 100644 --- a/region/crateria/central/Landing Site.json +++ b/region/crateria/central/Landing Site.json @@ -471,6 +471,55 @@ "clearsObstacles": ["A"], "flashSuitChecked": true }, + { + "link": [1, 1], + "name": "G-Mode through Bomb Blocks, Ship Refill", + "entranceCondition": { + "comeInWithGMode": { + "mode": "any", + "morphed": false + } + }, + "requires": [ + {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}, + {"or": [ + "SpaceJump", + {"and": [ + "HiJump", + "canSpringBallJumpMidAir" + ]}, + "canDelayedWalljump", + {"and": [ + "SpeedBooster", + "HiJump" + ]}, + {"and": [ + "SpeedBooster", + {"or": [ + "HiJump", + "canSpringBallJumpMidAir", + "canWalljump" + ]} + ]}, + {"and": [ + "h_canShineChargeMaxRunway", + "canMidairShinespark", + {"or": [ + {"shinespark": {"frames": 29, "excessFrames": 1}}, + {"and": [ + "canShinechargeMovementComplex", + {"shinespark": {"frames": 22, "excessFrames": 1}} + ]} + ]} + ]} + ]} + ], + "flashSuitChecked": true, + "note": [ + "Overload the scroll PLMs which are one tile to the left of the bomb blocks, then pass through them.", + "Refill at the ship, then return." + ] + }, { "id": 11, "link": [1, 4], @@ -496,14 +545,15 @@ "morphed": false } }, - "requires": [], + "requires": [ + {"refill": ["Energy", "Missile", "Super", "PowerBomb"]} + ], "flashSuitChecked": true, "note": [ "Overload the scroll PLMs which are one tile to the left of the bomb blocks leading to Gauntlet.", "Then pass through the bomb blocks (which will have become air).", - "If needed, continue on through the next set of bomb blocks (which will also be air) to reach the bottom right door." - ], - "devNote": "FIXME: It is possible to refill at the Ship on the way." + "If needed, refill at the ship and/or continue on through the next set of bomb blocks to reach the bottom right door." + ] }, { "id": 89, @@ -1557,7 +1607,8 @@ "name": "Refill", "requires": [ {"refill": ["Energy", "Missile", "Super", "PowerBomb"]} - ] + ], + "devNote": "If the ship refill is somehow altered or removed, this needs to be updated here and on the G-mode strat from 1->4." }, { "id": 73, diff --git a/region/crateria/central/Parlor and Alcatraz.json b/region/crateria/central/Parlor and Alcatraz.json index 68d351255b..9ffbff153e 100644 --- a/region/crateria/central/Parlor and Alcatraz.json +++ b/region/crateria/central/Parlor and Alcatraz.json @@ -450,7 +450,7 @@ { "id": 6, "link": [1, 2], - "name": "G-Mode Morph through Terminator Bomb Blocks into Save", + "name": "G-Mode Morph through Bomb Blocks to Middle Left Door", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -471,7 +471,7 @@ { "id": 7, "link": [1, 5], - "name": "G-Mode Morph through Terminator Bomb Blocks into Alcatraz", + "name": "G-Mode Morph through Bomb Blocks into Alcatraz", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -559,7 +559,7 @@ { "id": 12, "link": [1, 8], - "name": "G-Mode through Terminator Bomb Blocks (from Left)", + "name": "G-Mode through Bomb Blocks", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -576,7 +576,7 @@ { "id": 13, "link": [2, 1], - "name": "G-Mode Morph through Terminator Bomb Blocks (from Save)", + "name": "G-Mode Morph through Top Left Bomb Blocks", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -586,9 +586,8 @@ "requires": [], "flashSuitChecked": true, "note": [ - "Use G-Mode Morph to pass through the tunnel as you enter the room.", - "Then unmorph and get up to the top of the room normally.", - "There are scroll PLMs at the two-tile gap as you approach the Terminator bomb blocks, which can be used to overload PLMs.", + "Use artificial morph to pass through the tunnel, then unmorph and get up to the top of the room normally.", + "There are scroll PLMs at the two-tile gap as Samus approach the top left bomb blocks, which can be used to overload PLMs.", "The bomb blocks then become air and can be passed through." ] }, @@ -689,7 +688,7 @@ { "id": 19, "link": [2, 5], - "name": "G-Mode Morph into Alcatraz (from Save)", + "name": "G-Mode Morph into Alcatraz", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -701,7 +700,7 @@ ], "flashSuitChecked": true, "note": [ - "Use G-Mode Morph to pass through the tunnel as you enter the room.", + "Use artificial morph to pass through the tunnel at the entrance of the room.", "Use Bombs or SpringBall to navigate to Alcatraz without unmorphing." ] }, @@ -834,7 +833,7 @@ { "id": 24, "link": [2, 8], - "name": "G-Mode Morph out of Save", + "name": "G-Mode Morph", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -847,7 +846,7 @@ { "id": 25, "link": [3, 1], - "name": "G-Mode through Terminator Bomb Blocks (from Right)", + "name": "G-Mode through Top Left Bomb Blocks", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -977,7 +976,7 @@ { "id": 28, "link": [3, 2], - "name": "G-Mode Morph into Save", + "name": "G-Mode Morph to Middle Left Door", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1163,7 +1162,7 @@ { "id": 37, "link": [4, 1], - "name": "G-Mode through Terminator Bomb Blocks (from Right)", + "name": "G-Mode through Top Left Bomb Blocks", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1258,7 +1257,7 @@ { "id": 43, "link": [4, 2], - "name": "G-Mode Morph into Save (from Top Right Door)", + "name": "G-Mode Morph to Middle Left Door", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1319,7 +1318,7 @@ { "id": 47, "link": [4, 5], - "name": "G-Mode Morph into Alcatraz (from Top Right Door)", + "name": "G-Mode Morph into Alcatraz", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1329,7 +1328,13 @@ "requires": [ {"or": [ "h_canArtificialMorphMovement", - "h_canArtificialMorphPowerBomb", + {"and": [ + "h_canArtificialMorphPowerBomb", + {"or": [ + "h_additionalBomb", + "canTrickyGMode" + ]} + ]}, {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}, "h_ZebesNotAwake" ]} @@ -1338,10 +1343,10 @@ "note": [ "There are scroll PLMs one tile to the right of the bomb blocks which can be used to overload PLMs, turning the bomb blocks to air.", "However, if Zebes is awake, two Geemers block the way.", - "With a regular G-mode setup and no suits, a single Geemer hit would kill Samus.", "The Geemer hits can be avoided with Bombs or SpringBall.", - "Alternatively, a Power Bomb, placed precisely and as early as possible, can be used to jump onto the ledge and go around to the left entrance to Alcatraz (necessary since the Power Bomb blast will render the bomb blocks solid, unable to be turned to air).", - "A Geemer hit can also be tanked by having Varia or Gravity or by coming in with higher energy (e.g. with G-mode immobile)." + "Alternatively, use a Power Bombs, to kill the Geemers and another to boost over to the left Alcatraz entrance, as the Power Bomb blast will render the bomb blocks solid, unable to be turned to air.", + "This is possible but tricky to do with a single Power Bomb: In direct G-mode, use Samus' i-frames to roll through the first Geemer and horizontally bomb boost onto the ledge.", + "In indirect G-mode, roll immediately and place the Power Bomb just after the first downward slope to jump over both Geemers." ] }, { @@ -1353,7 +1358,7 @@ { "id": 49, "link": [5, 1], - "name": "G-Mode Morph through Terminator Blocks (from Alcatraz)", + "name": "G-Mode Morph through Top Left Bomb Blocks", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1361,15 +1366,18 @@ } }, "requires": [ - "canOffScreenMovement", - "h_canArtificialMorphMovement" + "h_canArtificialMorphMovement", + {"or": [ + "canTrickyDodgeEnemies", + {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}, + "h_ZebesNotAwake" + ]} ], "flashSuitChecked": true, "note": [ - "Use Bombs or SpringBall to navigate with artificial morph without unmorphing.", "There are scroll PLMs next to the bomb blocks and on the ledge below the Alcatraz exit, which will overload PLMs when going through them.", - "The bomb blocks then become air and can be passed through.", - "You will need to briefly navigate off-screen while to the right of Alcatraz before coming back left." + "Samus will need to briefly navigate off-screen while to the right of Alcatraz before coming back left.", + "Note that the global Geemer may still be in this area if traversing the room quickly, and can hit Samus off-screen." ] }, { @@ -1453,7 +1461,7 @@ { "id": 55, "link": [5, 2], - "name": "G-Mode Morph through Left Door Morph Tunnel (from Alcatraz)", + "name": "G-Mode Morph to Middle Left Door", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1466,10 +1474,10 @@ ], "flashSuitChecked": true, "note": [ - "Use Bombs or SpringBall to navigate with artificial morph without unmorphing.", "There are scroll PLMs next to the bomb blocks and on the ledge below the Alcatraz exit, which will overload PLMs when going through them.", - "The bomb blocks then become air and can be passed through.", - "You will need to briefly navigate off-screen while to the right of Alcatraz before coming back left, and while going down the left shaft." + "Samus will need to briefly navigate off-screen while to the right of Alcatraz before coming back left.", + "Note that the global Geemer may still be in this area if traversing the room quickly, and can hit Samus off-screen.", + "Again traverse off-screen while going down the left shaft and through the morph tunnel." ] }, { @@ -1723,13 +1731,18 @@ } }, "requires": [ - "h_canArtificialMorphMovement" + "h_canArtificialMorphMovement", + {"or": [ + "canTrickyDodgeEnemies", + {"enemyDamage": {"enemy": "Geemer (blue)", "type": "contact", "hits": 1}}, + "h_ZebesNotAwake" + ]} ], "flashSuitChecked": true, "note": [ - "Use Bombs or SpringBall to navigate with artificial morph without unmorphing.", "There are scroll PLMs next to the bomb blocks and on the ledge below the Alcatraz exit, which will overload PLMs when going through them.", - "The bomb blocks then become air and can be passed through." + "Samus will need to briefly navigate off-screen while to the right of Alcatraz before coming back left.", + "Note that the global Geemer may still be in this area if traversing the room quickly, and can hit Samus off-screen." ] }, { @@ -1784,7 +1797,7 @@ { "id": 71, "link": [6, 1], - "name": "G-Mode through Terminator Bomb Blocks (from Right)", + "name": "G-Mode through Top Left Bomb Blocks", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1879,7 +1892,7 @@ { "id": 77, "link": [6, 2], - "name": "G-Mode Morph into Save", + "name": "G-Mode Morph to Middle Left Door", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2154,7 +2167,7 @@ { "id": 87, "link": [7, 1], - "name": "G-Mode through Terminator Bomb Blocks (from Right)", + "name": "G-Mode through Top Left Bomb Blocks", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -2172,7 +2185,7 @@ { "id": 88, "link": [7, 2], - "name": "G-Mode Morph into Save", + "name": "G-Mode Morph to Middle Left Door", "entranceCondition": { "comeInWithGMode": { "mode": "any", diff --git a/region/crateria/central/Pit Room.json b/region/crateria/central/Pit Room.json index ac05e8f7b6..2d681690ed 100644 --- a/region/crateria/central/Pit Room.json +++ b/region/crateria/central/Pit Room.json @@ -301,14 +301,15 @@ } }, "requires": [ - "h_canArtificialMorphBombs" + "h_canArtificialMorphBombs", + "canTrickyJump" ], "clearsObstacles": ["A"], "flashSuitChecked": true, "note": [ "Overload PLMs using the scroll block directly above the bomb block leading down to the item.", - "When the bomb blocks turn to air, lay bombs as Samus falls.", - "After landing on the first platform, quickly unmorph and use X-ray to cancel G-mode before the bombs explode." + "Carefully land on the solid block and avoid falling further.", + "Use a Bomb to boost Samus, then on the descent place one in the air, one on the ground, and quickly use X-Ray before they explode to exit G-mode and break the blocks." ] }, { @@ -571,8 +572,8 @@ "note": [ "Without Morph, the pirates will not spawn.", "Overload PLMs using the scroll block directly above the bomb block leading down to the item.", - "When the bomb blocks turn to air, lay bombs as Samus falls.", - "After landing on the first platform, quickly unmorph and use X-Ray to cancel G-mode before the bombs explode." + "Carefully land on the solid block and avoid falling further.", + "Use a Bomb to boost Samus, then on the descent place one in the air, one on the ground, and quickly use X-Ray before they explode to exit G-mode and break the blocks." ] }, { From 4589ff6d89a04f2f304705b9ea3eeb56d49ea38e Mon Sep 17 00:00:00 2001 From: kjbranch Date: Thu, 3 Apr 2025 09:14:33 -0600 Subject: [PATCH 4/4] add spring fling strats from master into new strat as well --- .../crateria/central/Crateria Super Room.json | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/region/crateria/central/Crateria Super Room.json b/region/crateria/central/Crateria Super Room.json index 04ddd36cb4..f5a30ff9a4 100644 --- a/region/crateria/central/Crateria Super Room.json +++ b/region/crateria/central/Crateria Super Room.json @@ -639,9 +639,6 @@ "It is possible to cross the spike pit with spring flings and two spike hits.", "Pause then jump just before the fade out ends and turn Spring Ball off in order to get more horizontal distance at the start and avoid one spike hit.", "Turn Spring Ball off and on again while jumping on the spikes to get across to avoid another." - ], - "devNote": [ - "FIXME Add strat for going down without PBs, by using the uncollected item to overload PLMs. This can only be done once, as it forces item pickup." ] }, { @@ -671,11 +668,17 @@ {"or": [ {"and": [ "h_canArtificialMorphSpringBall", - {"spikeHits": 3}, - {"or": [ - "h_canArtificialMorphBombHorizontally", - {"spikeHits": 1} - ]} + {"spikeHits": 4} + ]}, + {"and": [ + "h_canArtificialMorphSpringBall", + "h_canArtificialMorphBombHorizontally", + {"spikeHits": 3} + ]}, + {"and": [ + "h_canArtificialMorphSpringFling", + "canTrickyJump", + {"spikeHits": 2} ]}, {"and": [ "Morph", @@ -696,9 +699,12 @@ "flashSuitChecked": true, "note": [ "Roll through the item to overload PLMs, then go down through the speed blocks and exit G-mode to collect the item.", - "Note that if the item has already been collected, Samus can overload PLMs with Grapple.", - "Quickly grapple to then release grapple on the grapple blocks a few times until they stop working. Be careful not to fall into the spikes." - ] + "Note that if the item has already been collected, Samus can overload PLMs with Grapple." + ], + "detailNote": [ + "With Morph and Grapple, quickly grapple to then release grapple on the grapple blocks a few times until they stop working. Be careful not to fall into the spikes." + ], + "devNote": "FIXME: It is possible to cross with spike hits, but it would require a CF and reserve trigger below." }, { "id": 17,