From 16fe66721f9c2c6871e73f251b1fc76c00be0240 Mon Sep 17 00:00:00 2001 From: Aaron Wagener Date: Fri, 27 Oct 2023 05:12:17 -0500 Subject: [PATCH] Stardew Valley: Use the pre-existing cache rather than ignoring it (#2368) --- worlds/stardew_valley/__init__.py | 4 ++-- worlds/stardew_valley/regions.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/worlds/stardew_valley/__init__.py b/worlds/stardew_valley/__init__.py index 1f46eb79..177b6436 100644 --- a/worlds/stardew_valley/__init__.py +++ b/worlds/stardew_valley/__init__.py @@ -100,15 +100,15 @@ class StardewValleyWorld(World): return region world_regions, self.randomized_entrances = create_regions(create_region, self.multiworld.random, self.options) - self.multiworld.regions.extend(world_regions) def add_location(name: str, code: Optional[int], region: str): - region = self.multiworld.get_region(region, self.player) + region = world_regions[region] location = StardewLocation(self.player, name, code, region) location.access_rule = lambda _: True region.locations.append(location) create_locations(add_location, self.options, self.multiworld.random) + self.multiworld.regions.extend(world_regions.values()) def create_items(self): self.precollect_starting_season() diff --git a/worlds/stardew_valley/regions.py b/worlds/stardew_valley/regions.py index e8daa772..d8e22484 100644 --- a/worlds/stardew_valley/regions.py +++ b/worlds/stardew_valley/regions.py @@ -429,7 +429,7 @@ def create_final_connections(world_options) -> List[ConnectionData]: def create_regions(region_factory: RegionFactory, random: Random, world_options) -> Tuple[ - Iterable[Region], Dict[str, str]]: + Dict[str, Region], Dict[str, str]]: final_regions = create_final_regions(world_options) regions: Dict[str: Region] = {region.name: region_factory(region.name, region.exits) for region in final_regions} @@ -444,7 +444,7 @@ def create_regions(region_factory: RegionFactory, random: Random, world_options) if connection.name in entrances: entrances[connection.name].connect(regions[connection.destination]) - return regions.values(), randomized_data + return regions, randomized_data def randomize_connections(random: Random, world_options, regions_by_name) -> Tuple[