Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SMZ3: Fix minimal logic considering SM boss tokens unnecessary #4377

Merged
merged 2 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion worlds/smz3/TotalSMZ3/Regions/Zelda/GanonsTower.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ def CanEnter(self, items: Progression):

# 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):
Expand Down
2 changes: 1 addition & 1 deletion worlds/smz3/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def create_items(self):
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 \
Expand Down
Loading