Merge pull request #2814 from blkerby/kraid-brin-bluesuit

Kraid Brinstar: blue suit logic

Author: osse101

region/brinstar/kraid/Baby Kraid Room.json

@@ -350,38 +350,47 @@
         {"resetRoom": {"nodes": [1]}},
         {"or": [
           {"and": [
-            "Plasma",
-            {"cycleFrames": 255}
-          ]},
-          {"and": [
-            "Wave",
-            {"cycleFrames": 280}
-          ]},
-          {"and": [
-            "ScrewAttack",
-            {"cycleFrames": 300}
-          ]},
-          {"and": [
-            "Spazer",
-            {"cycleFrames": 315}
+            "canDash",
+            {"or": [
+              {"and": [
+                "Plasma",
+                {"cycleFrames": 255}
+              ]},
+              {"and": [
+                "Wave",
+                {"cycleFrames": 280}
+              ]},
+              {"and": [
+                "ScrewAttack",
+                {"cycleFrames": 300}
+              ]},
+              {"and": [
+                "Spazer",
+                {"cycleFrames": 315}
+              ]},
+              {"and": [
+                "Ice",
+                {"cycleFrames": 400}
+              ]},
+              {"and": [
+                "canPseudoScrew",
+                {"cycleFrames": 450}
+              ]},
+              {"and": [
+                "Charge",
+                "canDodgeWhileShooting",
+                {"cycleFrames": 600}
+              ]},
+              {"and": [
+                "h_useMorphBombs",
+                "canTrickyDodgeEnemies",
+                {"cycleFrames": 620}
+              ]}
+            ]}
           ]},
           {"and": [
-            "Ice",
+            {"haveBlueSuit": {}},
             {"cycleFrames": 400}
-          ]},
-          {"and": [
-            "canPseudoScrew",
-            {"cycleFrames": 450}
-          ]},
-          {"and": [
-            "Charge",
-            "canDodgeWhileShooting",
-            {"cycleFrames": 600}
-          ]},
-          {"and": [
-            "h_useMorphBombs",
-            "canTrickyDodgeEnemies",
-            {"cycleFrames": 620}
           ]}
         ]}
       ],
@@ -567,7 +576,7 @@
     {
       "id": 12,
       "link": [1, 2],
-      "name": "Speedbooster Dodge Kill",
+      "name": "Speed Booster Dodge Kill",
       "requires": [
         "canDodgeWhileShooting",
         {"getBlueSpeed": {"usedTiles": 29, "openEnd": 2}}
@@ -584,7 +593,7 @@
     {
       "id": 13,
       "link": [1, 2],
-      "name": "Speedbooster Tank Kill",
+      "name": "Speed Booster Tank Kill",
       "requires": [
         "h_getBlueSpeedMaxRunway",
         {"enemyDamage": {
@@ -614,6 +623,7 @@
       "link": [1, 2],
       "name": "Space Jump",
       "requires": [
+        "canDash",
         "SpaceJump",
         {"or": [
           "canDodgeWhileShooting",
@@ -646,7 +656,7 @@
     {
       "id": 43,
       "link": [1, 2],
-      "name": "Direct G-mode Morph, Crystal Flash Interrupt",
+      "name": "Direct G-Mode Morph, Crystal Flash Interrupt",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",
@@ -956,31 +966,41 @@
         {"resetRoom": {"nodes": [2]}},
         {"or": [
           {"and": [
+            "canDash",
             {"or": [
-              "Plasma",
-              "ScrewAttack",
-              {"ammo": {"type": "Super", "count": 1}}
-            ]},
-            {"cycleFrames": 225}
-          ]},
-          {"and": [
-            "Wave",
-            {"cycleFrames": 310}
-          ]},
-          {"and": [
-            "Spazer",
-            {"cycleFrames": 330}
+              {"and": [
+                {"or": [
+                  "Plasma",
+                  "ScrewAttack",
+                  {"ammo": {"type": "Super", "count": 1}}
+                ]},
+                {"cycleFrames": 225}
+              ]},
+              {"and": [
+                "Wave",
+                {"cycleFrames": 310}
+              ]},
+              {"and": [
+                "Spazer",
+                {"cycleFrames": 330}
+              ]},
+              {"and": [
+                "Ice",
+                {"cycleFrames": 440}
+              ]},
+              {"cycleFrames": 600}
+            ]}
           ]},
           {"and": [
-            "Ice",
-            {"cycleFrames": 440}
-          ]},
-          {"cycleFrames": 600}
+            {"haveBlueSuit": {}},
+            {"cycleFrames": 275}
+          ]}
         ]},
         {"or": [
           {"enemyDamage": {"enemy": "Mini-Kraid", "type": "stone", "hits": 1}},
           "Plasma",
           "ScrewAttack",
+          {"haveBlueSuit": {}},
           {"and": [
             "Ice",
             "Wave",
@@ -1030,7 +1050,10 @@
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
       "blueSuitChecked": false,
-      "devNote": "These two farms are combined, to allow an option of using using Supers farmed from Mini-Kraid to kill the Pirates."
+      "devNote": [
+        "These two farms are combined, to allow an option of using using Supers farmed from Mini-Kraid to kill the Pirates.",
+        "FIXME: convert this to use farmCycleDrops."
+      ]
     },
     {
       "id": 27,
@@ -1228,7 +1251,7 @@
     {
       "id": 44,
       "link": [2, 2],
-      "name": "Direct G-mode Morph, Crystal Flash Interrupt",
+      "name": "Direct G-Mode Morph, Crystal Flash Interrupt",
       "entranceCondition": {
         "comeInWithGMode": {
           "mode": "direct",