Merge pull request #2068 from blkerby/warehouse-etank-damageless

Warehouse E-Tank tricky evade beetoms

Author: osse101

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

@@ -385,13 +385,40 @@
       "id": 15,
       "link": [1, 2],
       "name": "Tricky Evade",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
       "requires": [
+        {"doorUnlockedAtNode": 1},
         "canTrickyJump",
         {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 1}}
       ],
       "note": [
         "Wait by the door briefly before spin jumping over and grabbing the item.",
         "It is also possible to do this instead by entering with run speed and quickly grabbing the item."
+      ],
+      "unlocksDoors": [
+        {"nodeId": 1, "types": ["super"], "requires": []},
+        {"nodeId": 1, "types": ["missiles", "powerbomb"], "requires": ["never"]}
+      ]
+    },
+    {
+      "link": [1, 2],
+      "name": "Very Tricky Evade",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        {"doorUnlockedAtNode": 1},
+        "canTrickyDodgeEnemies",
+        "canInsaneJump"
+      ],
+      "note": [
+        "Carefully manipulate the Beetoms to avoid all damage."
+      ],
+      "unlocksDoors": [
+        {"nodeId": 1, "types": ["super"], "requires": []},
+        {"nodeId": 1, "types": ["missiles", "powerbomb"], "requires": ["never"]}
       ]
     },
     {
@@ -474,6 +501,17 @@
       "requires": [
         {"enemyDamage": {"enemy": "Beetom", "type": "contact", "hits": 6}}
       ]
+    },
+    {
+      "link": [2, 1],
+      "name": "Very Tricky Evade",
+      "requires": [
+        "canTrickyDodgeEnemies",
+        "canInsaneJump"
+      ],
+      "note": [
+        "Carefully manipulate the Beetoms to avoid all damage."
+      ]
     }
   ],
   "notables": [

region/wreckedship/main/Bowling Alley.json

@@ -1123,7 +1123,7 @@
             "canPartialFloorClip",
             "h_additionalBomb"
           ]},
-          {"and": [
+          {"and": [ 
             {"or": [
               {"and": [
                 {"canShineCharge": {"usedTiles": 35, "openEnd": 1}},