Merge pull request #2567 from aquanight/rsi-ws-main-shaft

Wrecked Ship Main Shaft R-Mode Spark Interrupt

Author: osse101

region/wreckedship/main/Wrecked Ship Main Shaft.json

@@ -1688,6 +1688,45 @@
       "clearsObstacles": ["A", "B", "C"],
       "flashSuitChecked": true
     },
+    {
+      "link": [4, 4],
+      "name": "R-Mode Spark Interrupt",
+      "requires": [
+        {"obstaclesCleared": ["R-Mode"]},
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 40}}
+          ]}
+        ]},
+        {"or": [
+          {"canShineCharge": {"usedTiles": 12, "steepUpTiles": 7, "openEnd": 1}},
+          {"and": [
+            {"obstaclesCleared": ["C"]},
+            "Morph",
+            {"or": [
+              {"canShineCharge": {"usedTiles": 16, "steepUpTiles": 6, "openEnd": 0}},
+              {"and": [
+                "f_DefeatedPhantoon",
+                {"canShineCharge": {"usedTiles": 19, "steepDownTiles": 6, "openEnd": 1}}
+              ]}
+            ]}
+          ]}
+        ]},
+        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        "canRModeSparkInterrupt"
+      ],
+      "resetsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Power Off: Farm Coverns and use either the ramp to the upper right door or the ramp by the inactive treadmills to shinecharge.",
+        "Interrupt using the next Covern spawn.",
+        "Power On: Farm Atomics and shinecharge using the ramp to the upper right door, using an Atomic to interrupt. Or open the path",
+        "to the treadmills, shinecharge there, and jump under a Kzan to interrupt."
+      ]
+    },
     {
       "id": 55,
       "link": [4, 4],
@@ -2458,16 +2497,19 @@
           "canBePatient",
           "Plasma"
         ]},
+        {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
         {"or": [
           {"and": [
             "canCarefulJump",
             "canMidAirMorph",
             "canDisableEquipment"
           ]},
           "h_useSpringBall"
-        ]}
+        ]},
+        {"autoReserveTrigger": {}}
       ],
       "clearsObstacles": ["B"],
+      "resetsObstacles": ["R-Mode"],
       "flashSuitChecked": true,
       "note": [
         "In R-Mode, kill the Coverns until there is Energy in Samus's Reserves. Get into the Morph tunnel and go to the far left.",