Merge pull request #2717 from kjbranch/ss-high-priority-sparks

Split Speed - Refine shinespark strats in Landing Site

Author: osse101

region/crateria/central/Landing Site.json

@@ -467,7 +467,12 @@
               {"shinespark": {"frames": 29, "excessFrames": 1}},
               {"and": [
                 "canShinechargeMovementComplex",
+                "h_speedJump",
                 {"shinespark": {"frames": 22, "excessFrames": 1}}
+              ]},
+              {"and": [
+                "HiJump",
+                {"shinespark": {"frames": 17, "excessFrames": 11}}
               ]}
             ]}
           ]}
@@ -799,8 +804,9 @@
       "unlocksDoors": [{"types": ["ammo"], "requires": [], "useImplicitRequires": false}],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
+      "note": "Open the top left door then shinecharge near the top right door, drop down and horizontally spark through the open door.",
       "devNote": [
-        "The Gauntlet Entrance door must be open, so the connecting room at 3 cannot be used.",
+        "The top left door must be open, so an entrance condition at this node cannot be used.",
         "Unlocking the door is free since the obstacle C cleared means that any lock was already taken care of."
       ]
     },
@@ -1117,6 +1123,7 @@
       "unlocksDoors": [{"types": ["ammo"], "requires": [], "useImplicitRequires": false}],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
+      "note": "Open the top left door then shinecharge on the plateau and horizontally spark through the open door.",
       "devNote": [
         "Unlocking the door is free since the obstacle C cleared means that any lock was already taken care of."
       ]
@@ -1135,18 +1142,27 @@
           "openEnd": 2
         }},
         {"or": [
-          {"shinespark": {"frames": 95, "excessFrames": 33}},
           {"and": [
+            "h_speedJump",
+            {"shinespark": {"frames": 95, "excessFrames": 33}}
+          ]},
+          {"and": [
+            "h_speedJump",
             "canShinechargeMovementTricky",
             {"shinespark": {"frames": 87, "excessFrames": 33}}
+          ]},
+          {"shinespark": {"frames": 104, "excessFrames": 33}},
+          {"and": [
+            "canShinechargeMovementTricky",
+            {"shinespark": {"frames": 103, "excessFrames": 33}}
           ]}
         ]}
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Store the spark on the right side of the ledge.  Run left and do a big jump towards the gauntlet door and then midair spark at the right time.",
+        "Store the spark on the right side of the ledge. Run left and do a big jump towards the top left door and then midair spark at the right time.",
         "Do not jump to max height or Samus will run out of shinecharge frames, instead short the jump a little.",
         "The lines in the background make for a good way to measure height."
       ]
@@ -1166,11 +1182,16 @@
           "openEnd": 2
         }},
         {"or": [
-          {"shinespark": {"frames": 96}},
           {"and": [
+            "h_speedJump",
+            {"shinespark": {"frames": 96}}
+          ]},
+          {"and": [
+            "h_speedJump",
             "canShinechargeMovementTricky",
             {"shinespark": {"frames": 88}}
-          ]}
+          ]},
+          {"shinespark": {"frames": 105}}
         ]}
       ],
       "exitCondition": {
@@ -1386,7 +1407,20 @@
           "steepDownTiles": 1,
           "openEnd": 2
         }},
-        {"shinespark": {"frames": 45, "excessFrames": 13}}
+        {"or": [
+          {"shinespark": {"frames": 41, "excessFrames": 14}},
+          {"and": [
+            "canShinechargeMovement",
+            "canMidairShinespark",
+            {"shinespark": {"frames": 34, "excessFrames": 15}}
+          ]},
+          {"and": [
+            "HiJump",
+            "canShinechargeMovement",
+            "canMidairShinespark",
+            {"shinespark": {"frames": 30, "excessFrames": 15}}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1409,7 +1443,14 @@
       "name": "Use Stored Spark",
       "requires": [
         "h_storedSpark",
-        {"shinespark": {"frames": 43, "excessFrames": 24}}
+        "canMidairShinespark",
+        {"or": [
+          {"shinespark": {"frames": 34, "excessFrames": 15}},
+          {"and": [
+            "HiJump",
+            {"shinespark": {"frames": 30, "excessFrames": 15}}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1633,7 +1674,25 @@
       "name": "Shinespark",
       "requires": [
         "h_shinechargeMaxRunway",
-        {"shinespark": {"frames": 40}},
+        {"or": [
+          {"shinespark": {"frames": 39, "excessFrames": 2}},
+          {"and": [
+            "canShinechargeMovement",
+            "canMidairShinespark",
+            {"or": [
+              {"shinespark": {"frames": 32, "excessFrames": 3}},
+              {"and": [
+                "HiJump",
+                {"shinespark": {"frames": 28, "excessFrames": 2}}
+              ]},
+              {"and": [
+                "h_speedJump",
+                "HiJump",
+                {"shinespark": {"frames": 24, "excessFrames": 3}}
+              ]}
+            ]}
+          ]}
+        ]},
         {"or": [
           "h_destroyBombWalls",
           {"obstaclesCleared": ["A"]}
@@ -1681,6 +1740,7 @@
       "name": "Use Stored Spark",
       "requires": [
         "h_storedSpark",
+        "canMidairShinespark",
         {"shinespark": {"frames": 31, "excessFrames": 2}},
         "h_destroyBombWalls"
       ],
@@ -1718,6 +1778,13 @@
             "canMidairShinespark",
             "HiJump",
             {"shinespark": {"frames": 61, "excessFrames": 14}}
+          ]},
+          {"and": [
+            "canShinechargeMovementComplex",
+            "canMidairShinespark",
+            "HiJump",
+            "h_speedJump",
+            {"shinespark": {"frames": 55, "excessFrames": 13}}
           ]}
         ]}
       ],
@@ -1849,7 +1916,15 @@
       "name": "Use Stored Spark",
       "requires": [
         "h_storedSpark",
-        {"shinespark": {"frames": 20, "excessFrames": 10}}
+        "canMidairShinespark",
+        {"or": [
+          {"shinespark": {"frames": 20, "excessFrames": 10}},
+          {"and": [
+            "HiJump",
+            {"shinespark": {"frames": 17, "excessFrames": 12}}
+          ]}
+        ]}
+        
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true