Merge pull request #2776 from kjbranch/writg-lenience

WRITG - Add more lenience

Author: osse101

region/lowernorfair/east/The Worst Room In The Game.json

@@ -1241,22 +1241,17 @@
       "requires": [
         {"or": [
           {"and": [
-            {"enemyKill": {
-              "enemies": [["Yellow Space Pirate (wall)"], ["Yellow Space Pirate (wall)"]],
-              "explicitWeapons": ["Super"]
-            }},
-            {"heatFrames": 395}
+            {"ammo": {"type": "Super", "count": 9}},
+            {"heatFrames": 330}
           ]},
           {"and": [
-            {"enemyKill": {
-              "enemies": [
-                ["Yellow Space Pirate (wall)"],
-                ["Yellow Space Pirate (wall)"],
-                ["Yellow Space Pirate (wall)"]
-              ],
-              "explicitWeapons": ["Super"]
-            }},
-            {"heatFrames": 330}
+            "canDodgeWhileShooting",
+            {"ammo": {"type": "Super", "count": 6}},
+            {"or": [
+              "canTrickyJump",
+              {"ammo": {"type": "Super", "count": 2}}
+            ]},
+            {"heatFrames": 395}
           ]}
         ]}
       ],
@@ -1308,7 +1303,7 @@
       "requires": [
         "canTrivialMidAirMorph",
         {"ammo": {"type": "PowerBomb", "count": 3}},
-        {"heatFrames": 450},
+        {"heatFrames": 470},
         {"or": [
           "canTrickyDodgeEnemies",
           {"and": [
@@ -1318,7 +1313,15 @@
           ]},
           {"and": [
             {"ammo": {"type": "PowerBomb", "count": 2}},
-            {"heatFrames": 200}
+            {"heatFrames": 400},
+            {"or": [
+              {"and": [
+                {"ammo": {"type": "PowerBomb", "count": 1}},
+                {"heatFrames": 200}
+              ]},
+              {"ammo": {"type": "Super", "count": 1}},
+              {"ammo": {"type": "Missile", "count": 1}}
+            ]}
           ]}
         ]},
         {"or": [
@@ -2112,6 +2115,7 @@
       "link": [5, 1],
       "name": "Wait for Pirate",
       "requires": [
+        "canDodgeWhileShooting",
         {"heatFrames": 530}
       ],
       "flashSuitChecked": true,
@@ -2222,6 +2226,30 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [5, 1],
+      "name": "Slow Heat Proof Kill",
+      "requires": [
+        "h_heatProof",
+        "Charge"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
+    {
+      "link": [5, 1],
+      "name": "Tank Pirate Hit",
+      "requires": [
+        {"enemyDamage": {
+          "enemy": "Yellow Space Pirate (standing)",
+          "type": "contact",
+          "hits": 1
+        }},
+        {"heatFrames": 250}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 47,
       "link": [5, 2],
@@ -2252,6 +2280,7 @@
       "link": [5, 3],
       "name": "Wait for Pirate",
       "requires": [
+        "canDodgeWhileShooting",
         {"heatFrames": 520}
       ],
       "flashSuitChecked": true,
@@ -2349,6 +2378,30 @@
       "flashSuitChecked": true,
       "blueSuitChecked": true
     },
+    {
+      "link": [5, 3],
+      "name": "Slow Heat Proof Kill",
+      "requires": [
+        "h_heatProof",
+        "Charge"
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
+    {
+      "link": [5, 3],
+      "name": "Tank Pirate Hit",
+      "requires": [
+        {"enemyDamage": {
+          "enemy": "Yellow Space Pirate (standing)",
+          "type": "contact",
+          "hits": 1
+        }},
+        {"heatFrames": 190}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 53,
       "link": [5, 4],