Merge pull request #2931 from AlmostSeagull/swimming-curriculum

make swimming required again

Author: AlmostSeagull

randomizer/CollectibleLogicFiles/AngryAztec.py

@@ -141,7 +141,7 @@
         Collectible(Collectibles.banana, Kongs.donkey, lambda _: True, None, 15),
         Collectible(Collectibles.banana, Kongs.lanky, lambda _: True, None, 6),
         Collectible(Collectibles.bunch, Kongs.lanky, lambda _: True, None, 1),  # Warp 1
-        Collectible(Collectibles.balloon, Kongs.lanky, lambda l: (((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase()) and l.grape, None, 2),
+        Collectible(Collectibles.balloon, Kongs.lanky, lambda l: ((Events.AztecLlamaSpit in l.Events and l.swim) or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) or l.CanPhase()) and l.grape, None, 2),
 
         Collectible(Collectibles.balloon, Kongs.tiny, lambda l: l.feather, None, 1),
         Collectible(Collectibles.banana, Kongs.tiny, lambda _: True, None, 3),

randomizer/Lists/CBLocations/AngryAztecCBLocations.py

@@ -2787,7 +2787,7 @@
         name="In front of Lanky's cage",
         konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
         region=Regions.LlamaTemple,
-        logic=lambda l: (((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase()),
+        logic=lambda l: (Events.AztecLlamaSpit in l.Events and l.swim) or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) or l.CanPhase(),
         locations=[
             [1, 1.0, 2238, 302, 1721],
             [1, 1.0, 2227, 302, 1688],
@@ -3193,7 +3193,7 @@
         konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
         region=Regions.LlamaTemple,
         vanilla=True,
-        logic=lambda l: (((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase()),
+        logic=lambda l: (Events.AztecLlamaSpit in l.Events and l.swim) or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) or l.CanPhase(),
         points=[[2308, 337, 1930], [2141, 330, 1906]],
     ),
     Balloon(
@@ -3204,7 +3204,7 @@
         konglist=[Kongs.donkey, Kongs.diddy, Kongs.lanky, Kongs.tiny, Kongs.chunky],
         region=Regions.LlamaTemple,
         vanilla=True,
-        logic=lambda l: (((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase()),
+        logic=lambda l: (Events.AztecLlamaSpit in l.Events and l.swim) or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) or l.CanPhase(),
         points=[[2281, 347, 1826], [2298, 328, 1928], [2093, 322, 1926], [2065, 332, 1837]],
     ),
     Balloon(

requirement_data.js

@@ -103,9 +103,9 @@ const requirement_data = {
             new Requirement(10, [[Moves.AztecTunnelDoor]]), // 1 bunch, 5 bananas in AngryAztecMain
             new Requirement(25, [[Moves.ClimbingCheck, Moves.AztecTunnelDoor]]), // 5 bunches in AngryAztecMain
             new Requirement(14, [[Moves.Diving, Moves.Grape, Moves.TinyTempleIce]]), // 1 bunch, 9 bananas in TempleVultureRoom
-            new Requirement(20, [[Moves.Grape, Moves.AztecTunnelDoor, Moves.AztecLlama]]), // 2 balloons in LlamaTemple
             new Requirement(10, [[Moves.Grape, Moves.AztecTunnelDoor, Moves.Aztec5DT]]), // 1 balloon in LankyTemple
             new Requirement(5, [[Moves.Vines, Moves.Grape, Moves.AztecTunnelDoor, Moves.AztecLlama]]), // 1 bunch in LlamaTempleMatching
+            new Requirement(20, [[Moves.Diving, Moves.Grape, Moves.AztecTunnelDoor, Moves.AztecLlama]]), // 2 balloons in LlamaTemple
             new Requirement(11, [ // 1 bunch, 6 bananas in LlamaTemple
                 [Moves.Coconut, Moves.AztecTunnelDoor, Moves.AztecLlama],
                 [Moves.Grape, Moves.AztecTunnelDoor, Moves.AztecLlama],

wiki/article_markdown/custom_locations/CustomLocationsColoredBananas.MD

@@ -506,13 +506,13 @@
 | On the lava pedestals first switch | 5 | `self.logic = lambda _: True` | 
 | Lower ledge of the pedestal switch platforms | 10 | `(l.CanSlamSwitch(Levels.AngryAztec, 1) or (l.twirl and l.monkey_maneuvers))` | 
 | Passage towards Lanky's cage | 5 | `(((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase())` | 
-| In front of Lanky's cage | 5 | `(((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase())` | 
+| In front of Lanky's cage | 5 | `(Events.AztecLlamaSpit in l.Events and l.swim) or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) or l.CanPhase()` | 
 | Matching game room right side | Balloon | `self.logic = lambda _: True` | 
 | Above Llama | Balloon | `self.logic = lambda _: True` | 
 | Lava room | Balloon | `self.logic = lambda _: True` | 
 | Above lava/water (Tiny) | Balloon | `self.logic = lambda _: True` | 
-| In Lanky's room (Lanky) | Balloon | `(((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase())` | 
-| In Lanky's room (Lanky) | Balloon | `(((Events.AztecLlamaSpit in l.Events or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) and l.swim)) or l.CanPhase())` | 
+| In Lanky's room (Lanky) | Balloon | `(Events.AztecLlamaSpit in l.Events and l.swim) or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) or l.CanPhase()` | 
+| In Lanky's room (Lanky) | Balloon | `(Events.AztecLlamaSpit in l.Events and l.swim) or (l.CanPhaseswim() and l.settings.damage_amount != DamageAmount.ohko) or l.CanPhase()` | 
 | Entrance stairs | Balloon | `self.logic = lambda _: True` | 
 | Left side behind the llama | Balloon | `self.logic = lambda _: True` | 
 | Right side behind the llama | Balloon | `self.logic = lambda _: True` |