From 1900d9382ad4f22c19fd7acbb2663e89b71dd69d Mon Sep 17 00:00:00 2001 From: Sunny Bat Date: Tue, 18 Oct 2022 23:47:33 -0700 Subject: [PATCH] Raft: Update rules to account for navigation (#1118) --- worlds/raft/Rules.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/worlds/raft/Rules.py b/worlds/raft/Rules.py index 0432c280..a55c0ef3 100644 --- a/worlds/raft/Rules.py +++ b/worlds/raft/Rules.py @@ -98,37 +98,37 @@ class RaftLogic(LogicMixin): return self.raft_can_access_vasagatan(player) def raft_can_access_balboa_island(self, player): - return self.raft_can_drive(player) and self.has("Balboa Island Frequency", player) + return self.raft_can_navigate(player) and self.raft_can_drive(player) and self.has("Balboa Island Frequency", player) def raft_can_complete_balboa_island(self, player): return self.raft_can_access_balboa_island(player) and self.raft_can_craft_machete(player) def raft_can_access_caravan_island(self, player): - return self.raft_can_drive(player) and self.has("Caravan Island Frequency", player) + return self.raft_can_navigate(player) and self.raft_can_drive(player) and self.has("Caravan Island Frequency", player) def raft_can_complete_caravan_island(self, player): return self.raft_can_access_caravan_island(player) and self.raft_can_craft_ziplineTool(player) def raft_can_access_tangaroa(self, player): - return self.raft_can_drive(player) and self.has("Tangaroa Frequency", player) + return self.raft_can_navigate(player) and self.raft_can_drive(player) and self.has("Tangaroa Frequency", player) def raft_can_complete_tangaroa(self, player): return self.raft_can_access_tangaroa(player) and self.raft_can_craft_ziplineTool(player) def raft_can_access_varuna_point(self, player): - return self.raft_can_drive(player) and self.has("Varuna Point Frequency", player) + return self.raft_can_navigate(player) and self.raft_can_drive(player) and self.has("Varuna Point Frequency", player) def raft_can_complete_varuna_point(self, player): return self.raft_can_access_varuna_point(player) and self.raft_can_craft_ziplineTool(player) def raft_can_access_temperance(self, player): - return self.raft_can_drive(player) and self.has("Temperance Frequency", player) + return self.raft_can_navigate(player) and self.raft_can_drive(player) and self.has("Temperance Frequency", player) def raft_can_complete_temperance(self, player): return self.raft_can_access_temperance(player) # No zipline required on Temperance def raft_can_access_utopia(self, player): - return (self.raft_can_drive(player) + return (self.raft_can_navigate(player) and self.raft_can_drive(player) # Access checks are to prevent frequencies for other # islands from appearing in Utopia and self.raft_can_access_radio_tower(player)