Merge pull request #2485 from aquanight/rsi-mp-halfie-climb

Halfie Climb Room R-Mode Spark Interrupt

Author: osse101

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

@@ -812,6 +812,32 @@
         "Samus will fall into the door transition, bypassing any lock that may be on the door."
       ]
     },
+    {
+      "link": [1, 3],
+      "name": "R-Mode Spark Interrupt",
+      "requires": [
+        {"obstaclesCleared": ["R-Mode"]},
+        "Gravity",
+        "Morph",
+        "h_RModeCanRefillReserves",
+        {"or": [
+          {"resourceMissingAtMost": [{"type": "Missile", "count": 2}]},
+          {"resourceMissingAtMost": [{"type": "Super", "count": 1}]}
+        ]},
+        {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+        "h_shinechargeMaxRunway",
+        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        "canRModeSparkInterrupt"
+      ],
+      "resetsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Enter and farm all three Mochtroids, or Crystal Flash.",
+        "Run right to left underneath the Ohms, then lead them to roll off the right side.",
+        "Shinecharge and use the Ohm lick attack to interrupt."
+      ]
+    },
     {
       "id": 16,
       "link": [1, 4],
@@ -2315,6 +2341,35 @@
       "flashSuitChecked": true,
       "note": "Run away from the oums and reclimb after each if jumping over them is difficult."
     },
+    {
+      "link": [2, 3],
+      "name": "R-Mode Spark Interrupt",
+      "requires": [
+        {"obstaclesCleared": ["R-Mode"]},
+        "Gravity",
+        "Morph",
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+            {"resourceMissingAtMost": [{"type": "Super", "count": 0}]},
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
+          ]}
+        ]},
+        "h_shinechargeMaxRunway",
+        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        "canRModeSparkInterrupt"
+      ],
+      "resetsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Enter and farm all three Mochtroids, or Crystal Flash.",
+        "Run right to left underneath the Ohms, then lead them to roll off the right side.",
+        "Shinecharge and use the Ohm lick attack to interrupt."
+      ]
+    },
     {
       "id": 62,
       "link": [2, 4],