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

Improved can_reach_smith search

Browse Source
This commit is contained in:
codemann8
2023-03-27 21:28:46 -05:00
parent c3266a904a
commit 28e5b7503d
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OverworldShuffle.py
View File

@@ -973,27 +973,26 @@ def can_reach_smith(world, player):
region = world.get_region(region_name, player) region = world.get_region(region_name, player)
for exit in region.exits: for exit in region.exits:
if not found and exit.connected_region is not None: if not found and exit.connected_region is not None:
if any(map(lambda i: i.name in ['Ocarina', 'Ocarina (Activated)'], world.precollected_items)) and exit.spot_type == 'Flute': if exit.spot_type == 'Flute':
fluteregion = exit.connected_region if any(map(lambda i: i.name == 'Ocarina (Activated)', world.precollected_items)):
for flutespot in fluteregion.exits: for flutespot in exit.connected_region.exits:
if flutespot.connected_region and flutespot.connected_region.name not in explored_regions: if flutespot.connected_region and flutespot.connected_region.name not in explored_regions:
explore_region(flutespot.connected_region.name, flutespot.connected_region) explore_region(flutespot.connected_region.name, flutespot.connected_region)
elif exit.connected_region.name not in explored_regions \
and exit.connected_region.type in [RegionType.LightWorld, RegionType.DarkWorld] \
and exit.access_rule(blank_state):
explore_region(exit.connected_region.name, exit.connected_region)
elif exit.name == 'Sanctuary S':
sanc_region = exit.connected_region
if len(sanc_region.exits) and sanc_region.exits[0].name == 'Sanctuary Exit':
explore_region(sanc_region.exits[0].connected_region.name, sanc_region.exits[0].connected_region)
elif exit.connected_region.name == 'Blacksmiths Hut' and exit.access_rule(blank_state): elif exit.connected_region.name == 'Blacksmiths Hut' and exit.access_rule(blank_state):
found = True found = True
return
elif exit.connected_region.name not in explored_regions:
if (region.type == RegionType.Dungeon and exit.connected_region.name.endswith(' Portal')) \
or (exit.connected_region.type in [RegionType.LightWorld, RegionType.DarkWorld] \
and exit.access_rule(blank_state)):
explore_region(exit.connected_region.name, exit.connected_region)
blank_state = CollectionState(world) blank_state = CollectionState(world)
if world.mode[player] == 'standard': if world.mode[player] == 'standard':
blank_state.collect(ItemFactory('Zelda Delivered', player), True) blank_state.collect(ItemFactory('Zelda Delivered', player), True)
if world.logic[player] in ['noglitches', 'minorglitches'] and world.get_region('Frog Prison', player).type == (RegionType.DarkWorld if not invFlag else RegionType.LightWorld): if world.logic[player] in ['noglitches', 'minorglitches'] and not world.is_tile_swapped(0x29, player):
blank_state.collect(ItemFactory('Titans Mitts', player), True) blank_state.collect(ItemFactory('Titans Mitts', player), True)
blank_state.collect(ItemFactory('Moon Pearl', player), True)
found = False found = False
explored_regions = list() explored_regions = list()
@@ -1004,7 +1003,11 @@ def can_reach_smith(world, player):
explore_region(start_region) explore_region(start_region)
if not found: if not found:
if not invFlag: if not invFlag:
explore_region('Sanctuary') if world.intensity[player] >= 3 and world.doorShuffle[player] != 'vanilla':
sanc_mirror = world.get_entrance('Sanctuary Mirror Route', player)
explore_region(sanc_mirror.connected_region.name, sanc_mirror.connected_region)
else:
explore_region('Sanctuary')
else: else:
explore_region('Dark Sanctuary Hint') explore_region('Dark Sanctuary Hint')
return found return found