From 62e925d589b175a0c625e0331512d34bfed232e2 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 15 Oct 2021 00:43:21 -0500 Subject: [PATCH] Some additional fixes --- EntranceShuffle.py | 3 ++- Rules.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index b4928da2..7d9713e6 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -432,7 +432,7 @@ def link_entrances(world, player): 'Skull Left Drop', 'Skull Pinball', 'Skull Pot Circle'] if world.mode[player] == 'standard': - connect_two_way(world, 'Hyrule Castle Exit (South)', 'Hyrule Castle Entrance (South)', player) + connect_two_way(world, 'Hyrule Castle Entrance (South)', 'Hyrule Castle Exit (South)', player) connect_entrance(world, 'Hyrule Castle Secret Entrance Drop', 'Hyrule Castle Secret Entrance', player) connect_two_way(world, 'Hyrule Castle Secret Entrance Stairs', 'Hyrule Castle Secret Entrance Exit', player) caves.append(('Hyrule Castle Exit (West)', 'Hyrule Castle Exit (East)')) @@ -513,6 +513,7 @@ def link_entrances(world, player): 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) + ignore_pool = True # check for swamp palace fix if not (world.get_entrance('Dam', player).connected_region.name in ['Dam', 'Swamp Portal'] and world.get_entrance('Swamp Palace', player).connected_region.name == ['Dam', 'Swamp Portal']): diff --git a/Rules.py b/Rules.py index c4429317..3f606755 100644 --- a/Rules.py +++ b/Rules.py @@ -1344,7 +1344,8 @@ def no_glitches_rules(world, player): # add_rule(world.get_location(location, player), lambda state: state.has('Hookshot', player)) set_rule(world.get_entrance('Paradox Cave Push Block Reverse', player), lambda state: False) # no glitches does not require block override forbid_bomb_jump_requirements(world, player) - add_conditional_lamps(world, player) + if world.get_region('Big Bomb Shop', player).entrances: # just some location that is placed late in the ER algorithm, prevent underworld rules from applying when trying to search reachability in the overworld + add_conditional_lamps(world, player) def fake_flipper_rules(world, player):