From 30b38ad8b6713fb6697af199ddbda3118b8a85e7 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Fri, 18 Jul 2025 11:10:29 -0600 Subject: [PATCH] add simpleCycleFrames to applicable farms --- region/brinstar/green/Early Supers Room.json | 3 ++- .../green/Etecoon Energy Tank Room.json | 3 ++- region/brinstar/green/Green Hill Zone.json | 20 +++++++++++++++++-- region/brinstar/pink/Big Pink.json | 3 ++- .../pink/Spore Spawn Farming Room.json | 6 +++++- .../brinstar/pink/Spore Spawn Super Room.json | 3 ++- region/brinstar/red/Hellway.json | 6 +++++- region/brinstar/red/Red Tower.json | 6 ++++++ .../west/Gauntlet Energy Tank Room.json | 5 ++++- 9 files changed, 46 insertions(+), 9 deletions(-) diff --git a/region/brinstar/green/Early Supers Room.json b/region/brinstar/green/Early Supers Room.json index 201f3fd9ce..00a20641c0 100644 --- a/region/brinstar/green/Early Supers Room.json +++ b/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 diff --git a/region/brinstar/green/Etecoon Energy Tank Room.json b/region/brinstar/green/Etecoon Energy Tank Room.json index 084de49807..516ea3d491 100644 --- a/region/brinstar/green/Etecoon Energy Tank Room.json +++ b/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}] diff --git a/region/brinstar/green/Green Hill Zone.json b/region/brinstar/green/Green Hill Zone.json index 046bc89a98..035fc4bab2 100644 --- a/region/brinstar/green/Green Hill Zone.json +++ b/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, diff --git a/region/brinstar/pink/Big Pink.json b/region/brinstar/pink/Big Pink.json index 861b6ce7a1..1c5c70acb6 100644 --- a/region/brinstar/pink/Big Pink.json +++ b/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}] }, diff --git a/region/brinstar/pink/Spore Spawn Farming Room.json b/region/brinstar/pink/Spore Spawn Farming Room.json index e67400b785..e7e63faa4b 100644 --- a/region/brinstar/pink/Spore Spawn Farming Room.json +++ b/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." ] }, { diff --git a/region/brinstar/pink/Spore Spawn Super Room.json b/region/brinstar/pink/Spore Spawn Super Room.json index d78a28ef25..680451d2df 100644 --- a/region/brinstar/pink/Spore Spawn Super Room.json +++ b/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} diff --git a/region/brinstar/red/Hellway.json b/region/brinstar/red/Hellway.json index 31a926f279..35c99e2810 100644 --- a/region/brinstar/red/Hellway.json +++ b/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." ] }, { diff --git a/region/brinstar/red/Red Tower.json b/region/brinstar/red/Red Tower.json index abc0c03ef0..536a63d2a1 100644 --- a/region/brinstar/red/Red Tower.json +++ b/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." ] }, { diff --git a/region/crateria/west/Gauntlet Energy Tank Room.json b/region/crateria/west/Gauntlet Energy Tank Room.json index 8396663035..845919dcff 100644 --- a/region/crateria/west/Gauntlet Energy Tank Room.json +++ b/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,