Refine Crumble Shaft strats

Author: blkerby

region/norfair/west/Crumble Shaft.json

@@ -214,7 +214,14 @@
       "link": [1, 2],
       "name": "Base",
       "requires": [
-        {"heatFrames": 200}
+        {"simpleHeatFrames": 150},
+        {"or": [
+          {"and": [
+            "canMoonfall",
+            {"heatFrames": 20}
+          ]},
+          {"heatFrames": 45}
+        ]}
       ]
     },
     {
@@ -395,25 +402,28 @@
       ],
       "note": "Shoot the shot block, then Spring Ball on the middle platform."
     },
-    {
-      "id": 11,
-      "link": [2, 1],
-      "name": "HiJump Climb",
-      "requires": [
-        "HiJump",
-        "canConsecutiveWalljump",
-        {"heatFrames": 500}
-      ],
-      "note": "Walljump up the right, then setup a walljump on the top-right crumble platform directly from the right wall."
-    },
     {
       "id": 12,
       "link": [2, 1],
-      "name": "HiJumpless Climb",
+      "name": "Wall Jump Climb",
       "requires": [
         "canPreciseWalljump",
         "canConsecutiveWalljump",
-        {"heatFrames": 500}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 270}
+          ]},
+          {"heatFrames": 340}
+        ]},
+        {"or": [
+          "canDodgeWhileShooting",
+          {"heatFrames": 300}
+        ]},
+        {"or": [
+          "canTrickyJump",
+          {"heatFrames": 300}
+        ]}
       ],
       "note": "Walljump up the right, then walljump off the top-middle crumble platform then off the top-right one."
     },
@@ -424,29 +434,28 @@
       "requires": [
         "canCrumbleJump",
         "canTrickyJump",
-        {"heatFrames": 800}
-      ],
-      "note": "Do 9 successive crumble jumps up the platforms.",
-      "devNote": "This is only really useful without wall jumps."
-    },
-    {
-      "id": 14,
-      "link": [2, 1],
-      "name": "Wall Jump Climb Crumble Jump",
-      "requires": [
-        "canCrumbleJump",
-        "canConsecutiveWalljump",
-        {"heatFrames": 600}
+        {"or": [
+          {"and": [
+            "HiJump",
+            "canTrickyDodgeEnemies",
+            {"heatFrames": 370}
+          ]},
+          {"heatFrames": 660}
+        ]}
       ],
-      "note": "Walljump up the right then do one crumble jump on the top middle platform."
+      "wallJumpAvoid": true,
+      "note": [
+        "Do 9 successive crumble jumps up the platforms.",
+        "If Hi-Jump is available, then it is possible to skip 4 of the crumble platforms."
+      ]
     },
     {
       "id": 15,
       "link": [2, 1],
       "name": "Spring Ball",
       "requires": [
         "h_useSpringBall",
-        {"heatFrames": 800}
+        {"heatFrames": 720}
       ],
       "note": "Hold jump to easily do 9 successive spring ball bounces up the platforms."
     },
@@ -457,19 +466,35 @@
       "requires": [
         "SpaceJump",
         "canConsecutiveWalljump",
-        {"heatFrames": 500}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 270}
+          ]},
+          {"heatFrames": 340}
+        ]},
+        {"or": [
+          "canDodgeWhileShooting",
+          {"heatFrames": 300}
+        ]}
       ],
-      "note": "Walljump up the right, then use SpaceJump at the top."
+      "note": "Wall jump up the right, then use Space Jump at the top."
     },
     {
       "id": 17,
       "link": [2, 1],
       "name": "Space Jump",
       "requires": [
         "SpaceJump",
-        {"heatFrames": 1000}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 450}
+          ]},
+          {"heatFrames": 720}
+        ]}
       ],
