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

Merge branch 'Customizer' into Synthesis

Browse Source
This commit is contained in:
aerinon
2022-10-28 08:56:15 -06:00
parent 82965ac734 4f5a41d040
commit e2392ef237
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ItemList.py
View File

@@ -1140,37 +1140,35 @@ def make_customizer_pool(world, player):
place_item('Master Sword Pedestal', 'Triforce') place_item('Master Sword Pedestal', 'Triforce')
guaranteed_items = alwaysitems + ['Magic Mirror', 'Moon Pearl'] guaranteed_items = alwaysitems + ['Magic Mirror', 'Moon Pearl']
missing_items = []
if world.shopsanity[player]: if world.shopsanity[player]:
guaranteed_items.extend(['Blue Potion', 'Green Potion', 'Red Potion']) guaranteed_items.extend(['Blue Potion', 'Green Potion', 'Red Potion'])
if world.keyshuffle[player] == 'universal': if world.keyshuffle[player] == 'universal':
guaranteed_items.append('Small Key (Universal)') guaranteed_items.append('Small Key (Universal)')
for item in guaranteed_items: for item in guaranteed_items:
if item not in pool: if item not in pool:
pool.append(item) missing_items.append(item)
glove_count = sum(1 for i in pool if i == 'Progressive Glove') glove_count = sum(1 for i in pool if i == 'Progressive Glove')
glove_count = 2 if next((i for i in pool if i == 'Titans Glove'), None) is not None else glove_count glove_count = 2 if next((i for i in pool if i == 'Titans Glove'), None) is not None else glove_count
for i in range(glove_count, 2): for i in range(glove_count, 2):
pool.append('Progressive Glove') missing_items.append('Progressive Glove')
if world.bombbag[player]: if world.bombbag[player]:
if 'Bomb Upgrade (+10)' not in pool: if 'Bomb Upgrade (+10)' not in pool:
pool.append('Bomb Upgrade (+10)') missing_items.append('Bomb Upgrade (+10)')
if world.swords[player] != 'swordless': if world.swords[player] != 'swordless':
beam_swords = {'Master Sword', 'Tempered Sword', 'Golden Sword'} beam_swords = {'Master Sword', 'Tempered Sword', 'Golden Sword'}
sword_count = sum(1 for i in pool if i in 'Progressive Sword') sword_count = sum(1 for i in pool if i in 'Progressive Sword')
sword_count = 2 if next((i for i in pool if i in beam_swords), None) is not None else sword_count sword_count = 2 if next((i for i in pool if i in beam_swords), None) is not None else sword_count
for i in range(sword_count, 2): for i in range(sword_count, 2):
pool.append('Progressive Sword') missing_items.append('Progressive Sword')
bow_found = next((i for i in pool if i in {'Bow', 'Progressive Bow'}), None) bow_found = next((i for i in pool if i in {'Bow', 'Progressive Bow'}), None)
if not bow_found: if not bow_found:
pool.append('Progressive Bow') missing_items.append('Progressive Bow')
logging.getLogger('').warning(f'The following items are not in the custom item pool {", ".join(missing_items)}')
heart_found = next((i for i in pool if i in {'Boss Heart Container', 'Sanctuary Heart Container'}), None)
if heart_found is None:
pool.append('Boss Heart Container')
g, t = set_default_triforce(world.goal[player], world.treasure_hunt_count[player], g, t = set_default_triforce(world.goal[player], world.treasure_hunt_count[player],
world.treasure_hunt_total[player]) world.treasure_hunt_total[player])