Merge pull request #2254 from blkerby/ridley-room-spark

Ridley Room shinespark

Author: osse101

region/lowernorfair/east/Ridley's Room.json

@@ -182,6 +182,43 @@
       "note": "Get into position and Ridley will hit Samus shorly after starting to move.",
       "devNote": "Not likely to be possible, as it requires canRiskPermanentLossOfAccess and Ridley alive with the door unlocked."
     },
+    {
+      "link": [1, 2],
+      "name": "Instant Diagonal Shinespark",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 1},
+        {"heatFrames": 20},
+        {"shinespark": {"frames": 20, "excessFrames": 2}},
+        {"heatFrames": 110}
+      ],
+      "note": [
+        "Buffer a diagonal shinespark to activate immediately on room entry."
+      ]
+    },
+    {
+      "link": [1, 2],
+      "name": "Use Flash Suit",
+      "requires": [
+        {"heatFrames": 65},
+        {"useFlashSuit": {}},
+        {"or": [
+          {"and": [
+            {"heatFrames": 14},
+            {"shinespark": {"frames": 14, "excessFrames": 2}}
+          ]},
+          {"and": [
+            "HiJump",
+            {"heatFrames": 11},
+            {"shinespark": {"frames": 11, "excessFrames": 2}}
+          ]}
+        ]},
+        {"heatFrames": 110}
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 26,
       "link": [1, 2],