Merge pull request #2560 from kjbranch/vh-notables-2

Rework notable: Snail Clip With Gravity and Morph

Author: osse101

region/maridia/inner-pink/Aqueduct.json

@@ -668,31 +668,32 @@
     {
       "id": 13,
       "link": [2, 1],
-      "name": "Snail Clip to the Left Middle Door",
+      "name": "X-Ray Morph Snail Clip to the Left Middle Door",
       "requires": [
         "Gravity",
         "canUseEnemies",
-        {"or": [
-          "canPreciseCeilingClip",
-          "canXRayCeilingClip"
-        ]}
+        "canXRayCeilingClip"
       ],
       "flashSuitChecked": true,
       "note": [
         "Jump on the Snail when it is at a precise location, and then crouch jump through the ceiling and jump again, without moving between jumps.",
-        "The Snail's positioning is very precise, but it is more lenient with Morph and an X-Ray Turn Around. X-Ray can also be useful for helping position the Snail."
+        "The Snail's positioning is more lenient with Morph and an X-Ray Turn Around. X-Ray can also be useful for helping position the Snail."
       ]
     },
     {
       "id": 140,
       "link": [2, 1],
-      "name": "Snail Clip with Morph to the Left Middle Door",
+      "name": "Precise Snail Clip to the Left Middle Door",
       "requires": [
-        {"notable": "Snail Clip With Gravity and Morph"},
+        {"notable": "Precise Snail Clip With Gravity"},
         "Gravity",
         "canUseEnemies",
-        "Morph",
-        "canCeilingClip"
+        "canCeilingClip",
+        {"or": [
+          "Morph",
+          "canPreciseCeilingClip",
+          {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 2}}
+        ]}
       ],
       "flashSuitChecked": true,
       "note": [
@@ -2367,31 +2368,32 @@
     {
       "id": 82,
       "link": [5, 7],
-      "name": "Snail Clip to the Items",
+      "name": "X-Ray Morph Snail Clip to the Items",
       "requires": [
         "Gravity",
         "canUseEnemies",
-        {"or": [
-          "canPreciseCeilingClip",
-          "canXRayCeilingClip"
-        ]}
+        "canXRayCeilingClip"
       ],
       "flashSuitChecked": true,
       "note": [
         "Jump on the Snail when it is at a precise location, and then crouch jump through the ceiling and jump again, without moving between jumps.",
-        "The Snail's positioning is very precise, but it is more lenient with Morph and an X-Ray Turn Around. X-Ray can also be useful for helping position the Snail."
+        "The Snail's positioning is more lenient with Morph and an X-Ray Turn Around. X-Ray can also be useful for helping position the Snail."
       ]
     },
     {
       "id": 141,
       "link": [5, 7],
-      "name": "Snail Clip with Morph to the Items",
+      "name": "Precise Snail Clip to the Items",
       "requires": [
-        {"notable": "Snail Clip With Gravity and Morph"},
+        {"notable": "Precise Snail Clip With Gravity"},
         "Gravity",
         "canUseEnemies",
-        "Morph",
-        "canCeilingClip"
+        "canCeilingClip",
+        {"or": [
+          "Morph",
+          "canPreciseCeilingClip",
+          {"enemyDamage": {"enemy": "Yard", "type": "contact", "hits": 2}}
+        ]}
       ],
       "flashSuitChecked": true,
       "note": [
@@ -3833,7 +3835,7 @@
     },
     {
       "id": 2,
-      "name": "Snail Clip With Gravity and Morph",
+      "name": "Precise Snail Clip With Gravity",
       "note": [
         "Jump on the Snail when it is at a precise location, and then crouch jump through the ceiling and jump again, without moving between jumps.",
         "The Snail's positioning is very precise. Morph can be used to help get onto the Snail and get off without taking a hit if it is in the wrong location.",