Merge pull request #2577 from aquanight/rsi-en-upper-farming

Upper Norfair Farming Room R-Mode Spark Interrupt

Author: osse101

region/norfair/east/Upper Norfair Farming Room.json

@@ -78,6 +78,11 @@
       "id": "A",
       "name": "Blue Gate",
       "obstacleType": "inanimate"
+    },
+    {
+      "id": "R-Mode",
+      "name": "Entered with R-Mode",
+      "obstacleType": "abstract"
     }
   ],
   "enemies": [
@@ -164,10 +169,22 @@
       "link": [1, 1],
       "name": "Crystal Flash",
       "requires": [
+        {"obstaclesNotCleared": ["R-Mode"]},
         "h_heatedCrystalFlash"
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "R-Mode Entry",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "clearsObstacles": ["R-Mode"]
+    },
     {
       "id": 3,
       "link": [1, 2],
@@ -481,6 +498,17 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [2, 2],
+      "name": "R-Mode Entry",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "clearsObstacles": ["R-Mode"]
+    },
     {
       "id": 54,
       "link": [2, 3],
@@ -963,10 +991,22 @@
       "link": [3, 3],
       "name": "Crystal Flash",
       "requires": [
+        {"obstaclesNotCleared": ["R-Mode"]},
         "h_heatedCrystalFlash"
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [3, 3],
+      "name": "R-Mode Entry",
+      "entranceCondition": {
+        "comeInWithRMode": {}
+      },
+      "requires": [],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "clearsObstacles": ["R-Mode"]
+    },
     {
       "id": 30,
       "link": [3, 4],
@@ -1346,6 +1386,27 @@
         "Without leniency, this can be done with about 235 heatFrames."
       ]
     },
+    {
+      "link": [5, 5],
+      "name": "Frozen Gamet Runway, R-Mode Spark Interrupt",
+      "requires": [
+        {"obstaclesCleared": ["R-Mode"]},
+        {"heatFrames": 60},
+        {"refill": ["Energy"]},
+        {"enemyKill": {"enemies": [["Fune"]]}},
+        "h_trickyFrozenEnemyRunway",
+        {"canShineCharge": {"usedTiles": 17, "openEnd": 1}},
+        {"autoReserveTrigger": {}},
+        "canRModeSparkInterrupt"
+      ],
+      "resetsObstacles": ["R-Mode"],
+      "flashSuitChecked": true,
+      "blueSuitChecked": true,
+      "note": [
+        "Fill up on the Gamets and kill the Fune to the right. Freeze a Gamet in perfect pixel position to bridge the runway between the center platform and right ledge.",
+        "Run across and shinecharge, then use a Gamet to interrupt."
+      ]
+    },
     {
       "id": 61,
       "link": [5, 5],