From 9684e759b15255440d555f1cff44341191e63265 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Thu, 10 Jul 2025 16:17:08 -0600 Subject: [PATCH 1/3] Rest of Blue Brinstar farms --- .../blue/Blue Brinstar Energy Tank Room.json | 47 ++++++++++++- region/brinstar/blue/Morph Ball Room.json | 67 +++++++++++++++++++ 2 files changed, 111 insertions(+), 3 deletions(-) diff --git a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json index 2dc5d38de3..6f13a0914b 100644 --- a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json +++ b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json @@ -494,6 +494,21 @@ "leaveWithTemporaryBlue": {} } }, + { + "link": [1, 1], + "name": "Geemer Farm", + "requires": [ + "h_ZebesIsAwake", + {"resetRoom": { + "nodes": [1] + }}, + {"cycleFrames": 135} + ], + "resetsObstacles": ["A", "B", "C", "D"], + "farmCycleDrops": [ + {"enemy": "Geemer (blue)", "count": 2} + ] + }, { "id": 14, "link": [1, 1], @@ -503,10 +518,14 @@ {"resetRoom": { "nodes": [1] }}, - {"refill": ["Missile"]}, - {"partialRefill": {"type": "Energy", "limit": 200}} + {"cycleFrames": 400} ], - "resetsObstacles": ["A", "B", "C", "D"] + "resetsObstacles": ["A", "B", "C", "D"], + "farmCycleDrops": [ + {"enemy": "Geemer (blue)", "count": 2}, + {"enemy": "Skree", "count": 2}, + {"enemy": "Reo", "count": 1} + ] }, { "id": 15, @@ -883,6 +902,28 @@ "flashSuitChecked": true, "note": "Falling down the shaft and breaking the crumble block does not require Morph." }, + { + "link": [2, 2], + "name": "Geemer, Skree, and Reo Farm", + "requires": [ + "h_ZebesIsAwake", + {"or": [ + "ScrewAttack", + "h_useMorphBombs" + ]}, + {"resetRoom": { + "nodes": [2] + }}, + {"cycleFrames": 1350} + ], + "resetsObstacles": ["C", "D"], + "clearsObstacles": ["A", "B"], + "farmCycleDrops": [ + {"enemy": "Geemer (blue)", "count": 2}, + {"enemy": "Skree", "count": 2}, + {"enemy": "Reo", "count": 1} + ] + }, { "id": 38, "link": [2, 2], diff --git a/region/brinstar/blue/Morph Ball Room.json b/region/brinstar/blue/Morph Ball Room.json index 9f3a2ce280..ca4add0e0b 100644 --- a/region/brinstar/blue/Morph Ball Room.json +++ b/region/brinstar/blue/Morph Ball Room.json @@ -363,6 +363,73 @@ "leaveWithTemporaryBlue": {} } }, + { + "link": [1, 1], + "name": "Sidehopper Farm", + "requires": [ + "h_ZebesIsAwake", + "canPrepareForNextRoom", + {"resetRoom": {"nodes": [1]}}, + {"or": [ + {"and": [ + "Plasma", + "Charge", + {"cycleFrames": 230} + ]}, + {"and": [ + "ScrewAttack", + {"cycleFrames": 250} + ]}, + {"and": [ + "Plasma", + "Wave", + "canTrickyDodgeEnemies", + {"cycleFrames": 300} + ]}, + {"and": [ + "h_PlasmaHitbox", + {"cycleFrames": 360} + ]}, + {"and": [ + "Morph", + "canTrickyDodgeEnemies", + {"or": [ + {"and": [ + "Wave", + "Spazer", + {"cycleFrames": 600} + ]}, + {"and": [ + "Wave", + {"cycleFrames": 840} + ]}, + {"and": [ + "Spazer", + "Ice", + {"cycleFrames": 840} + ]}, + {"and": [ + "Spazer", + {"cycleFrames": 960} + ]}, + {"and": [ + "Ice", + {"cycleFrames": 1560} + ]}, + {"and": [ + "canBePatient", + {"cycleFrames": 2320} + ]} + ]} + ]} + ]} + ], + "resetsObstacles": ["A", "B", "D"], + "clearsObstacles": ["C"], + "farmCycleDrops": [ + {"enemy": "Sidehopper", "count": 3} + ] + }, { "id": 10, "link": [1, 1], From f29e13f1ccd1d995a942fb48bf458240b9857e46 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Fri, 11 Jul 2025 16:17:11 -0600 Subject: [PATCH 2/3] Update region/brinstar/blue/Morph Ball Room.json Co-authored-by: Michael McKenzie --- region/brinstar/blue/Morph Ball Room.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/region/brinstar/blue/Morph Ball Room.json b/region/brinstar/blue/Morph Ball Room.json index ca4add0e0b..277b2bb6b7 100644 --- a/region/brinstar/blue/Morph Ball Room.json +++ b/region/brinstar/blue/Morph Ball Room.json @@ -374,7 +374,7 @@ {"and": [ "Plasma", "Charge", - {"cycleFrames": 230} + {"cycleFrames": 270} ]}, {"and": [ "ScrewAttack", From 4818626f3577b624a3329a138d9a8e85e280e183 Mon Sep 17 00:00:00 2001 From: Brent Kerby Date: Fri, 11 Jul 2025 16:17:25 -0600 Subject: [PATCH 3/3] feedback updates --- .../blue/Blue Brinstar Energy Tank Room.json | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json index 6f13a0914b..1eaec345a6 100644 --- a/region/brinstar/blue/Blue Brinstar Energy Tank Room.json +++ b/region/brinstar/blue/Blue Brinstar Energy Tank Room.json @@ -494,21 +494,6 @@ "leaveWithTemporaryBlue": {} } }, - { - "link": [1, 1], - "name": "Geemer Farm", - "requires": [ - "h_ZebesIsAwake", - {"resetRoom": { - "nodes": [1] - }}, - {"cycleFrames": 135} - ], - "resetsObstacles": ["A", "B", "C", "D"], - "farmCycleDrops": [ - {"enemy": "Geemer (blue)", "count": 2} - ] - }, { "id": 14, "link": [1, 1], @@ -906,11 +891,17 @@ "link": [2, 2], "name": "Geemer, Skree, and Reo Farm", "requires": [ + {"notable": "Return Through Crumble Blocks"}, "h_ZebesIsAwake", + "Morph", {"or": [ "ScrewAttack", "h_useMorphBombs" ]}, + {"or": [ + "canConsecutiveWalljump", + "SpaceJump" + ]}, {"resetRoom": { "nodes": [2] }}, @@ -922,6 +913,10 @@ {"enemy": "Geemer (blue)", "count": 2}, {"enemy": "Skree", "count": 2}, {"enemy": "Reo", "count": 1} + ], + "devNote": [ + "Returning with an IBJ or frozen Geemer would also be possible,", + "but these are probably too slow to model in a farm strat." ] }, {