From e2075686c290a627b27af0eebf6cfea2e5f5de04 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 19 Jan 2021 01:02:03 +0100 Subject: [PATCH] fix ItemPlando defaults --- Main.py | 1 + Mystery.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Main.py b/Main.py index 5d6577bc..7a4c8bab 100644 --- a/Main.py +++ b/Main.py @@ -457,6 +457,7 @@ def copy_world(world): ret.timer = world.timer.copy() ret.shufflepots = world.shufflepots.copy() ret.shuffle_prizes = world.shuffle_prizes.copy() + ret.shop_shuffle = world.shop_shuffle.copy() ret.dark_room_logic = world.dark_room_logic.copy() ret.restrict_dungeon_item_on_boss = world.restrict_dungeon_item_on_boss.copy() diff --git a/Mystery.py b/Mystery.py index 4e5286a0..94511822 100644 --- a/Mystery.py +++ b/Mystery.py @@ -572,9 +572,9 @@ def roll_settings(weights, plando_options: typing.Set[str] = frozenset(("bosses" options = weights.get("plando_items", []) for placement in options: if roll_percentage(get_choice("percentage", placement, 100)): - from_pool = get_choice("from_pool", placement, PlandoItem.from_pool) - location_world = get_choice("world", placement, PlandoItem.world) - force = str(get_choice("force", placement, PlandoItem.force)).lower() + from_pool = get_choice("from_pool", placement, PlandoItem._field_defaults["from_pool"]) + location_world = get_choice("world", placement, PlandoItem._field_defaults["world"]) + force = str(get_choice("force", placement, PlandoItem._field_defaults["force"])).lower() if "items" in placement and "locations" in placement: items = placement["items"] locations = placement["locations"]