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

Remove default bomb upgrades from shop

Browse Source
This commit is contained in:
StructuralMike
2021-07-26 11:09:24 +02:00
parent 779c7d78c0
commit e5e90fc805
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ItemList.py
View File

@@ -523,6 +523,17 @@ def set_up_shops(world, player):
rss.locked = True rss.locked = True
cap_shop = world.get_region('Capacity Upgrade', player).shop cap_shop = world.get_region('Capacity Upgrade', player).shop
cap_shop.inventory[1] = None # remove arrow capacity upgrades in retro cap_shop.inventory[1] = None # remove arrow capacity upgrades in retro
if world.bomblogic[player]:
if world.shopsanity[player]:
removals = [item for item in world.itempool if item.name == 'Bomb Upgrade (+5)' and item.player == player]
for i in removals:
print(i)
for remove in removals:
world.itempool.remove(remove)
world.itempool.append(ItemFactory('Rupees (50)', player)) # replace the bomb upgrade
else:
cap_shop = world.get_region('Capacity Upgrade', player).shop
cap_shop.inventory[0] = cap_shop.inventory[1] # remove bomb capacity upgrades in bomblogic
def customize_shops(world, player): def customize_shops(world, player):
@@ -567,7 +578,7 @@ def customize_shops(world, player):
if not found_bomb_upgrade and len(possible_replacements) > 0: if not found_bomb_upgrade and len(possible_replacements) > 0:
choices = [] choices = []
for shop, idx, loc, item in possible_replacements: for shop, idx, loc, item in possible_replacements:
if item.name in ['Bombs (3)', 'Bombs (10)']: if item.name in ['Bombs (3)', 'Bombs (10)'] and not world.bomblogic[player]:
choices.append((shop, idx, loc, item)) choices.append((shop, idx, loc, item))
if len(choices) > 0: if len(choices) > 0:
shop, idx, loc, item = random.choice(choices) shop, idx, loc, item = random.choice(choices)