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

Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable

Browse Source
This commit is contained in:
aerinon
2021-08-02 15:23:43 -06:00
parent 1871b7ee6e cab5f22390
commit c8dcdcc62c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ItemList.py
View File

@@ -318,6 +318,11 @@ def generate_itempool(world, player):
p_item = next(item for item in items if item.name == potion and item.player == player) p_item = next(item for item in items if item.name == potion and item.player == player)
p_item.priority = True # don't beemize one of each potion p_item.priority = True # don't beemize one of each potion
if world.bomblogic[player]:
for item in items:
if item.name == 'Bomb Upgrade (+10)' and item.player == player:
item.advancement = True
world.lamps_needed_for_dark_rooms = lamps_needed_for_dark_rooms world.lamps_needed_for_dark_rooms = lamps_needed_for_dark_rooms
if clock_mode is not None: if clock_mode is not None:
@@ -524,9 +529,6 @@ def set_up_shops(world, player):
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.bomblogic[player]:
for item in world.itempool:
if item.name == 'Bomb Upgrade (+10)' and item.player == player:
item.advancement = True
if world.shopsanity[player]: if world.shopsanity[player]:
removals = [item for item in world.itempool if item.name == 'Bomb Upgrade (+5)' and item.player == player] removals = [item for item in world.itempool if item.name == 'Bomb Upgrade (+5)' and item.player == player]
for remove in removals: for remove in removals: