From a2075ec9925eacd23998a17cf5880286ff3897e9 Mon Sep 17 00:00:00 2001 From: aerinon Date: Tue, 12 Nov 2024 14:10:28 -0700 Subject: [PATCH] fix: inconsistent treatment of beemizer --- BaseClasses.py | 2 +- CLI.py | 2 +- ItemList.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BaseClasses.py b/BaseClasses.py index 0d63917c..6846ac2d 100644 --- a/BaseClasses.py +++ b/BaseClasses.py @@ -129,7 +129,7 @@ class World(object): set_player_attr('enemy_health', 'default') set_player_attr('enemy_damage', 'default') set_player_attr('any_enemy_logic', 'allow_all') - set_player_attr('beemizer', 0) + set_player_attr('beemizer', '0') set_player_attr('escape_assist', []) set_player_attr('crystals_needed_for_ganon', 7) set_player_attr('crystals_needed_for_gt', 7) diff --git a/CLI.py b/CLI.py index cae0feb8..af94e810 100644 --- a/CLI.py +++ b/CLI.py @@ -270,7 +270,7 @@ def parse_settings(): "seed": "", "count": 1, "startinventory": "", - "beemizer": 0, + 'beemizer': '0', "remote_items": False, "race": False, "customitemarray": { diff --git a/ItemList.py b/ItemList.py index 1df02b2a..be1f744c 100644 --- a/ItemList.py +++ b/ItemList.py @@ -459,7 +459,7 @@ def generate_itempool(world, player): '3': {'trap': 50, 'bee': 50}, '4': {'trap': 100}} def beemizer(item): - if world.beemizer[item.player] and not item.advancement and not item.priority and not item.type: + if world.beemizer[item.player] != '0' and not item.advancement and not item.priority and not item.type: choice = random.choices(list(beeweights[world.beemizer[item.player]].keys()), weights=list(beeweights[world.beemizer[item.player]].values()))[0] return item if not choice else ItemFactory("Bee Trap", player) if choice == 'trap' else ItemFactory("Bee", player) return item