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

Placing Sanc Drop in DW if HC in DW and non-crossworld

Browse Source
This commit is contained in:
codemann8
2023-03-06 15:16:23 -06:00
parent 0748947502
commit da71e9ba12
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/overworld/EntranceShuffle2.py
View File

@@ -444,17 +444,19 @@ def do_holes_and_linked_drops(entrances, exits, avail, cross_world, keep_togethe
random.shuffle(hole_entrances) random.shuffle(hole_entrances)
if not cross_world and 'Sanctuary Grave' in holes_to_shuffle: if not cross_world and 'Sanctuary Grave' in holes_to_shuffle:
hc = avail.world.get_entrance('Hyrule Castle Exit (South)', avail.player) hc = avail.world.get_entrance('Hyrule Castle Exit (South)', avail.player)
chosen_entrance = None
if hc.connected_region and hc.connected_region.type == RegionType.DarkWorld: if hc.connected_region and hc.connected_region.type == RegionType.DarkWorld:
chosen_entrance = next(entrance for entrance in hole_entrances if entrance[0] in DW_Entrances) chosen_entrance = next(entrance for entrance in hole_entrances if entrance[0] in DW_Entrances)
if not chosen_entrance: if not chosen_entrance:
chosen_entrance = next(entrance for entrance in hole_entrances if entrance[0] in LW_Entrances) chosen_entrance = next(entrance for entrance in hole_entrances if entrance[0] in LW_Entrances)
hole_entrances.remove(chosen_entrance) if chosen_entrance:
sanc_interior = next(target for target in hole_targets if target[0] == 'Sanctuary Exit') hole_entrances.remove(chosen_entrance)
hole_targets.remove(sanc_interior) sanc_interior = next(target for target in hole_targets if target[0] == 'Sanctuary Exit')
connect_two_way(chosen_entrance[0], sanc_interior[0], avail) # two-way exit hole_targets.remove(sanc_interior)
connect_entrance(chosen_entrance[1], sanc_interior[1], avail) # hole connect_two_way(chosen_entrance[0], sanc_interior[0], avail) # two-way exit
remove_from_list(entrances, [chosen_entrance[0], chosen_entrance[1]]) connect_entrance(chosen_entrance[1], sanc_interior[1], avail) # hole
remove_from_list(exits, [sanc_interior[0], sanc_interior[1]]) remove_from_list(entrances, [chosen_entrance[0], chosen_entrance[1]])
remove_from_list(exits, [sanc_interior[0], sanc_interior[1]])
random.shuffle(hole_targets) random.shuffle(hole_targets)
for entrance, drop in hole_entrances: for entrance, drop in hole_entrances: