Add more notables for Mt. Everest (#2543)

Author: blkerby

region/maridia/inner-yellow/The Beach.json

@@ -1679,15 +1679,15 @@
     {
       "id": 68,
       "link": [2, 4],
-      "name": "Grapple Swing",
+      "name": "Tricky Grapple Swing",
       "entranceCondition": {
         "comeInWithGrappleSwing": {
           "blocks": [{"position": [-1, 5], "environment": "water", "note": "Mt. Everest"}]
         },
         "comesThroughToilet": "no"
       },
       "requires": [
-        "canTrickyJump"
+        {"notable": "Tricky Grapple Swing"}
       ],
       "flashSuitChecked": true,
       "note": [
@@ -1766,7 +1766,16 @@
       "flashSuitChecked": true
     }
   ],
-  "notables": [],
+  "notables": [
+    {
+      "id": 1,
+      "name": "Tricky Grapple Swing",
+      "note": [
+        "Swing up through the door from a Grapple block in the room below (Mt. Everest).",
+        "Fire a Grapple shot after entering the room, to allow Samus to move further right and get onto the ledge."
+      ]
+    }
+  ],
   "nextStratId": 77,
-  "nextNotableId": 1
+  "nextNotableId": 2
 }

region/maridia/outer/Main Street.json

@@ -5432,7 +5432,10 @@
         "canTrickyJump",
         {"or": [
           {"obstaclesNotCleared": ["A"]},
-          "canCrazyCrabClimb"
+          {"and": [
+            "canCrazyCrabClimb",
+            "canBePatient"
+          ]}
         ]}
       ],
       "flashSuitChecked": true,

region/maridia/outer/Mt. Everest.json

