diff --git a/helpers.json b/helpers.json index 7195e75c8d..d5450a44ba 100644 --- a/helpers.json +++ b/helpers.json @@ -33,6 +33,21 @@ "requires": [ "Gravity" ], "devNote": "In the original game Gravity provides full immunity, but some randomizers also require Varia." }, + { + "name": "h_partialEnemyDamageReduction", + "requires": [ + {"or": [ + "Varia", + "Gravity" + ]} + ], + "note": [ + "Suit requirements in order to have at least 50% damage reduction from enemies." + ], + "devNote": [ + "In the vanilla game, Varia provides 50% damage reduction and Gravity with or without Varia provides 75% damage reduction, but some randomizer may change this." + ] + }, { "name": "h_fullEnemyDamageReduction", "requires": [ diff --git a/region/lowernorfair/west/Golden Torizo's Room.json b/region/lowernorfair/west/Golden Torizo's Room.json index 10031f42ed..4ddc897676 100644 --- a/region/lowernorfair/west/Golden Torizo's Room.json +++ b/region/lowernorfair/west/Golden Torizo's Room.json @@ -1419,7 +1419,14 @@ "link": [5, 5], "name": "Safe Spot Heatproof Charge", "requires": [ - {"notable": "Safe Spot Kill"}, + {"or": [ + {"notable": "Safe Spot Kill"}, + {"and": [ + {"notable": "Safe Spot Kill (Lenient)"}, + {"resourceAtMost": [{"type": "Missile", "count": 31}]}, + {"enemyDamage": {"enemy": "Golden Torizo", "type": "contact", "hits": 1}} + ]} + ]}, "h_heatProof", "Charge", "canBeVeryPatient" @@ -1552,8 +1559,14 @@ "link": [5, 5], "name": "Safe Spot Full Combo", "requires": [ - {"notable": "Safe Spot Kill"}, - "h_navigateHeatRooms", + {"or": [ + {"notable": "Safe Spot Kill"}, + {"and": [ + {"notable": "Safe Spot Kill (Lenient)"}, + {"resourceAtMost": [{"type": "Missile", "count": 31}]}, + {"enemyDamage": {"enemy": "Golden Torizo", "type": "contact", "hits": 1}} + ]} + ]}, "Charge", "Ice", "Wave", @@ -1568,8 +1581,14 @@ "link": [5, 5], "name": "Safe Spot Almost Full Combo", "requires": [ - {"notable": "Safe Spot Kill"}, - "h_navigateHeatRooms", + {"or": [ + {"notable": "Safe Spot Kill"}, + {"and": [ + {"notable": "Safe Spot Kill (Lenient)"}, + {"resourceAtMost": [{"type": "Missile", "count": 31}]}, + {"enemyDamage": {"enemy": "Golden Torizo", "type": "contact", "hits": 1}} + ]} + ]}, "Charge", "Wave", "Plasma", @@ -1583,8 +1602,14 @@ "link": [5, 5], "name": "Safe Spot Charge Plasma", "requires": [ - {"notable": "Safe Spot Kill"}, - "h_navigateHeatRooms", + {"or": [ + {"notable": "Safe Spot Kill"}, + {"and": [ + {"notable": "Safe Spot Kill (Lenient)"}, + {"resourceAtMost": [{"type": "Missile", "count": 31}]}, + {"enemyDamage": {"enemy": "Golden Torizo", "type": "contact", "hits": 1}} + ]} + ]}, "Charge", "Plasma", {"heatFrames": 2000} @@ -1597,8 +1622,14 @@ "link": [5, 5], "name": "Safe Spot Full Spazer", "requires": [ - {"notable": "Safe Spot Kill"}, - "h_navigateHeatRooms", + {"or": [ + {"notable": "Safe Spot Kill"}, + {"and": [ + {"notable": "Safe Spot Kill (Lenient)"}, + {"resourceAtMost": [{"type": "Missile", "count": 31}]}, + {"enemyDamage": {"enemy": "Golden Torizo", "type": "contact", "hits": 1}} + ]} + ]}, "Charge", "Ice", "Wave", @@ -1613,8 +1644,14 @@ "link": [5, 5], "name": "Safe Spot Two Beam Charge", "requires": [ - {"notable": "Safe Spot Kill"}, - "h_navigateHeatRooms", + {"or": [ + {"notable": "Safe Spot Kill"}, + {"and": [ + {"notable": "Safe Spot Kill (Lenient)"}, + {"resourceAtMost": [{"type": "Missile", "count": 31}]}, + {"enemyDamage": {"enemy": "Golden Torizo", "type": "contact", "hits": 1}} + ]} + ]}, "Charge", {"heatFrames": 6500}, {"or": [ @@ -2058,7 +2095,8 @@ "The ability to get into the safe spot in the Golden Torizo fight, where Samus can attack while being safe from GT's standard attacks.", "To get into the safe spot near the door: Stand on the left side of the floor pillar for GT to jump back. Then stand to the right of the nearby background pillar.", "Shoot Golden Torizo by facing right and firing up. Farm drops by turning around to face left and firing up with no wide beams equipped." - ] + ], + "devNote": "There is a 5 px window where Samus is safe from all of GT's attacks, including the thrown Super attack and the attack that only occurs when Samus has too many Missiles." }, { "id": 3, @@ -2099,8 +2137,21 @@ "This can be done with Space Jump, a mid-air Spring Ball jump with HiJump, a spring wall, or a speedy jump with HiJump.", "All of these cases can be done with Golden Torizo either alive or dead." ] + }, + { + "id": 8, + "name": "Safe Spot Kill (Lenient)", + "note": [ + "The ability to get into the safe spot in the Golden Torizo fight, where Samus can attack while being safe from most of GT's attacks.", + "Samus is not able to shoot GT with Supers in this lenient safe spot and she must have fewer than 32 Missiles at all times.", + "To get into the safe spot near the door: Stand on the left side of the floor pillar for GT to jump back. Then stand to the right of the nearby background pillar.", + "This safe spot expects getting hit by GT before it jumps back. The space includes the less lenient spot, and also extends left 9 extra pixels.", + "If Samus is in the far end of the safe spot away from Golden Torizo near the end of the fight, it is possible to get hit by his bird spawner attack.", + "This attack is unlikley to occur with a strong beam. It is possible to jump over all the birds without one jump moving horizontally." + ], + "devNote": "There is a 14 px window where Samus is safe from all of GT's attacks except the thrown Super attack and the attack that only occurs when Samus has too many Missiles." } ], "nextStratId": 81, - "nextNotableId": 8 + "nextNotableId": 9 } \ No newline at end of file diff --git a/region/maridia/inner-pink/Botwoon's Room.json b/region/maridia/inner-pink/Botwoon's Room.json index dbca47bdbf..42690bd9e8 100644 --- a/region/maridia/inner-pink/Botwoon's Room.json +++ b/region/maridia/inner-pink/Botwoon's Room.json @@ -276,6 +276,12 @@ "name": "Gravity Botwoon Kill", "requires": [ "Gravity", + {"or": [ + "h_partialEnemyDamageReduction", + "Morph", + "canTrickyJump", + {"resourceCapacity": [{"type": "RegularEnergy", "count": 149}]} + ]}, {"enemyKill": { "enemies": [["Botwoon 1"]] }}, @@ -293,6 +299,15 @@ "requires": [ {"notable": "Suitless Kill"}, "canSuitlessMaridia", + {"or": [ + "h_partialEnemyDamageReduction", + {"and": [ + "Morph", + "canDodgeWhileShooting" + ]}, + "canTrickyJump", + {"resourceCapacity": [{"type": "RegularEnergy", "count": 149}]} + ]}, {"enemyKill": { "enemies": [["Botwoon 1"]] }}, diff --git a/region/norfair/crocomire/Crocomire's Room.json b/region/norfair/crocomire/Crocomire's Room.json index 75ba93e4f7..d5cde3d167 100644 --- a/region/norfair/crocomire/Crocomire's Room.json +++ b/region/norfair/crocomire/Crocomire's Room.json @@ -756,6 +756,20 @@ ], "flashSuitChecked": true }, + { + "link": [4, 4], + "name": "Charge Plasma Kill", + "requires": [ + "Charge", + "Plasma" + ], + "setsFlags": ["f_DefeatedCrocomire"], + "flashSuitChecked": true, + "note": [ + "One or two Charge Plasma shots can fully kill Crocomire. Be sure to stand a bit away to avoid getting hit by Crocomire's hand.", + "Note that this will cause Crocomire to flash rapidly, and it may be worth looking away for those sensitive to flashing lights." + ] + }, { "id": 42, "link": [4, 4], @@ -775,15 +789,26 @@ "link": [4, 4], "name": "Crocomire Fight (Missiles)", "requires": [ - {"ammo": {"type": "Missile", "count": 25}}, {"or": [ - "canDodgeWhileShooting", - {"ammo": {"type": "Missile", "count": 25}} + {"and": [ + "canDodgeWhileShooting", + {"ammo": {"type": "Missile", "count": 25}}, + {"resourceMissingAtMost": [{"type": "Energy", "count": 50}]} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"ammo": {"type": "Missile", "count": 30}} + ]}, + {"ammo": {"type": "Missile", "count": 50}} ]} ], "setsFlags": ["f_DefeatedCrocomire"], "flashSuitChecked": true, - "devNote": "Some farming will still be useful, but without dodging efficiently, many of the drops will be energy." + "note": [ + "Some farming can be useful, but without dodging efficiently, most of the drops will be Energy.", + "Stay far enough back to avoid Crocomire's hand, and shoot the fireballs with a diagonal up shot.", + "Keeping full Energy will significantly increase the number of Missiles farmed." + ] }, { "id": 44,