Expect Basic to fall in the acid, LN hall

Author: osse101

region/lowernorfair/east/Main Hall.json

@@ -222,15 +222,33 @@
       "requires": [
         "canDash",
         {"or": [
-          {"enemyDamage": {"enemy": "Dragon", "type": "fireball", "hits": 3}},
           {"and": [
-            "Ice",
-            "Wave"
+            "Wave",
+            "Ice"
           ]},
-          {"enemyKill": {
-            "enemies": [["Dragon", "Dragon"]],
-            "explicitWeapons": ["Wave+Plasma"]
-          }}
+          {"and": [
+            "Wave",
+            "Plasma"
+          ]},
+          {"and": [
+            {"enemyDamage": {"enemy": "Dragon", "type": "fireball", "hits": 3}},
+            {"acidFrames": 20},
+            {"heatFrames": 120},
+            {"or": [
+              "Gravity",
+              "canWalljump",
+              {"and": [
+                "HiJump",
+                {"or": [
+                  "canDownGrab",
+                  {"and": [
+                    {"acidFrames": 50},
+                    {"heatFrames": 50}
+                  ]}
+                ]}
+              ]}
+            ]}
+          ]}
         ]},
         {"heatFrames": 900}
       ],
@@ -391,7 +409,10 @@
         {"heatFrames": 480}
       ],
       "flashSuitChecked": true,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": [
+        "The flames are still active until they fully disperse."
+      ]
     },
     {
       "id": 8,
@@ -728,7 +749,10 @@
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "note": "Use a two tile wide platform to get a good amount of running speed to avoid the room hazards."
+      "note": [
+        "The flames are still active until they fully disperse",
+        "Use a two tile wide platform to get a good amount of running speed to avoid the room hazards."
+      ]
     },
     {
       "id": 15,
@@ -820,15 +844,33 @@
       "requires": [
         "canDash",
         {"or": [
-          {"enemyDamage": {"enemy": "Dragon", "type": "fireball", "hits": 3}},
           {"and": [
             "Ice",
             "Wave"
           ]},
-          {"enemyKill": {
-            "enemies": [["Dragon", "Dragon"]],
-            "explicitWeapons": ["Wave+Plasma"]
-          }}
+          {"and": [
+            "Plasma",
+            "Wave"
+          ]},
+          {"and": [
+            {"enemyDamage": {"enemy": "Dragon", "type": "fireball", "hits": 3}},
+            {"acidFrames": 20},
+            {"heatFrames": 120},
+            {"or": [
+              "Gravity",
+              "canWalljump",
+              {"and": [
+                "HiJump",
+                {"or": [
+                  "canDownGrab",
+                  {"and": [
+                    {"acidFrames": 50},
+                    {"heatFrames": 50}
+                  ]}
+                ]}
+              ]}
+            ]}
+          ]}
         ]},
         {"heatFrames": 1100}
       ],