-      "note": "Use SpaceJump to get to the top."
+      "note": "Use Space Jump to get to the top."
     },
     {
       "id": 18,
@@ -492,25 +517,15 @@
       "name": "Heatproof IBJ",
       "requires": [
         "h_heatProof",
-        "canLongIBJ"
+        "canLongIBJ",
+        "canBePatient"
       ],
       "note": [
         "Kill the Sova on the bottom-right platform, then IBJ right next to the left of the platform.",
         "Samus can align with the left side of the platform by jumping into it.",
         "Place bombs to kill the second Sova. Drop to the bottom and restart if necessary."
       ]
     },
-    {
-      "id": 20,
-      "link": [2, 1],
-      "name": "WallJump and SpringBall",
-      "requires": [
-        "h_useSpringBall",
-        "canConsecutiveWalljump",
-        {"heatFrames": 500}
-      ],
-      "note": "Walljump up the right then SpringBall bounce on top of the highest Crumble Block platform to reach the door."
-    },
     {
       "id": 21,
       "link": [2, 1],
@@ -519,24 +534,13 @@
         "comeInShinecharged": {}
       },
       "requires": [
-        {"shineChargeFrames": 60},
+        {"shineChargeFrames": 35},
         {"shinespark": {"frames": 59}},
-        {"heatFrames": 250}
+        {"heatFrames": 220}
       ],
       "flashSuitChecked": true,
       "note": "It has to be setup really close to the left side of the right platforms, otherwise it also requires a crumble jump at the top."
     },
-    {
-      "id": 22,
-      "link": [2, 1],
-      "name": "Frozen Sova Climb",
-      "requires": [
-        "canTrickyUseFrozenEnemies",
-        "canConsecutiveWalljump",
-        {"heatFrames": 800}
-      ],
-      "note": "Climb up the left, freeze the top-left Sova, and use it as a platform to reach the door."
-    },
     {
       "id": 23,
       "link": [2, 1],
@@ -550,8 +554,7 @@
         "canBePatient"
       ],
       "flashSuitChecked": true,
-      "note": "Climb up 3 screens.",
-      "devNote": "Heat frames split into the actual climb and the setup in the adjacent room."
+      "note": "Climb up 3 screens."
     },
     {
       "id": 24,
@@ -831,7 +834,28 @@
       "name": "Base",
       "requires": [
         "canConsecutiveWalljump",
-        {"heatFrames": 550}
+        {"or": [
+          {"and": [
+            "HiJump",
+            {"heatFrames": 320}
+          ]},
+          {"heatFrames": 395}
+        ]},
+        {"or": [
+          {"and": [
+            "canPreciseWalljump",
+            "canTrickyJump"
+          ]},
+          {"and": [
+            "canStaggeredWalljump",
+            {"heatFrames": 50}
+          ]},
+          {"heatFrames": 300}
+        ]}
+      ],
+      "note": [
+        "If entering from the bottom door, a Sova will be in the way in the top left:",
+        "either wall jump in place while waiting for it, or wall jump around it using two crumble platforms to the right."
       ]
     },
     {
@@ -851,7 +875,8 @@
       "name": "Heatproof IBJ",
       "requires": [
         "h_heatProof",
-        "canLongIBJ"
+        "canLongIBJ",
+        "canBePatient"
       ],
       "note": "IBJ against the left-most wall. Place bombs to kill the Sova. Drop to the bottom and restart if necessary."
     },
@@ -865,7 +890,7 @@
       "requires": [
         {"shineChargeFrames": 30},
         {"shinespark": {"frames": 59}},
-        {"heatFrames": 250}
+        {"heatFrames": 180}
       ],
       "flashSuitChecked": true,
       "note": "It is easiest to do a diagonal shinespark up the left wall, then hold left, angle down, and spam shoot to easily grab the item."
@@ -916,7 +941,7 @@
       "link": [3, 2],
       "name": "Base",
       "requires": [
-        {"heatFrames": 250}
+        {"heatFrames": 205}
       ]
     }
   ],