Merge pull request #2153 from blkerby/west-maridia-farms-2

Fish Tank and Main Street farms

Author: osse101

region/maridia/outer/Fish Tank.json

@@ -353,6 +353,63 @@
         "Use Gravity jumps to navigate to the left, chaining temporary blue through the door."
       ]
     },
+    {
+      "link": [1, 1],
+      "name": "Skultera Farm (Single Skultera)",
+      "requires": [
+        {"resetRoom": {"nodes": [1]}},
+        {"or": [
+          {"and": [
+            "Gravity",
+            {"or": [
+                {"and": [
+                  "Plasma",
+                  {"cycleFrames": 140}
+                ]},
+                {"and": [
+                  "ScrewAttack",
+                  {"cycleFrames": 170}
+                ]},
+                {"and": [
+                  "Wave",
+                  {"cycleFrames": 190}
+                ]},
+                {"and": [
+                  "Spazer",
+                  {"cycleFrames": 210}
+                ]},
+                {"and": [
+                  "Ice",
+                  {"cycleFrames": 290}
+                ]},
+                {"cycleFrames": 390}
+            ]}
+          ]},
+          {"and": [
+            {"or": [
+              "Plasma",
+              "Wave",
+              "Spazer"
+            ]},
+            {"cycleFrames": 270}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 330}
+          ]},
+          {"and": [
+            {"or": [
+              "canDodgeWhileShooting",
+              "HiJump"
+            ]},
+            {"cycleFrames": 450}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Skultera", "count": 1}
+      ]
+    },
     {
       "id": 7,
       "link": [1, 1],
@@ -1361,6 +1418,22 @@
         }
       }
     },
+    {
+      "link": [2, 2],
+      "name": "Pirate Farm (Single Pirate)",
+      "requires": [
+        {"resetRoom": {"nodes": [2]}},
+        {"cycleFrames": 630},
+        "Plasma"
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Pink Space Pirate (standing)", "count": 1}
+      ],
+      "devNote": [
+        "This is for farming suitless.",
+        "If Gravity is available, it is instead worthwhile to farm all the Pirates in the room."
+      ]
+    },
     {
       "id": 33,
       "link": [2, 2],
@@ -2842,18 +2915,100 @@
       ]
     },
     {
-      "id": 74,
       "link": [6, 6],
-      "name": "Space Pirate Farm",
+      "name": "Skultera Farm (All Skulteras)",
       "requires": [
         "Gravity",
+        "canConsecutiveWalljump",
+        {"or": [
+          {"and": [
+            {"resetRoom": {"nodes": [3]}},
+            {"cycleFrames": 1300}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            {"cycleFrames": 1540}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [4]}},
+            "canPreciseWalljump",
+            {"cycleFrames": 1690}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [2]}},
+            {"cycleFrames": 1890}
+          ]}
+        ]},
         {"or": [
           "Plasma",
-          "ScrewAttack"
+          "ScrewAttack",
+          {"and": [
+            "Wave",
+            {"cycleFrames": 365}
+          ]},
+          {"and": [
+            "Spazer",
+            {"cycleFrames": 480}
+          ]},
+          {"and": [
+            "Ice",
+            {"cycleFrames": 1250}
+          ]},
+          {"cycleFrames": 1685}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Skultera", "count": 4}
+      ],
+      "devNote": [
+        "Farming Skulteras with Plasma or Screw Attack is included for completeness,",
+        "though with these items it would be better to farm the Pirates.",
+        "FIXME: there are other, slower ways to farm here, e.g. without Gravity."  
+      ]
+    },
+    {
+      "id": 74,
+      "link": [6, 6],
+      "name": "Pirate Farm (All Pirates)",
+      "requires": [
+        "Gravity",
+        {"or": [
+          {"and": [
+            {"resetRoom": {"nodes": [3]}},
+            {"cycleFrames": 950}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [2]}},
+            {"cycleFrames": 1260}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [4]}},
+            "canPreciseWalljump",
+            {"cycleFrames": 1440}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            "canConsecutiveWalljump",
+            {"cycleFrames": 1600}
+          ]}
         ]},
-        {"resetRoom": {"nodes": [2, 3]}},
-        {"partialRefill": {"type": "Energy", "limit": 200}},
-        {"partialRefill": {"type": "Missile", "limit": 8}}
+        {"or": [
+          "canWalljump",
+          {"cycleFrames": 90}
+        ]},
+        {"or": [
+          "ScrewAttack",
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 150}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Pink Space Pirate (standing)", "count": 4}
+      ],
+      "devNote": [
+        "FIXME: there are other, slower ways to farm here, e.g. without Gravity."
       ]
     },
     {