morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 20:21:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

make potion_shop_shuffle more consistent in type use

Browse Source
This commit is contained in:
Fabian Dill
2021-01-09 17:29:31 +01:00
parent e36c6e97c1
commit aed763c58f
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ItemPool.py
View File

@@ -487,8 +487,9 @@ def shuffle_shops(world, items, player: int):
if shop.type == ShopType.UpgradeShop:
upgrade_shops.append(shop)
elif shop.type == ShopType.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
if shop.region.name == 'Potion Shop' and not potion_option:
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)
total_inventory.extend(shop.inventory)