diff --git a/region/lowernorfair/west/Acid Statue Room.json b/region/lowernorfair/west/Acid Statue Room.json index 51706c7522..66c8f24873 100644 --- a/region/lowernorfair/west/Acid Statue Room.json +++ b/region/lowernorfair/west/Acid Statue Room.json @@ -1018,6 +1018,41 @@ "note": "Menu to Grappling Beam before the crystal flash ends and mash shoot while holding down.", "devNote": "The extra Power Bomb or bombs is to get through the bomb blocks." }, + { + "link": [5, 5], + "name": "Magdollite Farm", + "requires": [ + "h_heatProof", + {"cycleFrames": 330}, + {"or": [ + {"and": [ + "canTrickyJump", + "canCameraManip" + ]}, + "Plasma", + "ScrewAttack", + {"and": [ + "Wave", + {"or": [ + "Spazer", + "Ice" + ]} + ]} + ]}, + {"or": [ + "canTrickyJump", + {"cycleFrames": 200} + ]} + ], + "farmCycleDrops": [ + {"enemy": "Magdollite", "count": 3} + ], + "flashSuitChecked": true, + "note": [ + "The Magdollite can be farmed from the left without activating the Holtzes.", + "Or from the right by trapping the Holtz by quickly jumping past them." + ] + }, { "id": 39, "link": [5, 5], diff --git a/region/lowernorfair/west/Fast Ripper Room.json b/region/lowernorfair/west/Fast Ripper Room.json index bebd72924b..73d3f8cb4a 100644 --- a/region/lowernorfair/west/Fast Ripper Room.json +++ b/region/lowernorfair/west/Fast Ripper Room.json @@ -115,12 +115,70 @@ "link": [1, 1], "name": "Ripper Farm", "requires": [ - "h_heatProof", "ScrewAttack", {"resetRoom": {"nodes": [1]}}, - {"refill": ["Energy", "Super"]} + {"heatFrames": 215}, + {"cycleFrames": 215}, + {"or": [ + "canInsaneJump", + {"and": [ + "canFarmWhileShooting", + {"heatFrames": 45}, + {"cycleFrames": 45} + ]}, + {"and": [ + {"heatFrames": 360}, + {"cycleFrames": 360} + ]} + ]} + ], + "resetsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Ripper 2 (red)", "count": 5} + ] + }, + { + "link": [1, 1], + "name": "Partial Ripper Farm (Supers)", + "entranceCondition": { + "comeInNormally": {} + }, + "requires": [ + "ScrewAttack", + "canDodgeWhileShooting", + {"heatFrames": 200}, + {"resourceAvailable": [{"type": "Energy", "count": 50}]}, + {"partialRefill": {"type": "Super","limit": 5}}, + {"heatFrames": 80} + ] + }, + { + "link": [1, 1], + "name": "Partial Ripper Farm (Energy)", + "entranceCondition": { + "comeInNormally": {} + }, + "requires": [ + "ScrewAttack", + "canFarmWhileShooting", + {"or": [ + {"and": [ + "canPauseAbuse", + "canInsaneJump", + {"heatFrames": 60} + ]}, + {"heatFrames": 120} + ]}, + {"or": [ + {"and": [ + {"resourceMissingAtMost": [{"type": "Super", "count": 0}]}, + {"partialRefill": {"type": "Energy","limit": 100}} + ]}, + {"partialRefill": {"type": "Energy","limit": 70}} + ]}, + {"heatFrames": 60} ], - "resetsObstacles": ["A"] + "note": "If Supers are not full, time the collection of energy to force further Energy drops." }, { "id": 3,