ubufugu/dockipelago
1
0
Fork 0
forked from mirror/Archipelago
Code Issues Pull Requests Actions Activity

HK: Fix cached filler item names persisting between generations (#5950)

Browse Source 
HK's `get_filler_item_name` was writing lists into a ClassVar[dict] on
the `HKWorld` class. This dict would not be cleaned out between
generations on the same process, leaving behind cached data from
previous generations.

I confirmed the issue when running single-slot generations on a local
webhost, where `self.cached_filler_items` could be already populated
during `HKWorld.__init__()`.

This has been fixed by putting an individual cache list on each HKWorld
instance, instead of a shared cached on the class.
This commit is contained in:
Mysteryem
2026-02-19 19:50:13 +00:00
committed by GitHub
parent 18e3a8911f
commit e0e34894a3
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
worlds/hk/__init__.py
View File

@@ -189,7 +189,7 @@ class HKWorld(World):
ranges: typing.Dict[str, typing.Tuple[int, int]] ranges: typing.Dict[str, typing.Tuple[int, int]]
charm_costs: typing.List[int] charm_costs: typing.List[int]
cached_filler_items = {} cached_filler_items: typing.List[str]
grub_count: int grub_count: int
grub_player_count: typing.Dict[int, int] grub_player_count: typing.Dict[int, int]
@@ -201,6 +201,7 @@ class HKWorld(World):
self.ranges = {} self.ranges = {}
self.created_shop_items = 0 self.created_shop_items = 0
self.vanilla_shop_costs = deepcopy(vanilla_shop_costs) self.vanilla_shop_costs = deepcopy(vanilla_shop_costs)
self.cached_filler_items = []
def generate_early(self): def generate_early(self):
options = self.options options = self.options
@@ -699,7 +700,7 @@ class HKWorld(World):
return f"{base}_{i}" return f"{base}_{i}"
def get_filler_item_name(self) -> str: def get_filler_item_name(self) -> str:
if self.player not in self.cached_filler_items: if not self.cached_filler_items:
fillers = ["One_Geo", "Soul_Refill"] fillers = ["One_Geo", "Soul_Refill"]
exclusions = self.white_palace_exclusions() exclusions = self.white_palace_exclusions()
for group in ( for group in (
@@ -709,8 +710,8 @@ class HKWorld(World):
if getattr(self.options, group): if getattr(self.options, group):
fillers.extend(item for item in hollow_knight_randomize_options[group].items if item not in fillers.extend(item for item in hollow_knight_randomize_options[group].items if item not in
exclusions) exclusions)
self.cached_filler_items[self.player] = fillers self.cached_filler_items = fillers
return self.random.choice(self.cached_filler_items[self.player]) return self.random.choice(self.cached_filler_items)
def create_region(multiworld: MultiWorld, player: int, name: str, location_names=None) -> Region: def create_region(multiworld: MultiWorld, player: int, name: str, location_names=None) -> Region: