From 395090d58fb86733c74f305c3b8d61c5a4efce05 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sat, 16 Oct 2021 13:37:08 -0500 Subject: [PATCH] Fixed Houlihan error in ER on subsequent generations --- EntranceShuffle.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index de9dea4c..b92f35fc 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -14,6 +14,7 @@ def link_entrances(world, player): invFlag = world.mode[player] == 'inverted' global entrance_pool, exit_pool, ignore_pool, suppress_spoiler + links_house = False entrance_pool = Entrance_Pool_Base.copy() exit_pool = Exit_Pool_Base.copy() drop_connections = default_drop_connections.copy() @@ -509,10 +510,12 @@ def link_entrances(world, player): # ensure Houlihan exits where Links House does # TODO: Plando should overrule this - for links_house in world.get_entrance('Links House Exit', player).connected_region.exits: - if links_house.connected_region and links_house.connected_region.name == 'Links House': - break - connect_exit(world, 'Chris Houlihan Room Exit', links_house.name, player) + if not links_house: + for links_house in world.get_entrance('Links House Exit', player).connected_region.exits: + if links_house.connected_region and links_house.connected_region.name == 'Links House': + links_house = links_house.name + break + connect_exit(world, 'Chris Houlihan Room Exit', links_house, player) ignore_pool = True # check for swamp palace fix