Skip to content

Commit 30b38ad

Browse files
committed
add simpleCycleFrames to applicable farms
1 parent ef41798 commit 30b38ad

9 files changed

Lines changed: 46 additions & 9 deletions

region/brinstar/green/Early Supers Room.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,8 @@
272272
"link": [1, 1],
273273
"name": "Zeb Farm",
274274
"requires": [
275-
{"cycleFrames": 105}
275+
{"simpleCycleFrames": 85},
276+
{"cycleFrames": 20}
276277
],
277278
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}],
278279
"flashSuitChecked": true

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1612,7 +1612,8 @@
16121612
"name": "Zebbo Farm",
16131613
"requires": [
16141614
{"obstaclesCleared": ["A"]},
1615-
{"cycleFrames": 115}
1615+
{"simpleCycleFrames": 85},
1616+
{"cycleFrames": 30}
16161617
],
16171618
"flashSuitChecked": true,
16181619
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}]

region/brinstar/green/Green Hill Zone.json

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,26 @@
314314
"link": [1, 1],
315315
"name": "Geega Farm",
316316
"requires": [
317-
{"cycleFrames": 125}
317+
{"cycleFrames": 130}
318318
],
319319
"farmCycleDrops": [{"enemy": "Geega", "count": 1}],
320-
"flashSuitChecked": true
320+
"flashSuitChecked": true,
321+
"devNote": [
322+
"We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
323+
]
324+
},
325+
{
326+
"link": [1, 1],
327+
"name": "Double Geega Farm",
328+
"requires": [
329+
"canFarmWhileShooting",
330+
{"cycleFrames": 160}
331+
],
332+
"farmCycleDrops": [{"enemy": "Geega", "count": 2}],
333+
"flashSuitChecked": true,
334+
"devNote": [
335+
"We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
336+
]
321337
},
322338
{
323339
"id": 29,

region/brinstar/pink/Big Pink.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3576,7 +3576,8 @@
35763576
"link": [13, 13],
35773577
"name": "Zeb Farm",
35783578
"requires": [
3579-
{"cycleFrames": 105}
3579+
{"simpleCycleFrames": 85},
3580+
{"cycleFrames": 20}
35803581
],
35813582
"farmCycleDrops": [{"enemy": "Zeb", "count": 1}]
35823583
},

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@
8080
"link": [1, 1],
8181
"name": "Zeb Farm",
8282
"requires": [
83-
{"cycleFrames": 105}
83+
{"simpleCycleFrames": 85},
84+
{"cycleFrames": 20}
8485
],
8586
"farmCycleDrops": [
8687
{"enemy": "Zeb", "count": 1}
@@ -98,6 +99,9 @@
9899
],
99100
"note": [
100101
"Jump back and forth between the left two bug pipes to farm them simultaneously."
102+
],
103+
"devNote": [
104+
"We use `cycleFrames` here rather than `simpleCycleFrames` because it requires non-trivial movement to maintain the double farm pattern."
101105
]
102106
},
103107
{

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@
119119
"link": [1, 1],
120120
"name": "Zeb Farm",
121121
"requires": [
122-
{"cycleFrames": 105}
122+
{"simpleCycleFrames": 85},
123+
{"cycleFrames": 20}
123124
],
124125
"farmCycleDrops": [
125126
{"enemy": "Zeb", "count": 1}

region/brinstar/red/Hellway.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
"link": [1, 1],
8888
"name": "Zebbo Farm",
8989
"requires": [
90-
{"cycleFrames": 160}
90+
{"simpleCycleFrames": 130},
91+
{"cycleFrames": 30}
9192
],
9293
"farmCycleDrops": [
9394
{"enemy": "Zebbo", "count": 1}
@@ -106,6 +107,9 @@
106107
"note": [
107108
"Stand on the platform between the right-most two Zebbo spawners,",
108109
"and walk back and forth to farm them simultaneously."
110+
],
111+
"devNote": [
112+
"We use `cycleFrames` here rather than `simpleCycleFrames` because it requires non-trivial movement to maintain the double farm pattern."
109113
]
110114
},
111115
{

region/brinstar/red/Red Tower.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,9 @@
407407
],
408408
"farmCycleDrops": [
409409
{"enemy": "Geega", "count": 1}
410+
],
411+
"devNote": [
412+
"We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
410413
]
411414
},
412415
{
@@ -418,6 +421,9 @@
418421
],
419422
"farmCycleDrops": [
420423
{"enemy": "Geega", "count": 2}
424+
],
425+
"devNote": [
426+
"We use `cycleFrames` here rather than `simpleCycleFrames` because it is non-trivial to avoid Geega damage while farming."
421427
]
422428
},
423429
{

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,10 @@
216216
"requires": [
217217
{"cycleFrames": 140}
218218
],
219-
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}]
219+
"farmCycleDrops": [{"enemy": "Zebbo", "count": 1}],
220+
"devNote": [
221+
"We use cycleFrames here rather than simpleCycleFrames because of how the acid (and Yapping Maw) complicates the farm."
222+
]
220223
},
221224
{
222225
"id": 5,

0 commit comments

Comments
 (0)