diff --git a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json index cf4d557f6..dd6825de7 100644 --- a/region/wreckedship/main/Wrecked Ship Energy Tank Room.json +++ b/region/wreckedship/main/Wrecked Ship Energy Tank Room.json @@ -88,6 +88,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Run must be synched with the low tide." }, { @@ -110,7 +111,8 @@ "steepUpTiles": 2 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 44, @@ -164,7 +166,8 @@ "blocks": [{"position": [5, 2], "note": "Closest Grapple block to the door"}] } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 3, @@ -189,6 +192,7 @@ "leaveWithSpark": {} }, "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": [ "Two thorn hits are expected per attempt (with any additional leniency hits being multiplied by this amount).", "FIXME: There is likely a fast wall jump climb strat with more spark frames." @@ -259,7 +263,8 @@ "canSpikeSuit", {"shinespark": {"frames": 2, "excessFrames": 2}} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 40, @@ -276,7 +281,8 @@ "h_thornXModeSpikeSuit", {"shinespark": {"frames": 2, "excessFrames": 2}} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 41, @@ -293,7 +299,8 @@ "h_thornDoubleXModeBlueSuit", {"shinespark": {"frames": 0, "excessFrames": 0}} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 37, @@ -302,6 +309,7 @@ "requires": [ "f_DefeatedPhantoon", {"resetRoom": {"nodes": [1]}}, + "canDash", "canDodgeWhileShooting", {"or": [ "Gravity", @@ -349,6 +357,26 @@ "Without movement items, hold down while jumping to ascend while on the platform." ] }, + { + "link": [1, 1], + "name": "Skultera Farm (Blue Suit)", + "requires": [ + "f_DefeatedPhantoon", + {"resetRoom": {"nodes": [1]}}, + {"haveBlueSuit": {}}, + {"or": [ + {"and": [ + "Gravity", + {"cycleFrames": 250} + ]}, + {"cycleFrames": 335} + ]} + ], + "resetsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Skultera", "count": 1}], + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 38, "link": [1, 1], @@ -356,6 +384,7 @@ "requires": [ "f_DefeatedPhantoon", {"resetRoom": {"nodes": [1]}}, + "canDash", "Gravity", "SpaceJump", {"or": [ @@ -381,7 +410,8 @@ ], "resetsObstacles": ["A"], "farmCycleDrops": [{"enemy": "Skultera", "count": 1}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 4, @@ -390,7 +420,8 @@ "requires": [ "h_CrystalFlash" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 5, @@ -399,7 +430,8 @@ "requires": [ "SpaceJump" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 6, @@ -409,18 +441,20 @@ "Grapple", "f_DefeatedPhantoon" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 7, "link": [1, 2], - "name": "Walljump", + "name": "Wall Jump", "requires": [ "Gravity", "canWalljump", "f_DefeatedPhantoon" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Jump across the first platforms. It is fine to jump from them when they are a bit submerged.", "Get a bit of run speed on the final platform, and wall jump if necessary.", @@ -432,6 +466,7 @@ "link": [1, 2], "name": "Platforming", "requires": [ + "canDash", "canCarefulJump", {"disableEquipment": "HiJump"}, "f_DefeatedPhantoon" @@ -458,6 +493,120 @@ "This should bounce on the third platform and get to the item." ] }, + { + "link": [1, 2], + "name": "Horizontal Bomb Boost", + "requires": [ + "f_DefeatedPhantoon", + "canJumpIntoIBJ", + "canBombHorizontally", + "canTrickyJump", + "h_complexToCarryFlashSuit" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Use a mid-air horizontal bomb boost to reach the first platform.", + "Jump across to the last platform.", + "Wait until the water is low, let the platform sink slightly,", + "then jump and horizontal bomb boost to the item." + ], + "detailNote": [ + "If HiJump is available, then it is possible to simply spin jump from the underwater platform to the first moving platform.", + "If HiJump cannot be disabled, then the bomb boost from the last platform is more difficult:", + "in this case Samus must jump, lay the bomb on the way down, then jump again to a precise height and morph to get the boost." + ] + }, + { + "link": [1, 2], + "name": "Horizontal Power Bomb Boost", + "requires": [ + "f_DefeatedPhantoon", + "canMidAirMorph", + {"tech": "canJumpIntoIBJ"}, + {"tech": "canBombHorizontally"}, + "canInsaneJump", + {"or": [ + {"and":[ + "HiJump", + {"ammo": {"type": "PowerBomb", "count": 1}} + ]}, + {"ammo": {"type": "PowerBomb", "count": 2}} + ]}, + "h_complexToCarryFlashSuit" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Use a mid-air horizontal Power Bomb boost to reach the first platform.", + "Jump across to the last platform.", + "Wait until the water is low, let the platform sink slightly,", + "then jump and horizontal Power Bomb boost to the item." + ], + "detailNote": [ + "If HiJump is available, then it is possible to simply spin jump from the underwater platform to the first moving platform, saving a Power Bomb.", + "If HiJump cannot be disabled, then the Power Bomb boost from the last platform is more difficult:", + "in this case Samus must jump, lay the Power Bomb on the way down, then jump again to a precise height and morph to get the boost." + ] + }, + { + "link": [1, 2], + "name": "Spring Ball Jump", + "requires": [ + "f_DefeatedPhantoon", + "Gravity", + "canSpringBallJumpMidAir" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Let the platform sink several tiles before jumping into a mid-air spring ball jump." + ] + }, + { + "link": [1, 2], + "name": "Spring Fling", + "requires": [ + "f_DefeatedPhantoon", + "canSpringFling" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Bounce on the platform, timing a pause to hit soon after bouncing,", + "then hold left and unequip Spring Ball to get a horizontal boost." + ] + }, + { + "link": [1, 2], + "name": "Gravity Jump", + "requires": [ + "f_DefeatedPhantoon", + "canGravityJump" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Sink on the platform until it on or near the floor, then gravity jump." + ] + }, + { + "link": [1, 2], + "name": "HiJump Insane Jump", + "requires": [ + "f_DefeatedPhantoon", + "HiJump", + "Gravity", + "canInsaneJump" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Sink on the platform a precise amount before spin jumping;", + "the peak of Samus' jump should just barely reach the ceiling or slightly below it,", + "making it possible to just barely make it to the ledge." + ] + }, { "id": 10, "link": [1, 2], @@ -468,7 +617,8 @@ "requires": [ {"shinespark": {"frames": 59, "excessFrames": 7}} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 11, @@ -492,6 +642,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Jump as far as possible before activating the spark, while sparking high enough to crash into the Chozo statue's hand." ], @@ -525,6 +676,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Gain a shinecharge while entering the room.", "Run back to the door, and then run left and jump as far as possible before activating the spark, while sparking high enough to crash into the Chozo statue's hand." @@ -544,6 +696,7 @@ ], "wallJumpAvoid": true, "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Arm pump until samus starts to move again. If the power is on, regular platforming can be used instead." }, { @@ -561,6 +714,7 @@ "h_complexToCarryFlashSuit" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Fling Samus from the first set of grapple blocks to the second set without falling.", "This requires precise timing but is made easier by morphing and unmorphing to reset Samus' fall speed." @@ -583,6 +737,7 @@ {"noFlashSuit": {}} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Fling Samus from the first set of grapple blocks to the second set without falling.", "This requires a frame-perfect release of Grapple and a 2-frame window to fire Grapple again." @@ -599,7 +754,8 @@ "canLongCeilingBombJump", "canBePatient" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 15, @@ -608,7 +764,14 @@ "requires": [ {"thornHits": 1}, {"or": [ - "canUseIFrames", + {"and": [ + "canUseIFrames", + "canDash" + ]}, + {"and": [ + {"tech": "canHorizontalDamageBoost"}, + "h_complexToCarryFlashSuit" + ]}, {"thornHits": 1} ]}, "canWalljump", @@ -616,13 +779,33 @@ {"or": [ "canRiskPermanentLossOfAccess", {"and": [ + "canDash", "canCarefulJump", {"disableEquipment": "HiJump"} ]}, - "Gravity" + {"and": [ + "Gravity", + "canDash" + ]}, + {"and": [ + "canJumpIntoIBJ", + "canBombHorizontally", + "canTrickyJump" + ]}, + {"and": [ + "Gravity", + "canSpringBallJumpMidAir" + ]}, + "canSpringFling", + {"and": [ + "HiJump", + "Gravity", + "canInsaneJump" + ]} ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "From the top right platform, jump to the left into the thorns, then climb the left wall.", "devNote": "The canCarefulJump and Gravity are here, as with either of those, there is access across with or without f_DefeatedPhantoon." }, @@ -648,6 +831,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Run from the adjacent room and jump at the end of the platform.", "From the top right platform, jump to the left and wall jump just above the spikes and climb the left wall." @@ -673,6 +857,7 @@ {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Run from the adjacent room and jump at the end of the platform.", "From the top right platform, jump to the left and wall jump just above the spikes and climb the left wall." @@ -695,6 +880,7 @@ {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Run from the adjacent room and jump at the end of the platform.", "From the top right platform, jump to the left and wall jump just above the spikes and climb the left wall." @@ -726,6 +912,7 @@ {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Using speed from the adjacent room, perform a ceiling mockball to make it across the gap." ], @@ -756,6 +943,7 @@ {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Using speed from the adjacent room, perform a ceiling mockball and equip or unequip Spring Ball to make it across the gap." ], @@ -784,6 +972,7 @@ {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": [ "The 5 thornHits are for lenience since it is difficult to get this first try." ] @@ -808,6 +997,7 @@ {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Run from the adjacent room and jump at the end of the platform.", "Aim down just before bonking the ceiling." @@ -827,6 +1017,7 @@ {"not": "f_DefeatedPhantoon"} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "In the spike pit, near the left wall, jump into an IBJ to climb out.", "devNote": "The h_IBJFromThorns requires canCarefulJump. There is no loss of access, because with that it is possible to get across with or without f_DefeatedPhantoon." }, @@ -842,13 +1033,21 @@ {"or": [ "canRiskPermanentLossOfAccess", {"and": [ + "canDash", "canCarefulJump", {"disableEquipment": "HiJump"} ]}, - "Gravity" + {"and": [ + "canJumpIntoIBJ", + "canBombHorizontally", + "canTrickyJump" + ]}, + "Gravity", + "canSpringFling" ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 19, @@ -865,7 +1064,7 @@ { "id": 20, "link": [1, 2], - "name": "G-mode Morph Ceiling Bomb Jump", + "name": "G-Mode Morph Ceiling Bomb Jump", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -877,7 +1076,8 @@ "canBePatient" ], "clearsObstacles": ["A"], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 21, @@ -890,6 +1090,7 @@ }, "requires": [], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "After teleporting, press down to retract Grapple, to prevent getting stuck inside the Chozo statue." }, { @@ -906,6 +1107,7 @@ "canOffScreenMovement" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "After teleporting, Samus should be standing inside the wall.", "Retract Grapple by pressing up, which will pull Samus down and right.", @@ -928,6 +1130,7 @@ "canXRayClimb" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Exit the previous room with Samus in a standing pose (while grappled).", "After teleporting, press right to release Grapple while staying standing (not being forced into a crouch).", @@ -940,22 +1143,144 @@ "name": "Base", "requires": [ {"or": [ - "f_DefeatedPhantoon", - "SpaceJump", {"and": [ - {"thornHits": 1}, - {"or": [ - "HiJump", - "canWalljump", - "canUseIFrames", - "Grapple", - "canHorizontalDamageBoost", - {"thornHits": 1} - ]} - ]} + "f_DefeatedPhantoon", + "canDash" + ]}, + "SpaceJump" + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [2, 1], + "name": "Tank Damage (Power Off)", + "requires": [ + {"or": [ + {"and": [ + {"not": "f_DefeatedPhantoon"}, + "canRiskPermanentLossOfAccess" + ]}, + "canDash" + ]}, + {"thornHits": 1}, + {"or": [ + "HiJump", + "canWalljump", + "canUseIFrames", + "Grapple", + "canHorizontalDamageBoost", + {"thornHits": 1} + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "devNote": [ + "When the power is off, the floor has thorns.", + "if power is on and dash is available, then the floating platforms could be used instead to avoid all damage." + ] + }, + { + "link": [2, 1], + "name": "Tank Damage (Blue Suit)", + "requires": [ + {"haveBlueSuit": {}}, + "canBlueSuitSpikeJump", + {"or": [ + {"and": [ + "canGravityJump", + {"spikeHits": 1} + ]}, + {"and": [ + {"disableEquipment": "Gravity"}, + {"spikeHits": 2} + ]}, + {"and": [ + "Gravity", + "HiJump", + {"spikeHits": 2} + ]}, + {"and": [ + "Gravity", + {"tech": "canHorizontalDamageBoost"}, + {"noFlashSuit": {}}, + {"spikeHits": 2} + ]}, + {"spikeHits": 3} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "When the power is on, the floor has spikes (not thorns), and Samus will quickly lose i-frames." + ] + }, + { + "link": [2, 1], + "name": "Spring Fling", + "requires": [ + "canSpringFling" + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [2, 1], + "name": "Insane Bomb Boost", + "requires": [ + "canJumpIntoIBJ", + "canBombHorizontally", + "canInsaneJump", + "canInsaneMidAirMorph", + "canResetFallSpeed" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Jump, place a bomb mid-air, then jump with controlled height to precisely mid-air morph and get a horizontal boost." + ] + }, + { + "link": [2, 1], + "name": "Insane Wall Jump", + "requires": [ + "Gravity", + "canInsaneWalljump" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Wall jump from near the top of the ledge to barely be able to wall jump off the floating platform." + ] + }, + { + "link": [2, 1], + "name": "HiJump Wall Jump", + "requires": [ + "Gravity", + "HiJump", + "canPreciseWalljump" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Wall jump from a few tiles below the ledge, then wall jump off the floating platform." + ] + }, + { + "link": [2, 1], + "name": "Gravity Jump Wall Jump", + "requires": [ + "canPreciseWalljump", + "canGravityJump", + "canTrickyJump" + ], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Press pause, wall jump from about halfway down the wall, disable Gravity, then wall jump off the floating platform." + ] }, { "id": 25, @@ -967,6 +1292,7 @@ "h_midAirShootUp" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Fling Samus from the first set of grapple blocks to the second set without falling. Requires precise timing." }, { @@ -989,7 +1315,8 @@ "canLongCeilingBombJump", "canBePatient" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 28, @@ -1002,6 +1329,7 @@ {"obstaclesCleared": ["A"]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Touch the item while remaining in artificial morph. Ceiling bomb jump back to the right, then use X-Ray to cancel G-mode and obtain the item.", "devNote": "This strat alone would only require canBePatient, but it is only possible after Ceiling Bomb Jumping there, so it would be a combined 4 minutes." }