remove redundant 2->2 leaveWithSpark, combine into 6->2

Author: blkerby

region/maridia/inner-pink/Halfie Climb Room.json

@@ -1738,50 +1738,6 @@
         }
       }
     },
-    {
-      "id": 52,
-      "link": [2, 2],
-      "name": "Stutter Water Shinecharge, Leave with Spark",
-      "entranceCondition": {
-        "comeInRunning": {
-          "speedBooster": true,
-          "minTiles": 2.4375
-        }
-      },
-      "requires": [
-        "canStutterWaterShineCharge",
-        "canShinechargeMovementComplex",
-        "h_shinechargeMaxRunway",
-        {"or": [
-          {"enemyDamage": {"enemy": "Mochtroid", "type": "contact", "hits": 2}},
-          {"and": [
-            "canDodgeWhileShooting",
-            {"or": [
-              "Wave",
-              "Spazer",
-              "Plasma",
-              {"ammo": {"type": "Missile", "count": 1}},
-              {"ammo": {"type": "Super", "count": 1}}
-            ]}
-          ]}
-        ]},
-        {"or": [
-          {"shinespark": {"frames": 12}},
-          {"and": [
-            "canShinechargeMovementTricky",
-            {"shinespark": {"frames": 3}}
-          ]}
-        ]}
-      ],
-      "exitCondition": {
-        "leaveWithSpark": {}
-      },
-      "unlocksDoors": [
-        {"types": ["missiles", "super"], "requires": []},
-        {"types": ["powerbomb"], "requires": ["never"]}
-      ],
-      "note": "Enter the room with a careful amount of momentum where Samus must spend extra time slowing down during the stutter, but must not have much run speed."
-    },
     {
       "id": 53,
       "link": [2, 2],
@@ -4251,7 +4207,13 @@
       "requires": [
         {"shineChargeFrames": 50},
         "canShinechargeMovementComplex",
-        {"shinespark": {"frames": 12}}        
+        {"or": [
+          {"shinespark": {"frames": 12}},
+          {"and": [
+            "canShinechargeMovementTricky",
+            {"shinespark": {"frames": 3}}
+          ]}
+        ]}
       ],
       "exitCondition": {
         "leaveWithSpark": {}