From 70a206fd22b0a684b4263418565c51ca411e7e25 Mon Sep 17 00:00:00 2001 From: compiling <8335770+compiling@users.noreply.github.com> Date: Tue, 1 Dec 2020 18:20:48 +1100 Subject: [PATCH 1/2] Fix issue with copying locations (fixes moon pearl logic during playthrough generation). --- Main.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Main.py b/Main.py index 1d549fca..dd3f6cd2 100644 --- a/Main.py +++ b/Main.py @@ -435,9 +435,7 @@ def copy_world(world): copied_region.is_light_world = region.is_light_world copied_region.is_dark_world = region.is_dark_world copied_region.dungeon = region.dungeon - copied_region.locations = [copy.copy(location) for location in region.locations] - for location in copied_region.locations: - location.parent_region = copied_region + copied_region.locations = [Location(location.player, location.name, parent=copied_region) for location in region.locations] for entrance in region.entrances: ret.get_entrance(entrance.name, entrance.player).connect(copied_region) From c02a890aba01461eaa6bf6258f64fe2260e1672a Mon Sep 17 00:00:00 2001 From: compiling <8335770+compiling@users.noreply.github.com> Date: Tue, 1 Dec 2020 18:29:38 +1100 Subject: [PATCH 2/2] Fix logs indicating pots are shuffled when they aren't. --- Main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Main.py b/Main.py index dd3f6cd2..cf33e7bf 100644 --- a/Main.py +++ b/Main.py @@ -114,7 +114,7 @@ def main(args, seed=None, fish=None): create_dungeons(world, player) adjust_locations(world, player) - if any(world.potshuffle): + if any(world.potshuffle.values()): logger.info(world.fish.translate("cli", "cli", "shuffling.pots")) for player in range(1, world.players + 1): if world.potshuffle[player]: