From b0932e503a24bc4f512de85b4627f16a8dd20fd8 Mon Sep 17 00:00:00 2001
From: Mez <git@praze.net>
Date: Sat, 6 Sep 2025 21:20:17 +0100
Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20request=20cards=20from=20decks?=
 =?UTF-8?q?=20with=20pending=20cards=20at=20the=20art=20shop=20(for=20real?=
 =?UTF-8?q?=20this=20time)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools.py | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/tools.py b/tools.py
index 04b5138..ea709c8 100644
--- a/tools.py
+++ b/tools.py
@@ -879,8 +879,9 @@ def artshop():
             requestred.append(card)
     proceed = True
     for card in requestred:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestred = []
     if len(requestred) > 0:
@@ -894,8 +895,9 @@ def artshop():
             requestorange.append(card)
     proceed = True
     for card in requestorange:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestorange = []
     if len(requestorange) > 0:
@@ -909,8 +911,9 @@ def artshop():
             requestyellow.append(card)
     proceed = True
     for card in requestyellow:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestyellow = []
     if len(requestyellow) > 0:
@@ -924,8 +927,9 @@ def artshop():
             requestgreen.append(card)
     proceed = True
     for card in requestgreen:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestgreen = []
     if len(requestgreen) > 0:
@@ -939,8 +943,9 @@ def artshop():
             requestblue.append(card)
     proceed = True
     for card in requestblue:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestblue = []
     if len(requestblue) > 0:
@@ -954,8 +959,9 @@ def artshop():
             requestpurple.append(card)
     proceed = True
     for card in requestpurple:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestpurple = []
     if len(requestpurple) > 0:
@@ -969,8 +975,9 @@ def artshop():
             requestbrown.append(card)
     proceed = True
     for card in requestbrown:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestbrown = []
     if len(requestbrown) > 0:
@@ -984,8 +991,9 @@ def artshop():
             requestgrey.append(card)
     proceed = True
     for card in requestgrey:
-        if card["name"] in colors.pends:
-            proceed = False
+        for pendcard in colors.pends:
+            if pendcard[:-2] == card["name"][:-2]:
+                proceed = False
     if not proceed:
         requestgrey = []
     if len(requestgrey) > 0: