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

Some corrections and improvements to pathing logic

Browse Source
This commit is contained in:
codemann8
2024-12-17 05:32:07 -06:00
parent a5bfd41aca
commit c38cb4d874
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
BaseClasses.py
View File

@@ -1730,7 +1730,8 @@ class Entrance(object):
# this is checked first as this often the shortest path # this is checked first as this often the shortest path
follower_region = start_region follower_region = start_region
if follower_region.type not in [RegionType.LightWorld, RegionType.DarkWorld]: if follower_region.type not in [RegionType.LightWorld, RegionType.DarkWorld]:
follower_region = [i for i in start_region.entrances if i.parent_region.name != 'Menu'][0].parent_region ent_list = [e for e in start_region.entrances if e.parent_region.type != RegionType.Menu]
follower_region = ent_list[0].parent_region
if (follower_region.world.mode[self.player] != 'inverted') == (follower_region.type == RegionType.LightWorld): if (follower_region.world.mode[self.player] != 'inverted') == (follower_region.type == RegionType.LightWorld):
from OverworldShuffle import get_mirror_edges from OverworldShuffle import get_mirror_edges
mirror_map = get_mirror_edges(follower_region.world, follower_region, self.player) mirror_map = get_mirror_edges(follower_region.world, follower_region, self.player)
@@ -1748,7 +1749,8 @@ class Entrance(object):
path = (follower_region.name, (mirror_exit, path)) path = (follower_region.name, (mirror_exit, path))
item_name = step_location.item.name if step_location.item else 'Pick Up Item' item_name = step_location.item.name if step_location.item else 'Pick Up Item'
if start_region.name != follower_region.name: if start_region.name != follower_region.name:
path = (start_region.name, (start_region.entrances[0].name, path)) ent_list = [e for e in start_region.entrances if e.parent_region.type != RegionType.Menu]
path = (start_region.name, (ent_list[0].name, path))
path = (f'{step_location.parent_region.name} Exit', ('Leave Item Area', (item_name, path))) path = (f'{step_location.parent_region.name} Exit', ('Leave Item Area', (item_name, path)))
else: else:
path = (item_name, path) path = (item_name, path)
@@ -1759,25 +1761,36 @@ class Entrance(object):
path = (self.parent_region.name, path) path = (self.parent_region.name, path)
state.path[self] = (self.name, path) state.path[self] = (self.name, path)
for ent in start_region.entrances:
if not found: if not found:
# check normal paths # check normal paths
traverse_paths(start_region.entrances[0].parent_region, self.parent_region) if ent.parent_region.type != RegionType.Menu and (ent.parent_region.type == start_region.type or \
ent.parent_region.type in [RegionType.LightWorld, RegionType.DarkWorld] or not ignore_underworld):
traverse_paths(ent.parent_region, self.parent_region)
if not found and allow_save_quit: if not found and allow_save_quit:
# check paths involving save and quit # check paths involving save and quit
exit = self.parent_region.world.get_entrance('Links House S&Q', self.player) exit = self.parent_region.world.get_entrance('Links House S&Q', self.player)
traverse_paths(exit.connected_region, self.parent_region, [exit]) traverse_paths(exit.connected_region, self.parent_region, [exit])
if not found:
world = self.parent_region.world
exit = world.get_entrance('Sanctuary S&Q', self.player)
# only allow save and quit at Sanc if the lobby is guaranteed vanilla
if exit.connected_region != 'Sanctuary' or world.mode[self.player] == 'standard' \
or world.doorShuffle[self.player] == 'vanilla' or world.intensity[self.player] < 3:
traverse_paths(exit.connected_region, self.parent_region, [exit])
if not found and allow_mirror_reentry and state.has_Mirror(self.player): if not found and allow_mirror_reentry and state.has_Mirror(self.player):
# check for paths using mirror portal re-entry at location of final destination # check for paths using mirror portal re-entry at location of final destination
# this is checked last as this is the most complicated/exhaustive check # this is checked last as this is the most complicated/exhaustive check
follower_region = start_region follower_region = start_region
if follower_region.type not in [RegionType.LightWorld, RegionType.DarkWorld]: if follower_region.type not in [RegionType.LightWorld, RegionType.DarkWorld]:
follower_region = start_region.entrances[0].parent_region ent_list = [e for e in start_region.entrances if e.parent_region.type != RegionType.Menu]
follower_region = ent_list[0].parent_region
if (follower_region.world.mode[self.player] != 'inverted') == (follower_region.type == RegionType.LightWorld): if (follower_region.world.mode[self.player] != 'inverted') == (follower_region.type == RegionType.LightWorld):
dest_region = self.parent_region dest_region = self.parent_region
if dest_region.type not in [RegionType.LightWorld, RegionType.DarkWorld]: if dest_region.type not in [RegionType.LightWorld, RegionType.DarkWorld]:
dest_region = start_region.entrances[0].parent_region dest_region = dest_region.entrances[0].parent_region
if (dest_region.world.mode[self.player] != 'inverted') != (dest_region.type == RegionType.LightWorld): if (dest_region.world.mode[self.player] != 'inverted') != (dest_region.type == RegionType.LightWorld):
# loop thru potential places to leave a mirror portal # loop thru potential places to leave a mirror portal
from OverworldShuffle import get_mirror_edges from OverworldShuffle import get_mirror_edges