Merge pull request #2796 from kjbranch/ss-ln-w

LN West shinesparks: split speed and general cleanup

Author: osse101

region/lowernorfair/west/Fast Ripper Room.json

@@ -374,6 +374,7 @@
         {"ammo": {"type": "Super", "count": 2}},
         {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
         "canShinechargeMovementTricky",
+        "h_speedJump",
         {"heatFrames": 870},
         {"shineChargeFrames": 175},
         {"shinespark": {"frames": 15, "excessFrames": 0}}

region/lowernorfair/west/Golden Torizo's Room.json

@@ -1643,7 +1643,7 @@
         "canConsecutiveWalljump",
         {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
         {"heatFrames": 900},
-        {"shinespark": {"frames": 8}}
+        {"shinespark": {"frames": 12, "excessFrames": 2}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -1665,7 +1665,7 @@
         "canSpeedyJump",
         {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
         {"heatFrames": 900},
-        {"shinespark": {"frames": 11}}
+        {"shinespark": {"frames": 11, "excessFrames": 3}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
@@ -2158,10 +2158,30 @@
               "canInsaneJump"
             ]}
           ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            "canTrickyDashJump",
+            "canWalljump"
+          ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            "canConsecutiveWalljump",
+            "canInsaneWalljump"
+          ]},
           {"and": [
             "f_DefeatedGoldenTorizo",
             {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
-            {"shinespark": {"frames": 29, "excessFrames": 5}}
+            {"or": [
+              {"and": [
+                "canWalljump",
+                {"shinespark": {"frames": 9, "excessFrames": 4}}
+              ]},
+              {"and": [
+                "canSpeedyJump",
+                {"shinespark": {"frames": 9, "excessFrames": 4}}
+              ]},
+              {"shinespark": {"frames": 32, "excessFrames": 4}}
+            ]}
           ]}
         ]},
         "h_heatedGModeOpenDifferentDoor"
@@ -2204,10 +2224,30 @@
               "canInsaneJump"
             ]}
           ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            "canTrickyDashJump",
+            "canWalljump"
+          ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            "canConsecutiveWalljump",
+            "canInsaneWalljump"
+          ]},
           {"and": [
             "f_DefeatedGoldenTorizo",
             {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
-            {"shinespark": {"frames": 29, "excessFrames": 5}}
+            {"or": [
+              {"and": [
+                "canWalljump",
+                {"shinespark": {"frames": 9, "excessFrames": 4}}
+              ]},
+              {"and": [
+                "canSpeedyJump",
+                {"shinespark": {"frames": 9, "excessFrames": 4}}
+              ]},
+              {"shinespark": {"frames": 32, "excessFrames": 4}}
+            ]}
           ]}
         ]},
         {"heatFrames": 0}
@@ -2250,10 +2290,25 @@
               "canInsaneJump"
             ]}
           ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            "canTrickyDashJump",
+            "canWalljump"
+          ]},
+          {"and": [
+            "f_DefeatedGoldenTorizo",
+            "canPreciseWalljump"
+          ]},
           {"and": [
             "f_DefeatedGoldenTorizo",
             {"canShineCharge": {"usedTiles": 28, "openEnd": 0}},
-            {"shinespark": {"frames": 28, "excessFrames": 5}}
+            {"or": [
+              {"and": [
+                "canSpeedyJump",
+                {"shinespark": {"frames": 7, "excessFrames": 4}}
+              ]},
+              {"shinespark": {"frames": 30, "excessFrames": 4}}
+            ]}
           ]}
         ]},
         {"or": [

region/lowernorfair/west/Screw Attack Room.json

@@ -418,16 +418,25 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 100},
         "HiJump",
         "ScrewAttack",
         "canShinechargeMovementComplex",
         {"heatFrames": 135},
         {"or": [
-          {"shinespark": {"frames": 3, "excessFrames": 0}},
-          {"shineChargeFrames": 10}
-        ]},
-        {"shinespark": {"frames": 3, "excessFrames": 0}}
+          {"and": [
+            "canSpeedyJump",
+            {"shineChargeFrames": 100},
+            {"shinespark": {"frames": 6, "excessFrames": 0}}
+          ]},
+          {"and": [
+            {"shineChargeFrames": 105},
+            {"shinespark": {"frames": 7, "excessFrames": 0}}
+          ]},
+          {"and": [
+            {"shineChargeFrames": 110},
+            {"shinespark": {"frames": 3, "excessFrames": 0}}
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveWithSpark": {}