From 4dd7c63cab9bc425d47938d01cfe9e9cdc533134 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Tue, 4 Jan 2022 20:04:02 +0100 Subject: [PATCH] Generate: fix accessibility and progression_balancing override --- Generate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Generate.py b/Generate.py index fc82ad43..4704a59d 100644 --- a/Generate.py +++ b/Generate.py @@ -491,7 +491,9 @@ def roll_settings(weights: dict, plando_options: typing.Set[str] = frozenset(("b for option_key, option in world_type.options.items(): handle_option(ret, game_weights, option_key, option) for option_key, option in Options.per_game_common_options.items(): - handle_option(ret, game_weights, option_key, option) + # skip setting this option if already set from common_options, defaulting to root option + if not (option_key in Options.common_options and option_key not in game_weights): + handle_option(ret, game_weights, option_key, option) if "items" in plando_options: ret.plando_items = roll_item_plando(world_type, game_weights) if ret.game == "Minecraft" or ret.game == "Ocarina of Time":