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

Core: add options to the list of valid names instead of deleting game weights (#3381)

This commit is contained in:
Aaron Wagener 2024-05-27 16:52:23 -05:00 committed by GitHub
parent 74aa4eca9d
commit dfc347cd24
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Generate.py
View File

@ -432,7 +432,6 @@ def handle_option(ret: argparse.Namespace, game_weights: dict, option_key: str,
player_option = option.from_any(game_weights[option_key]) player_option = option.from_any(game_weights[option_key])
else: else:
player_option = option.from_any(get_choice(option_key, game_weights)) player_option = option.from_any(get_choice(option_key, game_weights))
del game_weights[option_key]
else: else:
player_option = option.from_any(option.default) # call the from_any here to support default "random" player_option = option.from_any(option.default) # call the from_any here to support default "random"
setattr(ret, option_key, player_option) setattr(ret, option_key, player_option)
@ -446,9 +445,9 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
if "linked_options" in weights: if "linked_options" in weights:
weights = roll_linked_options(weights) weights = roll_linked_options(weights)
valid_trigger_names = set() valid_keys = set()
if "triggers" in weights: if "triggers" in weights:
weights = roll_triggers(weights, weights["triggers"], valid_trigger_names) weights = roll_triggers(weights, weights["triggers"], valid_keys)
requirements = weights.get("requires", {}) requirements = weights.get("requires", {})
if requirements: if requirements:
@ -490,7 +489,7 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
raise Exception(f"Remove tag cannot be used outside of trigger contexts. Found {weight}") raise Exception(f"Remove tag cannot be used outside of trigger contexts. Found {weight}")
if "triggers" in game_weights: if "triggers" in game_weights:
weights = roll_triggers(weights, game_weights["triggers"], valid_trigger_names) weights = roll_triggers(weights, game_weights["triggers"], valid_keys)
game_weights = weights[ret.game] game_weights = weights[ret.game]
ret.name = get_choice('name', weights) ret.name = get_choice('name', weights)
@ -499,8 +498,9 @@ def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.b
for option_key, option in world_type.options_dataclass.type_hints.items(): for option_key, option in world_type.options_dataclass.type_hints.items():
handle_option(ret, game_weights, option_key, option, plando_options) handle_option(ret, game_weights, option_key, option, plando_options)
valid_keys.add(option_key)
for option_key in game_weights: for option_key in game_weights:
if option_key in {"triggers", *valid_trigger_names}: if option_key in {"triggers", *valid_keys}:
continue continue
logging.warning(f"{option_key} is not a valid option name for {ret.game} and is not present in triggers.") logging.warning(f"{option_key} is not a valid option name for {ret.game} and is not present in triggers.")
if PlandoOptions.items in plando_options: if PlandoOptions.items in plando_options: