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

Revert "Potion Shop Changes" 

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

6
ItemPool.py
View File

@ -368,15 +368,11 @@ def shuffle_shops(world, items, player: int):
shops = [] shops = []
upgrade_shops = [] upgrade_shops = []
total_inventory = [] total_inventory = []
potion_option = world.potion_shop_shuffle[player]
for shop in world.shops: for shop in world.shops:
if shop.region.player == player: if shop.region.player == player:
if shop.type == ShopType.UpgradeShop: if shop.type == ShopType.UpgradeShop:
upgrade_shops.append(shop) upgrade_shops.append(shop)
elif shop.type == ShopType.Shop: elif shop.type == ShopType.Shop and shop.region.name != 'Potion Shop':
if shop.region.name == 'Potion Shop' and potion_option in [None, '', 'none']:
upgrade_shops.append(shop) # just put it with the upgrade shops/caves so we don't shuffle the items, just prices
else:
shops.append(shop) shops.append(shop)
total_inventory.extend(shop.inventory) total_inventory.extend(shop.inventory)

4
Mystery.py
View File

@ -368,10 +368,6 @@ def roll_settings(weights):
if not ret.shop_shuffle: if not ret.shop_shuffle:
ret.shop_shuffle = '' ret.shop_shuffle = ''
ret.potion_shop_shuffle = get_choice('potion_shop_shuffle', weights, '')
if not ret.potion_shop_shuffle:
ret.potion_shop_shuffle = ''
ret.mode = get_choice('world_state', weights, None) # legacy support ret.mode = get_choice('world_state', weights, None) # legacy support
if ret.mode == 'retro': if ret.mode == 'retro':
ret.mode = 'open' ret.mode = 'open'