monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

introduce 100 rupee piles for retro and universal keys to be swapped into pool for shop slots

This commit is contained in:
Fabian Dill 2021-02-07 09:45:30 +01:00
parent 47837f4dae
commit 191834200f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Shops.py
View File

@ -194,7 +194,7 @@ def ShopSlotFill(world):
world.random.shuffle(current_candidates) world.random.shuffle(current_candidates)
del(locations_per_sphere) del locations_per_sphere
total_spheres = len(candidates_per_sphere) total_spheres = len(candidates_per_sphere)
@ -270,6 +270,7 @@ def create_shops(world, player: int):
# make sure that blue potion is available in inverted, special case locked = None; lock when done. # make sure that blue potion is available in inverted, special case locked = None; lock when done.
player_shop_table["Dark Lake Hylia Shop"] = \ player_shop_table["Dark Lake Hylia Shop"] = \
player_shop_table["Dark Lake Hylia Shop"]._replace(items=_inverted_hylia_shop_defaults, locked=None) player_shop_table["Dark Lake Hylia Shop"]._replace(items=_inverted_hylia_shop_defaults, locked=None)
chance_100 = int(world.retro[player])*0.25+int(world.keyshuffle[player] == "universal") * 0.5
for region_name, (room_id, type, shopkeeper, custom, locked, inventory, sram_offset) in player_shop_table.items(): for region_name, (room_id, type, shopkeeper, custom, locked, inventory, sram_offset) in player_shop_table.items():
region = world.get_region(region_name, player) region = world.get_region(region_name, player)
shop: Shop = shop_class_mapping[type](region, room_id, shopkeeper, custom, locked, sram_offset) shop: Shop = shop_class_mapping[type](region, room_id, shopkeeper, custom, locked, sram_offset)
@ -288,7 +289,10 @@ def create_shops(world, player: int):
loc.locked = True loc.locked = True
if single_purchase_slots.pop(): if single_purchase_slots.pop():
if world.goal[player] != 'icerodhunt': if world.goal[player] != 'icerodhunt':
additional_item = 'Rupees (50)' if world.random.random() < chance_100:
additional_item = 'Rupees (100)'
else:
additional_item = 'Rupees (50)'
else: else:
additional_item = 'Nothing' additional_item = 'Nothing'
loc.item = ItemFactory(additional_item, player) loc.item = ItemFactory(additional_item, player)