monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Landstalker: remove global ref to multiworld (#4175) 

* Landstalker: remove global ref to multiworld

`cached_spheres` holds a reference to the multiworld, which leaks the multiworld if multidata is skipped. Instead of making it a class variable, give a reference to each matching world.

* Switch to using `get_game_worlds`
This commit is contained in:
Benjamin S Wolf 2024-11-13 04:05:34 -08:00 committed by GitHub
parent 85159a4f1f
commit c295926ce1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
worlds/landstalker/__init__.py
View File

@ -38,7 +38,7 @@ class LandstalkerWorld(World):
item_name_to_id = build_item_name_to_id_table()
location_name_to_id = build_location_name_to_id_table()
cached_spheres: ClassVar[List[Set[Location]]]
cached_spheres: List[Set[Location]]
def __init__(self, multiworld, player):
super().__init__(multiworld, player)
@ -47,6 +47,7 @@ class LandstalkerWorld(World):
self.dark_region_ids = []
self.teleport_tree_pairs = []
self.jewel_items = []
self.cached_spheres = []
def fill_slot_data(self) -> dict:
# Generate hints.
@ -220,14 +221,17 @@ class LandstalkerWorld(World):
return 4
@classmethod
def stage_post_fill(cls, multiworld):
def stage_post_fill(cls, multiworld: MultiWorld):
# Cache spheres for hint calculation after fill completes.
cls.cached_spheres = list(multiworld.get_spheres())
cached_spheres = list(multiworld.get_spheres())
for world in multiworld.get_game_worlds(cls.game):
world.cached_spheres = cached_spheres
@classmethod
def stage_modify_multidata(cls, *_):
def stage_modify_multidata(cls, multiworld: MultiWorld, *_):
# Clean up all references in cached spheres after generation completes.
del cls.cached_spheres
for world in multiworld.get_game_worlds(cls.game):
world.cached_spheres = []
def adjust_shop_prices(self):
# Calculate prices for items in shops once all items have their final position