Swap implementation of Take Any fix to match Multiworld.

BaseClasses.py

@@ -3,6 +3,8 @@ from enum import Enum, unique
 import logging
 import json
 from collections import OrderedDict
+
+from EntranceShuffle import door_addresses
 from _vendor.collections_extended import bag
 from Utils import int16_as_bytes
 
@@ -871,10 +873,9 @@ class ShopType(Enum):
     UpgradeShop = 2
 
 class Shop(object):
-    def __init__(self, region, room_id, default_door_id, type, shopkeeper_config, replaceable):
+    def __init__(self, region, room_id, type, shopkeeper_config, replaceable):
         self.region = region
         self.room_id = room_id
-        self.default_door_id = default_door_id
         self.type = type
         self.inventory = [None, None, None]
         self.shopkeeper_config = shopkeeper_config
@@ -892,10 +893,8 @@ class Shop(object):
         # [id][roomID-low][roomID-high][doorID][zero][shop_config][shopkeeper_config][sram_index]
         entrances = self.region.entrances
         config = self.item_count
-        if len(entrances) == 1 and entrances[0].addresses:
-            door_id = entrances[0].addresses+1
-        elif self.default_door_id is not None:
-            door_id = self.default_door_id
+        if len(entrances) == 1 and entrances[0].name in door_addresses:
+            door_id = door_addresses[entrances[0].name][0]+1
         else:
             door_id = 0
             config |= 0x40 # ignore door id