From 2a0d1962f1e59b83752e0c56e0859be713456d46 Mon Sep 17 00:00:00 2001 From: Fabian Dill Date: Sat, 9 Jan 2021 18:11:24 +0100 Subject: [PATCH] Tag version required for sending items out of shops --- Main.py | 12 ++++++++---- Utils.py | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Main.py b/Main.py index 3d7bce22..3d877568 100644 --- a/Main.py +++ b/Main.py @@ -217,16 +217,16 @@ def main(args, seed=None): shop_slots_adjusted = [] shop_items = [] - for location in shop_slots: + for location in shop_slots: slot_num = int(location.name[-1]) - 1 shop_item = location.parent_region.shop.inventory[slot_num] item = location.item # if item is a rupee or single bee, or identical, swap it out if (shop_item is not None and shop_item['item'] == item.name) or 'Rupee' in item.name or (item.name in ['Bee']): - for c in candidates: # chosen item locations + for c in candidates: # chosen item locations if 'Rupee' in c.item.name or c.item.name in 'Bee': continue if (shop_item is not None and shop_item['item'] == c.item.name): continue - if c.item_rule(location.item): # if rule is good... + if c.item_rule(location.item): # if rule is good... logging.debug('Swapping {} with {}:: {} ||| {}'.format(c, location, c.item, location.item)) c.item, location.item = location.item, c.item if not world.can_beat_game(): @@ -444,7 +444,11 @@ def main(args, seed=None): multidatatags.append("Spoiler") if not args.skip_playthrough: multidatatags.append("Play through") - minimum_versions = {"server": (1,0,0)} + minimum_versions = {"server": (1, 0, 0)} + minimum_versions["clients"] = client_versions = [] + for (slot, team, name) in rom_names: + if world.shop_shuffle_slots[slot]: + client_versions.append([team, slot, [3, 6, 1]]) multidata = zlib.compress(json.dumps({"names": parsed_names, # backwards compat for < 2.4.1 "roms": [(slot, team, list(name.encode())) diff --git a/Utils.py b/Utils.py index 0c03b31b..5741a3a2 100644 --- a/Utils.py +++ b/Utils.py @@ -13,7 +13,7 @@ class Version(typing.NamedTuple): micro: int -__version__ = "3.6.0" +__version__ = "3.6.1" _version_tuple = tuplize_version(__version__) import os