From d95e5cf4d27cdee22f549ee9053903657c8fe1e8 Mon Sep 17 00:00:00 2001 From: codemann8 Date: Tue, 10 Dec 2024 22:25:40 -0600 Subject: [PATCH] Fixed issue with plandoing prizes --- ItemList.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ItemList.py b/ItemList.py index 5a6f33e7..6c9bf589 100644 --- a/ItemList.py +++ b/ItemList.py @@ -1669,16 +1669,16 @@ def get_item_and_event_flag(item, world, player, dungeon_pool, prize_set, prize_ item_player = player if len(item_parts) < 2 else int(item_parts[1]) item_name = item_parts[0] event_flag = False - if is_dungeon_item(item_name, world, item_player): - item_to_place = next(x for x in dungeon_pool - if x.name == item_name and x.player == item_player) - dungeon_pool.remove(item_to_place) - event_flag = True - elif item_name in prize_set: + if item_name in prize_set: item_player = player # prizes must be for that player item_to_place = ItemFactory(item_name, item_player) prize_pool.remove(item_name) event_flag = True + elif is_dungeon_item(item_name, world, item_player): + item_to_place = next(x for x in dungeon_pool + if x.name == item_name and x.player == item_player) + dungeon_pool.remove(item_to_place) + event_flag = True else: matcher = lambda x: x.name == item_name and x.player == item_player if item_name == 'Bottle':