Merge pull request #2215 from blkerby/yellow-maridia-farm-2

Yellow Maridia Farms part 2: Plasma Spark Room, etc.

Author: osse101

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],

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,