diff --git a/BaseClasses.py b/BaseClasses.py index d8d6c94f..5617fd85 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: - # 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 + 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 # 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: diff --git a/Rom.py b/Rom.py index b3b58c6b..6eaf6854 100644 --- a/Rom.py +++ b/Rom.py @@ -1,7 +1,7 @@ from __future__ import annotations JAP10HASH = '03a63945398191337e896e5771f77173' -RANDOMIZERBASEHASH = '2e014eec91e08d0977d083fd4a6ae41d' +RANDOMIZERBASEHASH = '0954a778832b76ba4f96b10eb527ee83' import io import json diff --git a/data/basepatch.bmbp b/data/basepatch.bmbp index 4e2d3a0f..6cba8ef7 100644 Binary files a/data/basepatch.bmbp and b/data/basepatch.bmbp differ