From dd75273b83b9ffc03a74e4b92a6624e90e53ea84 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Sun, 17 Mar 2024 04:13:55 -0500 Subject: [PATCH] Fixed Pyramid Exit inaccessible issue in District ER --- EntranceShuffle.py | 2 +- source/overworld/EntranceShuffle2.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/EntranceShuffle.py b/EntranceShuffle.py index 516b0aad..c374ec15 100644 --- a/EntranceShuffle.py +++ b/EntranceShuffle.py @@ -1511,7 +1511,7 @@ def connect_inaccessible_regions(world, lw_entrances, dw_entrances, caves, playe } for region_name in world.inaccessible_regions[player]: if (world.logic[player] in ['noglitches', 'minorglitches'] and region_name in glitch_regions) \ - or (region_name == 'Pyramid Exit Ledge' and (world.shuffle[player] != 'insanity' or world.is_tile_swapped(0x1b, player))) \ + or (region_name == 'Pyramid Exit Ledge' and (world.shuffle[player] not in ['district', 'insanity'] or world.is_tile_swapped(0x1b, player))) \ or (region_name == 'Spiral Mimic Ledge Extend' and not world.is_tile_swapped(0x05, player)): # removing irrelevant and resolved regions inaccessible_regions.remove(region_name) diff --git a/source/overworld/EntranceShuffle2.py b/source/overworld/EntranceShuffle2.py index 2042ade8..54c58417 100644 --- a/source/overworld/EntranceShuffle2.py +++ b/source/overworld/EntranceShuffle2.py @@ -910,7 +910,7 @@ def must_exits_helper(avail): } for region_name in avail.world.inaccessible_regions[avail.player]: if (avail.world.logic[avail.player] in ['noglitches', 'minorglitches'] and region_name in glitch_regions) \ - or (region_name == 'Pyramid Exit Ledge' and (avail.world.shuffle[avail.player] != 'insanity' or avail.world.is_tile_swapped(0x1b, avail.player))) \ + or (region_name == 'Pyramid Exit Ledge' and (avail.keep_drops_together or avail.world.is_tile_swapped(0x1b, avail.player))) \ or (region_name == 'Spiral Mimic Ledge Extend' and not avail.world.is_tile_swapped(0x05, avail.player)): # removing irrelevant and resolved regions inaccessible_regions.remove(region_name)