Merge pull request #2755 from blkerby/blue-suit-shinespark-req

Add shinespark requirement to canRModeSparkInterrupt and canCrystalSpark

Author: osse101

helpers.json

@@ -1472,6 +1472,7 @@
           "requires": [
             {"tech": "canCrystalSpark"},
             "canMidAirMorph",
+            {"shinespark": {"frames": 0, "excessFrames": 0}},
             "h_CrystalFlash",
             {"ammo": {"type": "PowerBomb", "count": "n_CrystalSparkLenience"}},
             {"gainBlueSuit": {}}
@@ -1482,6 +1483,7 @@
           "requires": [
             {"tech": "canCrystalSpark"},
             "canMidAirMorph",
+            {"shinespark": {"frames": 0, "excessFrames": 0}},
             "h_CrystalFlash",
             {"gainBlueSuit": {}}
           ]
@@ -1491,6 +1493,7 @@
           "requires": [
             {"tech": "canUnderwaterCrystalSpark"},
             "canMidAirMorph",
+            {"shinespark": {"frames": 0, "excessFrames": 0}},
             "h_CrystalFlash",
             {"ammo": {"type": "PowerBomb", "count": "n_CrystalSparkLenience"}},
             {"gainBlueSuit": {}}
@@ -1501,6 +1504,7 @@
           "requires": [
             {"tech": "canUnderwaterCrystalSpark"},
             "canMidAirMorph",
+            {"shinespark": {"frames": 0, "excessFrames": 0}},
             "h_CrystalFlash",
             {"gainBlueSuit": {}}
           ]

tech.json

@@ -2713,8 +2713,8 @@
                 "canRMode"
               ],
               "otherRequires": [
-                {"gainBlueSuit": {}},
-                {"noFlashSuit": {}}
+                {"shinespark": {"frames": 0, "excessFrames": 0}},
+                {"gainBlueSuit": {}}
               ],
               "note": [
                 "The ability to gain a blue suit by triggering an R-Mode forced stand-up during a shinespark wind-up.",
@@ -2757,9 +2757,9 @@
                 "canCarryBlueSuit"
               ],
               "otherRequires": [
+                {"shinespark": {"frames": 0, "excessFrames": 0}},
                 "canCrystalFlash",
-                {"gainBlueSuit": {}},
-                {"noFlashSuit": {}}
+                {"gainBlueSuit": {}}
               ],
               "note": [
                 "The ability to gain a blue suit by activating a Crystal Flash during shinespark wind-up.",