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

Fix for path checking. should get pinball more often

Browse Source
This commit is contained in:
aerinon
2021-08-27 15:03:27 -06:00
parent 759e9979da
commit 9e7223795f
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DoorShuffle.py
View File

@@ -1915,14 +1915,18 @@ def check_required_paths(paths, world, player):
if dungeon_name in world.dungeon_layouts[player].keys(): if dungeon_name in world.dungeon_layouts[player].keys():
builder = world.dungeon_layouts[player][dungeon_name] builder = world.dungeon_layouts[player][dungeon_name]
if len(paths[dungeon_name]) > 0: if len(paths[dungeon_name]) > 0:
states_to_explore = defaultdict(list) states_to_explore = {}
for path in paths[dungeon_name]: for path in paths[dungeon_name]:
if type(path) is tuple: if type(path) is tuple:
states_to_explore[tuple([path[0]])] = path[1] states_to_explore[tuple([path[0]])] = (path[1], 'any')
else: else:
states_to_explore[tuple(builder.path_entrances)].append(path) common_starts = tuple(builder.path_entrances)
if common_starts not in states_to_explore:
states_to_explore[common_starts] = ([], 'all')
states_to_explore[common_starts][0].append(path)
cached_initial_state = None cached_initial_state = None
for start_regs, dest_regs in states_to_explore.items(): for start_regs, info in states_to_explore.items():
dest_regs, path_type = info
if type(dest_regs) is not list: if type(dest_regs) is not list:
dest_regs = [dest_regs] dest_regs = [dest_regs]
check_paths = convert_regions(dest_regs, world, player) check_paths = convert_regions(dest_regs, world, player)
@@ -1939,11 +1943,17 @@ def check_required_paths(paths, world, player):
cached_initial_state = state cached_initial_state = state
else: else:
state = cached_initial_state state = cached_initial_state
valid, bad_region = check_if_regions_visited(state, check_paths) if path_type == 'any':
valid, bad_region = check_if_any_regions_visited(state, check_paths)
else:
valid, bad_region = check_if_all_regions_visited(state, check_paths)
if not valid: if not valid:
if check_for_pinball_fix(state, bad_region, world, player): if check_for_pinball_fix(state, bad_region, world, player):
explore_state(state, world, player) explore_state(state, world, player)
valid, bad_region = check_if_regions_visited(state, check_paths) if path_type == 'any':
valid, bad_region = check_if_any_regions_visited(state, check_paths)
else:
valid, bad_region = check_if_all_regions_visited(state, check_paths)
if not valid: if not valid:
raise Exception('%s cannot reach %s' % (dungeon_name, bad_region.name)) raise Exception('%s cannot reach %s' % (dungeon_name, bad_region.name))
@@ -1983,7 +1993,7 @@ def explore_state_not_inaccessible(state, world, player):
state.add_all_doors_check_unattached(connect_region, world, player) state.add_all_doors_check_unattached(connect_region, world, player)
def check_if_regions_visited(state, check_paths): def check_if_any_regions_visited(state, check_paths):
valid = False valid = False
breaking_region = None breaking_region = None
for region_target in check_paths: for region_target in check_paths:
@@ -1995,6 +2005,13 @@ def check_if_regions_visited(state, check_paths):
return valid, breaking_region return valid, breaking_region
def check_if_all_regions_visited(state, check_paths):
for region_target in check_paths:
if not state.visited_at_all(region_target):
return False, region_target
return True, None
def check_for_pinball_fix(state, bad_region, world, player): def check_for_pinball_fix(state, bad_region, world, player):
pinball_region = world.get_region('Skull Pinball', player) pinball_region = world.get_region('Skull Pinball', player)
# todo: lobby shuffle # todo: lobby shuffle