diff --git a/colors.py b/colors.py index d7513d6..1a51c7a 100644 --- a/colors.py +++ b/colors.py @@ -1717,13 +1717,17 @@ def studio(): studiostring += "\"exchange\":{\"dupes\":" + str(dupeswant) + ",\"new\":" + str(newwant) + ",\"sigs\":" + str(sigswant) + ",\"choice\":" + str(choicewant) + ",\"special\":" + str(specialwant) + "}}" print("\n" + studiostring) -def randoms(): +def randoms(specials=False): totalrandoms = int(input("How many? ")) pool = [] for card in cardlist: - if card["priority"] == 4 and card["dupe"] == False and card["colour"] != "special" and card["colour"] != "sig" and card["colour"] != "limited": - pool.append(card["name"]) - chosen = random.sample(pool,totalrandoms) + if card["priority"] == 4 and card["dupe"] == False and card["colour"] != "sig" and card["colour"] != "limited": + if specials: + pool.append(card["name"]) + else: + if card["colour"] != "special": + pool.append(card["name"]) + chosen = sorted(random.sample(pool,totalrandoms)) print(", ".join(chosen)) if __name__ == "__main__":