alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Inverted shopsanity

Browse Source 
Randomize shopkeepers
One other fix
This commit is contained in:
aerinon
2020-12-07 14:01:04 -07:00
parent 71e07dcd5a
commit b80ea7c85a
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ItemList.py
View File

@@ -540,7 +540,10 @@ def customize_shops(world, player):
shop.add_inventory(idx, item.name, randomize_price(price), max_repeat)
if item.name in cap_replacements and shop_name not in retro_shops:
possible_replacements.append((shop, idx, location, item))
# todo: randomize shopkeeper
# randomize shopkeeper
if shop_name != 'Capacity Upgrade':
shopkeeper = random.choice([0xC1, 0xA0, 0xE2, 0xE3])
shop.shopkeeper_config = shopkeeper
# handle capacity upgrades - randomly choose a bomb bunch or arrow bunch to become capacity upgrades
if not found_bomb_upgrade and len(possible_replacements) > 0:
choices = []
@@ -582,7 +585,7 @@ def randomize_price(price):
def change_shop_items_to_rupees(world, player, shops):
locations = world.get_filled_locations(player)
for location in locations:
if location.item.name in shop_transfer.keys() and location.parent_region not in shops:
if location.item.name in shop_transfer.keys() and location.parent_region.name not in shops:
new_item = ItemFactory(shop_transfer[location.item.name], location.item.player)
location.item = new_item