LttP: Rename Shop Slot 1, 2, 3 to Shop Slot Left, Center, Right

General: Move generic IDs from LttP to new Generic World
Generate: ensure thread errors are collected before data from their completion may be referenced in playthrough/spoiler
This commit is contained in:
Fabian Dill
2021-08-27 14:52:33 +02:00
parent e8da9924c6
commit 21255b3b46
10 changed files with 61 additions and 33 deletions

View File

@@ -500,14 +500,14 @@ def create_dynamic_shop_locations(world, player):
if item is None:
continue
if item['create_location']:
loc = ALttPLocation(player, "{} Slot {}".format(shop.region.name, i + 1), parent=shop.region)
loc = ALttPLocation(player, f"{shop.region.name} {shop.slot_names[i]}", parent=shop.region)
shop.region.locations.append(loc)
world.dynamic_locations.append(loc)
world.clear_location_cache()
world.push_item(loc, ItemFactory(item['item'], player), False)
loc.shop_slot = True
loc.shop_slot = i
loc.event = True
loc.locked = True