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

Merge branch 'Customizer' into StandardThrone

Browse Source 
# Conflicts:
#	DungeonGenerator.py
#	Main.py
#	RELEASENOTES.md
This commit is contained in:
aerinon
2022-06-22 13:08:38 -06:00
parent c487634d3d 64048ba58d
commit 1972500e31
39 changed files with 4856 additions and 884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DungeonGenerator.py
View File

@@ -1313,6 +1313,10 @@ def create_dungeon_builders(all_sectors, connections_tuple, world, player,
complete_dungeons = {x: y for x, y in dungeon_map.items() if sum(len(sector.outstanding_doors) for sector in y.sectors) <= 0}
[dungeon_map.pop(key) for key in complete_dungeons.keys()]
if not dungeon_map:
dungeon_map.update(complete_dungeons)
return dungeon_map
# categorize sectors
identify_destination_sectors(accessible_sectors, reverse_d_map, dungeon_map, connections,
dungeon_entrances, split_dungeon_entrances)
@@ -1425,6 +1429,8 @@ def identify_destination_sectors(accessible_sectors, reverse_d_map, dungeon_map,
explored = False
else:
d_name = reverse_d_map[sector]
if d_name not in dungeon_map:
return
if d_name not in split_dungeon_entrances:
for r_name in dungeon_entrances[d_name]:
ent_sector = find_sector(r_name, dungeon_map[d_name].sectors)
@@ -3018,6 +3024,8 @@ def split_dungeon_builder(builder, split_list, builder_info):
dungeon_map['Hyrule Castle Dungeon'], candidate_sectors, global_pole)
dungeon_map['Hyrule Castle Dungeon'].throne_door = world.get_door('Hyrule Castle Throne Room N', player)
dungeon_map['Hyrule Castle Sewers'].sewers_access = builder.throne_door
if len(candidate_sectors) == 0:
return dungeon_map
comb_w_replace = len(dungeon_map) ** len(candidate_sectors)
return balance_split(candidate_sectors, dungeon_map, global_pole, builder_info)
except (GenerationException, NeutralizingException):