morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LttP: split Retro into Retro Bows and Retro Caves (#588)

Browse Source
This commit is contained in:
Fabian Dill
2022-06-01 17:29:21 +02:00
committed by GitHub
parent e13e7f286c
commit d0a98949f5
7 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
worlds/alttp/ItemPool.py
View File

@@ -440,7 +440,7 @@ def generate_itempool(world):
world.itempool += progressionitems + nonprogressionitems
if world.retro[player]:
if world.retro_caves[player]:
set_up_take_anys(world, player) # depends on world.itempool to be set
@@ -531,7 +531,7 @@ def get_pool_core(world, player: int):
goal = world.goal[player]
mode = world.mode[player]
swordless = world.swordless[player]
retro = world.retro[player]
retro_bow = world.retro_bow[player]
logic = world.logic[player]
pool = []
@@ -647,7 +647,7 @@ def get_pool_core(world, player: int):
place_item('Master Sword Pedestal', 'Triforce')
pool.remove("Rupees (20)")
if retro:
if retro_bow:
replace = {'Single Arrow', 'Arrows (10)', 'Arrow Upgrade (+5)', 'Arrow Upgrade (+10)'}
pool = ['Rupees (5)' if item in replace else item for item in pool]
if world.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
@@ -812,7 +812,7 @@ def make_custom_item_pool(world, player):
pool.extend(['Moon Pearl'] * customitemarray[28])
if world.smallkey_shuffle[player] == smallkey_shuffle.option_universal:
itemtotal = itemtotal - 28 # Corrects for small keys not being in item pool in Retro Mode
itemtotal = itemtotal - 28 # Corrects for small keys not being in item pool in universal mode
if itemtotal < total_items_to_place:
pool.extend(['Nothing'] * (total_items_to_place - itemtotal))
logging.warning(f"Pool was filled up with {total_items_to_place - itemtotal} Nothing's for player {player}")