From e5bbcb8d2731c5f302632b5380e56ba415a33370 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 8 May 2021 01:49:30 +0200 Subject: [PATCH] merge of https://github.com/cassidoxa/ALttPEntranceRandomizer/commit/6bf02455e605812750cd50d9435766bbe3c6fc7f --- worlds/alttp/EntranceShuffle.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/worlds/alttp/EntranceShuffle.py b/worlds/alttp/EntranceShuffle.py index b7d43235..92957409 100644 --- a/worlds/alttp/EntranceShuffle.py +++ b/worlds/alttp/EntranceShuffle.py @@ -1368,11 +1368,8 @@ def link_inverted_entrances(world, player): # tavern back door cannot be shuffled yet 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)') - if not world.shuffle_ganon: connect_two_way(world, 'Inverted Ganons Tower', 'Inverted Ganons Tower Exit', player) 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] world.random.shuffle(aga_doors) aga_door = aga_doors.pop() - + if aga_door in hc_ledge_entrances: lw_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) caves.remove('Inverted Agahnims Tower Exit') - + # place links house 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] @@ -1433,11 +1430,14 @@ def link_inverted_entrances(world, player): except ValueError: pass 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: connect_caves(world, dw_entrances, [], old_man_house, 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 # 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]