Skip to content

Rules: Verify the default values of Options. #2403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 2, 2024
Merged

Rules: Verify the default values of Options. #2403

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e89c2b
Verify the default values of `Option`s.
nex3 Oct 30, 2023
0a2aa52
Merge branch 'main' into option-verify-default
nex3 Jan 5, 2024
177d13e
Update Generate.py
nex3 Jan 5, 2024
ea57560
Merge branch 'main' into option-verify-default
NewSoupVi May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Generate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,19 +422,19 @@ def roll_triggers(weights: dict, triggers: list) -> dict:


def handle_option(ret: argparse.Namespace, game_weights: dict, option_key: str, option: type(Options.Option), plando_options: PlandoOptions):
if option_key in game_weights:
try:
try:
if option_key in game_weights:
if not option.supports_weighting:
player_option = option.from_any(game_weights[option_key])
else:
player_option = option.from_any(get_choice(option_key, game_weights))
setattr(ret, option_key, player_option)
except Exception as e:
raise Exception(f"Error generating option {option_key} in {ret.game}") from e
else:
player_option.verify(AutoWorldRegister.world_types[ret.game], ret.name, plando_options)
player_option = option.from_any(option.default) # call the from_any here to support default "random"
setattr(ret, option_key, player_option)
except Exception as e:
raise Exception(f"Error generating option {option_key} in {ret.game}") from e
else:
setattr(ret, option_key, option.from_any(option.default)) # call the from_any here to support default "random"
player_option.verify(AutoWorldRegister.world_types[ret.game], ret.name, plando_options)
Comment on lines 423 to +424
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I did not know try -> except -> else existed. Reading up on it, it seems kind of not necessary in this case, as the except block re-raises the Exception anyway, which exits the function, meaning there is no scenario in which "you need to prevent something running after the except". But maybe I'm missing nuance, and hey, it's not wrong or anything, it just took me by surprise. Also it mirrors the old code so I guess it's fine



def roll_settings(weights: dict, plando_options: PlandoOptions = PlandoOptions.bosses):
Expand Down