Merge pull request #2463 from nn357/betapeebs_shinexmode

refine existing shinespark strat and add xmode bluesuit to betapowerbomb room

Author: osse101

region/brinstar/red/Beta Power Bomb Room.json

@@ -170,18 +170,31 @@
       "name": "Gain Flash Suit (Spikesuit)",
       "requires": [
         {"obstaclesCleared": ["A"]},
-        {"obstaclesNotCleared": ["B"]},
-        {"canShineCharge": {"usedTiles": 29, "openEnd": 0}},
-        {"thornHits": 4},
         "h_spikeSuitThornHitLeniency",
-        "canSpikeSuit",
-        {"shinespark": {"frames": 1, "excessFrames": 1}}
+        {"or": [
+          {"and": [
+            {"obstaclesNotCleared": ["B"]},
+            {"canShineCharge": {"usedTiles": 29, "openEnd": 0}},
+            {"thornHits": 4},
+            "canSpikeSuit",
+            {"shinespark": {"frames": 1, "excessFrames": 1}}
+          ]},
+          {"and": [
+            {"obstaclesCleared": ["B"]},
+            "canSamusEaterStandUp",
+            {"samusEaterFrames": 160},
+            "h_shinechargeMaxRunway",
+            "h_spikeSuitSamusEaterLeniency",
+            {"thornHits": 1},
+            "canSpikeSuit",
+            {"shinespark": {"frames": 4, "excessFrames": 4}}
+          ]}
+        ]}
       ],
-      "flashSuitChecked": true,
-      "devNote": [
-        "FIXME: If the Power Bomb blocks are already broken, using a Samus Eater would also be an option;",
-        "A leaveShinecharged strat could also be added for that."
-      ]
+      "note": [
+        "Without Super Missiles or to save using a Super Missile, jump over the yapping maw to make it try to grab Samus, the Samus Eater can then be entered from the other side avoiding being grabbed."
+      ],
+      "flashSuitChecked": true
     },
     {
       "id": 1,
@@ -515,6 +528,24 @@
     },
     {
       "id": 33,
+      "link": [1, 1],
+      "name": "Gain Blue Suit - Samus Eater Shinecharge (X-Mode)",
+      "requires": [
+        {"obstaclesCleared": ["A", "B"]},
+        "canSamusEaterStandUp",
+        {"samusEaterFrames": 160},
+        "h_shinechargeMaxRunway",
+        "h_spikeSuitSamusEaterLeniency",
+        "h_thornXModeFramePerfectExtraLeniency",
+        "h_thornXModeBlueSuit",
+        {"shinespark": {"frames": 4}}
+      ],
+      "note":[
+        "Without Super Missiles or to save using a Super Missile, jump over the yapping maw to make it try to grab Samus, the Samus Eater can then be entered from the other side avoiding being grabbed."
+      ],
+      "flashSuitChecked": true
+    },
+    {
       "link": [1, 1],
       "name": "Direct G-mode Morph, Crystal Flash Interrupt",
       "entranceCondition": {