Merge pull request #2338 from nn357/ws_mainshaft_spikesuits

add spikesuits to WS mainshaft.

Author: osse101

region/wreckedship/main/Wrecked Ship Main Shaft.json

@@ -335,7 +335,8 @@
     {
       "from": 8,
       "to": [
-        {"id": 3}
+        {"id": 3},
+        {"id": 8}
       ]
     }
   ],
@@ -2261,6 +2262,33 @@
         "Wait for Coverns to damage Samus down until Reserves trigger, forcing a stand up and enabling her to shoot the shot blocks and escape."
       ]
     },
+    {
+      "link": [7, 7],
+      "name": "Come in Shinecharged, Gain Flash Suit (Spikesuit)",
+      "entranceCondition": {
+        "comeInShinecharged": {},
+        "comesThroughToilet": "any"
+      },
+      "requires": [
+        "f_DefeatedPhantoon",
+        {"shineChargeFrames": 55},
+        {"thornHits": 1},
+        "h_spikeSuitThornHitLeniency",
+        "canSpikeSuit",
+        {"shinespark": {"frames": 1, "excessFrames": 1}}
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [7, 7],
+      "name": "Gain Flash Suit (X-Mode Spikesuit)",
+      "requires": [
+        "f_DefeatedPhantoon",
+        "h_ThornXModeSpikeSuit",
+        {"shinespark": {"frames": 1, "excessFrames": 1}}
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 92,
       "link": [7, 7],
@@ -2486,6 +2514,19 @@
       ],
       "clearsObstacles": ["C"],
       "flashSuitChecked": true
+    },
+    {
+      "link": [8, 8],
+      "name": "Gain Flash Suit (Spikesuit)",
+      "requires": [
+        "f_DefeatedPhantoon",
+        {"canShineCharge": {"usedTiles": 20, "steepDownTiles": 5, "openEnd": 0}},
+        {"spikeHits": 1},
+        "h_spikeSuitSpikeHitLeniency",
+        "canSpikeSuit",
+        {"shinespark": {"frames": 1, "excessFrames": 1}}
+      ],
+      "flashSuitChecked": true
     }
   ],
   "notables": [