Remove Dried Meat from Figaro Castle WOR and Phantom Train shops and expand Starting Dried Meat flag range

args/shops.py

@@ -29,7 +29,7 @@ def parse(parser):
     shops_sell_fraction.add_argument("-ssf0", "--shop-sell-fraction0", action = "store_true",
                                      help = "Items sell for zero")
 
-    shops.add_argument("-sdm", "--shop-dried-meat", default = 1, type = int, choices = range(6), metavar = "COUNT",
+    shops.add_argument("-sdm", "--shop-dried-meat", default = 1, type = int, choices = range(11), metavar = "COUNT",
                         help = "%(metavar)s shops will contain dried meat")
     shops.add_argument("-npi", "--no-priceless-items", action = "store_true",
                        help = "Assign values to items which normally sell for 1 gold. Recommended with random inventory")

data/shops.py

@@ -145,11 +145,16 @@ def clear_inventories(self):
     def assign_dried_meats(self):
         dried_meat_id = self.items.get_id("Dried Meat")
         dried_meat_type = self.items.get_type(dried_meat_id)
+        excluded_shops = ["Figaro Castle WOR (Left)","Figaro Castle WOR (Right)","Phantom Train"]
 
         dried_meat_shops = []
         no_dried_meat_shops = []
+
         for shop in self.shops:
-            if shop.contains(dried_meat_id):
+            if shop.contains(dried_meat_id) and shop.name() in excluded_shops:
+                shop.remove(dried_meat_id)
+                no_dried_meat_shops.append(shop)
+            elif shop.contains(dried_meat_id):
                 dried_meat_shops.append(shop)
             elif shop.type == Shop.ITEM or shop.type == Shop.VENDOR:
                 no_dried_meat_shops.append(shop)
@@ -167,50 +172,18 @@ def assign_dried_meats(self):
             # add a dried meat if space, otherwise replace a random item with dried meat
             for index in range(number_shops_with_dried_meat, self.args.shop_dried_meat):
                 random_shop = random.choice(no_dried_meat_shops)
+
+                while random_shop.name() in excluded_shops: # keep looping if shop is on the "bad" list
+                    random_shop = random.choice(no_dried_meat_shops)
+
                 if not random_shop.full():
                     random_shop.append(dried_meat_id)
                 else:
                     random_index = random.randrange(random_shop.item_count)
                     random_shop.items[random_index] = dried_meat_id
                 no_dried_meat_shops.remove(random_shop)
+                dried_meat_shops.append(random_shop)
 
-    def no_dried_meat_phantom_train(self):
-        # move dried meat from phantom train shop to a different shop
-        phantom_train_shop_id = 85
-        phantom_train_shop = self.all_shops[phantom_train_shop_id]
-
-        dried_meat_id = self.items.get_id("Dried Meat")
-        dried_meat_type = self.items.get_type(dried_meat_id)
-        dried_meat_index = phantom_train_shop.index(dried_meat_id)
-        if dried_meat_index is None:
-            return # phantom train shop does not have dried meat
-
-        # possible shops the dried meat can be moved to
-        possible_shops = self.type_shops[Shop.ITEM] + self.type_shops[Shop.VENDOR]
-
-        import random
-        random.shuffle(possible_shops)
-
-        for random_shop in possible_shops:
-            if random_shop.contains(dried_meat_id):
-                continue
-
-            # try to swap an empty slot with the dried meat
-            if not random_shop.full():
-                random_shop.append(dried_meat_id)
-                phantom_train_shop.remove(dried_meat_id)
-                return
-
-            # try to find an item in random_shop that phantom train does not have and swap them
-            item_indices = list(range(random_shop.item_count))
-            random.shuffle(item_indices)
-            for item_index in item_indices:
-                item = random_shop.items[item_index]
-                item_type = self.items.get_type(item)
-                if item_type == dried_meat_type and not phantom_train_shop.contains(item):
-                    phantom_train_shop.items[dried_meat_index] = item
-                    random_shop.items[item_index] = dried_meat_id
-                    return
 
     def remove_excluded_items(self):
         exclude = self.items.get_excluded()

event/phantom_train.py

@@ -54,12 +54,6 @@ def add_gating_condition(self):
             field.ReturnIfEventBitClear(event_bit.character_recruited(self.character_gate())),
         )
 
-        sabin_path = self.characters.get_character_path(self.characters.SABIN)
-        veldt_gate = self.events["Veldt"].character_gate()
-        if veldt_gate in sabin_path and self.args.shop_dried_meat == 1:
-            # sabin requires veldt gate character and there is only one dried meat in shops
-            # make sure it is not in the phantom train
-            self.shops.no_dried_meat_phantom_train()
 
     def _load_world_map(self):
         src = [