diff --git a/colors.py b/colors.py index 1a4c6d7..9cf636e 100644 --- a/colors.py +++ b/colors.py @@ -553,6 +553,7 @@ for deck in decklist: wantedcard["series"] = deck["series"] wantedcard["priority"] = deck["priority"] wantedcard["mass"] = deck["mass"] + wantedcard["count"] = deck["count"] wantedlist.append(wantedcard) decknames = [] @@ -571,6 +572,7 @@ for deck in variables.lowpriority: wantedcard["colour"] = deckkey[deck]["type"] wantedcard["series"] = deckkey[deck]["series"] wantedcard["priority"] = 3 + wantedcard["count"] = 0 wantedlist.append(wantedcard) for theme in variables.masscollect: @@ -585,6 +587,7 @@ for theme in variables.masscollect: wantedcard["colour"] = deckkey[deck]["type"] wantedcard["series"] = deckkey[deck]["series"] wantedcard["priority"] = 3 + wantedcard["count"] = 0 wantedlist.append(wantedcard) except KeyError: pass @@ -597,6 +600,7 @@ for theme in variables.masscollect: wantedcard["colour"] = deckkey[deck]["type"] wantedcard["series"] = deckkey[deck]["series"] wantedcard["priority"] = 3 + wantedcard["count"] = 0 wantedlist.append(wantedcard) except KeyError: pass @@ -608,11 +612,13 @@ for theme in variables.masscollect: wantedcard["colour"] = deckkey[card[:-2]]["type"] wantedcard["series"] = deckkey[card[:-2]]["series"] wantedcard["priority"] = 3 + wantedcard["count"] = 0 wantedlist.append(wantedcard) except KeyError: pass wantedlist = sorted(wantedlist, key=lambda d: d["name"]) +wantedlist = sorted(wantedlist, key=lambda d: d["count"],reverse=True) wantedlist = sorted(wantedlist, key=lambda d: d["priority"]) removelist = [] @@ -2420,54 +2426,65 @@ def wantedgen(): content.write(", ") content.write(card["name"]) precomma = True - precomma = False content.write("\n

High priority

\n\n

") - for card in wantedlist: - if card["priority"] == 1: - if precomma: - content.write(", ") - content.write(cardtext(card)) - precomma = True + precomma = False + for card in wanthigh: + if precomma: + content.write(", ") + content.write(cardtext(card)) + precomma = True precomma = False content.write("

\n

Medium priority

\n\n

") - for card in wantedlist: - if card["priority"] == 2: - if precomma: - content.write(", ") - content.write(cardtext(card)) - precomma = True + precomma = False + for card in wantmed: + if precomma: + content.write(", ") + content.write(cardtext(card)) + precomma = True precomma = False content.write("

\n

Low priority

\n\n

") - for card in wantedlist: - if card["priority"] == 3: - if precomma: - content.write(", ") - content.write(cardtext(card)) - precomma = True + precomma = False + for card in wantlow: + if precomma: + content.write(", ") + content.write(cardtext(card)) + precomma = True content.write("

\n") content.close() footerwrite(thefile)