Merge pull request #1689 from blkerby/ice-zeb-skip-wave

Adjust Ice Zeb Skip

Author: osse101

logicalRequirements.md

@@ -617,4 +617,13 @@ A `notable` object indicates the need to be able to perform a notable, which is
 __Example:__
 ```json
 {"notable": "Taco Tank"}
-```
+```
+
+#### disableEquipment object
+
+A `disableEquipment` objects indicates the need for a specific item to be disabled, e.g. either by not having that item collected or by disabling it from the equipment screen. This requirement (with any item) implicitly includes a `canDisableEquipment` tech requirement.
+
+__Example:__
+```json
+{"disableEquipment": "HiJump"}
+```

region/tourian/main/Mother Brain Room.json

@@ -397,32 +397,45 @@
         "canTrickyUseFrozenEnemies",
         "Morph",
         {"or": [
-          "canTrickyJump",
           {"and": [
-            "canDownBack",
+            "Wave",
             {"enemyDamage": {
               "enemy": "Rinka",
               "type": "contact",
               "hits": 1
             }}
-          ]}
+          ]},
+          "canTrickyJump"
         ]},
-        {"enemyDamage": {
-          "enemy": "Mother Brain 1",
-          "type": "turret",
-          "hits": 1
-        }}
+        {"or": [
+          {"disableEquipment": "ScrewAttack"},
+          "canDownBack"
+        ]},
+        {"or": [
+          "canTrickyDodgeEnemies",
+          {"enemyDamage": {
+            "enemy": "Mother Brain 1",
+            "type": "turret",
+            "hits": 1
+          }}
+        ]}
       ],
       "note": [
         "Glitch through the Mother Brain Zebetites by using a frozen Rinka and i-frames.",
-        "Freeze the Rinka at its spawn location, then spinjump or Down-Back onto it after acquiring i-frames to clip inside of the Zebetite, then jump through.",
+        "Freeze the Rinka at its spawn location, then spin jump or down-back onto it after acquiring i-frames to clip inside of the Zebetite, then jump through.",
+        "I-frames can be acquired from a Rinka hit, a turret shot, or from the Zebetite itself.",
         "Note that Zebetites cause i-frames but deal no damage.",
-        "Ice+Wave can freeze the Rinka from above.  Ice+Plasma must freeze the Rinka from below while crouched."
+        "If Screw Attack is equipped, then a down-back must be used, since spin jumping will cancel i-frames.",
+        "With Ice+Wave, Samus can freeze the Rinka from above with an angle-down shot;",
+        "Otherwise Samus must go below, press against the wall, and freeze it with an upward shot.",
+        "With Ice+Plasma, Samus must be crouched when firing the shot."
       ],
       "devNote": [
-        "This technically requires f_KilledZebetites1 to not be set, but there is no loss of access, because there is no reason to kill any Zebs without being able to kill them all.",
-        "It is possible to Ice Zeb skip through the second Zeb with a morph/unmorph/remorph on a frozen Rinka.",
-        "This is known as a Remorph Zebetite Skip or a Spring Ball Zebetite Skip.",
+        "This technically requires f_KilledZebetites1 to not be set, but there is minimal risk of loss of access, because there is no reason to kill any Zebs without being able to kill them all.",
+        "It is also possible to Ice Zeb skip through the second Zeb with a morph/unmorph/remorph on a frozen Rinka;",
+        "this is known as a Remorph Zebetite Skip or a Spring Ball Zebetite Skip.",
+        "Technically this strat involves `canWallIceClip` but we don't include that requirement,",
+        "since the positioning of the Rinka is freely normalized, which makes the trick easier than this tech would normally imply.",
         "FIXME: It is possible to Ice Zeb Skip out, but it is much harder and would only be useful if getting here with canRiskPermanentLossOfAccess."
       ]
     },
@@ -1086,7 +1099,7 @@
         "Glitch through the Mother Brain Zebetites by using a frozen Rinka and i-frames.",
         "Freeze the Rinka at its spawn location, then spinjump or Down-Back onto it after acquiring i-frames to clip inside of the Zebetite, then jump through.",
         "Note that Zebetites cause i-frames but deal no damage.",
-        "Ice+Wave can freeze the Rinka from above.  Ice+Plasma must freeze the Rinka from below while crouched."
+        "With Ice+Wave, the Rinka can be frozen from above. With Ice+Plasma, Samus must crouch while freezing the Rinka from below."
       ]
     }
   ],

schema/m3-requirements.schema.json

@@ -889,6 +889,12 @@
             "type": "string",
             "title": "Notable Requirement",
             "description": "A notable requirement, which is like a tech requirement but specific to the room."
+          },
+          "disableEquipment": {
+            "$id": "#/definitions/logicalRequirement/items/properties/disableEquipment",
+            "type": "string",
+            "title": "Disable Equipment",
+            "description": "A requirement to disable a specific item."
           }
         }
       }