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

Update ItemList.py

Browse Source 
Fix iteration on item instead of name when using a custom pool in some cases.
This commit is contained in:
Paul Wendelboe
2023-10-09 00:39:54 +00:00
committed by GitHub
parent b50cf16fbf
commit c849f8202c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ItemList.py
View File

@@ -1164,12 +1164,12 @@ def make_custom_item_pool(world, player, progressive, shuffle, difficulty, timer
pool.extend(['Nothing'] * nothings) pool.extend(['Nothing'] * nothings)
start_inventory = [x for x in world.precollected_items if x.player == player] start_inventory = [x for x in world.precollected_items if x.player == player]
if world.logic[player] in ['owglitches', 'nologic'] and all(x !=' Pegasus Boots' for x in start_inventory): if world.logic[player] in ['owglitches', 'nologic'] and all(x.name !=' Pegasus Boots' for x in start_inventory):
precollected_items.append('Pegasus Boots') precollected_items.append('Pegasus Boots')
if 'Pegasus Boots' in pool: if 'Pegasus Boots' in pool:
pool.remove('Pegasus Boots') pool.remove('Pegasus Boots')
pool.append('Rupees (20)') pool.append('Rupees (20)')
if world.swords[player] == 'assured' and all(' Sword' not in x for x in start_inventory): if world.swords[player] == 'assured' and all(' Sword' not in x.name for x in start_inventory):
precollected_items.append('Progressive Sword') precollected_items.append('Progressive Sword')
if 'Progressive Sword' in pool: if 'Progressive Sword' in pool:
pool.remove('Progressive Sword') pool.remove('Progressive Sword')