Compare commits

..

No commits in common. "ab0c692141acb5ae08556799d57d6d990d36db75" and "a8783c95743ad9d812cf1974c7cf004b70c5169d" have entirely different histories.

View file

@ -406,6 +406,7 @@ def nextportfolio(monochrome=False):
print("Master some more decks first") print("Master some more decks first")
def switchit(): def switchit():
wantedbypriority = sorted(colors.wantedlist, key=lambda d: d["priority"])
redtrade = [] redtrade = []
orangetrade = [] orangetrade = []
yellowtrade = [] yellowtrade = []
@ -433,7 +434,7 @@ def switchit():
elif card["colour"] == "gray": elif card["colour"] == "gray":
greytrade.append(card["name"]) greytrade.append(card["name"])
wantednames = [] wantednames = []
for card in colors.wantedlist: for card in wantedbypriority:
wantednames.append(card["name"]) wantednames.append(card["name"])
wantall = [] wantall = []
tradeall = [] tradeall = []
@ -1707,13 +1708,9 @@ def natsume():
natsuwantgrouped.append(listone) natsuwantgrouped.append(listone)
listone = [] listone = []
listone.append(card) listone.append(card)
if index + 1 == len(natsuwant):
natsuwantgrouped.append(listone)
else: else:
listone = [] listone = []
listone.append(card) listone.append(card)
if len(natsuwant) == 1:
natsuwantgrouped.append(listone)
index += 1 index += 1
index = 0 index = 0
for card in natsugivech: for card in natsugivech:
@ -1726,13 +1723,9 @@ def natsume():
natsugivechgrouped.append(listtwo) natsugivechgrouped.append(listtwo)
listtwo = [] listtwo = []
listtwo.append(card["name"]) listtwo.append(card["name"])
if index + 1 == len(natsugivech):
natsugivechgrouped.append(listtwo)
else: else:
listtwo = [] listtwo = []
listtwo.append(card["name"]) listtwo.append(card["name"])
if len(natsugivech) == 1:
natsugivechgrouped.append(listtwo)
index += 1 index += 1
index = 0 index = 0
for card in natsugivesp: for card in natsugivesp:
@ -1745,57 +1738,54 @@ def natsume():
natsugivespgrouped.append(listthree) natsugivespgrouped.append(listthree)
listthree = [] listthree = []
listthree.append(card["name"]) listthree.append(card["name"])
if index + 1 == len(natsugivesp):
natsugivespgrouped.append(listthree)
else: else:
listthree = [] listthree = []
listthree.append(card["name"]) listthree.append(card["name"])
if len(natsugivesp) == 1:
natsugivespgrouped.append(listthree)
index += 1 index += 1
natsugivechgrouped = natsugivechgrouped[:5] natsugivechgrouped = natsugivechgrouped[:5]
natsugivespgrouped = natsugivespgrouped[:5] natsugivespgrouped = natsugivespgrouped[:5]
finalwant = [] finalwant = []
finalgive = [] finalgive = []
for group in natsuwantgrouped: for group in natsuwantgrouped:
if group[0]["colour"] == "special": if len(finalwant) < 5:
if len(natsugivespgrouped) > 0: if group[0]["colour"] == "special":
if natsugivespgrouped[0][0][:-2] == group[0]["name"][:-2]: if len(natsugivespgrouped) > 0:
if len(natsugivespgrouped) > 1: if natsugivespgrouped[0][0][:-2] == group[0]["name"][:-2]:
group = group[:len(natsugivespgrouped[1])] if len(natsugivespgrouped) > 1:
natsugivespgrouped[1] = natsugivespgrouped[1][:len(group)] group = group[:len(natsugivespgrouped[1])]
for givecard in natsugivespgrouped[1]: natsugivespgrouped[1] = natsugivespgrouped[1][:len(group)]
for givecard in natsugivespgrouped[1]:
finalgive.append(givecard)
natsugivespgrouped.pop(1)
for card in group:
finalwant.append(card["name"])
else:
group = group[:len(natsugivespgrouped[0])]
natsugivespgrouped[0] = natsugivespgrouped[0][:len(group)]
for givecard in natsugivespgrouped[0]:
finalgive.append(givecard) finalgive.append(givecard)
natsugivespgrouped.pop(1) natsugivespgrouped.pop(0)
for card in group: for card in group:
finalwant.append(card["name"]) finalwant.append(card["name"])
else: else:
group = group[:len(natsugivespgrouped[0])] if len(natsugivechgrouped) > 0:
natsugivespgrouped[0] = natsugivespgrouped[0][:len(group)] if natsugivechgrouped[0][0][:-2] == group[0]["name"][:-2]:
for givecard in natsugivespgrouped[0]: if len(natsugivechgrouped) > 1:
finalgive.append(givecard) group = group[:len(natsugivechgrouped[1])]
natsugivespgrouped.pop(0) natsugivechgrouped[1] = natsugivechgrouped[1][:len(group)]
for card in group: for givecard in natsugivechgrouped[1]:
finalwant.append(card["name"]) finalgive.append(givecard)
else: natsugivechgrouped.pop(1)
if len(natsugivechgrouped) > 0: for card in group:
if natsugivechgrouped[0][0][:-2] == group[0]["name"][:-2]: finalwant.append(card["name"])
if len(natsugivechgrouped) > 1: else:
group = group[:len(natsugivechgrouped[1])] group = group[:len(natsugivechgrouped[0])]
natsugivechgrouped[1] = natsugivechgrouped[1][:len(group)] natsugivechgrouped[0] = natsugivechgrouped[0][:len(group)]
for givecard in natsugivechgrouped[1]: for givecard in natsugivechgrouped[0]:
finalgive.append(givecard) finalgive.append(givecard)
natsugivechgrouped.pop(1) natsugivechgrouped.pop(0)
for card in group: for card in group:
finalwant.append(card["name"]) finalwant.append(card["name"])
else:
group = group[:len(natsugivechgrouped[0])]
natsugivechgrouped[0] = natsugivechgrouped[0][:len(group)]
for givecard in natsugivechgrouped[0]:
finalgive.append(givecard)
natsugivechgrouped.pop(0)
for card in group:
finalwant.append(card["name"])
finalwant = finalwant[:5] finalwant = finalwant[:5]
finalgive = finalgive[:5] finalgive = finalgive[:5]
if len(finalwant) > 0: if len(finalwant) > 0: