Adjust acid interrupt and add mella option

Author: aquanight

region/norfair/crocomire/Indiana Jones Room.json

@@ -463,14 +463,20 @@
         {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
         {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
         {"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
-        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        {"or": [
+          {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+          {"and": [
+            {"autoReserveTrigger": {}},
+            {"acidFrames": 20}
+          ]}
+        ]},
         "canRModeSparkInterrupt"
       ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Get past the speed blocks and farm the Mellas. Shinecharge while running back and dip in the acid to interrupt.",
+        "Get past the speed blocks and farm the Mellas. Shinecharge while running back and use a Mella or the acid to interrupt.",
         "Getting past the blocks without Morph requires either an Insane Short Charge or an Acid Shinespark."
       ]
     },
@@ -491,14 +497,20 @@
           ]}
         ]},
         "h_shinechargeMaxRunway",
-        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        {"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 dip into the acid to interrupt."
+        "Crystal Flash, or farm Mellas and use a Power Bomb. Run through the speed blocks and use a Mella or the acid to interrupt."
       ]
     },
     {
@@ -1595,15 +1607,20 @@
         {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
         {"partialRefill": {"type": "ReserveEnergy", "limit": 20}},
         {"canShineCharge": {"usedTiles": 17, "openEnd": 0}},
-        {"autoReserveTrigger": {}},
-        "canRModeSparkInterrupt",
-        {"acidFrames": 30}
+        {"or": [
+          {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+          {"and": [
+            {"autoReserveTrigger": {}},
+            {"acidFrames": 20}
+          ]}
+        ]},
+        "canRModeSparkInterrupt"
       ],
       "clearsObstacles": ["B"],
       "flashSuitChecked": true,
       "blueSuitChecked": true,
       "note": [
-        "Farm the Mellas for energy, then run through the speed blocks, shinecharge, and jump into the acid to interrupt."
+        "Farm the Mellas for energy, then run through the speed blocks, shinecharge, and use a Mella or the acid to interrupt."
       ]
     },
     {
@@ -1624,14 +1641,20 @@
           ]}
         ]},
         "h_shinechargeMaxRunway",
-        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        {"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 dip into the acid to interrupt."
+        "Crystal Flash, or farm Mellas and use a Power Bomb. Run through the speed blocks and use a Mella or the acid to interrupt."
       ]
     },
     {