From 5e80075352a1d2170c82bb235f4c1e301e68cea7 Mon Sep 17 00:00:00 2001 From: Edos512 <30857677+Edos512@users.noreply.github.com> Date: Fri, 4 Dec 2020 23:54:27 +0100 Subject: [PATCH] Revert "Add new patch, disallow single bee traps from shops" This reverts commit d0a005d34dc20c7073a783ea9866ce721cf09467. --- BaseClasses.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index eb5a4741..ad5f4317 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -345,9 +345,9 @@ class World(object): if location.parent_region.shop is not None and location.name != 'Potion Shop': # includes potion shop slots but not potion shop powder slot_num = int(location.name[-1]) - 1 my_item = location.parent_region.shop.inventory[slot_num] - if (my_item is not None and my_item['item'] == item.name) or 'Rupee' in item.name or ('Bee' in item.name and 'Trap' not in item.name): - # this will filter items that match the item in the shop or Rupees, or single bees - # really not a way for the player to know a renewable item from a player pool item + if (my_item is not None and my_item['item'] == item.name) or 'Rupee' in item.name: + # this will filter items that match the item in the shop or Rupees + # really not a way for the player to know a renewable item from a world item # bombs can be sitting on top of arrows or a potion refill, but dunno if that's a big deal logging.debug('skipping item shop {}'.format(item.name)) else: