From a08375c4f9efb351fd67b5c72828d6514fda8800 Mon Sep 17 00:00:00 2001 From: Mez Date: Sun, 3 Aug 2025 13:56:20 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20request=20cards=20of=20colours?= =?UTF-8?q?=20with=20pending=20cards=20at=20the=20art=20shop?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tools.py b/tools.py index 59422a8..d6adaed 100644 --- a/tools.py +++ b/tools.py @@ -878,6 +878,12 @@ def artshop(): for card in potentialred: if card["name"][:-2] != wantred[colors.crayred]["name"][:-2]: requestred.append(card) + proceed = True + for card in requestred: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestred = [] if len(requestred) > 0: for card in requestred: requestcards.append(card["name"]) @@ -887,6 +893,12 @@ def artshop(): for card in potentialorange: if card["name"][:-2] != wantorange[colors.crayorange]["name"][:-2]: requestorange.append(card) + proceed = True + for card in requestorange: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestorange = [] if len(requestorange) > 0: for card in requestorange: requestcards.append(card["name"]) @@ -896,6 +908,12 @@ def artshop(): for card in potentialyellow: if card["name"][:-2] != wantyellow[colors.crayyellow]["name"][:-2]: requestyellow.append(card) + proceed = True + for card in requestyellow: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestyellow = [] if len(requestyellow) > 0: for card in requestyellow: requestcards.append(card["name"]) @@ -905,6 +923,12 @@ def artshop(): for card in potentialgreen: if card["name"][:-2] != wantgreen[colors.craygreen]["name"][:-2]: requestgreen.append(card) + proceed = True + for card in requestgreen: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestgreen = [] if len(requestgreen) > 0: for card in requestgreen: requestcards.append(card["name"]) @@ -914,6 +938,12 @@ def artshop(): for card in potentialblue: if card["name"][:-2] != wantblue[colors.crayblue]["name"][:-2]: requestblue.append(card) + proceed = True + for card in requestblue: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestblue = [] if len(requestblue) > 0: for card in requestblue: requestcards.append(card["name"]) @@ -923,6 +953,12 @@ def artshop(): for card in potentialpurple: if card["name"][:-2] != wantpurple[colors.craypurple]["name"][:-2]: requestpurple.append(card) + proceed = True + for card in requestpurple: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestpurple = [] if len(requestpurple) > 0: for card in requestpurple: requestcards.append(card["name"]) @@ -932,6 +968,12 @@ def artshop(): for card in potentialbrown: if card["name"][:-2] != wantbrown[colors.craybrown]["name"][:-2]: requestbrown.append(card) + proceed = True + for card in requestbrown: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestbrown = [] if len(requestbrown) > 0: for card in requestbrown: requestcards.append(card["name"]) @@ -941,6 +983,12 @@ def artshop(): for card in potentialgrey: if card["name"][:-2] != wantgrey[colors.craygrey]["name"][:-2]: requestgrey.append(card) + proceed = True + for card in requestgrey: + if card["name"] in colors.pends: + proceed = False + if not proceed: + requestgrey = [] if len(requestgrey) > 0: for card in requestgrey: requestcards.append(card["name"])