describe angle turnaround, adjust requirements, add right-side strat

Author: blkerby

region/brinstar/kraid/Kraid Room.json

@@ -249,7 +249,6 @@
       "requires": [
         "canXMode",
         "h_XModeThornHit",
-        "h_XModeThornHit",
         "h_shinechargeMaxRunway",
         {"or": [
           {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
@@ -259,24 +258,26 @@
           ]}
         ]},
         "canShinechargeMovement",
-        {"shineChargeFrames": 55},
+        {"shineChargeFrames": 45},
         {"or": [
+          "canBeVeryPatient",
           {"and": [
-            "canNeutralDamageBoost",
-            "canBeVeryPatient"
-          ]},
-          {"shineChargeFrames": 10}
+            "h_XModeThornHit",
+            {"shineChargeFrames": 20}
+          ]}
         ]}
       ],
       "exitCondition": {
         "leaveShinecharged": {}
       },
       "flashSuitChecked": true,
       "note": [
-        "If Kraid is alive, use X-mode on the thorns to gain a shinecharge.",
-        "While running on the thorns, Samus' will be flashing as i-frames continually refresh;",
-        "by timing the shinecharge and X-Ray release to happen just before i-frames run out,",
-        "Samus can get a neutral damage boost to quickly put her on the ledge."
+        "If Kraid is alive, use X-mode on the thorns to gain blue speed.",
+        "Hold an angle button to turn around while retaining blue.",
+        "If needed, arm pump to get close to the ledge without touching it.",
+        "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."
       ],
       "devNote": [
         "If Kraid is alive, leaving with a horizontal damage boost is also possible, but not easy to model."
@@ -561,7 +562,7 @@
     {
       "id": 17,
       "link": [2, 2],
-      "name": "Leave Shinecharged",
+      "name": "Leave Shinecharged (Kraid Defeated)",
       "requires": [
         {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
         "canShinechargeMovement",
@@ -571,8 +572,48 @@
       "exitCondition": {
         "leaveShinecharged": {}
       },
+      "flashSuitChecked": true
+    },
+    {
+      "link": [2, 2],
+      "name": "Leave Shinecharged (X-Mode or Kraid Defeated)",
+      "requires": [
+        "h_KraidCameraFix",
+        "canXMode",
+        "h_XModeThornHit",
+        "h_shinechargeMaxRunway",
+        {"or": [
+          {"canShineCharge": {"usedTiles": 22, "openEnd": 0}},
+          {"and": [
+            {"not": "f_DefeatedKraid"},
+            "canRiskPermanentLossOfAccess"
+          ]}
+        ]},
+        "canShinechargeMovement",
+        {"shineChargeFrames": 45},
+        {"or": [
+          "canBeVeryPatient",
+          {"and": [
+            "h_XModeThornHit",
+            {"shineChargeFrames": 20}
+          ]}
+        ]}
+      ],
+      "exitCondition": {
+        "leaveShinecharged": {}
+      },
       "flashSuitChecked": true,
-      "devNote": "An X-Mode strat is likely possible but not included. It would require the doors unlocked and canRiskPermanentLossOfAccess."
+      "note": [
+        "If Kraid is alive, use X-mode on the thorns to gain blue speed.",
+        "Hold an angle button to turn around while retaining blue.",
+        "If needed, arm pump to get close to the ledge without touching it.",
+        "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."
+      ],
+      "devNote": [
+        "If Kraid is alive, leaving with a horizontal damage boost is also possible, but not easy to model."
+      ]
     },
     {
       "id": 18,