Merge pull request #2681 from kjbranch/blue-spark

Blue suit sparks - Brinstar and Crateria 2nd pass

Author: osse101

region/brinstar/green/Early Supers Room.json

@@ -470,15 +470,15 @@
     {
       "id": 16,
       "link": [1, 2],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark, Horizontal Spark",
       "requires": [
+        "h_storedSpark",
         "canHorizontalShinespark",
-        {"useFlashSuit": {}},
         {"shinespark": {"frames": 49, "excessFrames": 16}}
       ],
       "flashSuitChecked": true,
+      "blueSuitChecked": true,
       "devNote": [
-        "This isn't useful because all known methods of obtaining a flash suit make this strat irrelevant.",
         "The shinespark frames could be lowered by sparking from the crumble blocks, but there is a farm before and after."
       ]
     },

region/brinstar/green/Green Brinstar Main Shaft.json

@@ -4753,9 +4753,9 @@
     {
       "id": 202,
       "link": [10, 9],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"or": [
           {"shinespark": {"frames": 68, "excessFrames": 8}},
           {"and": [
@@ -4769,7 +4769,8 @@
           ]}
         ]}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 203,
@@ -5173,23 +5174,25 @@
     {
       "id": 217,
       "link": [10, 14],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"shinespark": {"frames": 68, "excessFrames": 57}}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 218,
       "link": [10, 14],
-      "name": "Use Flash Suit, Diagonal Spark",
+      "name": "Use Stored Spark, Diagonal Spark",
       "requires": [
         "HiJump",
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"shinespark": {"frames": 20, "excessFrames": 13}}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 219,
@@ -5207,20 +5210,33 @@
         {"shinespark": {"frames": 21, "excessFrames": 12}}
       ],
       "flashSuitChecked": true,
