From d8bc5ca2a8f82d77cbdffb4beb2504534663e851 Mon Sep 17 00:00:00 2001 From: caitsith2 Date: Wed, 17 Jun 2020 01:33:34 -0700 Subject: [PATCH] Set triforce pieces available to max of available and required. --- ItemList.py | 2 -- Main.py | 2 ++ Mystery.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ItemList.py b/ItemList.py index 7e9e1bd2..facb9b2f 100644 --- a/ItemList.py +++ b/ItemList.py @@ -511,8 +511,6 @@ def get_pool_core(world, player: int): extraitems -= len(diff.timedohko) clock_mode = 'countdown-ohko' if goal in {'triforcehunt', 'localtriforcehunt'}: - if world.triforce_pieces_required[player] > world.triforce_pieces_available[player]: - world.triforce_pieces_required[player] = world.triforce_pieces_available[player] while len(diff.triforcehunt) > world.triforce_pieces_available[player]: diff.triforcehunt.pop() pool.extend(diff.triforcehunt) diff --git a/Main.py b/Main.py index 57756620..c548a5f9 100644 --- a/Main.py +++ b/Main.py @@ -88,6 +88,8 @@ def main(args, seed=None): world.push_precollected(item) world.local_items[player] = {item.strip() for item in args.local_items[player].split(',')} + world.triforce_pieces_available[player] = max(world.triforce_pieces_available[player], world.triforce_pieces_required[player]) + if world.mode[player] != 'inverted': create_regions(world, player) else: diff --git a/Mystery.py b/Mystery.py index 32652bfb..9234ab29 100644 --- a/Mystery.py +++ b/Mystery.py @@ -302,7 +302,7 @@ def roll_settings(weights): 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)), ret.triforce_pieces_available) + ret.triforce_pieces_required = min(max(1, int(ret.triforce_pieces_required)), 112) ret.mode = get_choice('world_state', weights) if ret.mode == 'retro':