Don’t request cards from decks with pending cards at the art shop (for real this time)

This commit is contained in:
mez 2025-09-06 21:20:17 +01:00
parent f18ce22b47
commit b0932e503a

View file

@ -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: