From 83d8bd584b10c760492964ea73aa714db1c3edc9 Mon Sep 17 00:00:00 2001 From: NewSoupVi <57900059+NewSoupVi@users.noreply.github.com> Date: Fri, 11 Oct 2024 03:03:32 +0200 Subject: [PATCH] Revert "DS3: Make your own region cache (#4040)" This reverts commit 2751ccdaabc7e55fdfaa68cbb1d6ea9bb1d666ce. --- worlds/dark_souls_3/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py index 1aec6945eb..b51668539b 100644 --- a/worlds/dark_souls_3/__init__.py +++ b/worlds/dark_souls_3/__init__.py @@ -89,7 +89,6 @@ class DarkSouls3World(World): self.all_excluded_locations = set() def generate_early(self) -> None: - self.created_regions = set() self.all_excluded_locations.update(self.options.exclude_locations.value) # Inform Universal Tracker where Yhorm is being randomized to. @@ -295,7 +294,6 @@ class DarkSouls3World(World): new_region.locations.append(new_location) self.multiworld.regions.append(new_region) - self.created_regions.add(region_name) return new_region def create_items(self) -> None: @@ -1307,7 +1305,7 @@ class DarkSouls3World(World): def _add_entrance_rule(self, region: str, rule: Union[CollectionRule, str]) -> None: """Sets a rule for the entrance to the given region.""" assert region in location_tables - if region not in self.created_regions: return + if not any(region == reg for reg in self.multiworld.regions.region_cache[self.player]): return if isinstance(rule, str): if " -> " not in rule: assert item_dictionary[rule].classification == ItemClassification.progression