diff --git a/region/maridia/inner-pink/Botwoon's Room.json b/region/maridia/inner-pink/Botwoon's Room.json index d60b70c49..5b2260f25 100644 --- a/region/maridia/inner-pink/Botwoon's Room.json +++ b/region/maridia/inner-pink/Botwoon's Room.json @@ -618,11 +618,17 @@ "Charge", "Wave", {"or": [ - "canDodgeWhileShooting", + "canTrickyJump", "Plasma", - {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 2}}, {"and": [ "Spazer", + "Ice" + ]}, + {"and": [ + {"or": [ + "canDodgeWhileShooting", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}} + ]}, {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}} ]} ]} @@ -630,10 +636,9 @@ "setsFlags": ["f_DefeatedBotwoon"], "flashSuitChecked": true, "blueSuitChecked": true, - "note": ["Fight Botwoon from behind the wall."], - "devNote": [ - "With Gravity, dodging the acid is pretty trivial.", - "Even without knowing about the distance trick expected in the suitless version." + "note": [ + "It is safest to pseudoscrew through any acid projectiles.", + "Alternatively, standing on the stairs gives more time to run away." ] }, { @@ -646,23 +651,30 @@ "Charge", "Wave", {"or": [ - {"and": [ - "canDodgeWhileShooting", - "Morph" - ]}, + "Plasma", + "canTrickyDodgeEnemies", {"and": [ "canDodgeWhileShooting", {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 2}} ]}, {"and": [ - "Plasma", - {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}} + "Spazer", + "Ice", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}}, + {"or": [ + "canDodgeWhileShooting", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}} + ]} ]}, {"and": [ "Spazer", {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 4}} ]}, - {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 6}} + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 6}}, + {"and": [ + "canCameraManip", + "canBePatient" + ]} ]} ], "setsFlags": ["f_DefeatedBotwoon"], @@ -693,44 +705,88 @@ { "id": 32, "link": [2, 2], - "name": "Back-Side Waveless Microwave", + "name": "Back-Side Magic Pixel Fight (Plasma)", "requires": [ {"notable": "Back-Side Magic Pixel Beam Fight"}, "h_navigateUnderwater", "Charge", "Plasma", - "canXRayWaitForIFrames" + {"or": [ + "canXRayWaitForIFrames", + "canTrickyDodgeEnemies", + "Gravity", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}} + ]} ], "setsFlags": ["f_DefeatedBotwoon"], "flashSuitChecked": true, "blueSuitChecked": true, "note": [ - "Stand on the appropriate pixel for shooting diagonally through the wall and use the microwave trick to defeat Botwoon.", - "Using angle up, it is where Samus' front foot is on the seam in the floor.", - "There is not proper spacing for landing an angle down shot and xraying.", - "Waiting for Botwoon to peak their head through the wall works too but is less safe." + "A charge beam shot will pass right through the dividing wall if fired diagonally from the correct 2-pixel window.", + "Using angle up, it is where Samus' front foot is on the seam in the floor." ] }, { "id": 33, "link": [2, 2], - "name": "Back-Side Magic Pixel Fight", + "name": "Back-Side Magic Pixel Fight (Spazer)", "requires": [ {"notable": "Back-Side Magic Pixel Beam Fight"}, "h_navigateUnderwater", - {"enemyKill": { - "enemies": [["Reverse Botwoon 1"], ["Reverse Botwoon 2"]], - "explicitWeapons": ["Charge+Plasma", "Charge+Ice+Spazer"] - }}, + "Charge", + "Spazer", + {"or": [ + "canInsaneJump", + {"and": [ + "Gravity", + {"or": [ + "canTrickyJump", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}} + ]} + ]}, + {"and": [ + "canTrickyDodgeEnemies", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 1}} + ]}, + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 4}} + ]}, "h_trickyToCarryFlashSuit" ], "setsFlags": ["f_DefeatedBotwoon"], "flashSuitChecked": true, "blueSuitChecked": true, "note": [ - "A charge beam shot will pass right through the dividing wall if fired from the correct 2-pixel window.", - "Using angle down the spot is where Samus' front toe touches the wall.", - "Using angle up, it is where Samus' front foot is on the seam in the floor." + "A charge beam shot will pass right through the dividing wall if fired diagonally from the correct 2-pixel window.", + "Using angle up, it is where Samus' front foot is on the seam in the floor.", + "Angle down can also be used where where Samus' front toe touches the wall." + ] + }, + { + "link": [2, 2], + "name": "Back-Side Magic Pixel Fight (Slow)", + "requires": [ + {"notable": "Back-Side Magic Pixel Beam Fight"}, + "h_navigateUnderwater", + "Charge", + "canBeVeryPatient", + {"or": [ + "canInsaneJump", + {"and": [ + "Gravity", + "canTrickyJump", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 2}} + ]}, + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 6}} + ]}, + "h_trickyToCarryFlashSuit" + ], + "setsFlags": ["f_DefeatedBotwoon"], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "A charge beam shot will pass right through the dividing wall if fired diagonally from the correct 2-pixel window.", + "Using angle up, it is where Samus' front foot is on the seam in the floor.", + "Angle down can also be used where where Samus' front toe touches the wall." ] }, { @@ -743,7 +799,15 @@ "canSpecialBeamAttack", "Plasma", "canXRayWaitForIFrames", - {"ammo": {"type": "PowerBomb", "count": 2}} + {"ammo": {"type": "PowerBomb", "count": 1}}, + {"or": [ + "canTrickyDodgeEnemies", + {"ammo": {"type": "PowerBomb", "count": 2}} + ]}, + {"or": [ + "canBeLucky", + {"ammo": {"type": "PowerBomb", "count": 1}} + ]} ], "setsFlags": ["f_DefeatedBotwoon"], "flashSuitChecked": true, @@ -752,7 +816,11 @@ "Wait for Botwoon to spawn then use a Plasma Special Beam Attack.", "Use XRay to slow time and watch for a particle to overlap Botwoons head, then proceed to Microwave." ], - "devNote": "Killing in 1 SBA takes some luck." + "devNote": [ + "Killing in 1 SBA takes some luck.", + "Microwaving effeciently takes some dexterity.", + "This strat only applies to those who don't know the magic pixel strat is possible." + ] }, { "id": 35, @@ -761,10 +829,18 @@ "requires": [ {"notable": "Back-Side Plasma Shield Fight"}, "h_navigateUnderwater", - {"enemyKill": { - "enemies": [["Reverse Botwoon 1"], ["Reverse Botwoon 2"]], - "explicitWeapons": ["Plasma Shield"] - }} + "canSpecialBeamAttack", + "Plasma", + {"ammo": {"type": "PowerBomb", "count": 5}}, + {"or": [ + "canBeLucky", + {"ammo": {"type": "PowerBomb", "count": 2}} + ]}, + {"or": [ + "Gravity", + "canTrickyDodgeEnemies", + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 2}} + ]} ], "setsFlags": ["f_DefeatedBotwoon"], "flashSuitChecked": true, @@ -779,10 +855,15 @@ {"notable": "Back-Side Super Only Fight"}, "h_navigateUnderwater", "canBeVeryPatient", - {"enemyKill": { - "enemies": [["Reverse Botwoon 1"], ["Reverse Botwoon 2"]], - "explicitWeapons": ["Super"] - }} + {"ammo": {"type": "Super", "count": 10}}, + {"or": [ + "canInsaneJump", + {"and": [ + "Gravity", + "canTrickyJump" + ]}, + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 3}} + ]} ], "setsFlags": ["f_DefeatedBotwoon"], "flashSuitChecked": true, @@ -791,6 +872,44 @@ "Wait for the one pattern (bottom->right) where Botwoon's head passes through the dividing barrier briefly and fire TWO Super Missiles.", "This takes a long time, averaging two supers per minute." ] + }, + { + "link": [2, 2], + "name": "Back-Side Missile Only Fight", + "requires": [ + {"notable": "Back-Side Super Only Fight"}, + "h_navigateUnderwater", + {"ammo": {"type": "Missile", "count": 30}}, + {"or": [ + "canBeExtremelyPatient", + {"and": [ + "canBeVeryPatient", + "canBeVeryLucky", + "canGateGlitch", + {"noFlashSuit": {}}, + {"ammo": {"type": "Missile", "count": 30}} + ]} + ]}, + {"or": [ + "canInsaneJump", + {"and": [ + "Gravity", + "canTrickyJump" + ]}, + {"enemyDamage": {"enemy": "Botwoon 1", "type": "acid", "hits": 6}} + ]}, + {"ammo": {"type": "Missile", "count": 10}} + ], + "setsFlags": ["f_DefeatedBotwoon"], + "flashSuitChecked": true, + "blueSuitChecked": true, + "note": [ + "Wait for the one pattern (bottom->right) where Botwoon's head passes through the dividing barrier briefly.", + "The extent Botwoon's head passes through the wall varies ranging from almost no damage window up to enough time for 2 missiles.", + "By jumping there is a doppler effect allowing up to 2 more missiles to hit Botwoon.", + "The fight can be sped up by Gate Glitching through the wall and landing lucky hits throughout the fight." + ], + "devNote": "It is much easier to miss with missiles, so 10 leniency missiles are added." } ], "notables": [ diff --git a/region/tourian/main/Tourian Escape Room 3.json b/region/tourian/main/Tourian Escape Room 3.json index f5c17ee6b..c89f8149a 100644 --- a/region/tourian/main/Tourian Escape Room 3.json +++ b/region/tourian/main/Tourian Escape Room 3.json @@ -270,11 +270,7 @@ "hits": 1 }} ]}, - {"or": [ - "Morph", - "canTurnaroundAimCancel", - "canXRayTurnaround" - ]} + "Morph" ]} ]} ], @@ -814,11 +810,7 @@ "hits": 1 }} ]}, - {"or": [ - "Morph", - "canTurnaroundAimCancel", - "canXRayTurnaround" - ]} + "Morph" ]} ]} ],