monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add new patch, disallow single bee traps from shops" 

This reverts commit d0a005d34d.
This commit is contained in:
Edos512 2020-12-04 23:54:27 +01:00
parent 3da9b1df7b
commit 5e80075352
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BaseClasses.py
View File

@ -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 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 slot_num = int(location.name[-1]) - 1
my_item = location.parent_region.shop.inventory[slot_num] 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): 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, or single bees # 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 player pool item # 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 # 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)) logging.debug('skipping item shop {}'.format(item.name))
else: else: