From 36123308a682193a20ee6890a281cf4dc3b44963 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Sun, 10 Jan 2021 15:50:18 +0100
Subject: [PATCH] Refine Shop Item Candidate picking

---
 Dungeons.py |  2 +-
 Fill.py     |  5 ++++-
 Main.py     | 21 +++++++++------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Dungeons.py b/Dungeons.py
index e47d06ea..b80d2152 100644
--- a/Dungeons.py
+++ b/Dungeons.py
@@ -144,7 +144,7 @@ def fill_dungeons_restrictive(world):
         # sort in the order Big Key, Small Key, Other before placing dungeon items
         sort_order = {"BigKey": 3, "SmallKey": 2}
         dungeon_items.sort(key=lambda item: sort_order.get(item.type, 1))
-        fill_restrictive(world, all_state_base, locations, dungeon_items, True)
+        fill_restrictive(world, all_state_base, locations, dungeon_items, True, True)
 
 
 dungeon_music_addresses = {'Eastern Palace - Prize': [0x1559A],
diff --git a/Fill.py b/Fill.py
index e851208d..0727e128 100644
--- a/Fill.py
+++ b/Fill.py
@@ -10,7 +10,8 @@ class FillError(RuntimeError):
     pass
 
 
-def fill_restrictive(world, base_state: CollectionState, locations, itempool, single_player_placement=False):
+def fill_restrictive(world, base_state: CollectionState, locations, itempool, single_player_placement=False,
+                     lock=False):
     def sweep_from_pool():
         new_state = base_state.copy()
         for item in itempool:
@@ -63,6 +64,8 @@ def fill_restrictive(world, base_state: CollectionState, locations, itempool, si
                                     f'Already placed {len(placements)}: {", ".join(str(place) for place in placements)}')
 
                 world.push_item(spot_to_fill, item_to_place, False)
+                if lock:
+                    spot_to_fill.locked = True
                 locations.remove(spot_to_fill)
                 spot_to_fill.event = True
 
diff --git a/Main.py b/Main.py
index e067fb5a..74e0afe3 100644
--- a/Main.py
+++ b/Main.py
@@ -206,21 +206,19 @@ def main(args, seed=None):
         distribute_items_restrictive(world, True)
     elif args.algorithm == 'balanced':
         distribute_items_restrictive(world, True)
-        
+
     if world.players > 1:
         balance_multiworld_progression(world)
 
-
-    candidates = []
-    for location in [l for l in world.get_locations() if l.item.name in ['Bee Trap', 'Shovel', 'Bug Catching Net', 'Cane of Byrna', 'Triforce Piece'] or
-        any([x in l.item.name for x in ['Key', 'Map', 'Compass', 'Clock', 'Heart', 'Sword', 'Shield', 'Bomb', 'Arrow', 'Mail']])]:
-                if ( world.keyshuffle[location.item.player] or not location.item.smallkey) and \
-                        (world.bigkeyshuffle[location.item.player] or not location.item.bigkey) and \
-                        (world.mapshuffle[location.item.player] or not location.item.map) and \
-                        (world.compassshuffle[location.item.player] or not location.item.compass):
-                    candidates.append(location)
+    blacklist_words = {"Rupee", "Pendant", "Crystal"}
+    blacklist_words = {item_name for item_name in item_table if any(
+        blacklist_word in item_name for blacklist_word in blacklist_words)}
+    blacklist_words.add("Bee")
+    candidates = [location for location in world.get_locations() if
+                  not location.locked and not location.item.name in blacklist_words]
     world.random.shuffle(candidates)
-    shop_slots = [item for sublist in [shop.region.locations for shop in world.shops] for item in sublist if item.name != 'Potion Shop']
+    shop_slots = [item for sublist in [shop.region.locations for shop in world.shops] for item in sublist if
+                  item.name != 'Potion Shop']
     shop_slots_adjusted = []
     shop_items = []
     
@@ -232,7 +230,6 @@ def main(args, seed=None):
         if (shop_item is not None and shop_item['item'] == item.name) or 'Rupee' in item.name or (item.name in ['Bee']):
             for c in candidates:  # chosen item locations
                 if c.parent_region.shop or c is location: continue
-                if 'Rupee' in c.item.name or c.item.name in 'Bee': continue
                 if (shop_item is not None and shop_item['item'] == c.item.name): continue
                 if c.item_rule(location.item):  # if rule is good...
                     logging.debug('Swapping {} with {}:: {} ||| {}'.format(c, location, c.item, location.item))