From b3bb1f187dc63b11386d9a3775339c0624f6d6c5 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Mon, 17 Aug 2020 03:51:55 +0200 Subject: [PATCH] GT Trash Fill adjustments: - skipped in no_logic; already was skipped in OWG - instead of randint[0, 15] and randint[15, 50] (if any kind of triforce hunt) trash items, it is now randint[0, GT_crystals*2] and randint[GT_crystals*2, GT_crystals*4] if you're on local or singleplayer triforce hunt; in general this means that the trash prefill is lessened and is especially low if your GT can be entered early. --- Fill.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Fill.py b/Fill.py index 81a8dc13..c4a9eeb8 100644 --- a/Fill.py +++ b/Fill.py @@ -240,12 +240,14 @@ def distribute_items_restrictive(world, gftower_trash=False, fill_locations=None # fill in gtower locations with trash first for player in range(1, world.players + 1): - if not gftower_trash or not world.ganonstower_vanilla[player] or world.logic[player] == 'owglitches': + if not gftower_trash or not world.ganonstower_vanilla[player] or \ + world.logic[player] in {'owglitches', "nologic"}: continue - - gftower_trash_count = ( - world.random.randint(15, 50) if 'triforcehunt' in world.goal[player] - else world.random.randint(0, 15)) + if 'triforcehunt' in world.goal[player] and ('local' in world.goal[player] or world.players == 1): + gftower_trash_count = world.random.randint(world.crystals_needed_for_gt[player] * 2, + world.crystals_needed_for_gt[player] * 4) + else: + gftower_trash_count = world.random.randint(0, world.crystals_needed_for_gt[player] * 2) gtower_locations = [location for location in fill_locations if 'Ganons Tower' in location.name and location.player == player]