Don’t request cards of colours with pending cards at the art shop
This commit is contained in:
parent
696a1bfbbd
commit
a08375c4f9
1 changed files with 48 additions and 0 deletions
48
tools.py
48
tools.py
|
@ -878,6 +878,12 @@ def artshop():
|
||||||
for card in potentialred:
|
for card in potentialred:
|
||||||
if card["name"][:-2] != wantred[colors.crayred]["name"][:-2]:
|
if card["name"][:-2] != wantred[colors.crayred]["name"][:-2]:
|
||||||
requestred.append(card)
|
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:
|
if len(requestred) > 0:
|
||||||
for card in requestred:
|
for card in requestred:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
@ -887,6 +893,12 @@ def artshop():
|
||||||
for card in potentialorange:
|
for card in potentialorange:
|
||||||
if card["name"][:-2] != wantorange[colors.crayorange]["name"][:-2]:
|
if card["name"][:-2] != wantorange[colors.crayorange]["name"][:-2]:
|
||||||
requestorange.append(card)
|
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:
|
if len(requestorange) > 0:
|
||||||
for card in requestorange:
|
for card in requestorange:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
@ -896,6 +908,12 @@ def artshop():
|
||||||
for card in potentialyellow:
|
for card in potentialyellow:
|
||||||
if card["name"][:-2] != wantyellow[colors.crayyellow]["name"][:-2]:
|
if card["name"][:-2] != wantyellow[colors.crayyellow]["name"][:-2]:
|
||||||
requestyellow.append(card)
|
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:
|
if len(requestyellow) > 0:
|
||||||
for card in requestyellow:
|
for card in requestyellow:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
@ -905,6 +923,12 @@ def artshop():
|
||||||
for card in potentialgreen:
|
for card in potentialgreen:
|
||||||
if card["name"][:-2] != wantgreen[colors.craygreen]["name"][:-2]:
|
if card["name"][:-2] != wantgreen[colors.craygreen]["name"][:-2]:
|
||||||
requestgreen.append(card)
|
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:
|
if len(requestgreen) > 0:
|
||||||
for card in requestgreen:
|
for card in requestgreen:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
@ -914,6 +938,12 @@ def artshop():
|
||||||
for card in potentialblue:
|
for card in potentialblue:
|
||||||
if card["name"][:-2] != wantblue[colors.crayblue]["name"][:-2]:
|
if card["name"][:-2] != wantblue[colors.crayblue]["name"][:-2]:
|
||||||
requestblue.append(card)
|
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:
|
if len(requestblue) > 0:
|
||||||
for card in requestblue:
|
for card in requestblue:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
@ -923,6 +953,12 @@ def artshop():
|
||||||
for card in potentialpurple:
|
for card in potentialpurple:
|
||||||
if card["name"][:-2] != wantpurple[colors.craypurple]["name"][:-2]:
|
if card["name"][:-2] != wantpurple[colors.craypurple]["name"][:-2]:
|
||||||
requestpurple.append(card)
|
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:
|
if len(requestpurple) > 0:
|
||||||
for card in requestpurple:
|
for card in requestpurple:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
@ -932,6 +968,12 @@ def artshop():
|
||||||
for card in potentialbrown:
|
for card in potentialbrown:
|
||||||
if card["name"][:-2] != wantbrown[colors.craybrown]["name"][:-2]:
|
if card["name"][:-2] != wantbrown[colors.craybrown]["name"][:-2]:
|
||||||
requestbrown.append(card)
|
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:
|
if len(requestbrown) > 0:
|
||||||
for card in requestbrown:
|
for card in requestbrown:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
@ -941,6 +983,12 @@ def artshop():
|
||||||
for card in potentialgrey:
|
for card in potentialgrey:
|
||||||
if card["name"][:-2] != wantgrey[colors.craygrey]["name"][:-2]:
|
if card["name"][:-2] != wantgrey[colors.craygrey]["name"][:-2]:
|
||||||
requestgrey.append(card)
|
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:
|
if len(requestgrey) > 0:
|
||||||
for card in requestgrey:
|
for card in requestgrey:
|
||||||
requestcards.append(card["name"])
|
requestcards.append(card["name"])
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue