Merge pull request #2137 from blkerby/simple-cycle-farms

Add simpleCycleFrames to applicable farms

Author: osse101

region/brinstar/green/Early Supers Room.json

@@ -272,7 +272,8 @@
       "link": [1, 1],
       "name": "Zeb Farm",
       "requires": [
-        {"cycleFrames": 105}
+        {"simpleCycleFrames": 85},
+        {"cycleFrames": 20}
       ],
       "farmCycleDrops": [{"enemy": "Zeb", "count": 1}],
       "flashSuitChecked": true

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -1612,7 +1612,8 @@
       "name": "Zebbo Farm",
       "requires": [
         {"obstaclesCleared": ["A"]},
-        {"cycleFrames": 115}
+        {"simpleCycleFrames": 85},
+        {"cycleFrames": 30}
       ],
       "flashSuitChecked": true,
       "farmCycleDrops": [{"enemy": "Zebbo", "count": 1}]

region/brinstar/green/Green Hill Zone.json

@@ -314,10 +314,26 @@
       "link": [1, 1],
       "name": "Geega Farm",
       "requires": [
-        {"cycleFrames": 125}
+        {"cycleFrames": 130}
       ],
       "farmCycleDrops": [{"enemy": "Geega", "count": 1}],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "devNote": [
+        "We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
+      ]
+    },
+    {
+      "link": [1, 1],
+      "name": "Double Geega Farm",
+      "requires": [
+        "canFarmWhileShooting",
+        {"cycleFrames": 160}
+      ],
+      "farmCycleDrops": [{"enemy": "Geega", "count": 2}],
+      "flashSuitChecked": true,
+      "devNote": [
+        "We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
+      ]
     },
     {
       "id": 29,

region/brinstar/pink/Big Pink.json

@@ -3576,7 +3576,8 @@
       "link": [13, 13],
       "name": "Zeb Farm",
       "requires": [
-        {"cycleFrames": 105}
+        {"simpleCycleFrames": 85},
+        {"cycleFrames": 20}
       ],
       "farmCycleDrops": [{"enemy": "Zeb", "count": 1}]
     },

region/brinstar/pink/Spore Spawn Farming Room.json

@@ -80,7 +80,8 @@
       "link": [1, 1],
       "name": "Zeb Farm",
       "requires": [
-        {"cycleFrames": 105}
+        {"simpleCycleFrames": 85},
+        {"cycleFrames": 20}
       ],
       "farmCycleDrops": [
         {"enemy": "Zeb", "count": 1}
@@ -98,6 +99,9 @@
       ],
       "note": [
         "Jump back and forth between the left two bug pipes to farm them simultaneously."
+      ],
+      "devNote": [
+        "We use `cycleFrames` here rather than `simpleCycleFrames` because it requires non-trivial movement to maintain the double farm pattern."
       ]
     },
     {

region/brinstar/pink/Spore Spawn Super Room.json

@@ -119,7 +119,8 @@
       "link": [1, 1],
       "name": "Zeb Farm",
       "requires": [
-        {"cycleFrames": 105}
+        {"simpleCycleFrames": 85},
+        {"cycleFrames": 20}
       ],
       "farmCycleDrops": [
         {"enemy": "Zeb", "count": 1}

region/brinstar/red/Hellway.json

@@ -87,7 +87,8 @@
       "link": [1, 1],
       "name": "Zebbo Farm",
       "requires": [
-        {"cycleFrames": 160}
+        {"simpleCycleFrames": 130},
+        {"cycleFrames": 30}
       ],
       "farmCycleDrops": [
         {"enemy": "Zebbo", "count": 1}
@@ -106,6 +107,9 @@
       "note": [
         "Stand on the platform between the right-most two Zebbo spawners,",
         "and walk back and forth to farm them simultaneously."
+      ],
+      "devNote": [
+        "We use `cycleFrames` here rather than `simpleCycleFrames` because it requires non-trivial movement to maintain the double farm pattern."
       ]
     },
     {

region/brinstar/red/Red Tower.json

@@ -407,6 +407,9 @@
       ],
       "farmCycleDrops": [
         {"enemy": "Geega", "count": 1}
+      ],
+      "devNote": [
+        "We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
       ]
     },
     {
@@ -418,6 +421,9 @@
       ],
       "farmCycleDrops": [
         {"enemy": "Geega", "count": 2}
+      ],
+      "devNote": [
+        "We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
       ]
     },
     {

region/crateria/west/Gauntlet Energy Tank Room.json

@@ -216,7 +216,10 @@
       "requires": [
         {"cycleFrames": 140}
       ],
-      "farmCycleDrops": [{"enemy": "Zebbo", "count": 1}]
+      "farmCycleDrops": [{"enemy": "Zebbo", "count": 1}],
+      "devNote": [
+        "We use cycleFrames here rather than simpleCycleFrames because of how the acid (and Yapping Maw) complicates the farm."
+      ]
     },
     {
       "id": 5,