Merge pull request #2122 from blkerby/blue-brin-farms

Rest of Blue Brinstar farms

Author: osse101

region/brinstar/blue/Blue Brinstar Energy Tank Room.json

@@ -503,10 +503,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 +887,38 @@
       "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": [
+        {"notable": "Return Through Crumble Blocks"},
+        "h_ZebesIsAwake",
+        "Morph",
+        {"or": [
+          "ScrewAttack",
+          "h_useMorphBombs"
+        ]},
+        {"or": [
+          "canConsecutiveWalljump",
+          "SpaceJump"
+        ]},
+        {"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}
+      ],
+      "devNote": [
+        "Returning with an IBJ or frozen Geemer would also be possible,",
+        "but these are probably too slow to model in a farm strat."
+      ]
+    },
     {
       "id": 38,
       "link": [2, 2],

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": 270}
+          ]},
+          {"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],