Merge pull request #2764 from blkerby/plasma-room-sparks

Plasma Room: fix/refine shinesparks

Author: osse101

region/maridia/inner-yellow/Plasma Room.json

@@ -575,8 +575,6 @@
           "canCameraManip"
         ]},
         "canShinechargeMovementComplex",
-        {"canShineCharge": {"usedTiles": 21, "openEnd": 0}},
-        {"shinespark": {"frames": 30, "excessFrames": 7}},
         "canUseSpeedEchoes",
         {"or": [
           {"and": [
@@ -591,16 +589,55 @@
             {"enemyDamage": {
               "enemy": "Pink Space Pirate (standing)",
               "type": "laser",
-              "hits": 1
+              "hits": 2
             }}
           ]}
         ]},
+        {"canShineCharge": {"usedTiles": 21, "openEnd": 0}},
         {"or": [
-          "h_speedJump",
-          "canWalljump",
-          "HiJump",
-          "canTrickySpringBallJump",
-          "SpaceJump"
+          {"and": [
+            {"or": [
+              "HiJump",
+              "canWalljump",
+              {"and": [
+                "canShinechargeMovementComplex",
+                {"or": [
+                  "canSpeedyJump",
+                  "canTrickySpringBallJump",
+                  "SpaceJump"
+                ]}
+              ]}
+            ]},
+            {"shinespark": {"frames": 28, "excessFrames": 8}}
+          ]},
+          {"and": [
+            {"or": [
+              {"and": [
+                "canShinechargeMovementComplex",
+                "canWalljump"
+              ]},
+              {"and": [
+                "canShinechargeMovementTricky",
+                {"or": [
+                  "canSpeedyJump",
+                  "canTrickySpringBallJump",
+                  "SpaceJump"
+                ]}
+              ]}
+            ]},
+            {"shinespark": {"frames": 20, "excessFrames": 8}}
+          ]},
+          {"and": [
+            "HiJump",
+            "canShinechargeMovementComplex",
+            {"shinespark": {"frames": 16, "excessFrames": 8}}
+          ]},
+          {"and": [
+            "HiJump",
+            "canSpeedyJump",
+            "canShinechargeMovementTricky",
+            {"shinespark": {"frames": 11, "excessFrames": 8}}
+          ]}
         ]}
       ],
       "clearsObstacles": ["A"],
@@ -626,7 +663,10 @@
         "Building a spark towards the left allows for enough run speed to jump to the middle level.",
         "Then vertical shinespark out which kills the top pirate."
       ],
-      "devNote": "Killing the top pirate naturally ends at 1."
+      "devNote": [
+        "A leniency laser hit is included for the i-frames method.",
+        "Killing the top pirate naturally ends at 1."
+      ]
     },
     {
       "id": 18,
@@ -783,21 +823,45 @@
         {"canShineCharge": {"usedTiles": 21, "openEnd": 0}},
         {"or": [
           {"and": [
-            "HiJump",
-            {"shinespark": {"frames": 21, "excessFrames": 7}}
+            {"or": [
+              "HiJump",
+              "canWalljump",
+              {"and": [
+                "canShinechargeMovementComplex",
+                {"or": [
+                  "canSpeedyJump",
+                  "canSpringBallJumpMidAir"
+                ]}
+              ]}
+            ]},
+            {"shinespark": {"frames": 28, "excessFrames": 8}}
           ]},
           {"and": [
-            "HiJump",
-            "canShinechargeMovementTricky",
-            {"shinespark": {"frames": 11, "excessFrames": 8}}
+            {"or": [
+              {"and": [
+                "canShinechargeMovementComplex",
+                "canWalljump"
+              ]},
+              {"and": [
+                "canShinechargeMovementTricky",
+                {"or": [
+                  "canSpeedyJump",
+                  "canSpringBallJumpMidAir"
+                ]}
+              ]}
+            ]},
+            {"shinespark": {"frames": 20, "excessFrames": 8}}
           ]},
           {"and": [
+            "HiJump",
             "canShinechargeMovementComplex",
-            {"shinespark": {"frames": 30, "excessFrames": 7}}
+            {"shinespark": {"frames": 16, "excessFrames": 8}}
           ]},
           {"and": [
+            "HiJump",
+            "canSpeedyJump",
             "canShinechargeMovementTricky",
-            {"shinespark": {"frames": 20, "excessFrames": 8}}
+            {"shinespark": {"frames": 11, "excessFrames": 8}}
           ]}
         ]}
       ],