From e94431a1b6374a148f770a11448870211abdea05 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 5 Oct 2021 19:34:11 -0500 Subject: [PATCH] Changed Dark Sanc to 2way connection in ER --- EntranceShuffle.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index dd93d302..88fb6625 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -163,9 +163,7 @@ def link_entrances(world, player): sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in bomb_shop_doors] sanc_door = random.choice(sanc_doors) bomb_shop_doors.remove(sanc_door) - - connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) - world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region) + connect_two_way(world, sanc_door, 'Dark Sanctuary Hint', player) lw_dm_entrances = ['Paradox Cave (Bottom)', 'Paradox Cave (Middle)', 'Paradox Cave (Top)', 'Old Man House (Bottom)', 'Fairy Ascension Cave (Bottom)', 'Fairy Ascension Cave (Top)', 'Spiral Cave (Bottom)', 'Old Man Cave (East)', @@ -425,8 +423,7 @@ def link_entrances(world, player): sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in dw_entrances] sanc_door = random.choice(sanc_doors) dw_entrances.remove(sanc_door) - connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) - world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region) + connect_two_way(world, sanc_door, 'Dark Sanctuary Hint', player) # we randomize which world requirements we fulfill first so we get better dungeon distribution # we also places the Old Man House at this time to make sure he can be connected to the desert one way @@ -604,8 +601,7 @@ def link_entrances(world, player): sanc_doors = [door for door in Inverted_Dark_Sanctuary_Doors if door in entrances] sanc_door = random.choice(sanc_doors) entrances.remove(sanc_door) - connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) - world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region) + connect_two_way(world, sanc_door, 'Dark Sanctuary Hint', player) #place must-exit caves connect_mandatory_exits(world, entrances, caves, must_exits, player) @@ -785,8 +781,7 @@ def link_entrances(world, player): sanc_door = random.choice(sanc_doors) exit_pool.remove(sanc_door) doors.remove(sanc_door) - connect_entrance(world, sanc_door, 'Dark Sanctuary Hint', player) - world.get_entrance('Dark Sanctuary Hint Exit', player).connect(world.get_entrance(sanc_door, player).parent_region) + connect_two_way(world, sanc_door, 'Dark Sanctuary Hint', player) # now let's deal with mandatory reachable stuff def extract_reachable_exit(cavelist):