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

Potion changes

Browse Source
This commit is contained in:
pepperpow
2020-12-02 20:44:32 -06:00
parent 37493c85dc
commit 42adfd6f14
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Regions.py
View File

@@ -369,6 +369,7 @@ def create_shops(world, player: int):
ShopType.Shop: Shop, ShopType.Shop: Shop,
ShopType.TakeAny: TakeAny} ShopType.TakeAny: TakeAny}
option = world.shop_shuffle[player] option = world.shop_shuffle[player]
potion_option = world.potion_shop_shuffle[player]
my_shop_table = dict(shop_table) my_shop_table = dict(shop_table)
num_slots = int(world.shop_shuffle_slots[player]) num_slots = int(world.shop_shuffle_slots[player])
@@ -392,7 +393,10 @@ def create_shops(world, player: int):
if name == 'Capacity Upgrade': if name == 'Capacity Upgrade':
continue continue
if name == 'Potion Shop': if name == 'Potion Shop':
continue if 'b' in potion_option:
new_items = world.random.sample(shop_generation_types['potion_discount'] + shop_generation_types['bottle'], k=3)
elif 'a' not in potion_option:
new_items = items
keeper = world.random.choice([0xA0, 0xC1, 0xFF]) keeper = world.random.choice([0xA0, 0xC1, 0xFF])
my_shop_table[name] = (typ, shop_id, keeper, custom, locked, new_items) my_shop_table[name] = (typ, shop_id, keeper, custom, locked, new_items)
@@ -406,7 +410,7 @@ def create_shops(world, player: int):
world.shops.append(shop) world.shops.append(shop)
for index, item in enumerate(inventory): for index, item in enumerate(inventory):
shop.add_inventory(index, *item) shop.add_inventory(index, *item)
if region_name == 'Potion Shop': if region_name == 'Potion Shop' and 'a' not in potion_option:
pass pass
elif region_name == 'Capacity Upgrade': elif region_name == 'Capacity Upgrade':
pass pass