From 14956d27bde719261ad206a48defad9ab6c5f911 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 29 Mar 2022 02:03:57 +0200 Subject: [PATCH] Core: don't sweep excluded locations for accessibility check, as they are forbidden from having progression anyway. (#357) --- BaseClasses.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 10223cf9..0797001d 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -91,7 +91,6 @@ class MultiWorld(): lambda player: self.shuffle[player] not in ['vanilla', 'simple', 'restricted', 'dungeonssimple']) self.fix_trock_exit = self.AttributeProxy( lambda player: self.shuffle[player] not in ['vanilla', 'simple', 'restricted', 'dungeonssimple']) - self.NOTCURSED = self.AttributeProxy(lambda player: not self.CURSED[player]) for player in range(1, players + 1): def set_player_attr(attr, val): @@ -518,8 +517,9 @@ class MultiWorld(): def location_relevant(location: Location): """Determine if this location is relevant to sweep.""" - if location.player in players["locations"] or location.event or \ - (location.item and location.item.advancement): + if location.progress_type != LocationProgressType.EXCLUDED \ + and (location.player in players["locations"] or location.event + or (location.item and location.item.advancement)): return True return False