From bb28cce24c1b8d2b9bdb5f8f113f6000e835b41c Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Fri, 6 Nov 2020 03:25:26 +0100 Subject: [PATCH] note player name for mirrorless courtyard path failure --- Rom.py | 6 +++--- Rules.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Rom.py b/Rom.py index 37d84713..c35af843 100644 --- a/Rom.py +++ b/Rom.py @@ -697,12 +697,12 @@ def patch_rom(world, rom, player, team, enemized): # Thanks to Zarby89 for originally finding these values # todo fix screen scrolling - if world.shuffle[player] not in ['insanity', 'insanity_legacy', 'madness_legacy'] and \ - exit.name in ['Eastern Palace Exit', 'Tower of Hera Exit', 'Thieves Town Exit', + if world.shuffle[player] not in {'insanity', 'insanity_legacy', 'madness_legacy'} and \ + exit.name in {'Eastern Palace Exit', 'Tower of Hera Exit', 'Thieves Town Exit', 'Skull Woods Final Section Exit', 'Ice Palace Exit', 'Misery Mire Exit', 'Palace of Darkness Exit', 'Swamp Palace Exit', 'Ganons Tower Exit', 'Desert Palace Exit (North)', 'Agahnims Tower Exit', 'Spiral Cave Exit (Top)', - 'Superbunny Cave Exit (Bottom)', 'Turtle Rock Ledge Exit (East)']: + 'Superbunny Cave Exit (Bottom)', 'Turtle Rock Ledge Exit (East)'}: # For exits that connot be reached from another, no need to apply offset fixes. rom.write_int16(0x15DB5 + 2 * offset, link_y) # same as final else elif room_id == 0x0059 and world.fix_skullwoods_exit[player]: diff --git a/Rules.py b/Rules.py index b86060bc..6baeeb96 100644 --- a/Rules.py +++ b/Rules.py @@ -104,7 +104,7 @@ def mirrorless_path_to_castle_courtyard(world, player): else: queue.append((entrance.connected_region, new_path)) - raise Exception(f"Could not find mirrorless path to castle courtyard for Player {player}") + raise Exception(f"Could not find mirrorless path to castle courtyard for Player {player} ({world.get_player_names(player)})") def set_rule(spot, rule): spot.access_rule = rule