diff --git a/EntranceRandomizer.py b/EntranceRandomizer.py index 80b2906c..19f62453 100755 --- a/EntranceRandomizer.py +++ b/EntranceRandomizer.py @@ -82,10 +82,10 @@ def parse_arguments(argv, no_defaults=False): 20 of them to beat the game. ''') parser.add_argument('--triforce_pieces_available', default=defval(30), - type=lambda value: min(max(int(value), 1), 112), + type=lambda value: min(max(int(value), 1), 90), help='''Set Triforce Pieces available in item pool.''') parser.add_argument('--triforce_pieces_required', default=defval(20), - type=lambda value: min(max(int(value), 1), 112), + type=lambda value: min(max(int(value), 1), 90), help='''Set Triforce Pieces required to win a Triforce Hunt''') parser.add_argument('--difficulty', default=defval('normal'), const='normal', nargs='?', choices=['normal', 'hard', 'expert'], diff --git a/Mystery.py b/Mystery.py index 9234ab29..173cf334 100644 --- a/Mystery.py +++ b/Mystery.py @@ -230,8 +230,8 @@ def get_choice(option, root) -> typing.Any: return interpret_on_off(root[option]) if not root[option]: return None - return interpret_on_off( - random.choices(list(root[option].keys()), weights=list(map(int, root[option].values())))[0]) + return interpret_on_off( + random.choices(list(root[option].keys()), weights=list(map(int, root[option].values())))[0]) def handle_name(name: str): @@ -297,12 +297,12 @@ def roll_settings(weights): ret.triforce_pieces_available = get_choice('triforce_pieces_available', weights) if "triforce_pieces_available" in weights else 30 - - ret.triforce_pieces_available = min(max(1, int(ret.triforce_pieces_available)), 112) + + ret.triforce_pieces_available = min(max(1, int(ret.triforce_pieces_available)), 90) ret.triforce_pieces_required = get_choice('triforce_pieces_required', weights) if "triforce_pieces_required" in weights else 20 - ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 112) + ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 90) ret.mode = get_choice('world_state', weights) if ret.mode == 'retro':