From 1e0b44bdc5d0d29b46a8a83b14370d4254328493 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 14 Jun 2021 23:41:47 +0200 Subject: [PATCH] set Triforce Piece Defaults --- Mystery.py | 4 ++-- Options.py | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Mystery.py b/Mystery.py index 78d04970..748130e5 100644 --- a/Mystery.py +++ b/Mystery.py @@ -641,7 +641,7 @@ def roll_alttp_settings(ret: argparse.Namespace, weights, plando_options): extra_pieces = get_choice('triforce_pieces_mode', weights, 'available') - ret.triforce_pieces_required = Options.TriforcePieces.from_any(get_choice('triforce_pieces_required', weights)) + ret.triforce_pieces_required = Options.TriforcePieces.from_any(get_choice('triforce_pieces_required', weights, 20)) # sum a percentage to required if extra_pieces == 'percentage': @@ -649,7 +649,7 @@ def roll_alttp_settings(ret: argparse.Namespace, weights, plando_options): ret.triforce_pieces_available = int(round(ret.triforce_pieces_required * percentage, 0)) # vanilla mode (specify how many pieces are) elif extra_pieces == 'available': - ret.triforce_pieces_available = Options.TriforcePieces.from_any(get_choice('triforce_pieces_available', weights)) + ret.triforce_pieces_available = Options.TriforcePieces.from_any(get_choice('triforce_pieces_available', weights, 30)) # required pieces + fixed extra elif extra_pieces == 'extra': extra_pieces = max(0, int(get_choice('triforce_pieces_extra', weights, 10))) diff --git a/Options.py b/Options.py index d1cd3af0..4ba04a04 100644 --- a/Options.py +++ b/Options.py @@ -256,6 +256,7 @@ class CrystalsGanon(Crystals): class TriforcePieces(Range): + default = 30 range_start = 1 range_end = 90