add canShinesparkSlopeClip tech, x-mode variant, update canShinesparkDeepStuck note

Author: blkerby

region/wreckedship/main/Bowling Alley.json

@@ -441,14 +441,14 @@
     },
     {
       "link": [2, 1],
-      "name": "Shinespark X-Ray Climb (Power Off)",
+      "name": "Shinespark Slope Clip X-Ray Climb (Power Off)",
       "requires": [
-        {"notable": "Shinespark X-Ray Climb"},
         {"not": "f_DefeatedPhantoon"},
         "canRiskPermanentLossOfAccess",
         "h_shinechargeMaxRunway",
         "canShinechargeMovement",
         {"shinespark": {"frames": 1, "excessFrames": 1}},
+        "canShinesparkSlopeClip",
         "canXRayClimb",
         {"or": [
           {"getBlueSpeed": {"usedTiles": 16, "steepDownTiles": 4, "openEnd": 0}},
@@ -473,15 +473,15 @@
     },
     {
       "link": [2, 1],
-      "name": "Shinespark X-Ray Climb (Come in Shinecharged)",
+      "name": "Shinespark Slope Clip X-Ray Climb (Come in Shinecharged)",
       "entranceCondition": {
         "comeInShinecharged": {}
       },
       "requires": [
-        {"notable": "Shinespark X-Ray Climb"},
         {"shineChargeFrames": 50},
         "canShinechargeMovementTricky",
         {"shinespark": {"frames": 88, "excessFrames": 0}},
+        "canShinesparkSlopeClip",
         "canXRayClimb",
         {"or": [
           {"getBlueSpeed": {"usedTiles": 16, "steepDownTiles": 4, "openEnd": 0}},
@@ -1646,6 +1646,39 @@
         "There is a chance that Samus will not be able to Crystal Flash unless first placing a Bomb or Power Bomb."
       ]
     },
+    {
+      "link": [6, 1],
+      "name": "Shinespark Slope Clip X-Ray Climb (X-Mode)",
+      "requires": [
+        "canXMode",
+        "h_XModeSpikeHit",
+        "h_shinechargeMaxRunway",
+        "canShinechargeMovement",
+        {"shinespark": {"frames": 1, "excessFrames": 1}},
+        "canShinesparkSlopeClip",
+        "canXRayClimb",
+        {"or": [
+          {"getBlueSpeed": {"usedTiles": 16, "steepDownTiles": 4, "openEnd": 0}},
+          "can4HighMidAirMorph"
+        ]}
+      ],
+      "exitCondition": {
+        "leaveNormally": {}
+      },
+      "unlocksDoors": [{"types": ["ammo"], "requires": []}],
+      "note": [
+        "Use X-mode to gain a shinecharge near the Chozo statue.",
+        "Jump onto the Chozo statue, press against the wall, and shinespark into it to clip in;",
+        "then X-Ray climb up."
+      ],
+      "detailNote": [
+        "A second spike hit can be avoided by holding an angle button to turn around while in X-mode;",
+        "arm pump to move out of the spikes before activating the shinecharge and exiting X-mode."
+      ],
+      "devNote": [
+        "The leaveNormally is to ensure it won't be required to do the Speed block moondance blind up there."
+      ]
+    },
     {
       "id": 54,
       "link": [6, 3],
@@ -1753,13 +1786,6 @@
       "note": [
         "Jump into a breakable Grapple block. Crystal Flash then X-ray climb to the region above."
       ]
-    },
-    {
-      "id": 6,
-      "name": "Shinespark X-Ray Climb",
-      "note": [
-        "Shinespark into the wall behind the Chozo statue, to clip into the wall and X-Ray climb up."
-      ]
     }
   ],
   "nextStratId": 69,

tech.json

@@ -2009,8 +2009,25 @@
                       "otherRequires": [],
                       "note": [
                         "Activating a shinespark to get deep stuck in a door.",
-                        "This is done by shooting open the door and spin-jumping towards it with a shine charge, then pressing angle up to activate a shinespark on the same frame as getting a wall jump check by moving away from the transition tiles.",
+                        "This is done by spin jumping, facing away from the door, and pressing angle up to activate a shinespark on the same frame as getting a wall jump check.",
                         "While going through the transition, hold jump and angle up."
+                      ],
+                      "detailNote": [
+                        "If enough shinecharge frames are available, the recommended method is to moonwalk back into the doorway and perform a stationary spin jump:",
+                        "with this method, the deep stuck will always succeed as long as the forward press and angle-up press happen on the same frame.",
+                        "If instead approaching the door with momentum,",
+                        "backward must be pressed before Samus is in wall-jump check range,",
+                        "but close enough that Samus will reach wall-jump check range during the turnaround deceleration;",
+                        "angle-up must then be pressed on the frame that the wall-jump check triggers.",
+                        "This will need to happen after a delay of at least 1 frame after the backward press, but possibly more at high speeds.",
+                        "Note that if backward is pressed while already in wall-jump check range, there is no timing for the angle-up press that will work:",
+                        "if angle-up is pressed on the same frame as the wall-jump check, Samus will be facing the wrong direction when the spark activates,",
+                        "and if not, then the spark will not activate at all.",
+                        "With a walking spin-jump toward the door (i.e. no dash speed), the angle-up press will usually need to be delayed by exactly 1 frame after the backward press,",
+                        "and the backward press will usually also be frame-perfect, right at the edge of the wall-jump check range.",
+                        "At higher speeds, there will be a larger frame window for the backward press as the turnaround deceleration will last longer,",
+                        "but the angle-up press is still frame-perfect,",
+                        "and its required timing (relative to the backward press) will vary based on Samus' X position when the backward press happens."
                       ]
                     }
                   ]
@@ -2079,6 +2096,18 @@
               "note": [
                 "The ability to control where a shinespark ends, by starting with a certain amount of energy."
               ]
+            },
+            {
+              "name": "canShinesparkSlopeClip",
+              "techRequires": [
+                "canShinespark"
+              ],
+              "otherRequires": [],
+              "note": [
+                "The ability to clip into a slope-type wall by shinesparking into it.",
+                "In some cases this may require activating the spark at a precise horizontal position.",
+                "Clipping into a wall in this way can be used to set up an X-Ray climb."
+              ]
             }
           ]
         },