diff --git a/region/tourian/main/Big Boy Room.json b/region/tourian/main/Big Boy Room.json index 76c73c115d..24806a275b 100644 --- a/region/tourian/main/Big Boy Room.json +++ b/region/tourian/main/Big Boy Room.json @@ -69,6 +69,7 @@ "requires": [], "clearsObstacles": ["A"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "The Baby Metroid is not active when entering from the left side of the room." }, { @@ -84,7 +85,8 @@ "openEnd": 1 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 36, @@ -104,6 +106,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": ["Max extra run speed $3.1"] }, { @@ -119,7 +122,8 @@ "exitCondition": { "leaveShinecharged": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 4, @@ -136,7 +140,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 5, @@ -157,7 +162,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 6, @@ -179,7 +185,8 @@ "movementType": "uncontrolled" } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 7, @@ -196,7 +203,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 8, @@ -208,7 +216,8 @@ "exitCondition": { "leaveWithTemporaryBlue": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 39, @@ -238,7 +247,8 @@ } }, "bypassesDoorShell": "free", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 10, @@ -257,7 +267,8 @@ } }, "bypassesDoorShell": "free", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 11, @@ -266,7 +277,8 @@ "requires": [ {"obstaclesCleared": ["A"]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 12, @@ -283,6 +295,7 @@ }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Gain a shinecharge by running right-to-left on the leftmost runway.", "Then run toward the right, jumping twice before sparking mid-air." @@ -305,7 +318,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 14, @@ -329,7 +343,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 15, @@ -354,7 +369,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 16, @@ -378,7 +394,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 17, @@ -397,7 +414,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 18, @@ -416,7 +434,8 @@ "leaveWithTemporaryBlue": {} }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 19, @@ -426,7 +445,8 @@ {"resourceAtMost": [{"type": "RegularEnergy", "count": 1}]} ], "clearsObstacles": ["A"], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 38, @@ -458,8 +478,8 @@ "flashSuitChecked": true, "blueSuitChecked": true, "note": [ - "Once the camera unlocks, back up against the right bubble. Start running once the Big Boy attaches, and begin windup", - "before Samus's energy reaches 01." + "Once the camera unlocks, back up against the right bubble. Start running once the Big Boy attaches, and begin wind-up", + "before Samus's energy reaches 1." ] }, { @@ -469,7 +489,8 @@ "requires": [ {"obstaclesCleared": ["A"]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 21, @@ -490,6 +511,7 @@ "h_trickyToCarryFlashSuit" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Jump over the Baby Metroid to avoid getting grabbed.", "Use Wave plus a Wide Beam to clear much of the seaweed with each shot.", @@ -504,6 +526,7 @@ "requires": [ {"notable": "Baby Skip Without Wave or Speed"}, {"obstaclesNotCleared": ["A"]}, + "canDash", "canMidAirMorph", "HiJump", "canTrickyJump", @@ -511,6 +534,7 @@ "h_trickyToCarryFlashSuit" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Avoid the Baby Metroid by jumping over it many times in order to clear a path through the seaweed." }, { @@ -520,11 +544,13 @@ "requires": [ {"notable": "Baby Skip With Nothing"}, {"obstaclesNotCleared": ["A"]}, + "canDash", "canBabyMetroidAvoid", "canInsaneJump", "h_trickyToCarryFlashSuit" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Avoid the Baby Metroid with no items at all.", "Jump over it many times in order to clear a path through the seaweed.", @@ -559,7 +585,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 25, @@ -578,7 +605,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 26, @@ -590,7 +618,8 @@ } }, "requires": [], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 27, @@ -603,7 +632,8 @@ }, "requires": [], "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 28, @@ -621,7 +651,8 @@ } }, "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 29, @@ -639,7 +670,8 @@ } }, "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 30, @@ -652,7 +684,8 @@ "openEnd": 1 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 37, @@ -670,6 +703,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": ["Max extra run speed $2.5 with spin, or $2.6 with a quick aim-down."] }, { @@ -685,7 +719,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 32, @@ -704,7 +739,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 33, @@ -724,7 +760,8 @@ "movementType": "uncontrolled" } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 34, @@ -739,7 +776,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 35, @@ -748,7 +786,8 @@ "requires": [ "h_CrystalFlash" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true } ], "notables": [ diff --git a/region/tourian/main/Dust Torizo Room.json b/region/tourian/main/Dust Torizo Room.json index b387a52d91..f916df0106 100644 --- a/region/tourian/main/Dust Torizo Room.json +++ b/region/tourian/main/Dust Torizo Room.json @@ -63,7 +63,8 @@ "openEnd": 1 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 21, @@ -81,6 +82,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Avoid backing into the corner;", "instead press against it and turn around, to put Samus into a better position." @@ -99,7 +101,8 @@ "exitCondition": { "leaveShinecharged": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 3, @@ -114,7 +117,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 4, @@ -133,7 +137,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 5, @@ -153,7 +158,8 @@ "movementType": "uncontrolled" } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 6, @@ -168,7 +174,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 7, @@ -180,7 +187,8 @@ "exitCondition": { "leaveWithTemporaryBlue": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 8, @@ -189,7 +197,8 @@ "requires": [ "h_CrystalFlash" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 23, @@ -207,14 +216,16 @@ "link": [1, 2], "name": "Base", "requires": [], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 10, "link": [2, 1], "name": "Base", "requires": [], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 11, @@ -227,7 +238,8 @@ }, "requires": [], "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 12, @@ -245,7 +257,8 @@ } }, "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 13, @@ -263,7 +276,8 @@ } }, "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 14, @@ -276,7 +290,8 @@ "openEnd": 1 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 22, @@ -294,6 +309,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Avoid backing into the corner;", "instead press against it and turn around, to put Samus into a better position." @@ -312,7 +328,8 @@ "exitCondition": { "leaveShinecharged": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 16, @@ -327,7 +344,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 17, @@ -346,7 +364,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 18, @@ -366,7 +385,8 @@ "movementType": "uncontrolled" } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 19, @@ -381,7 +401,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 20, @@ -393,7 +414,8 @@ "exitCondition": { "leaveWithTemporaryBlue": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true } ], "notables": [], diff --git a/region/tourian/main/Lower Tourian Save Room.json b/region/tourian/main/Lower Tourian Save Room.json index 973cef4ed4..f9dda4f328 100644 --- a/region/tourian/main/Lower Tourian Save Room.json +++ b/region/tourian/main/Lower Tourian Save Room.json @@ -46,7 +46,8 @@ "openEnd": 1 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 2, @@ -55,7 +56,8 @@ "requires": [ "h_CrystalFlash" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 5, @@ -80,14 +82,16 @@ "link": [1, 2], "name": "Base", "requires": [], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 4, "link": [2, 1], "name": "Base", "requires": [], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true } ], "notables": [], diff --git a/region/tourian/main/Metroid Room 1.json b/region/tourian/main/Metroid Room 1.json index 7fe83f75ec..41eeb1c793 100644 --- a/region/tourian/main/Metroid Room 1.json +++ b/region/tourian/main/Metroid Room 1.json @@ -26,7 +26,7 @@ { "name": "Base", "requires": [ - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A", "B"]} ], "flashSuitChecked": true } @@ -58,6 +58,16 @@ "id": "R-Mode", "name": "Entered with R-Mode", "obstacleType": "abstract" + }, + { + "id": "A", + "name": "Left Two Metroids", + "obstacleType": "enemies" + }, + { + "id": "B", + "name": "Right Two Metroids", + "obstacleType": "enemies" } ], "enemies": [ @@ -101,6 +111,20 @@ } ], "strats": [ + { + "link": [1, 1], + "name": "Metroids Dead", + "requires": [ + {"or": [ + "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]} + ]} + ], + "clearsObstacles": ["A", "B"], + "setsFlags": ["f_KilledMetroidRoom1"], + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 1, "link": [1, 1], @@ -112,7 +136,8 @@ "openEnd": 1 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 2, @@ -128,9 +153,10 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Stand a bit more than a tile away from the ledge and wait for the Rinka to start moving.", - "Freeze the Rinka at the correct height while maintainig a half-tile gap between the Rinka and the runway to extend it as much as possible." + "Freeze the Rinka at the correct height while maintaining a half-tile gap between the Rinka and the runway to extend it as much as possible." ] }, { @@ -142,7 +168,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A"]} ]}, {"or": [ "canMomentumConservingMorph", @@ -163,6 +189,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "It is best to start 4 or 5 pixels from the end of the runway;", "equivalently, start at the end of the runway and use arm pumps to advance 4 or 5 pixels while running." @@ -177,7 +204,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A"]} ]}, "canShinechargeMovement", {"canShineCharge": {"usedTiles": 31, "openEnd": 1}}, @@ -186,7 +213,8 @@ "exitCondition": { "leaveShinecharged": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 4, @@ -196,7 +224,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A"]} ]} ], "exitCondition": { @@ -207,7 +235,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 5, @@ -217,7 +246,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A"]} ]} ], "exitCondition": { @@ -232,7 +261,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 6, @@ -242,7 +272,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A"]} ]} ], "exitCondition": { @@ -258,7 +288,8 @@ "movementType": "uncontrolled" } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 7, @@ -268,7 +299,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A"]} ]} ], "exitCondition": { @@ -279,7 +310,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 8, @@ -289,7 +321,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A"]} ]}, {"canShineCharge": {"usedTiles": 30, "openEnd": 1}}, "canChainTemporaryBlue" @@ -298,6 +330,7 @@ "leaveWithTemporaryBlue": {} }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": "If it not possible to freeze or kill the Metroids, then move quickly enough that they get stuck off-camera to the right, and gain the shinecharge in a position where Samus can angle up and shoot the Rinka while waiting for the shinecharge timer to run out." }, { @@ -305,11 +338,12 @@ "link": [1, 1], "name": "Crystal Flash", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A"]}, "h_CrystalFlash", {"obstaclesNotCleared": ["R-Mode"]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Be sure to be at a safe distance from Rinkas before performing the Crystal Flash." ] @@ -330,7 +364,9 @@ {"metroidFrames": 330} ], "setsFlags": ["f_KilledMetroidRoom1"], + "clearsObstacles": ["A", "B"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Place Power Bombs to kill the Metroids.", "By hitting the first Rinka, all of the Metroids (on a similar vertical height to the Power Bomb) will be damaged." @@ -340,7 +376,7 @@ { "id": 11, "link": [1, 1], - "name": "PB Dodge Kill (Left to Right)", + "name": "PB Dodge Kill", "requires": [ {"enemyKill": { "enemies": [["Metroid", "Metroid", "Metroid", "Metroid"]], @@ -355,7 +391,9 @@ ]} ], "setsFlags": ["f_KilledMetroidRoom1"], + "clearsObstacles": ["A", "B"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Group all of the Metroids by hitting the first Rinka with a Power Bomb.", "Once grouped, use two more Power Bombs to finish them off." @@ -366,7 +404,7 @@ "link": [1, 1], "name": "Crystal Spark", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A"]}, {"canShineCharge": {"usedTiles": 23, "openEnd": 1}}, "h_CrystalSpark" ], @@ -382,7 +420,8 @@ "exitCondition": { "leaveWithGModeSetup": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 13, @@ -392,7 +431,8 @@ {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}} ], "gModeRegainMobility": {}, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 14, @@ -415,7 +455,9 @@ ]} ], "setsFlags": ["f_KilledMetroidRoom1"], + "clearsObstacles": ["A", "B"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Kill the Metroids while artificially morphed with just Spring Ball to avoid them.", "A Rinka must killed whith a Power Bomb while a Metroid is completely on screen in order for it to lure the other Metroids.", @@ -445,13 +487,14 @@ "name": "R-Mode Crystal Flash Interrupt", "requires": [ {"obstaclesCleared": ["R-Mode"]}, - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A"]}, "canRModeCrystalFlashInterrupt", {"ammo": {"type": "Missile", "count": 10}}, {"ammo": {"type": "Super", "count": 10}} ], "resetsObstacles": ["R-Mode"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "On entry, kill or dodge the first Rinkas then Crystal Flash directly above or below a Rinka Spawner." ], @@ -471,7 +514,9 @@ ], "resetsObstacles": ["R-Mode"], "setsFlags": ["f_KilledMetroidRoom1"], + "clearsObstacles": ["A", "B"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "On entry, kill or dodge the first Rinkas then Crystal Flash. While in the light orb, Samus will be almost immune and the Metroids will take damage." ] @@ -492,7 +537,9 @@ {"autoReserveTrigger": {}} ], "setsFlags": ["f_KilledMetroidRoom1"], + "clearsObstacles": ["A", "B"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "On entry, kill or dodge the first Rinkas then Crystal Flash. While in the light orb, Samus will be almost immune and the Metroids will take damage.", "Note that it is necessary to exit G-Mode before exiting the room in order for the Metroids to remain killed. To do this, trigger Reserves in the acid or on a Rinka.", @@ -502,17 +549,18 @@ }, { "id": 27, - "link": [1, 2], + "link": [1, 1], "name": "Ammo Kill", "requires": [ "Ice", {"enemyKill": { - "enemies": [["Metroid", "Metroid", "Metroid", "Metroid"]], + "enemies": [["Metroid", "Metroid"]], "explicitWeapons": ["Super", "Missile"] }} ], - "setsFlags": ["f_KilledMetroidRoom1"], - "flashSuitChecked": true + "clearsObstacles": ["A"], + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 15, @@ -527,6 +575,7 @@ {"shinespark": {"frames": 112, "excessFrames": 16}} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Spark through the top of the door to avoid the platforms.", "devNote": "FIXME: Add strats that come in charged and spark to save energy." }, @@ -535,7 +584,7 @@ "link": [1, 2], "name": "Shinespark (Metroids Dead)", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, {"canShineCharge": {"usedTiles": 31, "openEnd": 0}}, "canHorizontalMidairShinespark", {"or": [ @@ -546,7 +595,8 @@ ]} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 90, @@ -567,6 +617,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Shinecharge just before the second Metroid comes on camera, jump over it and spark against the ceiling to avoid the rest of them.", "Sparking lower will likely get Samus grabbed by the right-most Metroid." @@ -581,11 +632,12 @@ "canCWJ", "canInsaneWalljump", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "canDodgeWhileShooting" ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Align with the wall below the door while facing left.", "Hold dash, turn around, start running and arm pump once.", @@ -603,7 +655,7 @@ "h_blueJump", "canCarefulJump", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "Ice", "ScrewAttack", "canPseudoScrew", @@ -612,6 +664,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Use the full runway to gain blue speed and enough speed to reach the far platform." }, { @@ -621,30 +674,33 @@ "requires": [ "SpaceJump", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "Ice", "ScrewAttack", "canPseudoScrew", + {"haveBlueSuit": {}}, "canMetroidAvoid", {"metroidFrames": 270} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 17, "link": [1, 2], - "name": "Blue SpaceJump", + "name": "Blue Space Jump", "requires": [ {"getBlueSpeed": {"usedTiles": 31, "openEnd": 1}}, "canBlueSpaceJump" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 18, "link": [1, 2], - "name": "Blue SpaceJump, Into the Room", + "name": "Blue Space Jump, Into the Room", "entranceCondition": { "comeInGettingBlueSpeed": { "length": 1, @@ -655,23 +711,25 @@ "canBlueSpaceJump" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Jump Immediately upon entry, or before the transition.", "devNote": "There is 1 unusable tile in this runway." }, { "id": 56, "link": [1, 2], - "name": "Spring Ball Bounce (Left to Right)", + "name": "Spring Ball Bounce", "requires": [ "canSpringBallBounce", "canCarefulJump", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "canMetroidAvoid", {"metroidFrames": 200} ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "At max run speed without SpeedBooster, you can bounce on both platforms and avoid all acid.", "Jump from the center of the rightmost X in the background.", @@ -682,7 +740,7 @@ { "id": 57, "link": [1, 2], - "name": "Frozen Enemy (Left to Right)", + "name": "Frozen Enemy", "requires": [ "canTrickyUseFrozenEnemies", "canTrickyJump", @@ -696,6 +754,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Freeze the middle Metroid as soon as it comes on screen to use as a platform to cross over the acid.", "If no Metroids are alive, the far left Rinka can be used instead, at a high angle.", @@ -705,19 +764,21 @@ { "id": 58, "link": [1, 2], - "name": "Rinka Damage Boost (Left to Right)", + "name": "Rinka Damage Boost", "requires": [ {"notable": "Rinka Damage Boost"}, {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}, + "canDash", "canTrickyJump", "canHorizontalDamageBoost", "canCameraManip", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "canMetroidAvoid" ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Aim the leftmost Rinka to travel horizontally across the top of the room and use it to damage boost between the two floating platforms.", "Killing the Rinka will normalize it's respawn timer, which may help in setting up the correct angle.", @@ -730,6 +791,7 @@ "link": [1, 2], "name": "Acid Dip", "requires": [ + "canDash", {"or": [ {"and": [ "Gravity", @@ -744,7 +806,7 @@ ]} ]}, {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "Ice", "ScrewAttack", {"and": [ @@ -760,16 +822,95 @@ {"metroidFrames": 150} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [1, 2], + "name": "Blue Suit Acid Dip", + "requires": [ + {"haveBlueSuit": {}}, + {"or": [ + {"and": [ + "Gravity", + {"acidFrames": 30} + ]}, + {"and": [ + "canPreciseWalljump", + {"acidFrames": 60} + ]}, + {"and": [ + "HiJump", + {"acidFrames": 130} + ]}, + {"acidFrames": 140} + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [1, 2], + "name": "Blue Suit Spring Fling Acid Dip", + "requires": [ + {"haveBlueSuit": {}}, + "canSpringFling", + {"or": [ + {"and": [ + "Gravity", + {"acidFrames": 15} + ]}, + {"and": [ + "canWalljump", + {"acidFrames": 20} + ]}, + {"and": [ + "HiJump", + {"disableEquipment": "HiJump"}, + {"acidFrames": 20} + ]}, + {"acidFrames": 75} + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [1, 2], + "name": "Blue Suit Spring Ball Bomb Jump Acid Dip", + "requires": [ + {"haveBlueSuit": {}}, + "canSpringBallBombJump", + "canInsaneJump", + {"or": [ + {"and": [ + "Gravity", + {"acidFrames": 15} + ]}, + {"and": [ + "canWalljump", + {"acidFrames": 20} + ]}, + {"and": [ + "HiJump", + {"disableEquipment": "HiJump"}, + {"acidFrames": 20} + ]}, + {"acidFrames": 75} + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 60, "link": [1, 2], "name": "Acid Run", "requires": [ + "canDash", {"acidFrames": 65}, {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, {"and": [ "canMetroidAvoid", "canInsaneJump" @@ -787,7 +928,8 @@ ]} ], "flashSuitChecked": true, - "note": "SpinJump often to reduce the amount of time spent in the acid." + "blueSuitChecked": true, + "note": "Spin jump often to reduce the amount of time spent in the acid." }, { "id": 61, @@ -799,7 +941,7 @@ "canLateralMidAirMorph", "can4HighMidAirMorph", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, {"and": [ "canTrickyDodgeEnemies", "canMetroidAvoid", @@ -808,6 +950,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Jump from the left platform and mid air morph to bounce through the lava quickly.", "This is only useful when morphing before reaching the ceiling." @@ -819,8 +962,9 @@ "link": [1, 2], "name": "Bomb Jump", "requires": [ + "canDash", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A"]}, {"and": [ "canCameraManip", "canMetroidAvoid" @@ -832,19 +976,20 @@ "canResetFallSpeed" ]}, {"and": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A"]}, "canDiagonalBombJump" ]}, "canCeilingBombJump" ]} ], "flashSuitChecked": true, - "note": "Bomb Jump between the two floating platforms." + "note": "Bomb Jump between the two floating platforms.", + "devNote": ["FIXME: This is probably possible dashless."] }, { "id": 19, "link": [1, 2], - "name": "G-mode Morph Ceiling Bomb Jump", + "name": "G-Mode Morph Ceiling Bomb Jump", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -856,7 +1001,8 @@ "h_artificialMorphLongCeilingBombJump", "canBePatient" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 74, @@ -864,7 +1010,7 @@ "name": "Use Stored Spark", "requires": [ {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "canMetroidAvoid" ]}, "h_storedSpark", @@ -887,7 +1033,7 @@ ]}, "ScrewAttack", "canPseudoScrew", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A", "B"]} ]}, "canTrickyJump", "SpaceJump" @@ -902,6 +1048,7 @@ }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": [ "Requires preopening the door, so this is more difficult than a normal MetroidAvoid.", "FIXME: Blue speed can be used to protect against metroid damage, in the canTrickyDodgeEnemies case;", @@ -922,7 +1069,7 @@ ]}, "ScrewAttack", "canPseudoScrew", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A", "B"]} ]}, "canPreciseSpaceJump" ], @@ -940,6 +1087,7 @@ }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": [ "It is possible to open the door with ammo and mockball out in one motion.", "But the timing makes it harder than crossing the room multiple times." @@ -958,7 +1106,7 @@ ]}, "ScrewAttack", "canPseudoScrew", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A", "B"]} ]}, "canTrickyJump", "canPreciseSpaceJump" @@ -977,7 +1125,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 23, @@ -992,7 +1141,7 @@ ]}, "ScrewAttack", "canPseudoScrew", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A", "B"]} ]}, "canTrickySpringBallBounce" ], @@ -1012,6 +1161,7 @@ }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": [ "FIXME: It is possible to open the door and leave with a controlled bounce in one motion.", "But then avoiding damage becomes unreliable." @@ -1030,7 +1180,7 @@ ]}, "ScrewAttack", "canPseudoScrew", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["A", "B"]} ]}, "canPreciseSpaceJump" ], @@ -1043,21 +1193,8 @@ } }, "unlocksDoors": [{"types": ["ammo"], "requires": []}], - "flashSuitChecked": true - }, - { - "id": 51, - "link": [2, 1], - "name": "Ammo Kill", - "requires": [ - "Ice", - {"enemyKill": { - "enemies": [["Metroid", "Metroid", "Metroid", "Metroid"]], - "explicitWeapons": ["Super", "Missile"] - }} - ], - "setsFlags": ["f_KilledMetroidRoom1"], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 63, @@ -1066,15 +1203,17 @@ "requires": [ "SpaceJump", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["B"]}, "ScrewAttack", "canPseudoScrew", + {"haveBlueSuit": {}}, "Ice", "canMetroidAvoid", {"metroidFrames": 420} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 64, @@ -1088,7 +1227,7 @@ "canTrickyJump" ]}, {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "Ice", "canMetroidAvoid", {"metroidFrames": 200} @@ -1106,17 +1245,18 @@ ]} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 65, "link": [2, 1], - "name": "Spring Ball Bounce (Right to Left)", + "name": "Spring Ball Bounce", "requires": [ "canSpringBallBounce", "canCarefulJump", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, {"and": [ "canTrickyJump", "canMetroidAvoid", @@ -1126,6 +1266,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "At max non-speed run speed, Spring Ball bounce on both platforms and avoid all acid.", "Land on the right side of the first platform to avoid the second Metroid.", @@ -1135,13 +1276,18 @@ { "id": 66, "link": [2, 1], - "name": "Frozen Rinka or Metroid (Right to Left)", + "name": "Frozen Rinka or Metroid", "requires": [ "canTrickyUseFrozenEnemies", "canTrickyJump", - "canCameraManip" + "canCameraManip", + {"or": [ + "canDash", + "canInsaneJump" + ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Use the lower Rinka as a platform to setup the angle for the top Rinka.", "Then use the frozen Rinka to cross the acid.", @@ -1151,15 +1297,16 @@ { "id": 67, "link": [2, 1], - "name": "Rinka Damage Boost (Right to Left)", + "name": "Rinka Damage Boost", "requires": [ {"notable": "Rinka Damage Boost"}, {"enemyDamage": {"enemy": "Rinka", "type": "contact", "hits": 1}}, + "canDash", "canTrickyJump", "canHorizontalDamageBoost", "canCameraManip", {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, {"and": [ "canMetroidAvoid", "canUseIFrames" @@ -1180,6 +1327,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Aim the ceiling Rinka to travel horizontally across the top of the room and use it to damage boost between the two floating platforms.", "Killing the lower Rinka shortly before killing the higher Rinka will synchronize their respawn timers so that Samus can jump when the lower Rinka reappears in order to get a good angle on the higher Rinka.", @@ -1214,7 +1362,7 @@ ]} ]}, {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "Ice", "ScrewAttack", "canMetroidAvoid", @@ -1243,21 +1391,54 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": [ "1) Jump from the acid to the floating platform.", "2) Deal with the Metroid.", "3) Jump from the platform to the ledge, potentially falling in acid." ] }, + { + "link": [2, 1], + "name": "Blue Suit Acid Dip", + "requires": [ + {"haveBlueSuit": {}}, + {"or": [ + {"and": [ + "Gravity", + {"acidFrames": 30} + ]}, + {"and": [ + "canWalljump", + {"acidFrames": 40} + ]}, + {"acidFrames": 80} + ]} + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [2, 1], + "name": "Blue Suit Spring Fling Acid Dip", + "requires": [ + {"haveBlueSuit": {}}, + "canSpringFling", + {"acidFrames": 65} + ], + "flashSuitChecked": true, + "blueSuitChecked": true + }, { "id": 69, "link": [2, 1], "name": "Acid Run", "requires": [ + "canDash", "canCarefulJump", {"acidFrames": 65}, {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "Ice", "ScrewAttack", {"and": [ @@ -1271,25 +1452,27 @@ {"metroidFrames": 670} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 70, "link": [2, 1], - "name": "Blue SpaceJump", + "name": "Blue Space Jump", "requires": [ {"getBlueSpeed": {"usedTiles": 22, "openEnd": 1}}, "canBlueSpaceJump", {"metroidFrames": 67} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 71, "link": [2, 1], "name": "Shinespark (Metroids Dead)", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "canHorizontalMidairShinespark", {"canShineCharge": {"usedTiles": 23, "openEnd": 0}}, {"or": [ @@ -1300,14 +1483,15 @@ ]} ]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 91, "link": [2, 1], "name": "Shinespark (Metroids Dead, Diagonal Spark)", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, {"canShineCharge": {"usedTiles": 23, "openEnd": 0}}, "canShinechargeMovementComplex", {"shinespark": {"frames": 7, "excessFrames": 2}}, @@ -1330,6 +1514,7 @@ ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": "This strat only makes sense without canSpeedyJump." }, { @@ -1354,20 +1539,22 @@ ]}, {"shinespark": {"frames": 80, "excessFrames": 5}} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 72, "link": [2, 1], "name": "Infinite Bomb Jump", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, {"or": [ "canCeilingBombJump", "canDiagonalBombJump" ]} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Bomb Jump between the two floating platforms." }, { @@ -1410,7 +1597,7 @@ "link": [2, 1], "name": "Use Stored Spark, Metroids Cleared", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]}, "h_storedSpark", "canDash", {"shinespark": {"frames": 4, "excessFrames": 2}}, @@ -1448,13 +1635,14 @@ {"shinespark": {"frames": 112, "excessFrames": 35}} ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Spark through the top of the door to avoid the platforms.", "devNote": "FIXME: Add strats that come in charged and spark to save energy." }, { "id": 29, "link": [2, 1], - "name": "Blue SpaceJump, Into the Room", + "name": "Blue Space Jump, Into the Room", "entranceCondition": { "comeInGettingBlueSpeed": { "length": 1, @@ -1465,13 +1653,14 @@ "canBlueSpaceJump" ], "flashSuitChecked": true, + "blueSuitChecked": true, "note": "Jump Immediately upon entry, or before the transition.", "devNote": "There is 1 unusable tile in this runway." }, { "id": 30, "link": [2, 1], - "name": "G-mode Morph Ceiling Bomb Jump", + "name": "G-Mode Morph Ceiling Bomb Jump", "entranceCondition": { "comeInWithGMode": { "mode": "any", @@ -1482,7 +1671,8 @@ "f_KilledMetroidRoom1", "h_artificialMorphCeilingBombJump" ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 31, @@ -1494,7 +1684,8 @@ } }, "requires": [], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 32, @@ -1507,7 +1698,8 @@ }, "requires": [], "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 33, @@ -1525,7 +1717,8 @@ } }, "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 34, @@ -1543,7 +1736,37 @@ } }, "bypassesDoorShell": "yes", - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "id": 51, + "link": [2, 2], + "name": "Ammo Kill", + "requires": [ + "Ice", + {"enemyKill": { + "enemies": [["Metroid", "Metroid"]], + "explicitWeapons": ["Super", "Missile"] + }} + ], + "clearsObstacles": ["B"], + "flashSuitChecked": true, + "blueSuitChecked": true + }, + { + "link": [2, 2], + "name": "Metroids Dead", + "requires": [ + {"or": [ + "f_KilledMetroidRoom1", + {"obstaclesCleared": ["A", "B"]} + ]} + ], + "clearsObstacles": ["A", "B"], + "setsFlags": ["f_KilledMetroidRoom1"], + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 35, @@ -1556,7 +1779,8 @@ "openEnd": 1 } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 36, @@ -1579,6 +1803,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Use a frozen Metroid or a Rinka from the left to extend the length of the runway.", "Luring a Rinka is easiest with Morph - While morphed, barely move the bottom Rinka spawner on camera in order to have it shoot at a usable angle.", @@ -1593,7 +1818,7 @@ "h_speedJump", {"or": [ "canMetroidAvoid", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]}, {"or": [ "canMomentumConservingMorph", @@ -1614,6 +1839,7 @@ } }, "flashSuitChecked": true, + "blueSuitChecked": true, "devNote": [ "Max extra run speed $4.7.", "Using almost the full runway (between 3 and 6 pixels from the edge), the momentum conserving turnaround has a 2-frame window for the jump,", @@ -1628,7 +1854,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]}, "canShinechargeMovement", {"canShineCharge": {"usedTiles": 23, "openEnd": 1}}, @@ -1637,7 +1863,8 @@ "exitCondition": { "leaveShinecharged": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 38, @@ -1647,7 +1874,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]} ], "exitCondition": { @@ -1658,7 +1885,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 39, @@ -1668,7 +1896,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]} ], "exitCondition": { @@ -1683,7 +1911,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 40, @@ -1693,7 +1922,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]} ], "exitCondition": { @@ -1709,7 +1938,8 @@ "movementType": "uncontrolled" } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 41, @@ -1719,7 +1949,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]} ], "exitCondition": { @@ -1730,7 +1960,8 @@ } } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 42, @@ -1740,7 +1971,7 @@ {"or": [ "canMetroidAvoid", "Ice", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]}, {"canShineCharge": {"usedTiles": 22, "openEnd": 0}}, "canChainTemporaryBlue" @@ -1748,7 +1979,8 @@ "exitCondition": { "leaveWithTemporaryBlue": {} }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 43, @@ -1758,7 +1990,8 @@ "h_CrystalFlash", {"obstaclesNotCleared": ["R-Mode"]} ], - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 44, @@ -1774,9 +2007,11 @@ {"ammo": {"type": "PowerBomb", "count": 2}} ]}, {"metroidFrames": 170} - ], + ], + "clearsObstacles": ["A", "B"], "setsFlags": ["f_KilledMetroidRoom1"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Place Power Bombs to kill the Metroids.", "By hitting the first Rinka, all of the Metroids (on a similar vertical height to the Power Bomb) will be damaged." @@ -1794,9 +2029,11 @@ "explicitWeapons": ["PowerBomb"] }}, "canMetroidAvoid" - ], + ], + "clearsObstacles": ["A", "B"], "setsFlags": ["f_KilledMetroidRoom1"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Group all of the Metroids by hitting the first Rinka with a Power Bomb.", "Once grouped, use two more Power Bombs to finish them off." @@ -1807,7 +2044,7 @@ "link": [2, 2], "name": "Crystal Spark", "requires": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["B"]}, {"canShineCharge": {"usedTiles": 31, "openEnd": 1}}, "h_CrystalSpark" ], @@ -1826,7 +2063,7 @@ "h_CrystalFlashForReserveEnergy", {"or": [ "canInsaneJump", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]} ]}, {"and": [ @@ -1842,7 +2079,7 @@ ]} ]}, {"or": [ - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["B"]}, "canMetroidAvoid", "Ice" ]}, @@ -1871,13 +2108,14 @@ "canMetroidAvoid", "canUseFrozenEnemies", "ScrewAttack", - "f_KilledMetroidRoom1" + {"obstaclesCleared": ["B"]} ]} ], "exitCondition": { "leaveWithGModeSetup": {} }, "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Wait for the Rinka to spawn, then jump, so the trajectory is as high as possible. Space jump makes this a bit easier.", "If the Metroids are alive, lure them off screen to the left." @@ -1896,7 +2134,8 @@ "knockback": false } }, - "flashSuitChecked": true + "flashSuitChecked": true, + "blueSuitChecked": true }, { "id": 48, @@ -1913,9 +2152,11 @@ "canInsaneJump", "h_artificialMorphSpringBall", {"ammo": {"type": "PowerBomb", "count": 4}} - ], + ], + "clearsObstacles": ["A", "B"], "setsFlags": ["f_KilledMetroidRoom1"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "Kill the Metroids while artificially morphed with just Spring Ball to avoid them.", "A Rinka must killed whith a Power Bomb while a Metroid is completely on screen in order for it to lure the other Metroids.", @@ -1947,13 +2188,14 @@ "name": "R-Mode Crystal Flash Interrupt", "requires": [ {"obstaclesCleared": ["R-Mode"]}, - "f_KilledMetroidRoom1", + {"obstaclesCleared": ["B"]}, "canRModeCrystalFlashInterrupt", {"ammo": {"type": "Missile", "count": 10}}, {"ammo": {"type": "Super", "count": 10}} ], "resetsObstacles": ["R-Mode"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "On entry, kill or dodge the first Rinkas then Crystal Flash directly above or below a Rinka Spawner." ], @@ -1971,9 +2213,11 @@ "canComplexGMode", "h_CrystalFlash" ], - "resetsObstacles": ["R-Mode"], + "resetsObstacles": ["R-Mode"], + "clearsObstacles": ["A", "B"], "setsFlags": ["f_KilledMetroidRoom1"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "On entry, kill or dodge the first Rinkas then Crystal Flash. While in the light orb, Samus will be almost immune and the Metroids will take damage." ] @@ -1993,8 +2237,10 @@ "h_artificialMorphCrystalFlash", {"autoReserveTrigger": {}} ], - "setsFlags": ["f_KilledMetroidRoom1"], + "clearsObstacles": ["A", "B"], + "setsFlags": ["f_KilledMetroidRoom1"], "flashSuitChecked": true, + "blueSuitChecked": true, "note": [ "On entry, kill or dodge the first Rinkas then Crystal Flash. While in the light orb, Samus will be almost immune and the Metroids will take damage.", "Note that it is necessary to exit G-Mode before exiting the room in order for the Metroids to remain killed. To do this, trigger Reserves in the acid or on a Rinka.", diff --git a/region/tourian/roomDiagrams/main_MetroidRoom1_226.png b/region/tourian/roomDiagrams/main_MetroidRoom1_226.png index 42bfac2958..df709e70cb 100644 Binary files a/region/tourian/roomDiagrams/main_MetroidRoom1_226.png and b/region/tourian/roomDiagrams/main_MetroidRoom1_226.png differ