From 6240061a65b03a3b3247327c0acab676ae87bdd7 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Fri, 16 Dec 2022 18:20:14 -0600 Subject: [PATCH] Final fixes and reorganization to Inverted Region merging --- KeyDoorShuffle.py | 4 ++-- source/overworld/EntranceShuffle2.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/KeyDoorShuffle.py b/KeyDoorShuffle.py index 97c3e0c2..92b7282d 100644 --- a/KeyDoorShuffle.py +++ b/KeyDoorShuffle.py @@ -1406,7 +1406,7 @@ def forced_big_key_avail(locations): def prize_relevance(key_layout, dungeon_entrance, is_atgt_swapped): if len(key_layout.start_regions) > 1 and dungeon_entrance and dungeon_table[key_layout.key_logic.dungeon].prize: - if dungeon_entrance.name == 'Agahnims Tower' if is_atgt_swapped else 'Ganons Tower': + if dungeon_entrance.name == ('Agahnims Tower' if is_atgt_swapped else 'Ganons Tower'): return 'GT' elif dungeon_entrance.name == 'Pyramid Fairy': return 'BigBomb' @@ -1415,7 +1415,7 @@ def prize_relevance(key_layout, dungeon_entrance, is_atgt_swapped): def prize_relevance_sig2(start_regions, d_name, dungeon_entrance, is_atgt_swapped): if len(start_regions) > 1 and dungeon_entrance and dungeon_table[d_name].prize: - if dungeon_entrance.name == 'Agahnims Tower' if is_atgt_swapped else 'Ganons Tower': + if dungeon_entrance.name == ('Agahnims Tower' if is_atgt_swapped else 'Ganons Tower'): return 'GT' elif dungeon_entrance.name == 'Pyramid Fairy': return 'BigBomb' diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index c78f85b2..801abc51 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -1572,7 +1572,6 @@ entrance_map = { 'Paradox Cave (Bottom)': 'Paradox Cave Exit (Bottom)', 'Paradox Cave (Middle)': 'Paradox Cave Exit (Middle)', 'Paradox Cave (Top)': 'Paradox Cave Exit (Top)', - 'Inverted Dark Sanctuary': 'Inverted Dark Sanctuary Exit', }