Review pass

Author: osse101

region/norfair/east/Red Pirate Shaft.json

@@ -209,11 +209,16 @@
               "type": "contact",
               "hits": 3
             }},
-            "canCarefulJump",
             {"or": [
-              "canWallJump",
-              "HiJump",
-              "SpaceJump",
+              {"and": [
+                "canCarefulJump",
+                "HiJump"
+              ]},
+              "canPreciseWalljump",
+              {"and": [
+                "canDodgeWhileShooting",
+                "SpaceJump"
+              ]},
               "canTrickySpringBallJump",
               "canUseIFrames"
             ]}
@@ -229,7 +234,13 @@
       "link": [1, 2],
       "name": "Avoid the Enemies",
       "requires": [
-        "canTrickyJump"
+        {"or": [
+          "canTrickyJump",
+          {"and": [
+            "canDodgeWhileShooting",
+            "HiJump"
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -254,10 +265,7 @@
       "link": [1, 2],
       "name": "Kill the Geemers",
       "requires": [
-        {"or": [
-          "ScrewAttack",
-          "canUseGrapple"
-        ]},
+        "canUseGrapple",
         {"or": [
           "canWallJump",
           "HiJump",
@@ -267,7 +275,7 @@
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "devNote": "PowerBombs would use Kill the Pirates."
+      "devNote": "ScrewAttack and PowerBombs would use Kill the Pirates."
     },
     {
       "id": 8,
@@ -299,7 +307,11 @@
       "link": [2, 1],
       "name": "Tank the Damage",
       "requires": [
-        {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 3}}
+        {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 1}},  
+        {"or": [  
+          "canUseIFrames",  
+          {"enemyDamage": {"enemy": "Geemer (grey)", "type": "contact", "hits": 2}}  
+        ]} 
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -310,7 +322,7 @@
       "name": "Kill the Enemies",
       "requires": [
         {"or": [
-          {"enemyKill": {"enemies": [["Geemer (grey)"],["Geemer (grey)"],["Geemer (grey)"]]}},
+          "canUseGrapple",
           {"enemyKill": {"enemies": [["Red Space Pirate (standing)", "Red Space Pirate (standing)"], ["Red Space Pirate (standing)"]]}}
         ]}
       ],