Introduce helper for heat-trigger spark interrupts.

Author: aquanight

helpers.json

@@ -1792,6 +1792,32 @@
             {"shinespark": {"frames": 4, "excessFrames": 4}}
           ]
         },
+        {
+          "name": "h_heatTriggerRModeSparkInterrupt",
+          "requires": [
+            {"disableEquipment": "Varia"},
+            {"disableEquipment": "Gravity"},
+            {"or": [
+              {"and": [
+                "canReserveTriggerBufferXRay",
+                {"autoReserveTrigger": {"implicitHeatFrames": "no"}},
+                "canRModeSparkInterrupt",
+                {"suitlessHeatFrames": 32}
+              ]},
+              {"and": [
+                "h_heatProof",
+                {"autoReserveTrigger": {}},
+                "canRModePauseAbuseSparkInterrupt"
+              ]},
+              {"and": [
+                {"autoReserveTrigger": {"implicitHeatFrames": "suitless"}},
+                "canRModeSparkInterrupt",
+                {"suitlessHeatFrames": 32}
+              ]}
+            ]}
+          ],
+          "note": "Represents triggering an R-Mode Spark Interrupt by using heat damage."
+        },
         {
           "name": "h_SpikeXModeSpikeSuit",
           "requires": [

region/lowernorfair/east/Metal Pirates Room.json

@@ -773,7 +773,7 @@
         "canHitbox",
         {"heatFrames": 180},
         "h_shinechargeMaxRunway",
-        {"autoReserveTrigger": {"maxReserveEnergy": 95}},
+        {"autoReserveTrigger": {}},
         "canRModeSparkInterrupt"
       ],
       "flashSuitChecked": true,
@@ -831,26 +831,7 @@
           ]}
         ]},
         "h_shinechargeMaxRunway",
-        {"disableEquipment": "Varia"},
-        {"disableEquipment": "Gravity"},
-        {"or": [
-          {"and": [
-            "canReserveTriggerBufferXRay",
-            {"autoReserveTrigger": {"implicitHeatFrames": "no"}},
-            "canRModeSparkInterrupt",
-            {"suitlessHeatFrames": 32}
-          ]},
-          {"and": [
-            "h_heatProof",
-            {"autoReserveTrigger": {}},
-            "canRModePauseAbuseSparkInterrupt"
-          ]},
-          {"and": [
-            {"autoReserveTrigger": {"implicitHeatFrames": "suitless"}},
-            "canRModeSparkInterrupt",
-            {"suitlessHeatFrames": 32}
-          ]}
-        ]}
+        "h_heatTriggerRModeSparkInterrupt"
       ],
       "clearsObstacles": ["A"],
       "flashSuitChecked": true,
@@ -927,30 +908,13 @@
         ]},
         {"heatFrames": 90},
          "h_shinechargeMaxRunway",
-        {"disableEquipment": "Varia"},
-        {"disableEquipment": "Gravity"},
         {"or": [
           {"and": [
             "canHitbox",
             {"autoReserveTrigger": {}},
             "canRModeSparkInterrupt"
           ]},
-          {"and": [
-            "canReserveTriggerBufferXRay",
-            {"autoReserveTrigger": {"implicitHeatFrames": "no"}},
-            "canRModeSparkInterrupt",
-            {"suitlessHeatFrames": 32}
-          ]},
-          {"and": [
-            "h_heatProof",
-            {"autoReserveTrigger": {}},
-            "canRModePauseAbuseSparkInterrupt"
-          ]},
-          {"and": [
-            {"autoReserveTrigger": {"implicitHeatFrames": "suitless"}},
-            "canRModeSparkInterrupt",
-            {"suitlessHeatFrames": 32}
-          ]}
+          "h_heatTriggerRModeSparkInterrupt"
         ]}
       ],
       "clearsObstacles": ["A"],

tests/asserts/keywords.py

@@ -504,7 +504,7 @@ def process_req_speed_state(req, states, err_fn):
             states = {"preshinespark"}
         elif req in ["h_CrystalSpark", "h_CrystalSparkWithoutLenience",
                      "h_underwaterCrystalSpark", "h_underwaterCrystalSparkWithoutLenience", "h_heatedCrystalSpark",
-                     "canRModeSparkInterrupt", "canRModePauseAbuseSparkInterrupt", "h_RModeKnockbackSpark"]:
+                     "canRModeSparkInterrupt", "canRModePauseAbuseSparkInterrupt", "h_RModeKnockbackSpark", "h_heatTriggerRModeSparkInterrupt"]:
             if not states.issubset(["shinecharging", "shinecharged", "preshinespark"]):
                 err_fn(f"{req} while not shinecharging/shinecharged/preshinespark")
             states = {"normal"}