monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge of 6bf02455e6

This commit is contained in:
Fabian Dill 2021-05-08 01:49:30 +02:00
parent cf488e5a5d
commit e5bbcb8d27
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
worlds/alttp/EntranceShuffle.py
View File

@ -1368,11 +1368,8 @@ def link_inverted_entrances(world, player):
# tavern back door cannot be shuffled yet # tavern back door cannot be shuffled yet
connect_doors(world, ['Tavern North'], ['Tavern'], player) connect_doors(world, ['Tavern North'], ['Tavern'], player)
caves.append(tuple(world.random.sample(
['Hyrule Castle Exit (South)', 'Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)'], 3)))
lw_entrances.append('Hyrule Castle Entrance (South)') lw_entrances.append('Hyrule Castle Entrance (South)')
if not world.shuffle_ganon: if not world.shuffle_ganon:
connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player) connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player)
hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)'] hc_ledge_entrances = ['Hyrule Castle Entrance (West)', 'Hyrule Castle Entrance (East)']
@ -1386,7 +1383,7 @@ def link_inverted_entrances(world, player):
aga_doors = [i for i in all_entrances_aga] aga_doors = [i for i in all_entrances_aga]
world.random.shuffle(aga_doors) world.random.shuffle(aga_doors)
aga_door = aga_doors.pop() aga_door = aga_doors.pop()
if aga_door in hc_ledge_entrances: if aga_door in hc_ledge_entrances:
lw_entrances.remove(aga_door) lw_entrances.remove(aga_door)
hc_ledge_entrances.remove(aga_door) hc_ledge_entrances.remove(aga_door)
@ -1403,7 +1400,7 @@ def link_inverted_entrances(world, player):
connect_two_way(world, aga_door, 'Inverted Agahnims Tower Exit', player) connect_two_way(world, aga_door, 'Inverted Agahnims Tower Exit', player)
caves.remove('Inverted Agahnims Tower Exit') caves.remove('Inverted Agahnims Tower Exit')
# place links house # place links house
links_house_doors = [i for i in lw_entrances + dw_entrances + lw_must_exits if links_house_doors = [i for i in lw_entrances + dw_entrances + lw_must_exits if
i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors] i not in Inverted_Dark_Sanctuary_Doors + Isolated_LH_Doors]
@ -1433,11 +1430,14 @@ def link_inverted_entrances(world, player):
except ValueError: except ValueError:
pass pass
else: # if the cave wasn't placed we get here else: # if the cave wasn't placed we get here
connect_caves(world, lw_entrances, [], old_man_house, player) connect_caves(world, lw_entrances, [], old_man_house, player)
else: else:
connect_caves(world, dw_entrances, [], old_man_house, player) connect_caves(world, dw_entrances, [], old_man_house, player)
connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player) connect_mandatory_exits(world, lw_entrances, caves, lw_must_exits, player)
# put all HC exits in LW in inverted full shuffle
connect_caves(world, lw_entrances, [], [('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)', 'Hyrule Castle Exit (South)')], player)
# place old man, has limited options # place old man, has limited options
# exit has to come from specific set of doors, the entrance is free to move about # exit has to come from specific set of doors, the entrance is free to move about
old_man_entrances = [door for door in old_man_entrances if door in dw_entrances + lw_entrances] old_man_entrances = [door for door in old_man_entrances if door in dw_entrances + lw_entrances]