Merge pull request #2363 from nn357/xmodebluesuitstuff

add xmode bluesuit stuff

Author: osse101

helpers.json

@@ -1691,6 +1691,40 @@
             "h_shinechargeMaxRunway",
             "canShinechargeMovement"
           ]
+        },
+        {
+          "name": "h_spikeXModeBlueSuit",
+          "requires": [
+            "canXModeBlueSuit",
+            "h_XModeSpikeHit",
+            {"shinespark": {"frames": 4, "excessFrames": 4}}
+          ]
+        },
+        {
+          "name": "h_thornXModeBlueSuit",
+          "requires": [
+            "canXModeBlueSuit",
+            "h_XModeThornHit",
+            {"shinespark": {"frames": 4, "excessFrames": 4}}
+          ]
+        },
+        {
+          "name": "h_spikeDoubleXModeBlueSuit",
+          "requires":[
+            "canDoubleXModeBlueSuit",
+            "h_spikeXModeShinecharge",
+            "h_spikeXModeBlueSuit",
+            {"shinespark": {"frames": 4, "excessFrames": 4}}
+          ]
+        },
+        {
+          "name": "h_thornDoubleXModeBlueSuit",
+          "requires":[
+            "canDoubleXModeBlueSuit",
+            "h_thornXModeShinecharge",
+            "h_thornXModeBlueSuit",
+            {"shinespark": {"frames": 4, "excessFrames": 4}}
+          ]
         }
       ]
     }

region/brinstar/green/Green Brinstar Fireflea Room.json

@@ -82,13 +82,10 @@
       "link": [1, 1],
       "name": "Leave Shinecharged (X-Mode)",
       "requires": [
-        "canXMode",
         "h_XModeThornHit",
         "h_XModeThornHit",
-        "h_XModeThornHit",
-        "h_shinechargeMaxRunway",
-        "canShinechargeMovement",
-        {"shineChargeFrames": 130}
+        "h_thornXModeShinecharge",
+        {"shineChargeFrames": 120}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
@@ -359,6 +356,24 @@
         "Assuming the room can be reset, leniency is not included because a farm is available."
       ]
     },
+    {
+      "link": [2, 2],
+      "name": "Gain Blue Suit (X-Mode)",
+      "requires": [
+        {"or": [
+          {"canShineCharge": {"usedTiles": 16, "openEnd": 0}},
+          {"and": [
+            {"doorUnlockedAtNode": 2},
+            {"canShineCharge": {"usedTiles": 17, "openEnd": 0}}
+          ]}
+        ]},
+        "h_thornXModeBlueSuit"
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Bouncing into the spikes is not required due to wall. Roll off the edge holding forwards from at least 1 tile before the drop to hit the wall on the way down."
+      ]
+    },
     {
       "id": 12,
       "link": [2, 2],

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

@@ -309,6 +309,18 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "Gain Blue Suit (X-Mode)",
+      "requires": [
+        "canSamusEaterStandUp",
+        {"samusEaterFrames": 160},
+        "h_shinechargeMaxRunway",
+        "h_spikeSuitSamusEaterLeniency",
+        "h_thornXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 28,
       "link": [1, 1],

region/crateria/central/Climb Supers Room.json

@@ -261,12 +261,7 @@
       "link": [1, 1],
       "name": "X-Mode, Leave Shinecharged",
       "requires": [
-        "canXMode",
-        "h_XModeSpikeHit",
-        "h_XModeSpikeHit",
-        "canShinechargeMovement",
-        "canUseIFrames",
-        "h_shinechargeMaxRunway",
+        "h_spikeXModeShinecharge",
         {"shineChargeFrames": 110}
       ],
       "exitCondition": {
@@ -275,6 +270,26 @@
       "flashSuitChecked": true,
       "devNote": "Two spike hits are expected per attempt (with any additional leniency hits being multiplied by this amount)."
     },
+    {
+      "link": [1, 1],
+      "name": "Gain Blue Suit (X-Mode)",
+      "entranceCondition": {
+        "comeInShinecharged": {}
+      },
+      "requires": [
+        {"shineChargeFrames": 145},
+        "h_spikeXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
+    {
+      "link": [1, 1],
+      "name": "Gain Blue Suit (Double X-Mode)",
+      "requires": [
+        "h_spikeDoubleXModeBlueSuit"
+      ],
+      "flashSuitChecked": true
+    },
     {
       "id": 3,
       "link": [1, 1],

tech.json

@@ -2572,6 +2572,44 @@
                 "This tech should not be used directly; instead use a helper,",
                 "in order to correctly account for the amount of Crystal Flash refill, which depends on the environment."
               ]
+            },
+            {
+              "name": "canXModeBlueSuit",
+              "techRequires": [
+                "canXMode",
+                "canCarryBlueSuit"
+              ],
+              "otherRequires": [
+                {"gainBlueSuit": {}},
+                {"noFlashSuit": {}}
+              ],
+              "note": [
+                "The ability to gain a blue suit by shinesparking while in X-Mode and exiting X-Mode before the shinespark has crashed.",
+                "Release dash during the shinespark wind-up animation to exit X-Mode, interrupting the shinespark and gaining a blue suit.",
+                "A blue suit will not be gained if dash is released after a shinespark has crashed against a wall or object.",
+                "Releasing dash mid shinespark will cause Samus to SuperJump and potentially go out of bounds but this can also be used to jump away from spikes or thorns.",
+                "Care must be taken around spikes or thorns after a blue suit is gained if there are active enemies as I-frames will expire quickly and escaping can be difficult."
+              ]
+            },
+            {
+              "name": "canDoubleXModeBlueSuit",
+              "techRequires": [
+               "canXModeBlueSuit",
+               "canCarryBlueSuit"
+              ],
+              "otherRequires": [
+                {"gainBlueSuit": {}},
+                {"noFlashSuit": {}}
+              ],
+              "note": [
+                "The ability to gain a blue suit by shinesparking in X-Mode and exiting X-Mode before the shinespark has crashed.",
+                "Build the intial shinecharge by entering X-Mode with dash speed, once shinecharged release dash to exit X-Mode.",
+                "Before the shinecharged window expires, quickly re-enter X-Mode and peform a shinespark. Due to the short window, this second X-Mode has to be done first try.",
+                "Release dash during the shinespark wind-up animation to exit X-Mode, interrupting the shinespark and gaining a blue suit.",
+                "A blue suit will not be gained if dash is released after a shinespark has crashed against a wall or object.",
+                "Releasing dash mid shinespark will cause Samus to SuperJump and potentially go out of bounds but this can also be used to jump away from spikes or thorns.",
+                "Care must be taken around spikes or thorns after a blue suit is gained if there are active enemies as I-frames will expire quickly and escaping can be difficult."
+              ]
             }
           ]
         },
@@ -2941,6 +2979,26 @@
             }
           ]
         },
+        {
+          "name": "canSlopeXMode",
+          "techRequires": [],
+          "otherRequires": [
+            "XRayScope",
+            {"noFlashSuit": {}}
+          ],
+          "note": [
+            "The ability to enter X-Mode by using a frame perfect direction switch damage boost to land samus onto a slope and enter X-Mode",
+            "This method of X-Mode doesn't require Morph but cannot be used to charge a shinespark, only for room traversal or gaining a bluesuit if shinecharged when entering X-Mode.",
+            "Walking into a solid tile while in X-Mode will crash the game."
+          ],
+          "detailNote": [
+            "Have X-Ray selected and buffer a jump input. Stand next to a slope tile and walk into an enemy, frame perfectly switch directions and hold dash on contact with an enemy, landing on the slope and entering X-Mode. Jump can be released anytime after X-Mode is entered."
+          ],
+          "devNote": [
+            "A flash suit can be used while in X-Mode, but any unused flash suit will be lost when X-Ray is released.",
+            "Using a flash suit during X-Mode should be represented by a `useFlashSuit` immediately before `canSlopeXMode`."
+          ]
+        },
         {
           "id": 161,
           "name": "canRMode",

tests/asserts/keywords.py

@@ -501,7 +501,7 @@ def process_req_speed_state(req, states, err_fn):
             if not states.issubset(["shinecharging", "shinecharged", "preshinespark"]):
                 err_fn(f"{req} while not shinecharging/shinecharged/preshinespark")
             states = {"preshinespark"}
-        elif req in ["h_CrystalSpark", "h_CrystalSparkWithoutLenience", "h_heatedCrystalSpark", "canRModeSparkInterrupt", "canRModePauseAbuseSparkInterrupt", "h_RModeKnockbackSpark"]:
+        elif req in ["h_CrystalSpark", "h_CrystalSparkWithoutLenience", "h_heatedCrystalSpark", "canRModeSparkInterrupt", "canRModePauseAbuseSparkInterrupt", "h_RModeKnockbackSpark", "h_spikeXModeBlueSuit", "h_thornXModeBlueSuit"]:
             if not states.issubset(["shinecharging", "shinecharged", "preshinespark"]):
                 err_fn(f"{req} while not shinecharging/shinecharged/preshinespark")
             states = {"normal"}