Don’t request cards from decks with pending cards at the art shop (for real this time)
This commit is contained in:
parent
f18ce22b47
commit
b0932e503a
1 changed files with 24 additions and 16 deletions
24
tools.py
24
tools.py
|
@ -879,7 +879,8 @@ def artshop():
|
||||||
requestred.append(card)
|
requestred.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestred:
|
for card in requestred:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestred = []
|
requestred = []
|
||||||
|
@ -894,7 +895,8 @@ def artshop():
|
||||||
requestorange.append(card)
|
requestorange.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestorange:
|
for card in requestorange:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestorange = []
|
requestorange = []
|
||||||
|
@ -909,7 +911,8 @@ def artshop():
|
||||||
requestyellow.append(card)
|
requestyellow.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestyellow:
|
for card in requestyellow:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestyellow = []
|
requestyellow = []
|
||||||
|
@ -924,7 +927,8 @@ def artshop():
|
||||||
requestgreen.append(card)
|
requestgreen.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestgreen:
|
for card in requestgreen:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestgreen = []
|
requestgreen = []
|
||||||
|
@ -939,7 +943,8 @@ def artshop():
|
||||||
requestblue.append(card)
|
requestblue.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestblue:
|
for card in requestblue:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestblue = []
|
requestblue = []
|
||||||
|
@ -954,7 +959,8 @@ def artshop():
|
||||||
requestpurple.append(card)
|
requestpurple.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestpurple:
|
for card in requestpurple:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestpurple = []
|
requestpurple = []
|
||||||
|
@ -969,7 +975,8 @@ def artshop():
|
||||||
requestbrown.append(card)
|
requestbrown.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestbrown:
|
for card in requestbrown:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestbrown = []
|
requestbrown = []
|
||||||
|
@ -984,7 +991,8 @@ def artshop():
|
||||||
requestgrey.append(card)
|
requestgrey.append(card)
|
||||||
proceed = True
|
proceed = True
|
||||||
for card in requestgrey:
|
for card in requestgrey:
|
||||||
if card["name"] in colors.pends:
|
for pendcard in colors.pends:
|
||||||
|
if pendcard[:-2] == card["name"][:-2]:
|
||||||
proceed = False
|
proceed = False
|
||||||
if not proceed:
|
if not proceed:
|
||||||
requestgrey = []
|
requestgrey = []
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue