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

Pokemon RB: make stage_post_fill deterministic (#4008) 

stage_post_fill iterates sets of locations, so the iteration order is
non-deterministic, resulting in different items being converted from
Progression to Useful when generating with the same seed.

This patch makes stage_post_fill deterministic by sorting the duplicate
pokemon locations in each sphere before choosing which of the duplicates
should remain as progression.
This commit is contained in:
Mysteryem 2024-11-08 11:11:41 +00:00 committed by GitHub
parent 2bdc1e0fc5
commit f52d65a141
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
worlds/pokemon_rb/__init__.py
View File

@ -526,6 +526,7 @@ class PokemonRedBlueWorld(World):
# This cuts down on time spent calculating the spoiler playthrough. # This cuts down on time spent calculating the spoiler playthrough.
found_mons = set() found_mons = set()
for sphere in multiworld.get_spheres(): for sphere in multiworld.get_spheres():
mon_locations_in_sphere = {}
for location in sphere: for location in sphere:
if (location.game == "Pokemon Red and Blue" and (location.item.name in poke_data.pokemon_data.keys() if (location.game == "Pokemon Red and Blue" and (location.item.name in poke_data.pokemon_data.keys()
or "Static " in location.item.name) or "Static " in location.item.name)
@ -534,7 +535,15 @@ class PokemonRedBlueWorld(World):
if key in found_mons: if key in found_mons:
location.item.classification = ItemClassification.useful location.item.classification = ItemClassification.useful
else: else:
found_mons.add(key) mon_locations_in_sphere.setdefault(key, []).append(location)
for key, mon_locations in mon_locations_in_sphere.items():
found_mons.add(key)
if len(mon_locations) > 1:
# Sort for deterministic results.
mon_locations.sort()
# Convert all but the first to useful classification.
for location in mon_locations[1:]:
location.item.classification = ItemClassification.useful
def create_regions(self): def create_regions(self):
if (self.options.old_man == "vanilla" or if (self.options.old_man == "vanilla" or