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

Merge pull request #6 from aerinon/DoorShuffleStandardModeDev

Browse Source 
Clean up shuffle_dungeon
This commit is contained in:
aerinon
2019-09-11 13:13:15 -06:00
committed by GitHub
parent ec5e8614bc a0b9b1fefe
commit e739bf94bb
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
DoorShuffle.py
View File

@@ -150,6 +150,7 @@ def within_dungeon(world, player):
shuffle_dungeon(world, player, region_list) shuffle_dungeon(world, player, region_list)
def shuffle_dungeon(world, player, dungeon_region_names): def shuffle_dungeon(world, player, dungeon_region_names):
logger = logging.getLogger('')
available_regions = [] available_regions = []
for name in dungeon_region_names: for name in dungeon_region_names:
available_regions.append(world.get_region(name, player)) available_regions.append(world.get_region(name, player))
@@ -168,11 +169,11 @@ def shuffle_dungeon(world, player, dungeon_region_names):
# TODO: Is there an existing "remove random from list" in this codebase? # TODO: Is there an existing "remove random from list" in this codebase?
random.shuffle(available_doors) random.shuffle(available_doors)
door = available_doors.pop() door = available_doors.pop()
print("Linking " + door.name) logger.info('Linking %s', door.name)
# Find an available region that has a compatible door # Find an available region that has a compatible door
connect_region, connect_door = find_compatible_door_in_regions(world, door, available_regions, player) connect_region, connect_door = find_compatible_door_in_regions(world, door, available_regions, player)
if connect_region is not None: if connect_region is not None:
print("Found new region " + connect_region.name + " via " + connect_door.name) logger.info(' Found new region %s via %s', connect_region.name, connect_door.name)
# Apply connection and add the new region's doors to the available list # Apply connection and add the new region's doors to the available list
maybe_connect_two_way(world, door, connect_door, player) maybe_connect_two_way(world, door, connect_door, player)
available_doors.extend(get_doors(world, connect_region, player)) available_doors.extend(get_doors(world, connect_region, player))
@@ -182,11 +183,13 @@ def shuffle_dungeon(world, player, dungeon_region_names):
else: else:
# If there's no available region with a door, use an internal connection # If there's no available region with a door, use an internal connection
connect_door = find_compatible_door_in_list(world, door, available_doors, player) connect_door = find_compatible_door_in_list(world, door, available_doors, player)
print("Adding loop via " + connect_door.name) logger.info(' Adding loop via %s', connect_door.name)
maybe_connect_two_way(world, door, connect_door, player) maybe_connect_two_way(world, door, connect_door, player)
available_doors.remove(connect_door) available_doors.remove(connect_door)
print(available_regions) # Check that we used everything, and retry if we failed
print(available_doors) if len(available_regions) > 0 or len(available_doors) > 0:
logger.info('Failed to add all regions to dungeon, trying again.')
shuffle_dungeon(world, player, dungeon_region_names)
# Connects a and b. Or don't if they're an unsupported connection type. # Connects a and b. Or don't if they're an unsupported connection type.
# TODO: This is gross, don't do it this way # TODO: This is gross, don't do it this way