alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix starting flute logic

Browse Source
This commit is contained in:
aerinon
2023-03-31 09:29:01 -06:00
parent 6f18c4c4a5
commit d9c18407e4
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@@ -1191,8 +1191,6 @@ class CollectionState(object):
def can_flute(self, player): def can_flute(self, player):
if self.world.mode[player] == 'standard' and not self.has('Zelda Delivered', player): if self.world.mode[player] == 'standard' and not self.has('Zelda Delivered', player):
return False # can't flute in rain state 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) lw = self.world.get_region('Light World', player)
return self.has('Ocarina (Activated)', player) or (self.has('Ocarina', player) and lw.can_reach(self) return self.has('Ocarina (Activated)', player) or (self.has('Ocarina', player) and lw.can_reach(self)
and self.is_not_bunny(lw, player)) and self.is_not_bunny(lw, player))

2
Main.py
View File

@@ -252,6 +252,7 @@ def main(args, seed=None, fish=None):
set_rules(world, player) set_rules(world, player)
district_item_pool_config(world) district_item_pool_config(world)
dungeon_tracking(world)
fill_specific_items(world) fill_specific_items(world)
for player in range(1, world.players + 1): for player in range(1, world.players + 1):
if world.shopsanity[player]: if world.shopsanity[player]:
@@ -264,7 +265,6 @@ def main(args, seed=None, fish=None):
massage_item_pool(world) massage_item_pool(world)
if args.print_custom_yaml: if args.print_custom_yaml:
world.settings.record_item_pool(world) world.settings.record_item_pool(world)
dungeon_tracking(world)
logger.info(world.fish.translate("cli", "cli", "placing.dungeon.prizes")) logger.info(world.fish.translate("cli", "cli", "placing.dungeon.prizes"))
fill_prizes(world) fill_prizes(world)