Merge pull request #2321 from blkerby/moat-cwj

Refine Moat CWJ

Author: osse101

region/crateria/east/The Moat.json

@@ -396,37 +396,62 @@
         }
       },
       "requires": [
+        {"or": [
+          {"notable": "First-Try CWJ"},
+          {"and": [
+            "h_bombThings",
+            "h_additionalBomb",
+            "h_additionalBomb"
+          ]}
+        ]},
         "canCWJ",
-        "canDisableEquipment"
+        {"disableEquipment": "HiJump"},
+        {"disableEquipment": "SpeedBooster"}
       ],
       "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
-        "Aligning against the closed door shell on the other side of the transition.",
+        "Align against the closed door shell on the other side of the transition.",
         "Run towards the water and jump on the last possible frame.",
         "Perform the CWJ off of the item pedestal to cross to the other side."
+      ],
+      "detailNote": [
+        "This requires running and jumping on the last possible frame before Samus would run off into the water.",
+        "If the setup is done correctly, there will then be a 2-frame window for the wall jump."
       ]
     },
     {
       "id": 13,
       "link": [1, 2],
       "name": "Continuous Walljump, Open Doorway",
       "requires": [
+        {"or": [
+          {"notable": "First-Try CWJ"},
+          {"and": [
+            "h_bombThings",
+            "h_additionalBomb",
+            "h_additionalBomb"
+          ]}
+        ]},
         "canCWJ",
-        "canDisableEquipment",
+        {"disableEquipment": "HiJump"},
+        {"disableEquipment": "SpeedBooster"},
         {"doorUnlockedAtNode": 1},
-        {"or": [
-          "canMoonwalk",
-          "Morph",
-          "canXRayTurnaround"
-        ]}
+        "h_backIntoCorner"
       ],
       "collectsItems": [3],
       "flashSuitChecked": true,
       "note": [
         "Stand on the farthest pixel into the door possible using moonwalk, X-Ray, or morphball turn around.",
         "Run towards the water and jump on the last possible frame.",
         "Perform the CWJ off of the item pedestal to cross to the other side."
+      ],
+      "detailNote": [
+        "This requires running and jumping on the last possible frame before Samus would run off into the water.",
+        "There is either a 1-frame or 2-frame window for the wall jump, depending on Samus' X subpixel position.",
+        "To get a 2-frame window, Samus must start in the leftmost 75% of the pixel next to the transition.",
+        "One method to guarantee that Samus gets a good subpixel is to jump and press against the overhang to align with it,",
+        "then land, turn around, and moonwalk back into position."
       ]
     },
     {
@@ -1349,8 +1374,17 @@
         "Perform a stationary spin jump with some dash speed, and do a continuous wall jump off the item pedestal.",
         "Lay a Power Bomb (or Bomb) and use it to boost to the right, with a well-timed unmorph to reset fall speed."
       ]
+    },
+    {
+      "id": 4,
+      "name": "First-Try CWJ",
+      "note": [
+        "Perform a CWJ across the Moat on the first try, where failure may result in a softlock.",
+        "Run towards the water and jump on the last possible frame.",
+        "Perform the CWJ off of the item pedestal to cross to the other side."
+      ]
     }
   ],
   "nextStratId": 66,
-  "nextNotableId": 4
+  "nextNotableId": 5
 }