Merge pull request #2844 from kjbranch/writg

WRITG - move some things out of basic

Author: osse101

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

@@ -1172,6 +1172,18 @@
       "name": "Heat-Proof Pirates Kill",
       "requires": [
         "h_heatProof",
+        {"or": [
+          "canDodgeWhileShooting",
+          {"enemyDamage": {
+            "enemy": "Yellow Space Pirate (wall)",
+            "type": "contact",
+            "hits": 1
+          }},
+          {"and": [
+            "Ice",
+            "Plasma"
+          ]}
+        ]},
         {"enemyKill": {
           "enemies": [
             ["Yellow Space Pirate (wall)", "Yellow Space Pirate (wall)"],
@@ -1182,10 +1194,12 @@
       ],
       "flashSuitChecked": false,
       "blueSuitChecked": true,
-      "note": "Being heatproof allows slower kill methods.",
+      "note": [
+        "Being heatproof allows slower kill methods.",
+        "Note that it is possible to freeze the Namihe on entry with Plasma and Ice."
+      ],
       "devNote": [
-        "Bombs are still excluded because they take 30 bombs each and that's ridiculous.",
-        "FIXME: This probably needs some enemy-dodging tech or the ability to freeze the Namihe."
+        "Bombs are still excluded because they take 30 bombs each and that's ridiculous."
       ]
     },
     {
@@ -1236,6 +1250,15 @@
       "link": [2, 6],
       "name": "Charge Plasma Pirates Kill",
       "requires": [
+        {"or": [
+          "canDodgeWhileShooting",
+          {"enemyDamage": {
+            "enemy": "Yellow Space Pirate (wall)",
+            "type": "contact",
+            "hits": 1
+          }},
+          "Ice"
+        ]},
         {"enemyKill": {
           "enemies": [
             ["Yellow Space Pirate (wall)", "Yellow Space Pirate (wall)"],
@@ -1246,13 +1269,27 @@
         {"heatFrames": 450}
       ],
       "flashSuitChecked": false,
-      "blueSuitChecked": true
+      "blueSuitChecked": true,
+      "note": "Note that it is possible to freeze the Namihe on entry with Plasma and Ice."
     },
     {
       "id": 23,
       "link": [2, 6],
       "name": "Supers Pirates Kill",
       "requires": [
+        {"or": [
+          "canDodgeWhileShooting",
+          {"enemyDamage": {
+            "enemy": "Yellow Space Pirate (wall)",
+            "type": "contact",
+            "hits": 1
+          }},
+          "ScrewAttack",
+          {"and": [
+            "Ice",
+            "Plasma"
+          ]}
+        ]},
         {"or": [
           {"and": [
             {"ammo": {"type": "Super", "count": 9}},
@@ -1271,13 +1308,28 @@
       ],
       "flashSuitChecked": false,
       "blueSuitChecked": true,
-      "note": "The bottom wall pirates can be killed while stacked to save ammo."
+      "note": [
+        "The bottom wall pirates can be killed while stacked to save ammo.",
+        "Note that it is possible to freeze the Namihe on entry with Plasma and Ice."
+      ]
     },
     {
       "id": 24,
       "link": [2, 6],
       "name": "Missiles Pirates Kill",
       "requires": [
+        {"or": [
+          "canDodgeWhileShooting",
+          {"enemyDamage": {
+            "enemy": "Yellow Space Pirate (wall)",
+            "type": "contact",
+            "hits": 1
+          }},
+          {"and": [
+            "Ice",
+            "Plasma"
+          ]}
+        ]},
         {"enemyKill": {
           "enemies": [
             ["Yellow Space Pirate (wall)"],
@@ -1290,13 +1342,24 @@
       ],
       "flashSuitChecked": false,
       "blueSuitChecked": true,
-      "note": "The bottom wall pirates can be killed while stacked to save ammo, but it is not expected."
+      "note": [
+        "The bottom wall pirates can be killed while stacked to save ammo, but it is not expected.",
+        "Note that it is possible to freeze the Namihe on entry with Plasma and Ice."
+      ]
     },
     {
       "id": 25,
       "link": [2, 6],
       "name": "Full Spazer Pirates Kill",
       "requires": [
+        {"or": [
+          "canDodgeWhileShooting",
+          {"enemyDamage": {
+            "enemy": "Yellow Space Pirate (wall)",
+            "type": "contact",
+            "hits": 1
+          }}
+        ]},
         {"enemyKill": {
           "enemies": [
             ["Yellow Space Pirate (wall)"],
@@ -1315,6 +1378,18 @@
       "link": [2, 6],
       "name": "Power Bomb Pirates Kill",
       "requires": [
+        {"or": [
+          "canDodgeWhileShooting",
+          {"enemyDamage": {
+            "enemy": "Yellow Space Pirate (wall)",
+            "type": "contact",
+            "hits": 1
+          }},
+          {"and": [
+            "Ice",
+            "Plasma"
+          ]}
+        ]},
         "canTrivialMidAirMorph",
         {"ammo": {"type": "PowerBomb", "count": 3}},
         {"heatFrames": 470},
@@ -1349,7 +1424,8 @@
       "note": [
         "Jump to the center platform, morph, and kill the bottom two Pirates by laying Power Bombs on the platform.",
         "Then jump morph to lay additional Power Bombs to kill the top Pirate.",
-        "The amount of Power Bombs needed can be reduced by jump morphing over the bottom Pirate to lay one or more of the Power Bombs mid-air."
+        "The amount of Power Bombs needed can be reduced by jump morphing over the bottom Pirate to lay one or more of the Power Bombs mid-air.",
+        "Note that it is possible to freeze the Namihe on entry with Plasma and Ice."
       ]
     },
     {
@@ -2649,6 +2725,7 @@
       "link": [6, 4],
       "name": "HiJump Tricky Dash Spring Ball Jump",
       "requires": [
+        {"obstaclesCleared": ["A"]},
         "HiJump",
         "canTrickyDashJump",
         "canTrickySpringBallJump",