Merge branch 'master' into g-ws

Author: kjbranch

helpers.json

@@ -969,6 +969,14 @@
             ]}
           ]
         },
+        {
+          "name": "h_flashSuitIceClip",
+          "requires": [
+            "canTrickyUseFrozenEnemies",
+            "canCeilingClip",
+            {"useFlashSuit": {}}
+          ]
+        },
         {
           "name": "h_maxHeightSpringBallJump",
           "requires": [

logicalRequirements.md

@@ -242,6 +242,22 @@ __Example:__
 }}
 ```
 
+#### lavaFramesWithEnergyDrops object
+
+A `lavaFramesWithEnergyDrops` object represents the need for Samus to spend time in lava, but with the possibility of offsetting some of the lava damage using energy drops from enemies. Any lava damage is logically applied before the energy gain, so Samus must be able to survive the heat before picking up the drops. Any energy gain is logically capped to not exceed the heat damage, so this logical requirement cannot result in a net energy gain.
+
+The actual amount of energy gained typically depends on RNG and also on which ammo types are completely full. The drop probabilities for each enemy type is given in the [enemies](enemies/main.json) file. Because of the randomness involved, the logical amount of energy gain is open to various interpretations. For example, the mean, the median, or a lower confidence limit could be used.
+
+__Example:__
+```json
+{"lavaFramesWithEnergyDrops": {
+  "frames": 200,
+  "drops": [
+    {"enemy": "Fune", "count": 1}
+  ]
+}}
+```
+
 #### gravitylessHeatFrames object
 A `gravitylessHeatFrames` object represents Samus in a heated environment with Gravity Suit turned off, even if it is available. The number of frames here needs to be represented as `heatFrames` without the reduction effects given by Gravity Suit.
 

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],

region/brinstar/green/Brinstar Pre-Map Room.json

@@ -127,6 +127,18 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1], 
+      "name": "Zeela Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [1]}},
+        {"cycleFrames": 120}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Zeela", "count": 1}
+      ],
+      "resetsObstacles": ["A"]
+    },
     {
       "id": 2,
       "link": [1, 1],
@@ -433,12 +445,30 @@
         {"resetRoom": {
           "nodes": [2]
         }},
-        {"partialRefill": {"type": "Energy", "limit": 240}},
-        {"partialRefill": {"type": "Missile", "limit": 20}},
-        {"partialRefill": {"type": "Super", "limit": 4}}
+        {"cycleFrames": 320},
+        {"or": [
+          "canDodgeWhileShooting",
+          "Plasma",
+          {"and": [
+            "Wave",
+            "Spazer"
+          ]},
+          {"and": [
+            "Ice",
+            "Wave"
+          ]},
+          {"and": [
+            "Ice",
+            "Spazer"
+          ]}
+        ]}
       ],
       "resetsObstacles": ["A"],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "farmCycleDrops": [
+        {"enemy": "Zeela", "count": 2},
+        {"enemy": "Sm. Sidehopper", "count": 1}
+      ]
     },
     {
       "id": 24,

region/brinstar/green/Early Supers Room.json

@@ -272,7 +272,10 @@
       "link": [1, 1],
       "name": "Zeb Farm",
       "requires": [
-        {"refill": ["Energy", "Missile", "Super"]}
+        {"cycleFrames": 105}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Zeb", "count": 1}
       ],
       "flashSuitChecked": true
     },
@@ -802,6 +805,45 @@
         "leaveWithTemporaryBlue": {}
       }
     },
+    {
+      "link": [2, 2],
+      "name": "Waver and Sidehopper Farm",
+      "requires": [
+        {"resetRoom": {"nodes": [2]}},
+        {"or": [
+          "canWalljump",
+          "canCrouchJump"
+        ]},
+        {"or": [
+          {"and": [
+            "Plasma",
+            {"cycleFrames": 600}
+          ]},
+          {"and": [
+            "ScrewAttack",
+            {"cycleFrames": 700}
+          ]},
+          {"and": [
+            {"or": [
+              "Wave",
+              "Spazer"
+            ]},
+            {"cycleFrames": 750}
+          ]},
+          {"and": [
+            "canDodgeWhileShooting",
+            {"cycleFrames": 1050}
+          ]}
+        ]}
+      ],
+      "farmCycleDrops": [
+        {"enemy": "Waver", "count": 4},
+        {"enemy": "Sm. Sidehopper", "count": 3}
+      ],
+      "clearsObstacles": ["A"],
+      "resetsObstacles": ["B"],
+      "flashSuitChecked": true
+    },
     {
       "id": 30,
       "link": [2, 2],