Feedback Fixes

Author: osse101

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

@@ -204,8 +204,8 @@
       "link": [1, 1],
       "name": "X-Mode, Leave Shinecharged",
       "requires": [
-        "canShinechargeMovementComplex",
         "h_canShineChargeMaxRunway",
+        "canShinechargeMovementComplex",
         "canXMode",
         "h_XModeSpikeHit",
         "h_XModeSpikeHit",
@@ -219,17 +219,17 @@
           {"and": [
             "HiJump",
             "SpaceJump", 
-            {"shineChargeFrames": 50}
+            {"shineChargeFrames": 130}
           ]},
           {"and": [
             "HiJump",
             "canPreciseWalljump",
-            {"shineChargeFrames": 20}
+            {"shineChargeFrames": 160}
           ]},
           {"and": [
             "SpaceJump",
             "canPreciseWalljump",
-            {"shineChargeFrames": 20}
+            {"shineChargeFrames": 160}
           ]}
         ]}
       ],
@@ -241,31 +241,6 @@
         "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
       ]
     },
-    {
-      "link": [1, 1],
-      "name": "X-Mode, Leave With Spark (Bottom)",
-      "requires": [
-        "canXMode",
-        "h_XModeSpikeHit",
-        "h_XModeSpikeHit",
-        "canInsaneJump",
-        "Gravity",
-        "SpaceJump", 
-        "canShinechargeMovementTricky",
-        "canMidairShinespark",
-        "h_canShineChargeMaxRunway",
-        {"shinespark": {"frames": 8}}
-      ],
-      "exitCondition": {
-        "leaveWithSpark": {
-          "position": "bottom"
-        }
-      },
-      "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],
@@ -274,6 +249,8 @@
         "canXMode",
         "h_XModeSpikeHit",
         "h_XModeSpikeHit",
+        "h_canShineChargeMaxRunway",
+        "canShinechargeMovementTricky",
         "canTrickyJump",
         "Gravity",
         {"or": [
@@ -284,11 +261,14 @@
           {"and": [
             "canFastWalljumpClimb",
             "canPreciseWalljump"
+          ]},
+          {"and": [
+            "SpaceJump",
+            "canInsaneJump",
+            {"shinespark": {"frames": 3}}
           ]}
         ]},
-        "canShinechargeMovementTricky",
         "canMidairShinespark",
-        "h_canShineChargeMaxRunway",
         {"shinespark": {"frames": 5}}
       ],
       "exitCondition": {