diff --git a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json index 2948af8322..f2417a7eaa 100644 --- a/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json +++ b/region/lowernorfair/east/Lower Norfair Spring Ball Maze.json @@ -220,6 +220,76 @@ } } }, + { + "link": [1, 1], + "name": "Single Alcoon Farm", + "requires": [ + "h_heatProof", + {"resetRoom": {"nodes": [1]}}, + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 245}, + {"or": [ + "Wave", + "Charge" + ]} + ]}, + {"and": [ + {"or": [ + "Wave", + "ScrewAttack", + "Spazer", + "canPseudoScrew" + ]}, + {"cycleFrames": 285} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"cycleFrames": 420} + ]} + ]} + ], + "clearsObstacles": ["A"], + "resetsObstacles": ["B", "C"], + "farmCycleDrops": [ + {"enemy": "Alcoon", "count": 1} + ] + }, + { + "link": [1, 1], + "name": "Partial Alcoon Farm", + "requires": [ + {"or": [ + {"and": [ + "Plasma", + {"heatFrames": 245}, + {"or": [ + "Wave", + "Charge" + ]} + ]}, + {"and": [ + {"or": [ + "Wave", + "ScrewAttack", + "Spazer", + "canPseudoScrew" + ]}, + {"heatFrames": 285} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"heatFrames": 420} + ]} + ]}, + {"resourceAvailable": [ + {"type": "Energy", "count": 50} + ]}, + {"partialRefill": {"type": "PowerBomb", "limit": 1}} + ], + "clearsObstacles": ["A"] + }, { "id": 2, "link": [1, 1], @@ -686,6 +756,85 @@ } } }, + { + "link": [3, 3], + "name": "Alcoon Farm", + "requires": [ + "h_heatProof", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"or": [ + "canWalljump", + "HiJump", + "SpaceJump" + ]}, + {"cycleFrames": 150} + ]}, + {"resetRoom": {"nodes": [3]}} + ]}, + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 400} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 360} + ]}, + {"and": [ + "canPseudoScrew", + {"cycleFrames": 440} + ]}, + {"and": [ + "Spazer", + "Wave", + {"cycleFrames": 560} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"cycleFrames": 910} + ]} + ]} + ], + "resetsObstacles": ["A", "B", "C"], + "farmCycleDrops": [ + {"enemy": "Alcoon", "count": 3} + ] + }, + { + "link": [3, 3], + "name": "Partial Alcoon Farm", + "requires": [ + {"or": [ + {"and": [ + "Plasma", + {"heatFrames": 400} + ]}, + {"and": [ + "ScrewAttack", + {"heatFrames": 360} + ]}, + {"and": [ + "canPseudoScrew", + {"heatFrames": 440} + ]}, + {"and": [ + "Spazer", + "Wave", + {"heatFrames": 560} + ]}, + {"and": [ + "canDodgeWhileShooting", + {"heatFrames": 910} + ]} + ]}, + {"resourceAvailable": [ + {"type": "Energy", "count": 50} + ]}, + {"partialRefill": {"type": "PowerBomb", "limit": 3}} + ] + }, { "id": 16, "link": [3, 3], diff --git a/region/lowernorfair/east/Metal Pirates Room.json b/region/lowernorfair/east/Metal Pirates Room.json index 542282b8cf..6c9d33c9e3 100644 --- a/region/lowernorfair/east/Metal Pirates Room.json +++ b/region/lowernorfair/east/Metal Pirates Room.json @@ -948,10 +948,48 @@ "requires": [ "h_heatProof", "canDodgeWhileShooting", - "Plasma", - {"refill": ["Energy", "Super"]}, - {"partialRefill": {"type": "Missile", "limit": 14}} - ] + {"resetRoom": {"nodes": [1, 2]}}, + {"or": [ + {"and": [ + "Plasma", + "Charge", + "Wave", + "Ice", + {"cycleFrames": 720} + ]}, + {"and": [ + "Plasma", + {"or": [ + "Charge", + "Wave", + "Ice" + ]}, + {"cycleFrames": 1110} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 1320} + ]}, + {"and": [ + "Charge", + "Ice", + "Wave", + "Spazer", + {"cycleFrames": 1800} + ]}, + {"and": [ + "Ice", + "Wave", + "Spazer", + {"cycleFrames": 2700} + ]} + ]} + ], + "clearsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Space Pirate (fighting)", "count": 2} + ], + "devNote": "FIXME: There are many more beam combinations that could be used." }, { "id": 32, @@ -960,11 +998,17 @@ "requires": [ {"notable": "Speed Echoes Kill"}, "h_heatProof", - "canDodgeWhileShooting", + {"resetRoom": {"nodes": [1, 2]}}, + "canFarmWhileShooting", "canUseSpeedEchoes", "canHitbox", - {"refill": ["Energy", "Super"]}, - {"partialRefill": {"type": "Missile", "limit": 14}} + {"canShineCharge": {"usedTiles": 38, "openEnd": 2}}, + {"shinespark": {"frames": 9}}, + {"cycleFrames": 730} + ], + "clearsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Space Pirate (fighting)", "count": 2} ], "note": [ "Use the Echoes created by shinesparking to defeat the Metal Pirates.", diff --git a/region/lowernorfair/east/Mickey Mouse Room.json b/region/lowernorfair/east/Mickey Mouse Room.json index 348c057273..65b6de917e 100644 --- a/region/lowernorfair/east/Mickey Mouse Room.json +++ b/region/lowernorfair/east/Mickey Mouse Room.json @@ -427,6 +427,64 @@ {"heatFrames": 0} ] }, + { + "link": [1, 1], + "name": "Single Multiviola Farm", + "requires": [ + "canPrepareForNextRoom", + "h_heatProof", + {"resetRoom": {"nodes": [1]}}, + {"or": [ + "Plasma", + "ScrewAttack", + {"and": [ + "canPseudoScrew", + {"cycleFrames": 30} + ]}, + {"and": [ + "Wave", + "Ice", + {"cycleFrames": 30} + ]} + ]}, + {"cycleFrames": 60} + ], + "resetsObstacles": ["A", "B", "C", "D", "E", "F"], + "farmCycleDrops": [ + {"enemy": "Multiviola", "count": 1} + ] + }, + { + "link": [1, 1], + "name": "Multiviola and Dessgeega Farm", + "requires": [ + "canPrepareForNextRoom", + "canDodgeWhileShooting", + "h_heatProof", + {"resetRoom": {"nodes": [1]}}, + {"or": [ + {"and": [ + "Plasma", + "Wave", + {"cycleFrames": 770} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 1290} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 610} + ]} + ]} + ], + "clearsObstacles": ["C", "E", "F"], + "resetsObstacles": ["A", "B", "D"], + "farmCycleDrops": [ + {"enemy": "Multiviola", "count": 2}, + {"enemy": "Dessgeega", "count": 5} + ] + }, { "id": 4, "link": [1, 1], diff --git a/region/lowernorfair/east/Plowerhouse Room.json b/region/lowernorfair/east/Plowerhouse Room.json index 9a346fdfe0..eb8db3efd8 100644 --- a/region/lowernorfair/east/Plowerhouse Room.json +++ b/region/lowernorfair/east/Plowerhouse Room.json @@ -1095,7 +1095,11 @@ "name": "Zebbo Farm", "requires": [ "h_heatProof", - {"refill": ["Energy", "Missile", "Super"]} + {"simpleCycleFrames": 100}, + {"cycleFrames": 20} + ], + "farmCycleDrops": [ + {"enemy": "Zebbo", "count": 1} ], "flashSuitChecked": true }, @@ -1105,15 +1109,27 @@ "name": "Holtz Farm", "requires": [ "h_heatProof", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 120} + ]}, + {"and": [ + {"resetRoom": {"nodes": [2]}}, + {"cycleFrames": 260} + ]} + ]}, {"or": [ "ScrewAttack", {"and": [ "Plasma", - "Wave" + "Wave", + {"cycleFrames": 60} ]} - ]}, - {"resetRoom": {"nodes": [1, 2]}}, - {"refill": ["PowerBomb"]} + ]} + ], + "farmCycleDrops": [ + {"enemy": "Holtz", "count": 2} ], "flashSuitChecked": true }, diff --git a/region/lowernorfair/east/Red Kihunter Shaft.json b/region/lowernorfair/east/Red Kihunter Shaft.json index 99f8980faa..382e3c8e87 100644 --- a/region/lowernorfair/east/Red Kihunter Shaft.json +++ b/region/lowernorfair/east/Red Kihunter Shaft.json @@ -742,20 +742,40 @@ "name": "Red Kihunter Farm", "requires": [ "h_heatProof", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1, 4]}}, + {"cycleFrames": 840} + ]}, + {"and": [ + {"resetRoom": {"nodes": [3]}}, + "canDodgeWhileShooting", + {"cycleFrames": 540} + ]} + ]}, {"or": [ "ScrewAttack", {"and": [ "Plasma", "Wave", - "Ice" + "Ice", + {"cycleFrames": 300} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 1960} ]} - ]}, - {"resetRoom": {"nodes": [1, 3, 4]}}, - {"partialRefill": {"type": "Energy", "limit": 200}}, - {"partialRefill": {"type": "Missile", "limit": 10}}, - {"partialRefill": {"type": "Super", "limit": 4}} + ]} ], - "resetsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Kihunter (red)", "count": 3} + ], + "flashSuitChecked": true, + "devNote": [ + "FIXME: More beam combinations would be possible.", + "There is some randomness in the KiHunter positioning." + ] }, { "id": 25, diff --git a/region/lowernorfair/east/The Worst Room In The Game.json b/region/lowernorfair/east/The Worst Room In The Game.json index bf63171474..673ae8fc7b 100644 --- a/region/lowernorfair/east/The Worst Room In The Game.json +++ b/region/lowernorfair/east/The Worst Room In The Game.json @@ -532,6 +532,29 @@ } } }, + { + "link": [2, 2], + "name": "Yellow Space Pirates Farm", + "requires": [ + "h_heatProof", + {"resetRoom": {"nodes": [2]}}, + {"or": [ + "ScrewAttack", + {"and": [ + "Charge", + "Plasma", + "Wave", + "Ice" + ]} + ]}, + {"cycleFrames": 285} + ], + "resetsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Yellow Space Pirate (wall)", "count": 2} + ], + "devNote": "FIXME: There are more possible beam combinations." + }, { "id": 8, "link": [2, 2], @@ -1850,6 +1873,16 @@ "name": "Yellow Space Pirates Farm", "requires": [ "h_heatProof", + {"or": [ + {"and": [ + {"resetRoom": {"nodes": [1]}}, + {"cycleFrames": 270} + ]}, + {"and": [ + {"resetRoom": {"nodes": [3]}}, + {"cycleFrames": 130} + ]} + ]}, {"or": [ "ScrewAttack", {"and": [ @@ -1858,12 +1891,13 @@ "Wave", "Ice" ]} - ]}, - {"resetRoom": {"nodes": [1, 3]}}, - {"partialRefill": {"type": "Energy", "limit": 199}}, - {"partialRefill": {"type": "Missile", "limit": 10}} + ]} + ], + "resetsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Yellow Space Pirate (standing)", "count": 1} ], - "resetsObstacles": ["A"] + "devNote": "FIXME: There are more possible beam combinations." }, { "id": 55, diff --git a/region/lowernorfair/east/Three Musketeers' Room.json b/region/lowernorfair/east/Three Musketeers' Room.json index 83de0e61e2..4513eec177 100644 --- a/region/lowernorfair/east/Three Musketeers' Room.json +++ b/region/lowernorfair/east/Three Musketeers' Room.json @@ -173,20 +173,33 @@ "name": "Red Kihunter Farm", "requires": [ "h_heatProof", + {"resetRoom": {"nodes": [1]}}, {"or": [ "ScrewAttack", {"and": [ "Plasma", "Wave", - "Ice" + "Ice", + {"cycleFrames": 200} ]} ]}, - {"resetRoom": {"nodes": [1]}}, - {"partialRefill": {"type": "Energy", "limit": 200}}, - {"partialRefill": {"type": "Missile", "limit": 10}}, - {"partialRefill": {"type": "Super", "limit": 4}} + {"or": [ + {"and": [ + "h_crouchJumpDownGrab", + {"cycleFrames": 60} + ]}, + "canWalljump", + "HiJump", + {"and": [ + "SpaceJump", + {"cycleFrames": 90} + ]} + ]}, + {"cycleFrames": 520} ], - "clearsObstacles": ["A"] + "clearsObstacles": ["A"], + "farmCycleDrops": [{"enemy": "Kihunter (red)", "count": 3}], + "devNote": "FIXME: Other beam options for this are possible." }, { "id": 4,