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

Customizer: Fixed issue with Assured sword and start inventory

Browse Source
This commit is contained in:
aerinon
2023-07-12 09:50:53 -06:00
parent d135405ed3
commit 1b81151941
2 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ItemList.py
View File

@@ -1297,20 +1297,23 @@ def make_customizer_pool(world, player):
if pieces < t: if pieces < t:
pool.extend(['Triforce Piece'] * (t - pieces)) pool.extend(['Triforce Piece'] * (t - pieces))
if not world.customizer.get_start_inventory(): sphere_0 = world.customizer.get_start_inventory()
if world.logic[player] in ['owglitches', 'nologic']: no_start_inventory = not sphere_0 or not sphere_0[player]
precollected_items.append('Pegasus Boots') init_equip = [] if no_start_inventory else sphere_0[player]
if 'Pegasus Boots' in pool: if (world.logic[player] in ['owglitches', 'nologic']
pool.remove('Pegasus Boots') and (no_start_inventory or all(x != 'Pegasus Boots' for x in init_equip))):
pool.append('Rupees (20)') precollected_items.append('Pegasus Boots')
if world.swords[player] == 'assured': if 'Pegasus Boots' in pool:
precollected_items.append('Progressive Sword') pool.remove('Pegasus Boots')
if 'Progressive Sword' in pool: pool.append('Rupees (20)')
pool.remove('Progressive Sword') if world.swords[player] == 'assured' and (no_start_inventory or all(' Sword' not in x for x in init_equip)):
pool.append('Rupees (50)') precollected_items.append('Progressive Sword')
elif 'Fighter Sword' in pool: if 'Progressive Sword' in pool:
pool.remove('Fighter Sword') pool.remove('Progressive Sword')
pool.append('Rupees (50)') pool.append('Rupees (50)')
elif 'Fighter Sword' in pool:
pool.remove('Fighter Sword')
pool.append('Rupees (50)')
return pool, placed_items, precollected_items, clock_mode, 1 return pool, placed_items, precollected_items, clock_mode, 1

4
RELEASENOTES.md
View File

@@ -113,7 +113,9 @@ These are now independent of retro mode and have three options: None, Random, an
* Fixed an issue with pyramid hole being in logic when it is not opened. * Fixed an issue with pyramid hole being in logic when it is not opened.
* Crystal cutscene at GT use new symmetrical layouts (thanks Codemann) * Crystal cutscene at GT use new symmetrical layouts (thanks Codemann)
* Fix for Hera Boss music (thanks Codemann) * Fix for Hera Boss music (thanks Codemann)
* Fixed accessibility: none using a spoiling message * Customizer: fixed an issue with assured sword and start_inventory
* Customizer: warns when trying to specifically place an item that's not in the item pool
* Fixed "accessibility: none" displaying a spoiling message
* Fixed warning message about custom item pool when it is fine * Fixed warning message about custom item pool when it is fine
* 1.2.0.17u * 1.2.0.17u
* Fixed logic bug that allowed Pearl to be behind Graveyard Cave or King's Tomb entrances with only Mirror and West Dark World access (cross world shuffles only) * Fixed logic bug that allowed Pearl to be behind Graveyard Cave or King's Tomb entrances with only Mirror and West Dark World access (cross world shuffles only)