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

Progressive bomb/arrow capacity upgrades

This commit is contained in:
CaitSith2 2020-08-31 14:18:20 -07:00
parent 0236097809
commit e39903283f
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ItemPool.py
View File

@ -340,10 +340,17 @@ def generate_itempool(world, player: int):
def shuffle_shops(world, items, player: int): def shuffle_shops(world, items, player: int):
option = world.shop_shuffle[player] option = world.shop_shuffle[player]
if 'u' in option: if 'u' in option:
if world.retro[player]: progressive = world.progressive[player]
new_items = ["Bomb Upgrade (+5)"] * 7 progressive = world.random.choice([True, False]) if progressive == 'random' else progressive == 'on'
else: new_items = ["Bomb Upgrade (+5)"] * 6
new_items = ["Bomb Upgrade (+5)", "Arrow Upgrade (+5)"] * 7 new_items.append("Bomb Upgrade (+5)" if progressive else "Bomb Upgrade (+10)")
if not world.retro[player]:
new_items += ["Arrow Upgrade (+5)"] * 6
new_items.append("Arrow Upgrade (+5)" if progressive else "Arrow Upgrade (+10)")
world.random.shuffle(new_items) # Decide what gets tossed randomly if it can't insert everything.
for shop in world.shops: for shop in world.shops:
if shop.type == ShopType.UpgradeShop and shop.region.player == player and \ if shop.type == ShopType.UpgradeShop and shop.region.player == player and \
shop.region.name == "Capacity Upgrade": shop.region.name == "Capacity Upgrade":