From d9c18407e435b6b7e75fda14576f6a14e12665f2 Mon Sep 17 00:00:00 2001 From: aerinon Date: Fri, 31 Mar 2023 09:29:01 -0600 Subject: [PATCH] Fix starting flute logic --- BaseClasses.py | 2 -- Main.py | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 0dc89695..d5bea2c7 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -1191,8 +1191,6 @@ class CollectionState(object): def can_flute(self, player): if self.world.mode[player] == 'standard' and not self.has('Zelda Delivered', player): return False # can't flute in rain state - if any(map(lambda i: i.name in ['Ocarina', 'Ocarina (Activated)'], self.world.precollected_items)): - return True lw = self.world.get_region('Light World', player) return self.has('Ocarina (Activated)', player) or (self.has('Ocarina', player) and lw.can_reach(self) and self.is_not_bunny(lw, player)) diff --git a/Main.py b/Main.py index 69476418..3b54fb8d 100644 --- a/Main.py +++ b/Main.py @@ -252,6 +252,7 @@ def main(args, seed=None, fish=None): set_rules(world, player) district_item_pool_config(world) + dungeon_tracking(world) fill_specific_items(world) for player in range(1, world.players + 1): if world.shopsanity[player]: @@ -264,7 +265,6 @@ def main(args, seed=None, fish=None): massage_item_pool(world) if args.print_custom_yaml: world.settings.record_item_pool(world) - dungeon_tracking(world) logger.info(world.fish.translate("cli", "cli", "placing.dungeon.prizes")) fill_prizes(world)