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

Fix swordless checks not checking for swordless_b

Browse Source
This commit is contained in:
karafruit
2023-10-24 13:06:47 -05:00
parent bf6c05d7a9
commit f5f0cebe26
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ItemList.py
View File

@@ -357,7 +357,7 @@ def generate_itempool(world, player):
possible_weapons = []
for item in pool:
if item in ['Progressive Sword', 'Fighter Sword', 'Master Sword', 'Tempered Sword', 'Golden Sword']:
if not found_sword and world.swords[player] != 'swordless':
if not found_sword and world.swords[player] not in ['swordless', 'swordless_b']:
found_sword = True
possible_weapons.append(item)
if item in ['Progressive Cane', 'Progressive Net']:
@@ -1162,7 +1162,7 @@ def get_pool_core(world, player, progressive, shuffle, difficulty, treasure_hunt
else:
pool.extend(['Bow', 'Silver Arrows'])
if swords == 'swordless':
if swords in ['swordless', 'swordless_b']:
pool.extend(diff.swordless)
elif swords == 'bombs':
pool.extend(diff.bombs_only)
@@ -1572,7 +1572,7 @@ def make_customizer_pool(world, player):
if 'Bomb Upgrade (+10)' not in pool:
missing_items.append('Bomb Upgrade (+10)')
if world.swords[player] != 'swordless':
if world.swords[player] not in ['swordless', 'swordless_b']:
beam_swords = {'Master Sword', 'Tempered Sword', 'Golden 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