Fix art shop function again

tools.py

@@ -878,13 +878,16 @@ def artshop():
     potentialred = []
     requestred = []
     added = 0
+    extrared = 0
     for card in wantred:
         if added < colors.crayred:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extrared += 1
+            else:
                 potentialred.append(card)
                 added += 1
     for card in potentialred:
-        if card["name"][:-2] != wantred[colors.crayred]["name"][:-2]:
+        if card["name"][:-2] != wantred[colors.crayred + extrared]["name"][:-2]:
             requestred.append(card)
     if len(requestred) > 0:
         for card in requestred:
@@ -892,13 +895,16 @@ def artshop():
     potentialorange = []
     requestorange = []
     added = 0
+    extraorange = 0
     for card in wantorange:
         if added < colors.crayorange:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extraorange += 1
+            else:
                 potentialorange.append(card)
                 added += 1
     for card in potentialorange:
-        if card["name"][:-2] != wantorange[colors.crayorange]["name"][:-2]:
+        if card["name"][:-2] != wantorange[colors.crayorange + extraorange]["name"][:-2]:
             requestorange.append(card)
     if len(requestorange) > 0:
         for card in requestorange:
@@ -906,13 +912,16 @@ def artshop():
     potentialyellow = []
     requestyellow = []
     added = 0
+    extrayellow = 0
     for card in wantyellow:
         if added < colors.crayyellow:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extrayellow += 1
+            else:
                 potentialyellow.append(card)
                 added += 1
     for card in potentialyellow:
-        if card["name"][:-2] != wantyellow[colors.crayyellow]["name"][:-2]:
+        if card["name"][:-2] != wantyellow[colors.crayyellow + extrayellow]["name"][:-2]:
             requestyellow.append(card)
     if len(requestyellow) > 0:
         for card in requestyellow:
@@ -920,13 +929,16 @@ def artshop():
     potentialgreen = []
     requestgreen = []
     added = 0
+    extragreen = 0
     for card in wantgreen:
         if added < colors.craygreen:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extragreen += 1
+            else:
                 potentialgreen.append(card)
                 added += 1
     for card in potentialgreen:
-        if card["name"][:-2] != wantgreen[colors.craygreen]["name"][:-2]:
+        if card["name"][:-2] != wantgreen[colors.craygreen + extragreen]["name"][:-2]:
             requestgreen.append(card)
     if len(requestgreen) > 0:
         for card in requestgreen:
@@ -934,13 +946,16 @@ def artshop():
     potentialblue = []
     requestblue = []
     added = 0
+    extrablue = 0
     for card in wantblue:
         if added < colors.crayblue:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extrablue += 1
+            else:
                 potentialblue.append(card)
                 added += 1
     for card in potentialblue:
-        if card["name"][:-2] != wantblue[colors.crayblue]["name"][:-2]:
+        if card["name"][:-2] != wantblue[colors.crayblue + extrablue]["name"][:-2]:
             requestblue.append(card)
     if len(requestblue) > 0:
         for card in requestblue:
@@ -948,13 +963,16 @@ def artshop():
     potentialpurple = []
     requestpurple = []
     added = 0
+    extrapurple= 0
     for card in wantpurple:
         if added < colors.craypurple:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extrapurple += 1
+            else:
                 potentialpurple.append(card)
                 added += 1
     for card in potentialpurple:
-        if card["name"][:-2] != wantpurple[colors.craypurple]["name"][:-2]:
+        if card["name"][:-2] != wantpurple[colors.craypurple + extrapurple]["name"][:-2]:
             requestpurple.append(card)
     if len(requestpurple) > 0:
         for card in requestpurple:
@@ -962,13 +980,16 @@ def artshop():
     potentialbrown = []
     requestbrown = []
     added = 0
+    extrabrown = 0
     for card in wantbrown:
         if added < colors.craybrown:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extrabrown += 1
+            else:
                 potentialbrown.append(card)
                 added += 1
     for card in potentialbrown:
-        if card["name"][:-2] != wantbrown[colors.craybrown]["name"][:-2]:
+        if card["name"][:-2] != wantbrown[colors.craybrown + extrabrown]["name"][:-2]:
             requestbrown.append(card)
     if len(requestbrown) > 0:
         for card in requestbrown:
@@ -976,13 +997,16 @@ def artshop():
     potentialgrey = []
     requestgrey = []
     added = 0
+    extragrey = 0
     for card in wantgrey:
         if added < colors.craygrey:
-            if card["name"][:-2] not in penddecks:
+            if card["name"][:-2] in penddecks:
+                extragrey += 1
+            else:
                 potentialgrey.append(card)
                 added += 1
     for card in potentialgrey:
-        if card["name"][:-2] != wantgrey[colors.craygrey]["name"][:-2]:
+        if card["name"][:-2] != wantgrey[colors.craygrey + extragrey]["name"][:-2]:
             requestgrey.append(card)
     if len(requestgrey) > 0:
         for card in requestgrey: