From 52cf99c5c8afdcfbc8c6430c3200b4ef1ef4a070 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Mon, 17 Aug 2020 03:55:46 +0200
Subject: [PATCH] skip gtower fill if target fill count is 0 Also rename
 gftower to gtower. I don't know what the f could stand for. Girlfriend tower?

---
 Fill.py | 51 ++++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/Fill.py b/Fill.py
index c4a9eeb8..d8ce1a3b 100644
--- a/Fill.py
+++ b/Fill.py
@@ -242,34 +242,35 @@ def distribute_items_restrictive(world, gftower_trash=False, fill_locations=None
     for player in range(1, world.players + 1):
         if not gftower_trash or not world.ganonstower_vanilla[player] or \
                 world.logic[player] in {'owglitches', "nologic"}:
-            continue
-        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)
+            gtower_trash_count = 0
+        elif 'triforcehunt' in world.goal[player] and ('local' in world.goal[player] or world.players == 1):
+            gtower_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_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]
-        world.random.shuffle(gtower_locations)
-        trashcnt = 0
-        localrest = localrestitempool[player]
-        if localrest:
-            gt_item_pool = restitempool + localrest
-            world.random.shuffle(gt_item_pool)
-        else:
-            gt_item_pool = restitempool.copy()
-
-        while gtower_locations and gt_item_pool and trashcnt < gftower_trash_count:
-            spot_to_fill = gtower_locations.pop()
-            item_to_place = gt_item_pool.pop()
-            if item_to_place in localrest:
-                localrest.remove(item_to_place)
+        if gtower_trash_count:
+            gtower_locations = [location for location in fill_locations if
+                                'Ganons Tower' in location.name and location.player == player]
+            world.random.shuffle(gtower_locations)
+            trashcnt = 0
+            localrest = localrestitempool[player]
+            if localrest:
+                gt_item_pool = restitempool + localrest
+                world.random.shuffle(gt_item_pool)
             else:
-                restitempool.remove(item_to_place)
-            world.push_item(spot_to_fill, item_to_place, False)
-            fill_locations.remove(spot_to_fill)
-            trashcnt += 1
+                gt_item_pool = restitempool.copy()
+
+            while gtower_locations and gt_item_pool and trashcnt < gtower_trash_count:
+                spot_to_fill = gtower_locations.pop()
+                item_to_place = gt_item_pool.pop()
+                if item_to_place in localrest:
+                    localrest.remove(item_to_place)
+                else:
+                    restitempool.remove(item_to_place)
+                world.push_item(spot_to_fill, item_to_place, False)
+                fill_locations.remove(spot_to_fill)
+                trashcnt += 1
 
     world.random.shuffle(fill_locations)
     fill_locations.reverse()