Merge pull request #2780 from kjbranch/ss-croc

Croc shinesparks: split speed and general cleanup

Author: osse101

region/norfair/crocomire/Crocomire's Room.json

@@ -908,7 +908,13 @@
             "h_shinechargeMaxRunway"
           ]}
         ]},
-        {"shinespark": {"frames": 9}}
+        {"or": [
+          {"shinespark": {"frames": 9, "excessFrames": 0}},
+          {"and": [
+            "canMidairShinespark",
+            {"shinespark": {"frames": 2, "excessFrames": 0}}
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
@@ -1087,13 +1093,19 @@
       "name": "Shinespark",
       "requires": [
         "f_DefeatedCrocomire",
-        "canMidairShinespark",
+        "canHorizontalMidairShinespark",
         "h_shinechargeMaxRunway",
         {"or": [
           {"shinespark": {"frames": 45, "excessFrames": 5}},
           {"and": [
             "canShinechargeMovementComplex",
-            {"shinespark": {"frames": 5}}
+            {"shinespark": {"frames": 25, "excessFrames": 1}}
+          ]},
+          {"and": [
+            "canShinechargeMovementComplex",
+            "h_speedJump",
+            "canTrickyJump",
+            {"shinespark": {"frames": 6, "excessFrames": 4}}
           ]}
         ]}
       ],

region/norfair/crocomire/Grapple Beam Room.json

@@ -202,7 +202,13 @@
         }
       },
       "requires": [
-        {"shinespark": {"frames": 40}}
+        {"or": [
+          {"shinespark": {"frames": 40, "excessFrames": 5}},
+          {"and": [
+            "canMidairShinespark",
+            {"shinespark": {"frames": 33, "excessFrames": 6}}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -216,7 +222,7 @@
       },
       "requires": [
         {"shineChargeFrames": 10},
-        {"shinespark": {"frames": 40}}
+        {"shinespark": {"frames": 40, "excessFrames": 5}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -524,7 +530,7 @@
       "startsWithShineCharge": true,
       "requires": [
         {"shineChargeFrames": 35},
-        {"shinespark": {"frames": 40}}
+        {"shinespark": {"frames": 40, "excessFrames": 3}}
       ],
       "flashSuitChecked": true
     },
@@ -542,8 +548,8 @@
       "name": "Start Shinecharged, Leave With Spark",
       "startsWithShineCharge": true,
       "requires": [
-        {"shineChargeFrames": 25},
-        {"shinespark": {"frames": 6}}
+        {"shineChargeFrames": 20},
+        {"shinespark": {"frames": 15, "excessFrames": 0}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}

region/norfair/crocomire/Grapple Tutorial Room 3.json

@@ -362,7 +362,17 @@
       },
       "requires": [
         "canHorizontalShinespark",
-        {"shinespark": {"frames": 54, "excessFrames": 1}}
+        {"or": [
+          {"shinespark": {"frames": 54, "excessFrames": 3}},
+          {"and": [
+            "canHorizontalMidairShinespark",
+            {"shinespark": {"frames": 47, "excessFrames": 3}}
+          ]},
+          {"and": [
+            "canShinechargeMovementComplex",
+            {"shinespark": {"frames": 42, "excessFrames": 4}}
+          ]}
+        ]}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -482,7 +492,7 @@
       "name": "Use Stored Spark",
       "requires": [
         "h_storedSpark",
-        {"shinespark": {"frames": 44, "excessFrames": 6}}
+        {"shinespark": {"frames": 42, "excessFrames": 4}}
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
@@ -1295,7 +1305,10 @@
       "unlocksDoors": [{"types": ["ammo"], "requires": []}],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
-      "note": "Kill the Puyos in the right pit, jump in the pool multiple times while opening the gate and the door, then spark out the door."
+      "note": [
+        "Kill the Puyos in the right pit, jump in the pool multiple times while opening the gate and the door, then spark out the door.",
+        "It is possible to get a hero shot to open the gate and the door with a blue suit alone."
+      ]
     },
     {
       "id": 43,
@@ -1418,6 +1431,22 @@
       ],
       "flashSuitChecked": true,
       "blueSuitChecked": true
+    },
+    {
+      "link": [4, 4],
+      "name": "Open the Gate from Afar",
+      "requires": [
+        {"ammo": {"type": "Super", "count": 1}},
+        {"or": [
+          "canDash",
+          "canHeroShot"
+        ]}
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": "It is possible to open the Gate and the door even without dashing. Kill the Puyos below beforehand.",
+      "devNote": "This is only useful if you are using a stored spark to spark out the door."
     }
   ],
   "notables": [

region/norfair/crocomire/Indiana Jones Room.json

@@ -276,7 +276,6 @@
         "canShinechargeMovementComplex",
         "canPreciseWalljump",
         "canConsecutiveWalljump",
-        "canHorizontalMidairShinespark",
         {"shinespark": {"frames": 78}}
       ],
       "flashSuitChecked": true,
@@ -297,7 +296,6 @@
         "canShinechargeMovementComplex",
         "canPreciseWalljump",
         "canConsecutiveWalljump",
-        "canHorizontalMidairShinespark",
         {"shinespark": {"frames": 78}}
       ],
       "flashSuitChecked": true,
@@ -315,7 +313,6 @@
         {"shineChargeFrames": 80},
         "HiJump",
         "canShinechargeMovementComplex",
-        "canHorizontalMidairShinespark",
         {"or": [
           {"and": [
             "canWalljump",
@@ -343,7 +340,6 @@
       },
       "requires": [
         "HiJump",
-        "canHorizontalMidairShinespark",
         "canShinechargeMovementComplex",
         {"or": [
           {"and": [
@@ -373,7 +369,6 @@
         "h_speedJump",
         "canTrickyJump",
         "canShinechargeMovementTricky",
-        "canMidairShinespark",
         {"shinespark": {"frames": 40}}
       ],
       "flashSuitChecked": true,
@@ -650,7 +645,6 @@
       "requires": [
         "canWalljump",
         "canShinechargeMovementComplex",
-        "canHorizontalMidairShinespark",
         {"obstaclesCleared": ["B"]},
         {"or": [
           {"canShineCharge": {"usedTiles": 32, "gentleUpTiles": 6, "openEnd": 1}},
@@ -673,7 +667,6 @@
         {"notable": "Big Jump Shinespark"},
         "h_speedJump",
         "canShinechargeMovementComplex",
-        "canHorizontalMidairShinespark",
         {"obstaclesCleared": ["B"]},
         {"canShineCharge": {"usedTiles": 32, "gentleDownTiles": 6, "openEnd": 1}},
         {"shinespark": {"frames": 52}},
@@ -768,7 +761,6 @@
         {"canShineCharge": {"usedTiles": 32, "gentleUpTiles": 6, "openEnd": 1}},
         "canWalljump",
         "canShinechargeMovementComplex",
-        "canHorizontalMidairShinespark",
         {"shinespark": {"frames": 85}}
       ],
       "exitCondition": {
@@ -787,7 +779,6 @@
         {"canShineCharge": {"usedTiles": 32, "gentleDownTiles": 6, "openEnd": 1}},
         "canSpeedyJump",
         "canShinechargeMovementComplex",
-        "canHorizontalMidairShinespark",
         {"shinespark": {"frames": 57}}
       ],
       "exitCondition": {
@@ -809,7 +800,6 @@
         {"obstaclesCleared": ["B", "E"]},
         {"canShineCharge": {"usedTiles": 32, "gentleDownTiles": 6, "openEnd": 1}},
         "canShinechargeMovementComplex",
-        "canHorizontalMidairShinespark",
         {"shinespark": {"frames": 56}}
       ],
       "exitCondition": {
@@ -828,7 +818,6 @@
         "h_shinechargeMaxRunway",
         "canSpeedyJump",
         "canShinechargeMovementComplex",
-        "canHorizontalMidairShinespark",
         {"shinespark": {"frames": 53}}
       ],
       "exitCondition": {
@@ -1602,7 +1591,6 @@
       "name": "Shinespark",
       "requires": [
         {"obstaclesCleared": ["B"]},
-        "canShinechargeMovement",
         "canMidairShinespark",
         {"or": [
           {"canShineCharge": {"usedTiles": 32, "gentleUpTiles": 6, "openEnd": 1}},