Merge pull request #2529 from aquanight/rsi-en-speedbooster-hall

Speed Booster Hall R-Mode Spark Interrupt

Author: osse101

items.json

@@ -133,6 +133,7 @@
   "gameFlags": [
     "f_AnimalsSaved",
     "f_BeatSuperMetroid",
+    "f_ClearedSpeedBoosterLavaTrap",
     "f_DefeatedBombTorizo",
     "f_DefeatedBotwoon",
     "f_DefeatedCeresRidley",

region/norfair/east/Speed Booster Hall.json

@@ -466,6 +466,42 @@
         "To speed it up, it helps to prevent breaking most of the crumbles (no more than two consecutive) so the Geruta doesn't get stuck."
       ]
     },
+    {
+      "link": [1, 2],
+      "name": "R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"or": [
+          "h_heatedCrystalFlashForReserveEnergy",
+          {"and": [
+            "h_RModeCanRefillReserves",
+            "h_heatProof",
+            {"or": [
+              {"enemyKill": {"enemies": [["Metaree", "Metaree"]]}},
+              {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]}
+            ]},
+            {"or": [
+              {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+              {"resourceMissingAtMost": [{"type": "Super", "count": 0}]}
+            ]},
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
+          ]}
+        ]},
+        {"simpleHeatFrames": 310},
+        {"heatFrames": 40},
+        "h_shinechargeMaxRunway",
+        "h_heatTriggerRModeSparkInterrupt"
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Farm the Metarees if able. Farm the Geruta while they are trapped.",
+        "After the third Geruta, run toward the right door to shinecharge and use heat damage to interrupt."
+      ]
+    },
     {
       "id": 33,
       "link": [1, 2],
@@ -598,6 +634,59 @@
       "clearsObstacles": ["A"],
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 1],
+      "name": "Speed Booster Lava Trap",
+      "entranceCondition": {
+        "comeInNormally": {}
+      },
+      "requires": [
+        {"not": "f_ClearedSpeedBoosterLavaTrap"},
+        {"doorUnlockedAtNode": 1},
+        {"simpleHeatFrames": 310},
+        {"heatFrames": 40},
+        "h_speedDash"
+      ],
+      "exitCondition": {
+        "leaveNormally": {}
+      },
+      "setsFlags": ["f_ClearedSpeedBoosterLavaTrap"],
+      "unlocksDoors": [
+        {"nodeId": 1, "types": ["missiles", "super"], "requires": []},
+        {"nodeId": 1, "types": ["powerbomb"], "requires": [{"heatFrames": 120}]}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true
+    },
+    {
+      "link": [2, 1],
+      "name": "R-Mode Spark Interrupt",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        "f_ClearedSpeedBoosterLavaTrap",
+        {"or": [
+          "h_CrystalFlashForReserveEnergy",
+          {"and": [
+            "h_heatProof",
+            "h_RModeCanRefillReserves",
+            {"resourceMissingAtMost": [{"type": "Missile", "count": 0}]},
+            {"partialRefill": {"type": "ReserveEnergy", "limit": 20}}
+          ]}
+        ]},
+        {"simpleHeatFrames": 310},
+        {"heatFrames": 40},
+        "h_shinechargeMaxRunway",
+        "h_heatTriggerRModeSparkInterrupt"
+      ],
+      "clearsObstacles": ["A"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "The three Gerutas can be farmed while trapped. Run the rest of the way to the left door and use heat damage to interrupt."
+      ]
+    },
     {
       "id": 16,
       "link": [2, 1],
@@ -994,6 +1083,79 @@
         "To speed it up, it helps to prevent breaking most of the crumbles (no more than two consecutive) so the Geruta doesn't get stuck."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "R-Mode SparK Interrupt, No Lava Trap",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        "f_ClearedSpeedBoosterLavaTrap",
+        "h_heatedCrystalFlashForReserveEnergy",
+        {"heatFrames": 100},
+        {"canShineCharge": {"usedTiles": 27, "openEnd": 0}},
+        "h_heatTriggerRModeSparkInterrupt",
+        {"heatFrames": 240},
+        {"lavaFrames": 20}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Crystal Flash at the right door, then shinecharge across two sets of crumble blocks.",
+        "Use heat damage to interrupt, then jump back across to the door."
+      ]
+    },
+    {
+      "link": [2, 2],
+      "name": "R-Mode Spark Interrupt, Return through Lava Trap",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [
+        {"simpleHeatFrames": 310},
+        {"heatFrames": 40},
+        "h_shinechargeMaxRunway",
+        {"shinespark": {"frames": 49, "excessFrames": 10}},
+        "h_heatedCrystalFlashForReserveEnergy",
+        {"heatFrames": 100},
+        "h_shinechargeMaxRunway",
+        "h_heatTriggerRModeSparkInterrupt",
+        {"or": [
+          {"and": [
+            "f_ClearedSpeedBoosterLavaTrap",
+            {"heatFrames": 1250},
+            {"lavaFrames": 40}
+          ]},
+          {"and": [
+            "h_heatedCrystalFlash",
+            {"heatFrames": 2060},
+            {"lavaFrames": 2060}
+          ]},
+          {"and": [
+            "Gravity",
+            "h_heatedCrystalFlash",
+            {"heatFrames": 1250},
+            {"lavaFrames": 1250}
+          ]},
+          {"and": [
+            "Gravity",
+            "h_heatProof",
+            "h_lavaProof"
+          ]}
+        ]}
+      ],
+      "exitCondition": {"leaveNormally": {}},
+      "unlocksDoors": [
+        {"nodeId": 2, "types": ["ammo"], "requires": []}
+      ],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Outrun the rising lava up to the highest ledge and shinecharge before touching the crumble blocks.",
+        "Shinespark across to the door. Crystal Flash, then run back across the crumble blocks and shinecharge before entering the lava.",
+        "Windup and interrupt using the heat damage. Then run back through the lava to the right door."
+      ]
+    },
     {
       "id": 27,
       "link": [2, 3],