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

fix: inconsistent treatment of beemizer

Browse Source
This commit is contained in:
aerinon
2024-11-12 14:10:28 -07:00
parent 82a04dabd7
commit a2075ec992
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BaseClasses.py
View File

@@ -129,7 +129,7 @@ class World(object):
set_player_attr('enemy_health', 'default') set_player_attr('enemy_health', 'default')
set_player_attr('enemy_damage', 'default') set_player_attr('enemy_damage', 'default')
set_player_attr('any_enemy_logic', 'allow_all') 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('escape_assist', [])
set_player_attr('crystals_needed_for_ganon', 7) set_player_attr('crystals_needed_for_ganon', 7)
set_player_attr('crystals_needed_for_gt', 7) set_player_attr('crystals_needed_for_gt', 7)

2
CLI.py
View File

@@ -270,7 +270,7 @@ def parse_settings():
"seed": "", "seed": "",
"count": 1, "count": 1,
"startinventory": "", "startinventory": "",
"beemizer": 0, 'beemizer': '0',
"remote_items": False, "remote_items": False,
"race": False, "race": False,
"customitemarray": { "customitemarray": {

2
ItemList.py
View File

@@ -459,7 +459,7 @@ def generate_itempool(world, player):
'3': {'trap': 50, 'bee': 50}, '3': {'trap': 50, 'bee': 50},
'4': {'trap': 100}} '4': {'trap': 100}}
def beemizer(item): 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] 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 if not choice else ItemFactory("Bee Trap", player) if choice == 'trap' else ItemFactory("Bee", player)
return item return item