From 28c12054dd00064447b9ee79412730871bfa680d Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Sat, 30 Jan 2021 23:37:35 +0100
Subject: [PATCH] update to Shops release

---
 MultiClient.py       | 2 +-
 Shops.py             | 4 ++--
 worlds/alttp/Main.py | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/MultiClient.py b/MultiClient.py
index 4a357daf..e6e88097 100644
--- a/MultiClient.py
+++ b/MultiClient.py
@@ -862,7 +862,7 @@ async def process_server_cmd(ctx: Context, cmd: str, args: typing.Optional[dict]
         raise Exception('Connection refused by the multiworld host, no reason provided')
 
     elif cmd == 'Connected':
-         Utils.persistent_store("servers", ctx.rom, ctx.server_address)
+        Utils.persistent_store("servers", ctx.rom, ctx.server_address)
         ctx.team = args["team"]
         ctx.slot = args["slot"]
         ctx.player_names = {p: n for p, n in args["playernames"]}
diff --git a/Shops.py b/Shops.py
index a3c09c88..6749243e 100644
--- a/Shops.py
+++ b/Shops.py
@@ -4,8 +4,8 @@ from typing import List, Union, Optional, Set, NamedTuple, Dict
 import logging
 
 from BaseClasses import Location
-from EntranceShuffle import door_addresses
-from Items import item_name_groups, item_table, ItemFactory, trap_replaceable
+from worlds.alttp.EntranceShuffle import door_addresses
+from worlds.alttp.Items import item_name_groups, item_table, ItemFactory, trap_replaceable
 from Utils import int16_as_bytes
 
 logger = logging.getLogger("Shops")
diff --git a/worlds/alttp/Main.py b/worlds/alttp/Main.py
index a3431981..37a989fb 100644
--- a/worlds/alttp/Main.py
+++ b/worlds/alttp/Main.py
@@ -19,6 +19,7 @@ from worlds.alttp.Rom import patch_rom, patch_race_rom, patch_enemizer, apply_ro
 from worlds.alttp.Rules import set_rules
 from worlds.alttp.Dungeons import create_dungeons, fill_dungeons, fill_dungeons_restrictive
 from Fill import distribute_items_restrictive, flood_items, balance_multiworld_progression, distribute_planned
+from Shops import create_shops, ShopSlotFill, SHOP_ID_START, total_shop_slots, FillDisabledShopSlots
 from worlds.alttp.ItemPool import generate_itempool, difficulties, fill_prizes
 from Utils import output_path, parse_player_names, get_options, __version__, _version_tuple
 import Patch
@@ -351,7 +352,6 @@ def main(args, seed=None):
                 main_entrance = get_entrance_to_region(region)
                 for location in region.locations:
                     if type(location.address) == int:  # skips events and crystals
-                        if location.address >= SHOP_ID_START + 33:  continue
                         if lookup_vanilla_location_to_entrance[location.address] != main_entrance.name:
                             er_hint_data[region.player][location.address] = main_entrance.name