Merge pull request #1529 from osse101/FarmBranch

More Logic Updates

Author: osse101

region/brinstar/kraid/Warehouse Energy Tank Room.json

@@ -88,16 +88,34 @@
           {"and": [
             {"or": [
               "Ice",
-              "canCarefulJump"
+              "canTrickyJump",
+              {"enemyDamage": {
+                "enemy": "Beetom",
+                "type": "contact",
+                "hits": 1
+              }}
             ]},
-            "h_canUseMorphBombs"
+            {"or": [
+              "h_canUseMorphBombs",
+              {"and": [
+                {"resourceAvailable": [ {"type": "Energy", "count": 50} ]},
+                {"or": [
+                  {"ammo": {"type": "Missile", "count": 1}},
+                  {"ammo": {"type": "Super", "count": 1}},
+                  {"ammo": {"type": "PowerBomb", "count": 1}}
+                ]},
+                {"partialRefill": {"type": "PowerBomb", "limit": 1}},
+                "h_canUsePowerBombs"
+              ]}
+            ]}
           ]}
         ]},
-        {"refill": ["Energy", "PowerBomb"]}
+        {"refill": ["PowerBomb"]}
       ],
       "note": "Kill the Beetoms with Screw Attack or by freezing or carefully avoiding them and using Bombs or Power Bombs.",
       "devNote": [
-        "FIXME: Using a Missile, Super, or Power Bomb at the start could be added to the logic to get the first Power Bombs to use for further farming, but this needs a way to express that we're not in health-bomb energy range."
+        "Health Bomb ends at 50 energy.",
+        "One ammo can be used to gain a power bomb and then power bombs can be used to farm more power bombs."
       ]
     },
     {