Ability requirement fixups

SunnyBat · Sep 17, 2023 · 6a39519 · 6a39519
1 parent 57ee029
commit 6a39519
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/worlds/yooka_laylee/Rules.py b/worlds/yooka_laylee/Rules.py
@@ -73,7 +73,6 @@ def yookaLaylee_can_access_glacier_exp(self, player):
     def yookaLaylee_can_access_marsh(self, player):
         return (self.has("Pagie", player, 19)
                 and self.yookaLaylee_can_access_HT_waterworks(player)
-                # TODO Does Buddy Bubble also require Buddy Slam for a switch to open the entrance to get to Marsh book?
                 and (self.has("Buddy Bubble", player) or self.has("Lizard Lash", player) or self.has("Flappy Flight", player)))
 
     def yookaLaylee_can_access_marsh_exp(self, player):
@@ -87,7 +86,7 @@ def yookaLaylee_can_access_cashino(self, player):
     def yookaLaylee_can_access_cashino_exp(self, player):
         return self.has("Pagie", player, 48) and self.yookaLaylee_can_access_cashino(player)
 
-    def yookaLaylee_can_access_galaxy(self, player): #Once abilities are items, this will require Flappy Flight
+    def yookaLaylee_can_access_galaxy(self, player):
         return self.has("Pagie", player, 60) and self.yookaLaylee_can_access_HT_finalArea(player)
 
     def yookaLaylee_can_access_galaxy_exp(self, player):

diff --git a/worlds/yooka_laylee/locations.json b/worlds/yooka_laylee/locations.json
@@ -122,12 +122,7 @@
         "id": 625490512,
         "name": "Underwater Challenge",
         "region": "Hivory Towers Waterworks",
-        "requiresAbilities": {
-            "AND": [
-                "Buddy Bubble",
-                "Buddy Slam"
-            ]
-        }
+        "requiresAbilities": "Buddy Bubble"
     },
     {
         "id": 625490513,
@@ -1599,12 +1594,7 @@
         "requiresAbilities": {
             "AND": [
                 "<MoodymazeEntry>",
-                {
-                    "OR": [
-                        "Lizard Lash",
-                        "Flappy Flight"
-                    ]
-                }
+                "Lizard Lash"
             ]
         }
     },