Merge pull request #2136 from osse101/CrocFarm

Croc Area Farms

Author: blkerby

region/norfair/crocomire/Cosine Room.json

@@ -127,6 +127,20 @@
       "flashSuitChecked": true,
       "devNote": ["Leniency is not included, because a farm is available."]
     },
+    {
+      "link": [1, 1],
+      "name": "Metaree Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [1]}},
+        "ScrewAttack",
+        {"cycleFrames": 255},
+        {"obstaclesNotCleared": ["A"]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Metaree", "count": 2}
+      ],
+      "resetsObstacles": ["A"]
+    },
     {
       "id": 3,
       "link": [1, 2],
@@ -249,8 +263,22 @@
       "link": [2, 2],
       "name": "Gamet Farm",
       "requires": [
-        {"obstaclesNotCleared": ["A"]},
-        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
+        {"or": [
+          {"and": [
+            {"simpleCycleFrames": 140},
+            {"cycleFrames": 20}
+          ]},
+          {"and": [
+            "canFarmWhileShooting",
+            "canUseGrapple",
+            {"simpleCycleFrames": 100},
+            {"cycleFrames": 35}
+          ]}
+        ]},
+        {"obstaclesNotCleared": ["A"]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Gamet", "count": 5}
       ]
     }
   ],

region/norfair/crocomire/Grapple Tutorial Room 3.json

@@ -163,12 +163,14 @@
       ]
     },
     {
-      "id": 3,
       "link": [1, 1],
       "name": "Gamet Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]},
-        {"obstaclesNotCleared": ["B"]}
+        {"simpleCycleFrames": 100},
+        {"cycleFrames": 20}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Gamet", "count": 5}
       ]
     },
     {

region/norfair/crocomire/Indiana Jones Room.json

@@ -203,6 +203,29 @@
       ],
       "clearsObstacles": ["E"]
     },
+    {
+      "link": [1, 1],
+      "name": "Ripper Farm",
+      "requires": [
+        {"or": [
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            {"cycleFrames": 880}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [2]}},
+            "Morph",
+            {"cycleFrames": 1640}
+          ]}
+        ]},
+        "SpaceJump",
+        "ScrewAttack"
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Ripper 2 (green)", "count": 4}
+      ],
+      "resetsObstacles": ["A", "B", "C", "D", "E"]
+    },
     {
       "id": 3,
       "link": [1, 2],
@@ -678,18 +701,56 @@
       "name": "Mella Farm",
       "requires": [
         {"or": [
-          "canDodgeWhileShooting",
-          "ScrewAttack",
-          "Ice",
+          {"and": [
+            {"resetRoom": {"nodes": [1]}},
+            {"cycleFrames": 1020},
+            "Morph",
+            {"or": [
+              "SpaceJump",
+              {"and": [
+                "HiJump",
+                "SpeedBooster",
+                "canWalljump",
+                {"cycleFrames": 120}
+              ]},
+              {"and": [
+                "HiJump",
+                "canSpringBallJumpMidAir",
+                "h_doubleEquipmentScreenCycleFrames",
+                {"cycleFrames": 540}
+              ]},
+              {"and": [
+                "canJumpIntoIBJ",
+                {"cycleFrames": 1400}
+              ]}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {"nodes": [2]}},
+            {"cycleFrames": 240}
+          ]}
+        ]},
+        {"or": [
+          "Grapple",
           "Wave",
           "Spazer",
-          "Plasma"
-        ]},
-        {"resetRoom": {
-          "nodes": [2]
-        }},
-        {"partialRefill": {"type": "Energy", "limit": 240}},
-        {"partialRefill": {"type": "Missile", "limit": 16}}
+          "Plasma",
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 60}
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"cycleFrames": 300}
+          ]},
+          {"and": [
+            "canFarmWhileShooting",
+            {"cycleFrames": 120}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Mella", "count": 5}
       ],
       "resetsObstacles": ["A", "B", "C", "D", "E"],
       "note": "Shoot the Mellas when they first begin to come on screen, and they will not move."

region/norfair/crocomire/Post Crocomire Farming Room.json

@@ -879,7 +879,11 @@
       "link": [3, 3],
       "name": "Gamet Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "Super", "PowerBomb"]}
+        {"simpleCycleFrames": 90},
+        {"cycleFrames": 20}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Gamet", "count": 5}
       ]
     },
     {

region/norfair/crocomire/Post Crocomire Shaft.json

@@ -541,10 +541,47 @@
       "link": [3, 3],
       "name": "Viola Farm",
       "requires": [
-        {"resetRoom": {
-          "nodes": [2, 3]
-        }},
-        {"refill": ["PowerBomb"]}
+        {"or": [
+          {"and": [
+            {"resetRoom": {
+              "nodes": [1, 4]
+            }},
+            {"cycleFrames": 760},
+            {"or": [
+              "canConsecutiveWalljump",
+              {"and": [
+                "SpaceJump",
+                {"cycleFrames": 300}
+              ]}
+            ]},
+            {"or": [
+              "canMoonfall",
+              {"cycleFrames": 40}
+            ]}
+          ]},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [2]
+            }},
+            {"cycleFrames": 400}
+          ]},
+          {"and": [
+            {"resetRoom": {
+              "nodes": [3]
+            }},
+            {"cycleFrames": 320}
+          ]}
+        ]},
+        {"or": [
+          "Grapple",
+          "Wave",
+          "Plasma",
+          "Spazer",
+          {"cycleFrames": 60}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Viola", "count": 4}
       ]
     },
     {