Merge pull request #1940 from osse101/SuitlessPuyoClip

Add Suitless Puyo Ice Clip with Xray

Author: osse101

region/brinstar/green/Green Hill Zone.json

@@ -956,7 +956,7 @@
       "name": "Grapple Gate Glitch",
       "requires": [
         {"notable": "Grapple Gate Glitch"},
-        "Grapple",
+        "canPreciseGrapple",
         "SpeedBooster",
         "canTrickyJump"
       ],

region/maridia/inner-green/East Pants Room.json

@@ -410,6 +410,36 @@
         {"or": [
           "canTrickyJump",
           {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}}
+        ]},
+        {"or": [
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}},
+          "Wave",
+          "canPreciseGrapple"
+        ]}
+      ],
+      "flashSuitChecked": true,
+      "note": [
+        "Freeze the Puyo at standing-shot height and then jump on top of it with a spinjump before morphing, unmorphing, and using X-Ray to standup and clip.",
+        "Standing on a side of the room and shooting forward will freeze the Puyo at the correct height."
+      ]
+    },
+    {
+      "link": [3, 2],
+      "name": "Suitless Puyo Clip with Morph and X-Ray",
+      "requires": [
+        {"notable": "Puyo Clip"},
+        "h_canXRayMorphIceClip",
+        "canTrickyJump",
+        {"or": [
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}}
+        ]},
+        {"or": [
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}},
+          "Wave",
+          "canPreciseGrapple"
         ]}
       ],
       "flashSuitChecked": true,
@@ -427,8 +457,10 @@
         "Gravity",
         "h_canPreciseIceClip",
         {"or": [
-          "canTrickyJump",
-          {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}}
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}},
+          "Wave",
+          "canPreciseGrapple"
         ]}
       ],
       "flashSuitChecked": true,
@@ -445,9 +477,17 @@
         {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 2}},
         {"or": [
           {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 6}},
-          {"resetRoom": {
-            "nodes": [1]
-          }}
+          {"and": [
+            "canBePatient",
+            {"resetRoom": {
+              "nodes": [1]
+            }}
+          ]}
+        ]},
+        {"or": [
+          {"enemyDamage": {"enemy": "Puyo", "type": "contact", "hits": 1}},
+          "Wave",
+          "canPreciseGrapple"
         ]}
       ],
       "flashSuitChecked": true,

tech.json

@@ -714,7 +714,10 @@
                 "canUseGrapple"
               ],
               "otherRequires": [],
-              "note": "The ability to precisely aim at grapple points while moving quickly, and precise control of Samus' speed and trajectory when releasing from a grapplable object."
+              "note": [
+                "The ability to precisely aim at grapple points while moving quickly, and precise control of Samus' speed and trajectory when releasing from a grapplable object.",
+                "canPreciseGrapple can also be used to shoot Grapple Beam through single tile ceilings."
+              ]
             },
             {
               "id": 52,