Merge pull request #2512 from aquanight/rsi-cl-indiana-jones

Indiana Jones Room R-Mode Spark Interrupt

Author: osse101

region/norfair/crocomire/Indiana Jones Room.json

@@ -440,6 +440,73 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 5],
+      "name": "No Power Bombs, R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+          "Morph",
+          {"getBlueSpeed": {"usedTiles": 12, "gentleDownTiles": 6, "openEnd": 1}},
+          {"and": [
+            {"notable": "Acid Shinespark"},
+            "Gravity",
+            "canSuitlessLavaDive",
+            "h_shinechargeMaxRunway",
+            {"acidFrames": 140},
+            {"shinespark": {"frames": 35}}
+          ]}
+        ]},
+        "h_RModeCanRefillReserves",
+        {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+        {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+        {"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
+        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        "canRModeSparkInterrupt"
+      ],
+      "clearsObstacles": ["B"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Get past the speed blocks and farm the Mellas. Shinecharge while running back and use a Mella to interrupt.",
+        "Getting past the blocks without Morph requires either an Insane Short Charge or an Acid Shinespark."
+      ]
+    },
+    {
+      "link": [1, 5],
+      "name": "Clear the Power Bomb Blocks, R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+            "h_usePowerBomb"
+          ]}
+        ]},
+        "h_shinechargeMaxRunway",
+        {"or": [
+          {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+          {"and": [
+            {"autoReserveTrigger": {}},
+            {"acidFrames": 20}
+          ]}
+        ]},
+        "canRModeSparkInterrupt"
+      ],
+      "clearsObstacles": ["A", "B"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Crystal Flash, or farm Mellas and use a Power Bomb. Run through the speed blocks and use a Mella or the acid to interrupt."
+      ]
+    },
     {
       "id": 89,
       "link": [1, 6],
@@ -1522,6 +1589,62 @@
       "flashSuitChecked": true,
       "note": "Use a flash suit to spark horizontally through the speed blocks. Samus may stop above the acid, but it should always be possible to land on one of the platforms."
     },
+    {
+      "link": [2, 5],
+      "name": "No Power Bombs, R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {},
+        "comesThroughToilet": "no"
+      },
+      "requires": [
+        "h_RModeCanRefillReserves",
+        {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+        {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+        {"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
+        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        "canRModeSparkInterrupt"
+      ],
+      "clearsObstacles": ["B"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Farm the Mellas for energy, then run through the speed blocks, shinecharge, and use a Mella to interrupt."
+      ]
+    },
+    {
+      "link": [2, 5],
+      "name": "Clear the Power Bomb Blocks, R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {},
+        "comesThroughToilet": "no"
+      },
+      "requires": [
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
+            "h_usePowerBomb"
+          ]}
+        ]},
+        "h_shinechargeMaxRunway",
+        {"or": [
+          {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+          {"and": [
+            {"autoReserveTrigger": {}},
+            {"acidFrames": 20}
+          ]}
+        ]},
+        "canRModeSparkInterrupt"
+      ],
+      "clearsObstacles": ["A", "B"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Crystal Flash, or farm Mellas and use a Power Bomb. Run through the speed blocks and use a Mella or the acid to interrupt."
+      ]
+    },
     {
       "id": 44,
       "link": [2, 6],