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

Potential fix for duped HC/AT Maps/Compasses

Browse Source
This commit is contained in:
Cody Bailey
2023-01-19 20:02:49 -05:00
parent b3aba607f8
commit 5cde789b43
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
DoorShuffle.py
View File

@@ -797,15 +797,18 @@ def main_dungeon_pool(dungeon_pool, world, player):
hc = world.get_dungeon('Hyrule Castle', player) hc = world.get_dungeon('Hyrule Castle', player)
hc_compass = ItemFactory('Compass (Escape)', player) hc_compass = ItemFactory('Compass (Escape)', player)
hc_compass.advancement = world.restrict_boss_items[player] != 'none' hc_compass.advancement = world.restrict_boss_items[player] != 'none'
hc.dungeon_items.append(hc_compass) if hc.dungeon_items.count(hc_compass) < 1:
hc.dungeon_items.append(hc_compass)
if 'Agahnims Tower' in pool: if 'Agahnims Tower' in pool:
at = world.get_dungeon('Agahnims Tower', player) at = world.get_dungeon('Agahnims Tower', player)
at_compass = ItemFactory('Compass (Agahnims Tower)', player) at_compass = ItemFactory('Compass (Agahnims Tower)', player)
at_compass.advancement = world.restrict_boss_items[player] != 'none' at_compass.advancement = world.restrict_boss_items[player] != 'none'
at.dungeon_items.append(at_compass) if at.dungeon_items.count(at_compass) < 1:
at.dungeon_items.append(at_compass)
at_map = ItemFactory('Map (Agahnims Tower)', player) at_map = ItemFactory('Map (Agahnims Tower)', player)
at_map.advancement = world.restrict_boss_items[player] != 'none' at_map.advancement = world.restrict_boss_items[player] != 'none'
at.dungeon_items.append(at_map) if at.dungeon_items.count(at_map) < 1:
at.dungeon_items.append(at_map)
sector_pool = convert_to_sectors(region_list, world, player) sector_pool = convert_to_sectors(region_list, world, player)
merge_sectors(sector_pool, world, player) merge_sectors(sector_pool, world, player)
# todo: which dungeon to create # todo: which dungeon to create
@@ -1237,10 +1240,13 @@ def cross_dungeon(world, player):
if world.restrict_boss_items[player] != 'none': if world.restrict_boss_items[player] != 'none':
hc_compass.advancement = at_compass.advancement = at_map.advancement = True hc_compass.advancement = at_compass.advancement = at_map.advancement = True
hc = world.get_dungeon('Hyrule Castle', player) hc = world.get_dungeon('Hyrule Castle', player)
hc.dungeon_items.append(hc_compass) if hc.dungeon_items.count(hc_compass) < 1:
hc.dungeon_items.append(hc_compass)
at = world.get_dungeon('Agahnims Tower', player) at = world.get_dungeon('Agahnims Tower', player)
at.dungeon_items.append(at_compass) if at.dungeon_items.count(at_compass) < 1:
at.dungeon_items.append(at_map) at.dungeon_items.append(at_compass)
if at.dungeon_items.count(at_map) < 1:
at.dungeon_items.append(at_map)
setup_custom_door_types(world, player) setup_custom_door_types(world, player)
assign_cross_keys(dungeon_builders, world, player) assign_cross_keys(dungeon_builders, world, player)