Merge pull request #2497 from nn357/red_fireflees_revisit

some additional spikesuit / xmode stuff for ln firefleas

Author: osse101

region/lowernorfair/east/Lower Norfair Fireflea Room.json

@@ -221,7 +221,8 @@
     {
       "from": 4,
       "to": [
-        {"id": 5}
+        {"id": 5},
+        {"id": 7,  "note": "X-Mode Shinespark / Spikesuit strats starting at Item"}
       ]
     },
     {
@@ -242,7 +243,8 @@
       "from": 7,
       "to": [
         {"id": 5},
-        {"id": 6}
+        {"id": 6},
+        {"id": 7,  "note": "Spikesuit strats using initial spark to return"}
       ]
     }
   ],
@@ -736,7 +738,7 @@
             ]}
           ]}
         ]},
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 4, "excessFrames": 4}}
       ],
       "clearsObstacles": ["A"],
@@ -753,7 +755,7 @@
         {"shineChargeFrames": 75},
         {"spikeHits": 1},
         "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 4}}
       ],
       "flashSuitChecked": true,
@@ -769,7 +771,7 @@
         {"canShineCharge": {"usedTiles": 20, "gentleDownTiles": 2, "openEnd": 1}},
         {"spikeHits": 1},
         "h_spikeSuitSpikeHitLeniency",
-        "canSpikeSuit",
+        "canPatientSpikeSuit",
         {"shinespark": {"frames": 11}}
       ],
       "exitCondition": {
@@ -1469,6 +1471,33 @@
       ],
       "flashSuitChecked": true
     },
+    {
+      "link": [4, 7],
+      "name": "X-Mode Shinespark",
+      "requires": [
+        "h_spikeXModeShinecharge",
+        {"shinespark": {"frames": 14, "excessFrames": 9}}
+      ],
+      "note": [
+        "After armpumping for a while Samus will start to move forwards again, when this happens armpump to move forward one tile"
+      ],
+      "wallJumpAvoid": true,
+      "flashSuitChecked": true
+    },
+    {
+      "link": [4, 7],
+      "name": "Gain Flash Suit (X-Mode Spikesuit) - Shinespark up.",
+      "requires": [
+        "canUseFlashSuitInitialSpark",
+        "h_spikeXModeSpikeSuit",
+        {"shinespark": {"frames": 24, "excessFrames": 8}}
+      ],
+      "note": [
+        "After armpumping for a while Samus will start to move forwards again, when this happens armpump to move forward one tile"
+      ],
+      "wallJumpAvoid": true,
+      "flashSuitChecked": true
+    },
     {
       "id": 40,
       "link": [5, 4],
@@ -1710,6 +1739,25 @@
       "requires": [],
       "flashSuitChecked": true
     },
+    {
+      "link": [7, 5],
+      "name": "Gain Flash Suit - (Spikesuit)",
+      "requires": [
+        {"canShineCharge": {
+          "usedTiles": 17,
+          "gentleUpTiles": 6,
+          "steepUpTiles": 1,
+          "openEnd": 1
+        }},
+        {"spikeHits": 1},
+        "canPatientSpikeSuit",
+        {"shinespark": {"frames": 24, "excessFrames": 22}}
+      ],
+      "devNote": [
+        "No leniency added becuase can farm the firefleas."
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 60,
       "link": [7, 6],
@@ -1772,6 +1820,28 @@
         "canSpringBallJumpMidAir"
       ],
       "flashSuitChecked": true
+    },
+    {
+      "link": [7, 7],
+      "name": "Gain Flash Suit - Shinespark up.",
+      "requires": [
+        "canUseFlashSuitInitialSpark",
+        {"canShineCharge": {
+          "usedTiles": 17,
+          "gentleUpTiles": 6,
+          "steepUpTiles": 1,
+          "openEnd": 1
+        }},
+        {"spikeHits": 1},
+        "h_spikeSuitSpikeHitLeniency",
+        "canTrickySpikeSuit",
+        {"shinespark": {"frames": 24, "excessFrames": 8}}
+      ],
+      "note": [
+        "Failing the spikesuit without a way to get back up to the junction results in a softlock."
+      ],
+      "wallJumpAvoid": true,
+      "flashSuitChecked": true
     }
   ],
   "notables": [