Merge pull request #1917 from osse101/eastcacx

Refine East Cac Alley left-side X-mode shinecharge

Author: osse101

region/maridia/inner-pink/East Cactus Alley Room.json

@@ -201,32 +201,82 @@
       ]
     },
     {
-      "id": 3,
       "link": [1, 1],
-      "name": "X-Mode, Leave With Spark",
+      "name": "X-Mode, Leave Shinecharged",
       "requires": [
+        "h_canShineChargeMaxRunway",
+        "canShinechargeMovementComplex",
         "canXMode",
         "h_XModeSpikeHit",
         "h_XModeSpikeHit",
         {"or": [
           "h_XModeSpikeHit",
-          "canStationarySpinJump"
+          "canStationarySpinJump",
+          "canTrickyJump"
         ]},
         "Gravity",
-        "HiJump",
-        "SpaceJump",
-        "canShinechargeMovementComplex",
-        "canMidairShinespark",
+        {"or": [
+          {"and": [
+            "HiJump",
+            "SpaceJump", 
+            {"shineChargeFrames": 130}
+          ]},
+          {"and": [
+            "HiJump",
+            "canPreciseWalljump",
+            {"shineChargeFrames": 160}
+          ]},
+          {"and": [
+            "SpaceJump",
+            "canPreciseWalljump",
+            {"shineChargeFrames": 160}
+          ]}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true,
+      "devNote": [
+        "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
+      ]
+    },
+    {
+      "id": 3,
+      "link": [1, 1],
+      "name": "X-Mode, Leave With Spark",
+      "requires": [
+        "canXMode",
+        "h_XModeSpikeHit",
+        "h_XModeSpikeHit",
         "h_canShineChargeMaxRunway",
-        {"shinespark": {"frames": 10}}
+        "canShinechargeMovementTricky",
+        "canTrickyJump",
+        "Gravity",
+        {"or": [
+          {"and": [
+            "HiJump",
+            "canTrickyDashJump"
+          ]},
+          {"and": [
+            "canFastWalljumpClimb",
+            "canPreciseWalljump"
+          ]},
+          {"and": [
+            "SpaceJump",
+            "canInsaneJump",
+            {"shinespark": {"frames": 3}}
+          ]}
+        ]},
+        "canMidairShinespark",
+        {"shinespark": {"frames": 5}}
       ],
       "exitCondition": {
         "leaveWithSpark": {}
       },
       "flashSuitChecked": true,
       "devNote": [
-        "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount).",
-        "FIXME: This should be doable with fewer items."
+        "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
       ]
     },
     {