From 4c15c193f42e6156e66e5558ef8daf68210754e3 Mon Sep 17 00:00:00 2001 From: StructuralMike <66819228+StructuralMike@users.noreply.github.com> Date: Thu, 29 Jul 2021 15:27:49 +0200 Subject: [PATCH] Set bomb upgrades as advancement before beemizer Beemizer can replace bomb upgrades in bomblogic unless they're tagged as advancement earlier --- ItemList.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ItemList.py b/ItemList.py index 57566418..9128436a 100644 --- a/ItemList.py +++ b/ItemList.py @@ -301,6 +301,11 @@ def generate_itempool(world, player): world.get_location(location, player).event = True world.get_location(location, player).locked = True + 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]: for shop in world.shops[player]: if shop.region.name in shop_to_location_table: @@ -524,9 +529,6 @@ def set_up_shops(world, player): cap_shop = world.get_region('Capacity Upgrade', player).shop cap_shop.inventory[1] = None # remove arrow capacity upgrades in retro 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]: removals = [item for item in world.itempool if item.name == 'Bomb Upgrade (+5)' and item.player == player] for remove in removals: