Merge pull request #2114 from blkerby/x-mode-shinecharges

Some more X-mode strats & refinements

Author: osse101

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

@@ -965,6 +965,27 @@
         "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": "X-Mode, Leave Shinecharged",
+      "requires": [
+        "canXMode",
+        "h_XModeThornHit",
+        "h_shinechargeMaxRunway",
+        {"shineChargeFrames": 60}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "note": [
+        "With some dash speed, bounce into the opening of the spikeway, and enter X-mode.",
+        "The spike knockback will push Samus back out of the spikeway."
+      ],
+      "detailNote": [
+        "By holding an angle button, it is possible turn around in X-mode without losing dash speed.",
+        "Arm pumps can be used to get close to the ledge before shinecharging, to leave with more frames remaining."
+      ]
+    },    
     {
       "id": 79,
       "link": [3, 3],
@@ -1567,6 +1588,25 @@
       "note": "Kill or get the Beetom stuck below the platform, then lure a Zebbo to the left door. Be careful not to let the Zebbo go off camera or it will despawn.",
       "devNote": "It is possible to do this with a Beetom, avoiding the tricky jump, but we will ignore that here."
     },
+    {
+      "link": [4, 4],
+      "name": "X-Mode, Leave With Spark",
+      "requires": [
+        {"obstaclesCleared": ["A"]},
+        "canXMode",
+        "h_XModeThornHit",
+        "h_shinechargeMaxRunway",
+        {"shinespark": {"frames": 62, "excessFrames": 0}}
+      ],
+      "exitCondition": {
+        "leaveWithSpark": {}
+      },
+      "note": [
+        "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
+        "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
+        "a second thorn hit can be avoided."  
+      ]
+    },    
     {
       "id": 88,
       "link": [4, 5],

region/brinstar/kraid/Kraid Eye Door Room.json

@@ -145,6 +145,25 @@
       },
       "flashSuitChecked": true
     },
+    {
+      "link": [1, 1],
+      "name": "X-Mode, Leave Shinecharged",
+      "requires": [
+        "canXMode",
+        {"thornHits": 2},
+        "h_shinechargeMaxRunway",
+        {"shineChargeFrames": 110}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true,
+      "note": ["A very precise bounce is needed in order to enter X-mode with dash speed."],
+      "devNote": [
+        "Two thorn hits are expected.",
+        "Lenience is not included because there is a farm available."
+      ]
+    },
     {
       "id": 5,
       "link": [1, 2],
@@ -899,6 +918,25 @@
         "Freeze the Zeb after it thaws, noting that it will rise one pixel relative to its first frozen location."
       ]
     },
+    {
+      "link": [3, 3],
+      "name": "X-Mode, Leave Shinecharged",
+      "requires": [
+        "canXMode",
+        {"thornHits": 2},
+        "h_shinechargeMaxRunway",
+        {"shineChargeFrames": 155}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true,
+      "note": ["A very precise bounce is needed in order to enter X-mode with dash speed."],
+      "devNote": [
+        "Two thorn hits are expected.",
+        "Lenience is not included because there is a farm available."
+      ]
+    },
     {
       "id": 43,
       "link": [3, 3],

region/brinstar/pink/Pink Brinstar Wave Gate Room.json

@@ -192,6 +192,28 @@
       },
       "devNote": "This is worst-case scenario. A strat that comes in and leaves with a single hit could be added."
     },
+    {
+      "link": [1, 1],
+      "name": "X-Mode, Leave Shinecharged",
+      "requires": [
+        {"obstaclesCleared": ["A"]},
+        "h_destroyBombWalls",
+        "canXMode",
+        "h_XModeSpikeHit",
+        "h_XModeSpikeHit",
+        "h_shinechargeMaxRunway",
+        "canBeVeryPatient",
+        {"shineChargeFrames": 110}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "flashSuitChecked": true,
+      "note": [
+        "A very precise bounce is needed in order to enter X-mode with dash speed.",
+        "Neutral knockback or a damage boost can be used to reach the door more quickly."
+      ]
+    },
     {
       "id": 85,
       "link": [1, 1],

region/brinstar/red/Below Spazer.json

@@ -174,6 +174,26 @@
         }
       }
     },
+    {
+      "link": [1, 1],
+      "name": "X-Mode, Leave Shinecharged",
+      "requires": [
+        "Gravity",
+        {"enemyKill": {"enemies": [["Yapping Maw"]], "explicitWeapons": ["Super"]}},
+        "canXMode",
+        "h_XModeThornHit",
+        "h_shinechargeMaxRunway",
+        {"shineChargeFrames": 75}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "note": [
+        "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
+        "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
+        "a second thorn hit can be avoided."  
+      ]
+    },
     {
       "id": 6,
       "link": [1, 2],
@@ -570,6 +590,26 @@
         }
       }
     },
+    {
+      "link": [2, 2],
+      "name": "X-Mode, Leave Shinecharged",
+      "requires": [
+        "Gravity",
+        {"enemyKill": {"enemies": [["Yapping Maw"]], "explicitWeapons": ["Super"]}},
+        "canXMode",
+        "h_XModeThornHit",
+        "h_shinechargeMaxRunway",
+        {"shineChargeFrames": 65}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
+      "note": [
+        "While in X-mode on the thorns, Samus' will be flashing as i-frames periodically refresh;",
+        "by timing the shinecharge and X-Ray release to happen soon after i-frames refresh,",
+        "a second thorn hit can be avoided."  
+      ]
+    },
     {
       "id": 25,
       "link": [2, 2],