From cf2a6185e38ee4f9d9d7fcc40cb6ddf2bc8bbcbf Mon Sep 17 00:00:00 2001 From: Mez Date: Fri, 1 Aug 2025 20:41:13 +0100 Subject: [PATCH] Autofill art studio requests from wantlist --- tools.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools.py b/tools.py index d33b9ae..04e635a 100644 --- a/tools.py +++ b/tools.py @@ -698,7 +698,7 @@ def studio(): tradenormal = [] tradespecial = [] for card in colors.cardlist: - if card["priority"] == 4 and card["dupe"] == False: + if card["priority"] == 4: if card["colour"] != "sig" and card["colour"] != "limited": if card["dupe"]: if len(card["mass"]) == 0: @@ -785,10 +785,15 @@ def studio(): give.extend(random.sample(tradenormal,needednormal)) if neededspecial > 0: give.extend(random.sample(tradespecial,neededspecial)) - if choicewant > 0: - choicelist = input(str(choicewant) + " choice character cards: ").split(", ") - if specialwant > 0: - speciallist = input(str(specialwant) + " choice special cards: ").split(", ") + allwantch = [] + allwantsp = [] + for card in colors.wantedlist: + if card["colour"] == "special": + allwantsp.append(card["name"]) + else: + allwantch.append(card["name"]) + choicelist = allwantch[:choicewant] + speciallist = allwantsp[:specialwant] allwants = [] if dupeswant > 1: allwants.append(str(dupeswant) + " random cards")