Merge branch 'main' into multishop

This commit is contained in:
Fabian Dill
2021-01-18 22:30:05 +01:00
3 changed files with 9 additions and 5 deletions

View File

@@ -576,7 +576,7 @@ def roll_settings(weights, plando_options: typing.Set[str] = frozenset(("bosses"
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 = get_choice("force", placement, PlandoItem.force)
force = str(get_choice("force", placement, PlandoItem.force)).lower()
if "items" in placement and "locations" in placement:
items = placement["items"]
locations = placement["locations"]