diff --git a/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py b/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py index 42933b9f..e17d7072 100644 --- a/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py +++ b/worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py @@ -140,7 +140,8 @@ class GanonsTower(Z3Region): # added for AP completion_condition when TowerCrystals is lower than GanonCrystals def CanComplete(self, items: Progression): - return self.world.CanAcquireAtLeast(self.world.GanonCrystals, items, RewardType.AnyCrystal) + return self.world.CanAcquireAtLeast(self.world.GanonCrystals, items, RewardType.AnyCrystal) and \ + self.world.CanAcquireAtLeast(self.world.TourianBossTokens, items, RewardType.AnyBossToken) def CanFill(self, item: Item): if (self.Config.Multiworld): diff --git a/worlds/smz3/__init__.py b/worlds/smz3/__init__.py index 838db1f7..5998db8e 100644 --- a/worlds/smz3/__init__.py +++ b/worlds/smz3/__init__.py @@ -230,7 +230,7 @@ class SMZ3World(World): self.multiworld.itempool += itemPool def set_rules(self): - # SM G4 is logically required to access Ganon's Tower in SMZ3 + # SM G4 is logically required to complete Ganon's Tower self.multiworld.completion_condition[self.player] = lambda state: \ self.smz3World.GetRegion("Ganon's Tower").CanEnter(state.smz3state[self.player]) and \ self.smz3World.GetRegion("Ganon's Tower").TowerAscend(state.smz3state[self.player]) and \