@@ -1084,8 +1084,8 @@
         "canTrickyUseFrozenEnemies",
         {"or": [
           {"and": [
-            "canCrazyCrabClimb",
-            "h_underwaterCrouchJumpDownGrab"
+            "h_underwaterCrouchJumpDownGrab",
+            "canBePatient"
           ]},
           "HiJump",
           "canSpringBallJumpMidAir"
@@ -4964,6 +4964,7 @@
         "canSuitlessMaridia",
         "HiJump",
         "canTrickySpringBallJump",
+        "canTrickyJump",
         "canTrickyUseFrozenEnemies"
       ],
       "clearsObstacles": ["A", "B"],
@@ -4992,8 +4993,8 @@
       "link": [7, 10],
       "name": "Right Bottom Half Crab Climb with Supers and HiJump",
       "requires": [
+        {"notable": "Right Crab Climb with Supers and HiJump"},
         "canSuitlessMaridia",
-        "canCrazyCrabClimb",
         "HiJump",
         {"ammo": {"type": "Super", "count": 1}}
       ],
@@ -5011,6 +5012,7 @@
       "link": [7, 10],
       "name": "Right Bottom Half Crab Climb with Supers and Spring Ball",
       "requires": [
+        {"notable": "Right Crab Climb with Supers and Spring Ball"},
         "canSuitlessMaridia",
         "canCrazyCrabClimb",
         "canTrickySpringBallJump",
@@ -5078,7 +5080,7 @@
       "link": [7, 10],
       "name": "Right Bottom Half Crab Climb with HiJump",
       "requires": [
-        {"notable": "Right Crab Climb with Only HiJump or Springball"},
+        {"notable": "Right Crab Climb with Only HiJump"},
         "canSuitlessMaridia",
         "canCrazyCrabClimb",
         "HiJump",
@@ -5109,7 +5111,7 @@
       "link": [7, 10],
       "name": "Right Bottom Half Crab Climb with Spring Ball",
       "requires": [
-        {"notable": "Right Crab Climb with Only HiJump or Springball"},
+        {"notable": "Right Crab Climb with Only Spring Ball"},
         "canSuitlessMaridia",
         "canCrazyCrabClimb",
         "canTrickySpringBallJump",
@@ -5777,6 +5779,7 @@
       "link": [10, 4],
       "name": "Right Top Half Crab Climb with Supers and HiJump",
       "requires": [
+        {"notable": "Right Crab Climb with Supers and HiJump"},
         "canSuitlessMaridia",
         "HiJump",
         "canTrickyUseFrozenEnemies",
@@ -5797,6 +5800,7 @@
       "link": [10, 4],
       "name": "Right Top Half Crab Climb with Supers and Spring Ball",
       "requires": [
+        {"notable": "Right Crab Climb with Supers and Spring Ball"},
         "canSuitlessMaridia",
         "canTrickySpringBallJump",
         "canCrazyCrabClimb",
@@ -5857,7 +5861,7 @@
       "link": [10, 4],
       "name": "Right Top Half Crab Climb with HiJump",
       "requires": [
-        {"notable": "Right Crab Climb with Only HiJump or Springball"},
+        {"notable": "Right Crab Climb with Only HiJump"},
         "canSuitlessMaridia",
         "canCrazyCrabClimb",
         "HiJump",
@@ -5879,7 +5883,7 @@
       "link": [10, 4],
       "name": "Right Top Half Crab Climb with Spring Ball",
       "requires": [
-        {"notable": "Right Crab Climb with Only HiJump or Springball"},
+        {"notable": "Right Crab Climb with Only Spring Ball"},
         "canSuitlessMaridia",
         "canCrazyCrabClimb",
         "canTrickySpringBallJump",
@@ -6171,9 +6175,9 @@
   "notables": [
     {
       "id": 1,
-      "name": "Right Crab Climb with Only HiJump or Springball",
+      "name": "Right Crab Climb with Only HiJump",
       "note": [
-        "Using HiJump or SpringBallJumpMidAir and ice to freeze a crab and climb the right side of the room.",
+        "Using HiJump and ice to freeze a crab and climb the right side of the room.",
         "Requires precise platforming to climb around protruding ledges while carefully manipulating and freezing crabs."
       ]
     },
@@ -6265,10 +6269,38 @@
         "This gives a total of 3 jumps to climb from the bottom of the room up to one of the lower peaks.",
         "In the likely event of failure, the room will need to be reset and the crabs repositioned for the next attempt."
       ]
+    },
+    {
+      "id": 11,
+      "name": "Right Crab Climb with Supers and HiJump",
+      "note": [
+        "Climbing the right side of the room with two Supers, Ice, and HiJump.",
+        "Requires luring 3 crabs; the third crab is from the morph tunnel to the left.",
+        "Use a Super to knock off and freeze a crab midair. Stand on it and let the other crab climb, then jump up and follow it.",
+        "Be sure two crabs make it to the next section in order to crab climb further."
+      ]
+    },
+    {
+      "id": 12,
+      "name": "Right Crab Climb with Supers and Spring Ball",
+      "note": [
+        "Climbing the right side of the room with two Supers, Ice, and Spring Ball.",
+        "Requires luring 3 crabs; the third crab is from the morph tunnel to the left.",
+        "Use a Super to knock off and freeze a crab midair. Stand on it and let the other crab climb, then jump up and follow it.",
+        "Be sure two crabs make it to the next section in order to crab climb further."
+      ]
+    },
+    {
+      "id": 13,
+      "name": "Right Crab Climb with Only Spring Ball",
+      "note": [
+        "Using a mid-air Spring Ball jump and ice to freeze a crab and climb the right side of the room.",
+        "Requires precise platforming to climb around protruding ledges while carefully manipulating and freezing crabs."
+      ]
     }
   ],
   "nextStratId": 280,
-  "nextNotableId": 11,
+  "nextNotableId": 14,
   "devNote": [
     "FIXME: A 4->6 grapple teleport is possible, but the wrong-side transition will usually put Samus out-of-bounds. "
   ]