Merge pull request #2453 from nn357/etecoon_spikesuit

add spikesuits to etecoon e-tank room

Author: osse101

region/brinstar/green/Etecoon Energy Tank Room.json

@@ -1060,6 +1060,68 @@
         "Freezing the lower one may be made easier or damageless by scrolling the camera when the Beetom is in the correct position and freezing it with a hero shot from the right."
       ]
     },
+    {
+      "link": [3, 3],
+      "name": "Come in Shinecharged, Gain Flash Suit (Spikesuit)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"or": [
+          "h_spikeSuitThornHitLeniency",
+          {"and": [
+            {"resetRoom": {"nodes": [3]}},
+            {"or":[
+              "ScrewAttack",
+              {"ammo": {"type": "Missile", "count": 2}},
+              {"ammo": {"type": "Super", "count": 2}},
+              {"ammo": {"type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "Ice",
+            "canTrickyDodgeEnemies"]}
+        ]},
+        {"shineChargeFrames": 80},
+        {"thornHits": 1},
+        "canSpikeSuit",
+        {"shinespark": {"frames": 1, "excessFrames": 1}}
+      ],
+      "resetsObstacles": ["A", "B", "R-Mode"],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [3, 3],
+      "name": "Come in Shinecharging, Gain Flash Suit (Spikesuit)",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 6,
+          "openEnd": 1
+        }
+      },
+      "requires": [
+        {"or": [
+          "h_spikeSuitThornHitLeniency",
+          {"and": [
+            {"resetRoom": {"nodes": [3]}},
+            {"or":[
+              "ScrewAttack",
+              {"ammo": {"type": "Missile", "count": 2}},
+              {"ammo": {"type": "Super", "count": 2}},
+              {"ammo": {"type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "Ice",
+            "canTrickyDodgeEnemies"]}
+        ]},
+        {"thornHits": 1},
+        "canSpikeSuit",
+        {"shinespark": {"frames": 1, "excessFrames": 1}}
+      ],
+      "resetsObstacles": ["A", "B", "R-Mode"],
+      "flashSuitChecked": true
+    },
     {
       "id": 103,
       "link": [3, 3],
@@ -1672,6 +1734,68 @@
       ],
       "devNote": "This does not require canRiskPermanentLossOfAccess if Samus returns through the crumble blocks."
     },
+    {
+      "link": [4, 4],
+      "name": "Come in Shinecharged, Gain Flash Suit (Spikesuit)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"or": [
+          "h_spikeSuitThornHitLeniency",
+          {"and": [
+            {"resetRoom": {"nodes": [4]}},
+            {"or":[
+              "ScrewAttack",
+              {"ammo": {"type": "Missile", "count": 2}},
+              {"ammo": {"type": "Super", "count": 2}},
+              {"ammo": {"type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "Ice",
+            "canTrickyDodgeEnemies"]}
+        ]},
+        {"shineChargeFrames": 60},
+        {"thornHits": 1},
+        "canSpikeSuit",
+        {"shinespark": {"frames": 1, "excessFrames": 1}}
+      ],
+      "resetsObstacles": ["A", "B", "R-Mode"],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [4, 4],
+      "name": "Come in Shinecharging, Gain Flash Suit (Spikesuit)",
+      "entranceCondition": {
+        "comeInShinecharging": {
+          "length": 3,
+          "openEnd": 0
+        }
+      },
+      "requires": [
+        {"or": [
+          "h_spikeSuitThornHitLeniency",
+          {"and": [
+            {"resetRoom": {"nodes": [4]}},
+            {"or":[
+              "ScrewAttack",
+              {"ammo": {"type": "Missile", "count": 2}},
+              {"ammo": {"type": "Super", "count": 2}},
+              {"ammo": {"type": "PowerBomb", "count": 1}}
+            ]}
+          ]},
+          {"and": [
+            "Ice",
+            "canTrickyDodgeEnemies"]}
+        ]},
+        {"thornHits": 1},
+        "canSpikeSuit",
+        {"shinespark": {"frames": 1, "excessFrames": 1}}
+      ],
+      "resetsObstacles": ["A", "B", "R-Mode"],
+      "flashSuitChecked": true
+    },
     {
       "id": 48,
       "link": [4, 4],