diff --git a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json index 9978705667..e78969cffa 100644 --- a/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json +++ b/region/maridia/inner-yellow/Maridia Swiss Cheese Room.json @@ -124,6 +124,60 @@ } } }, + { + "link": [1, 1], + "name": "Menu Farm", + "requires": [ + {"resetRoom": {"nodes": [1]}}, + "canCameraManip", + "canDodgeWhileShooting", + "canTrickyJump", + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 220} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 280} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 290} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 290} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 330} + ]}, + {"and": [ + "canPseudoScrew", + {"cycleFrames": 435} + ]}, + {"and": [ + "canTrickyJump", + {"cycleFrames": 500} + ]} + ]}, + {"or": [ + "canFarmWhileShooting", + {"cycleFrames": 400} + ]} + ], + "farmCycleDrops": [{"enemy": "Menu", "count": 2}], + "resetsObstacles": ["A"], + "note": [ + "A Menu can be activated by jumping on the doorway platform to scroll the camera down.", + "A second Menu can be activated with a tricky jump onto the ledge on the right,", + "without needing to fall down to the bottom part of the room." + ], + "devNote": [ + "FIXME: By dropping down, it would be possible to farm 4 or 5 Menus and also Owtches." + ] + }, { "id": 2, "link": [1, 1], @@ -395,6 +449,51 @@ ], "clearsObstacles": ["A"] }, + { + "link": [2, 2], + "name": "Menu Farm", + "requires": [ + {"resetRoom": {"nodes": [2]}}, + "canDodgeWhileShooting", + {"or": [ + {"and": [ + "ScrewAttack", + {"cycleFrames": 210} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 220} + ]}, + {"and": [ + "Grapple", + {"cycleFrames": 240} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 260} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 285} + ]}, + {"and": [ + {"or": [ + "canTrickyDodgeEnemies", + {"and": [ + "Gravity", + "canTrickyJump" + ]} + ]}, + {"cycleFrames": 360} + ]} + ]} + ], + "farmCycleDrops": [{"enemy": "Menu", "count": 2}], + "clearsObstacles": ["A"], + "devNote": [ + "FIXME: It is also posssible to farm Owtches and/or additional Menus." + ] + }, { "id": 16, "link": [2, 2], diff --git a/region/maridia/inner-yellow/Plasma Room.json b/region/maridia/inner-yellow/Plasma Room.json index f2a4b597e6..d6dac1c6d8 100644 --- a/region/maridia/inner-yellow/Plasma Room.json +++ b/region/maridia/inner-yellow/Plasma Room.json @@ -228,18 +228,82 @@ { "id": 7, "link": [1, 1], - "name": "Space Pirate Farm", + "name": "Pirate Farm (All Pirates)", "requires": [ - "SpaceJump", + {"resetRoom": {"nodes": [1]}}, + {"or": [ + {"and": [ + "HiJump", + "SpaceJump", + {"cycleFrames": 930} + ]}, + {"and": [ + "HiJump", + "canTrickyWalljump", + {"cycleFrames": 960} + ]}, + {"and": [ + "SpaceJump", + {"cycleFrames": 1220} + ]}, + {"and": [ + "canSpringwall", + {"cycleFrames": 1035}, + "h_doubleEquipmentScreenCycleFrames" + ]}, + {"and": [ + "HiJump", + "canSpringBallJumpMidAir", + {"cycleFrames": 910}, + "h_doubleEquipmentScreenCycleFrames" + ]}, + {"and": [ + "canDoubleBombJump", + {"or": [ + "canWalljump", + "h_crouchJumpDownGrab" + ]}, + {"cycleFrames": 1410} + ]}, + {"and": [ + "canDoubleBombJump", + {"cycleFrames": 1560} + ]} + ]}, {"or": [ "ScrewAttack", "Plasma" - ]}, + ]} + ], + "clearsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Pink Space Pirate (standing)", "count": 4}, + {"enemy": "Pink Space Pirate (wall)", "count": 2} + ], + "devNote": [ + "FIXME: Add option to kill the Pirates with speed echoes, and possibly to get back up with a shinespark." + ] + }, + { + "link": [1, 1], + "name": "Pirate Farm (Single Pirate)", + "requires": [ {"resetRoom": {"nodes": [1]}}, - {"partialRefill": {"type": "Energy", "limit": 200}}, - {"partialRefill": {"type": "Missile", "limit": 12}} + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 210} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 255} + ]} + ]} ], - "clearsObstacles": ["A"] + "resetsObstacles": ["A"], + "farmCycleDrops": [ + {"enemy": "Pink Space Pirate (standing)", "count": 1} + ] }, { "id": 8, diff --git a/region/maridia/inner-yellow/Plasma Spark Room.json b/region/maridia/inner-yellow/Plasma Spark Room.json index 9e839aa32f..67e00d83de 100644 --- a/region/maridia/inner-yellow/Plasma Spark Room.json +++ b/region/maridia/inner-yellow/Plasma Spark Room.json @@ -281,6 +281,90 @@ "FIXME: This is also possible using Spring Ball jumps (with pause remorphs) instead of HiJump." ] }, + { + "link": [1, 1], + "name": "Choot Farm (Single Choot)", + "requires": [ + {"resetRoom": {"nodes": [1]}}, + {"or": [ + {"and": [ + "Grapple", + {"cycleFrames": 130} + ]}, + {"and": [ + "Plasma", + {"cycleFrames": 150} + ]}, + {"and": [ + {"or": [ + "Wave", + "Spazer" + ]}, + {"cycleFrames": 160} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 170} + ]}, + {"and": [ + "canPseudoScrew", + {"cycleFrames": 180} + ]}, + {"cycleFrames": 220} + ]} + ], + "farmCycleDrops": [{"enemy": "Choot", "count": 1}] + }, + { + "link": [1, 1], + "name": "Choot Farm (3 Choots)", + "requires": [ + {"resetRoom": {"nodes": [1]}}, + {"or": [ + "canWalljump", + "HiJump", + {"and": [ + "SpaceJump", + {"cycleFrames": 300} + ]}, + {"and": [ + "canTrickySpringBallJump", + {"cycleFrames": 360}, + "h_doubleEquipmentScreenCycleFrames", + "h_doubleEquipmentScreenCycleFrames", + "h_doubleEquipmentScreenCycleFrames" + ]}, + {"and": [ + "canDoubleBombJump", + {"cycleFrames": 930} + ]} + ]}, + {"or": [ + {"and": [ + {"or": [ + "Grapple", + "Wave", + "Plasma" + ]}, + {"cycleFrames": 750} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 820} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 850} + ]}, + {"and": [ + "canPseudoScrew", + {"cycleFrames": 870} + ]}, + {"cycleFrames": 1080} + ]} + ], + "farmCycleDrops": [{"enemy": "Choot", "count": 3}] + }, { "id": 3, "link": [1, 1], @@ -930,6 +1014,33 @@ "but not by enough to remove the need for the canLongChainTemporaryBlue requirement." ] }, + { + "link": [2, 2], + "name": "Skultera Farm", + "requires": [ + "canSuitlessMaridia", + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 1660} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 1860} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 2100} + ]}, + {"cycleFrames": 2500} + ]} + ], + "farmCycleDrops": [{"enemy": "Skultera", "count": 2}], + "devNote": [ + "With Gravity the Choot farm would be used instead.", + "FIXME: The Owtches could also be farmed, though they are not worth much." + ] + }, { "id": 16, "link": [2, 2], @@ -1394,12 +1505,69 @@ "link": [3, 3], "name": "Choot Farm", "requires": [ - "canBePatient", - {"resetRoom": {"nodes": [3]}}, - {"partialRefill": {"type": "Super", "limit": 5}}, - {"partialRefill": {"type": "Missile", "limit": 10}}, - {"partialRefill": {"type": "Energy", "limit": 140}} - ] + {"or": [ + {"resetRoom": {"nodes": [3]}}, + {"and": [ + {"resetRoom": {"nodes": [2]}}, + {"or": [ + {"and": [ + "Gravity", + {"cycleFrames": 835} + ]}, + {"and": [ + "canSuitlessMaridia", + "HiJump", + {"cycleFrames": 1540} + ]} + ]} + ]}, + {"and": [ + {"resetRoom": {"nodes": [4]}}, + {"or": [ + {"and": [ + "HiJump", + "SpaceJump", + {"cycleFrames": 230} + ]}, + {"and": [ + "canTrickyWalljump", + "canConsecutiveWalljump", + {"cycleFrames": 310} + ]}, + {"and": [ + "SpaceJump", + {"cycleFrames": 400} + ]} + ]} + ]} + ]}, + {"or": [ + {"and": [ + "Plasma", + {"cycleFrames": 320} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 340} + ]}, + {"and": [ + "Grapple", + {"cycleFrames": 360} + ]}, + {"and": [ + "Spazer", + "canFarmWhileShooting", + {"cycleFrames": 390} + ]}, + {"and": [ + "ScrewAttack", + "canDodgeWhileShooting", + {"cycleFrames": 500} + ]}, + {"cycleFrames": 640} + ]} + ], + "farmCycleDrops": [{"enemy": "Choot", "count": 2}] }, { "id": 37,