From acc802dfdf1639728003eac337b6a6aa2206d622 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 11 Mar 2025 09:07:57 -0500 Subject: [PATCH] Fixed errors with starting equipment containing bottles --- ItemList.py | 2 +- Main.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ItemList.py b/ItemList.py index 08be1d62..3c879c9f 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1245,7 +1245,7 @@ def modify_pool_for_start_inventory(start_inventory, world, player): world.itempool.remove(alt_item) i = i-1 elif 'Bottle' in item.name: - bottle_item = next((x for x in world.itempool if 'Bottle' in item.name and x.player == player), None) + bottle_item = next((x for x in world.itempool if 'Bottle' in x.name and x.player == player), None) if bottle_item is not None: world.itempool.remove(bottle_item) if item.dungeon: diff --git a/Main.py b/Main.py index e1af57b1..f668e853 100644 --- a/Main.py +++ b/Main.py @@ -429,6 +429,9 @@ def export_yaml(args, fish): for k,v in {"DR":__version__,"OR":ORVersion}.items(): logger.info((k + ' Version:').ljust(16) + '%s' % v) + for player in range(1, world.players + 1): + world.difficulty_requirements[player] = difficulties[world.difficulty[player]] + set_starting_inventory(world, args) world.settings = CustomSettings()