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

Fix SP key placement/removal issue in HMG

Browse Source
This commit is contained in:
codemann8
2024-03-22 05:19:10 -05:00
parent 9eedbff0e5
commit 4dd334f66e
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ItemList.py
View File

@@ -327,13 +327,6 @@ def generate_itempool(world, player):
for _ in range(0, amt): for _ in range(0, amt):
pool.append('Rupees (20)') pool.append('Rupees (20)')
if world.logic[player] == 'hybridglitches' and world.pottery[player] not in ['none', 'cave']:
# In HMG force swamp smalls in pots to allow getting out of swamp palace
placed_items['Swamp Palace - Trench 1 Pot Key'] = 'Small Key (Swamp Palace)'
placed_items['Swamp Palace - Pot Row Pot Key'] = 'Small Key (Swamp Palace)'
pool.remove('Small Key (Swamp Palace)')
pool.remove('Small Key (Swamp Palace)')
start_inventory = list(world.precollected_items) start_inventory = list(world.precollected_items)
for item in precollected_items: for item in precollected_items:
world.push_precollected(ItemFactory(item, player)) world.push_precollected(ItemFactory(item, player))
@@ -410,6 +403,13 @@ def generate_itempool(world, player):
or (item.map and world.mapshuffle[player]) or (item.map and world.mapshuffle[player])
or (item.compass and world.compassshuffle[player]))]) or (item.compass and world.compassshuffle[player]))])
if world.logic[player] == 'hybridglitches' and world.pottery[player] not in ['none', 'cave']:
# In HMG force swamp smalls in pots to allow getting out of swamp palace
placed_items['Swamp Palace - Trench 1 Pot Key'] = 'Small Key (Swamp Palace)'
placed_items['Swamp Palace - Pot Row Pot Key'] = 'Small Key (Swamp Palace)'
world.itempool.remove(ItemFactory('Small Key (Swamp Palace)', player))
world.itempool.remove(ItemFactory('Small Key (Swamp Palace)', player))
# logic has some branches where having 4 hearts is one possible requirement (of several alternatives) # logic has some branches where having 4 hearts is one possible requirement (of several alternatives)
# rather than making all hearts/heart pieces progression items (which slows down generation considerably) # rather than making all hearts/heart pieces progression items (which slows down generation considerably)
# We mark one random heart container as an advancement item (or 4 heart pieces in expert mode) # We mark one random heart container as an advancement item (or 4 heart pieces in expert mode)