-      "note": "With a runway of at least 4 tiles in the adjacent room, jump just before hitting the right wall then spark diagonally to the right at the top of the jump."
+      "note": "With a runway of at least 4 tiles in the adjacent room, jump just before hitting the right wall then spark diagonally to the left at the top of the jump.",
+      "devNote": "FIXME: This could be done with a blue suit but is not possible to model currently."
     },
     {
       "id": 220,
       "link": [10, 14],
-      "name": "Use Flash Suit, Spring Ball Bomb Boost, Diagonal Spark",
+      "name": "Use Stored Spark, Spring Ball Bomb Boost, Diagonal Spark",
       "requires": [
+        {"or": [
+          {"useFlashSuit": {}},
+          {"and": [
+            "canInsaneJump",
+            {"blueSuitShinecharge": {}}
+          ]}
+        ]},
+        "canDash",
         "canSpringBallJumpMidAir",
         "canUnmorphBombBoost",
-        {"useFlashSuit": {}},
         {"shinespark": {"frames": 18, "excessFrames": 13}}
       ],
       "flashSuitChecked": true,
-      "note": "Spring ball jump then bounce on a Power Bomb in order to be able to midair spark."
+      "blueSuitChecked": true,
+      "note": [
+        "Spring ball jump then bounce on a Power Bomb in order to be able to midair spark.",
+        "It is easiest to wait to turn around until after the bomb boost.",
+        "With a blue suit, this requires using dash after shinecharging to be able to boost on the Power Bomb."
+      ]
     },
     {
       "id": 221,
@@ -5661,9 +5677,9 @@
     {
       "id": 242,
       "link": [14, 9],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"or": [
           {"shinespark": {"frames": 49, "excessFrames": 8}},
           {"and": [
@@ -5672,7 +5688,8 @@
           ]}
         ]}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 243,

region/brinstar/green/Green Hill Zone.json

@@ -550,12 +550,13 @@
     {
       "id": 18,
       "link": [1, 2],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"shinespark": {"frames": 9, "excessFrames": 5}}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 19,
@@ -892,14 +893,15 @@
     {
       "id": 33,
       "link": [1, 5],
-      "name": "Use Flash Suit, Shinespark Down Back",
+      "name": "Use Stored Spark, Shinespark Down Back",
       "requires": [
+        "h_storedSpark",
         "canDownBack",
-        {"useFlashSuit": {}},
         {"shinespark": {"frames": 3, "excessFrames": 0}}
       ],
       "flashSuitChecked": true,
-      "note": "excessFrames don't matter much here, as Samus can farm before and after."
+      "blueSuitChecked": true,
+      "devNote": "ExcessFrames don't matter much here, as Samus can farm before and after."
     },
     {
       "id": 34,

region/brinstar/kraid/Warehouse Entrance.json

@@ -795,12 +795,14 @@
     {
       "id": 41,
       "link": [4, 3],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
-        {"useFlashSuit": {}},
+        "h_storedSpark",
+        "canDash",
         {"shinespark": {"frames": 2, "excessFrames": 2}}
       ],
       "flashSuitChecked": true,
+      "blueSuitChecked": true,
       "note": "To save energy, jump from the runway by the Super blocks. This is doable with less than 29 Energy."
     },
     {

region/brinstar/pink/Mission Impossible Room.json

@@ -976,11 +976,11 @@
     {
       "id": 35,
       "link": [3, 4],
-      "name": "Mission Impossible Shinespark (Flash Suit)",
+      "name": "Mission Impossible Shinespark (Stored Spark)",
       "requires": [
         {"notable": "Mission Impossible Shinespark"},
         "canQuickDrop",
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"or": [
           {"shinespark": {"frames": 19, "excessFrames": 7}},
           {"and": [
@@ -991,6 +991,7 @@
         {"obstaclesCleared": ["A", "B"]}
       ],
       "flashSuitChecked": true,
+      "blueSuitChecked": true,
       "failures": [
         {
           "name": "Crumble Failure",

region/brinstar/pink/Pink Brinstar Wave Gate Room.json

@@ -1308,10 +1308,10 @@
     {
       "id": 36,
       "link": [1, 3],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
         {"obstaclesCleared": ["A"]},
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"or": [
           {"shinespark": {"frames": 16, "excessFrames": 7}},
           {"and": [
@@ -1320,7 +1320,8 @@
           ]}
         ]}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 37,
@@ -1770,13 +1771,14 @@
     {
       "id": 54,
       "link": [2, 3],
-      "name": "Screw and Kago to Ride the Elevator",
+      "name": "Kago to Ride the Elevator",
       "requires": [
-        {"notable": "Screw and Kago to Ride the Elevator"},
+        {"notable": "Kago to Ride the Elevator"},
         "canKago",
         {"or": [
           "ScrewAttack",
-          "canPseudoScrew"
+          "canPseudoScrew",
+          {"haveBlueSuit": {}}
         ]},
         {"or": [
           "Morph",
@@ -1794,8 +1796,9 @@
       "clearsObstacles": ["B"],
       "wallJumpAvoid": true,
       "flashSuitChecked": true,
+      "blueSuitChecked": true,
       "note": [
-        "Start the elevator ride by using Screw Attack or Pseudo Screw in the hole.",
+        "Start the elevator ride by using Screw Attack or Pseudo Screw in the hole, or by jumping in the hole with a blue suit.",
         "Kago the elevator to fall back in and hit the elevator again. This is much easier while the elevator is still rising, but can still be done with Morph afterwards.",
         "Without HiJump, this will need to be done once more to get high enough to get to the blue gate,",
         "and, without Morph, Samus will need to Kago the second elevator section first-try, without jumping out of the first section of elevator.",
@@ -1939,17 +1942,18 @@
     {
       "id": 62,
       "link": [2, 3],
-      "name": "Shinespark to Ride the Elevator (Use Flash Suit)",
+      "name": "Shinespark to Ride the Elevator (Use Stored Spark)",
       "requires": [
         {"notable": "Shinespark to Ride the Elevator"},
         "canHorizontalShinespark",
         "canUseSpeedEchoes",
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"shinespark": {"frames": 1, "excessFrames": 1}}
       ],
       "clearsObstacles": ["B"],
       "wallJumpAvoid": true,
       "flashSuitChecked": true,
+      "blueSuitChecked": true,
       "note": "Shinesparking horizontally into the wall will trigger the elevator as Samus's echos hit it."
     },
     {
@@ -2617,10 +2621,10 @@
     },
     {
       "id": 5,
-      "name": "Screw and Kago to Ride the Elevator",
+      "name": "Kago to Ride the Elevator",
       "wallJumpAvoid": true,
       "note": [
-        "Start the elevator ride by using Screw Attack or Pseudo Screw in the hole.",
+        "Start the elevator ride by using Screw Attack or Pseudo Screw in the hole, or by jumping in the hole with a blue suit.",
         "Kago the elevator to fall back in and hit the elevator again. This is much easier while the elevator is still rising, but can still be done with Morph afterwards.",
         "Unless HiJump is owned, this will need to be done once more to get high enough to get to the blue gate."
       ]

region/brinstar/pink/Waterway Energy Tank Room.json

@@ -658,6 +658,16 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 1],
+      "name": "Blue Suit",
+      "requires": [
+        {"haveBlueSuit": {}}
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 38,
       "link": [2, 1],

region/brinstar/red/Below Spazer.json

@@ -428,6 +428,32 @@
       "note": "Spark diagonally in order to make it to the top.",
       "devNote": "FIXME: There should be a come in shinecharged strat that does the same thing."
     },
+    {
+      "link": [1, 3],
+      "name": "Use Blue Suit",
+      "requires": [
+        "h_bombThings",
+        {"blueSuitShinecharge": {}},
+        {"or": [
+          {"shinespark": {"frames": 24, "excessFrames": 1}},
+          {"and": [
+            "HiJump",
+            {"shinespark": {"frames": 24, "excessFrames": 12}}
+          ]},
+          {"and": [
+            "Gravity",
+            {"shinespark": {"frames": 20, "excessFrames": 2}}
+          ]},
+          {"and": [
+            "HiJump",
+            "Gravity",
+            {"shinespark": {"frames": 17, "excessFrames": 13}}
+          ]}
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
     {
       "id": 44,
       "link": [1, 3],

region/brinstar/red/Caterpillar Room.json

@@ -1088,12 +1088,13 @@
     {
       "id": 36,
       "link": [2, 4],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
-        {"useFlashSuit": {}},
+        "h_storedSpark",
         {"shinespark": {"frames": 7, "excessFrames": 5}}
       ],
       "flashSuitChecked": true,
+      "blueSuitChecked": true,
       "note": "To save energy, spark diagonally to the right to hit the ledge below the doorframe."
     },
     {

region/brinstar/red/Red Brinstar Fireflea Room.json

@@ -397,13 +397,15 @@
     {
       "id": 11,
       "link": [1, 2],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
+        "h_storedSpark",
+        "canDash",
         "canHorizontalShinespark",
-        {"useFlashSuit": {}},
         {"shinespark": {"frames": 132, "excessFrames": 60}}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 12,
@@ -714,13 +716,15 @@
     {
       "id": 26,
       "link": [2, 1],
-      "name": "Use Flash Suit",
+      "name": "Use Stored Spark",
       "requires": [
+        "h_storedSpark",
+        "canDash",
         "canHorizontalShinespark",
-        {"useFlashSuit": {}},
         {"shinespark": {"frames": 99, "excessFrames": 5}}
       ],
-      "flashSuitChecked": true
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
     },
     {
       "id": 27,