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-03 20:29:19 -06:00
parent d1b4d9e044
commit 2f61dceb0e
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/overworld/EntranceShuffle2.py
View File

@@ -442,14 +442,18 @@ def do_holes_and_linked_drops(entrances, exits, avail, cross_world, keep_togethe
hole_targets.append((target_exit, target_drop)) hole_targets.append((target_exit, target_drop))
random.shuffle(hole_entrances) random.shuffle(hole_entrances)
if not cross_world and avail.is_sanc_forced_in_hc() and 'Sanctuary Grave' in holes_to_shuffle: if not cross_world and 'Sanctuary Grave' in holes_to_shuffle:
lw_entrance = next(entrance for entrance in hole_entrances if entrance[0] in LW_Entrances) hc = avail.world.get_entrance('Hyrule Castle Exit (South)', avail.player)
hole_entrances.remove(lw_entrance) 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)
if not chosen_entrance:
chosen_entrance = next(entrance for entrance in hole_entrances if entrance[0] in LW_Entrances)
hole_entrances.remove(chosen_entrance)
sanc_interior = next(target for target in hole_targets if target[0] == 'Sanctuary Exit') sanc_interior = next(target for target in hole_targets if target[0] == 'Sanctuary Exit')
hole_targets.remove(sanc_interior) hole_targets.remove(sanc_interior)
connect_two_way(lw_entrance[0], sanc_interior[0], avail) # two-way exit connect_two_way(chosen_entrance[0], sanc_interior[0], avail) # two-way exit
connect_entrance(lw_entrance[1], sanc_interior[1], avail) # hole connect_entrance(chosen_entrance[1], sanc_interior[1], avail) # hole
remove_from_list(entrances, [lw_entrance[0], lw_entrance[1]]) remove_from_list(entrances, [chosen_entrance[0], chosen_entrance[1]])
remove_from_list(exits, [sanc_interior[0], sanc_interior[1]]) remove_from_list(exits, [sanc_interior[0], sanc_interior[1]])
random.shuffle(hole_targets) random.shuffle(hole_targets)