Norfair East shinesparks: split speed and general cleanup

Author: kjbranch

region/norfair/east/Bat Cave.json

@@ -296,9 +296,8 @@
       },
       "requires": [
         "canShinechargeMovementComplex",
-        "canMidairShinespark",
-        {"heatFrames": 300},
-        {"shinespark": {"frames": 14, "excessFrames": 3}}
+        {"shinespark": {"frames": 14, "excessFrames": 3}},
+        {"heatFrames": 300}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -314,9 +313,8 @@
       "requires": [
         {"shineChargeFrames": 80},
         "canShinechargeMovementComplex",
-        "canMidairShinespark",
-        {"heatFrames": 270},
-        {"shinespark": {"frames": 13, "excessFrames": 3}}
+        {"shinespark": {"frames": 13, "excessFrames": 3}},
+        {"heatFrames": 270}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -482,7 +480,7 @@
       "requires": [
         "canShinechargeMovementTricky",
         {"heatFrames": 165},
-        {"shinespark": {"frames": 15}}
+        {"shinespark": {"frames": 15, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
@@ -506,7 +504,7 @@
         {"shineChargeFrames": 115},
         "canShinechargeMovementTricky",
         {"heatFrames": 165},
-        {"shinespark": {"frames": 15}}
+        {"shinespark": {"frames": 15, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}

region/norfair/east/Bubble Mountain.json

@@ -1027,6 +1027,7 @@
         }
       },
       "requires": [
+        "canHorizontalShinespark",
         {"shinespark": {"frames": 27, "excessFrames": 2}}
       ],
       "flashSuitChecked": true,
@@ -1041,6 +1042,7 @@
       },
       "requires": [
         {"shineChargeFrames": 50},
+        "canHorizontalShinespark",
         {"shinespark": {"frames": 27, "excessFrames": 2}}
       ],
       "flashSuitChecked": true,
@@ -1054,10 +1056,9 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 22},
-        "canShinechargeMovement",
+        {"shineChargeFrames": 25},
         "canMidairShinespark",
-        {"shinespark": {"frames": 19}}
+        {"shinespark": {"frames": 20, "excessFrames": 4}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1098,7 +1099,7 @@
         "HiJump",
         "SpaceJump",
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 20, "excessFrames": 0}}
+        {"shinespark": {"frames": 10, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
@@ -1821,7 +1822,13 @@
         }
       },
       "requires": [
-        {"shinespark": {"frames": 22, "excessFrames": 2}}
+        {"or": [
+          {"shinespark": {"frames": 22, "excessFrames": 2}},
+          {"and": [
+            "canMidairShinespark",
+            {"shinespark": {"frames": 14, "excessFrames": 3}}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1875,7 +1882,16 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 125},
+        {"or": [
+          {"and": [
+            "canSpeedyJump",
+            {"shineChargeFrames": 125}
+          ]},
+          {"and": [
+            {"shineChargeFrames": 160},
+            {"enemyDamage": {"enemy": "Waver", "type": "contact", "hits": 1}}
+          ]}
+        ]},
         "HiJump",
         "canWalljump",
         "canShinechargeMovementTricky",
@@ -2437,7 +2453,7 @@
       },
       "requires": [
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 26}}
+        {"shinespark": {"frames": 26, "excessFrames": 3}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -2453,7 +2469,7 @@
       "requires": [
         {"shineChargeFrames": 100},
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 26}}
+        {"shinespark": {"frames": 26, "excessFrames": 3}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -3043,7 +3059,7 @@
       "requires": [
         {"shineChargeFrames": 40},
         "canShinechargeMovement",
-        {"shinespark": {"frames": 9}}
+        {"shinespark": {"frames": 9, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
@@ -3159,7 +3175,6 @@
       },
       "requires": [
         {"shineChargeFrames": 115},
-        "canMidairShinespark",
         "canShinechargeMovementComplex",
         {"shinespark": {"frames": 30, "excessFrames": 6}}
       ],
@@ -3177,7 +3192,6 @@
         }
       },
       "requires": [
-        "canMidairShinespark",
         "canShinechargeMovementComplex",
         {"shinespark": {"frames": 30, "excessFrames": 6}}
       ],
@@ -3553,9 +3567,8 @@
       },
       "requires": [
         {"shineChargeFrames": 120},
-        "canMidairShinespark",
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 15}}
+        {"shinespark": {"frames": 15, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
@@ -3575,11 +3588,30 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 80},
         "HiJump",
-        "canMidairShinespark",
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 11}}
+        {"or": [
+          {"and": [
+            "canWalljump",
+            "canSpeedyJump",
+            {"shineChargeFrames": 80},
+            {"shinespark": {"frames": 11, "excessFrames": 0}}
+          ]},
+          {"and": [
+            "canWalljump",
+            {"shineChargeFrames": 95},
+            {"shinespark": {"frames": 10, "excessFrames": 0}}
+          ]},
+          {"and": [
+            "canSpeedyJump",
+            {"shineChargeFrames": 95},
+            {"shinespark": {"frames": 15, "excessFrames": 0}}
+          ]},
+          {"and": [
+            {"shineChargeFrames": 110},
+            {"shinespark": {"frames": 17, "excessFrames": 0}}
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
@@ -3745,7 +3777,6 @@
       "requires": [
         {"shineChargeFrames": 100},
         "canShinechargeMovementComplex",
-        "canMidairShinespark",
         "canCarefulJump",
         {"shinespark": {"frames": 30, "excessFrames": 6}}
       ],
@@ -3768,7 +3799,6 @@
       },
       "requires": [
         "canShinechargeMovementComplex",
-        "canMidairShinespark",
         "canCarefulJump",
         {"shinespark": {"frames": 30, "excessFrames": 6}}
       ],
@@ -3791,7 +3821,6 @@
       },
       "requires": [
         "canShinechargeMovementComplex",
-        "canMidairShinespark",
         "canTrickyJump",
         "canHeroShot",
         {"shinespark": {"frames": 25}},
@@ -4235,7 +4264,7 @@
       },
       "requires": [
         {"shineChargeFrames": 105},
-        {"shinespark": {"frames": 5}}
+        {"shinespark": {"frames": 5, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}

region/norfair/east/Cathedral.json

@@ -459,7 +459,6 @@
       },
       "requires": [
         "canShinechargeMovementTricky",
-        "canHorizontalShinespark",
         {"heatFrames": 225},
         {"shinespark": {"frames": 53, "excessFrames": 0}},
         {"heatFrames": 105}