|
|
@ -2599,11 +2599,11 @@ def tradegen(colour=False):
|
|
|
|
content.write(", ")
|
|
|
|
content.write(", ")
|
|
|
|
content.write(card["name"])
|
|
|
|
content.write(card["name"])
|
|
|
|
precomma = True
|
|
|
|
precomma = True
|
|
|
|
elif card["colour"] == colour:
|
|
|
|
elif card["colour"] == colour:
|
|
|
|
if precomma:
|
|
|
|
if precomma:
|
|
|
|
content.write(", ")
|
|
|
|
content.write(", ")
|
|
|
|
content.write(card["name"])
|
|
|
|
content.write(card["name"])
|
|
|
|
precomma = True
|
|
|
|
precomma = True
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
if precomma:
|
|
|
|
if precomma:
|
|
|
|
content.write(", ")
|
|
|
|
content.write(", ")
|
|
|
@ -2615,8 +2615,8 @@ def tradegen(colour=False):
|
|
|
|
if colour == "recent":
|
|
|
|
if colour == "recent":
|
|
|
|
if card["received"].month == datetime.datetime.now().month and card["received"].year == datetime.datetime.now().year:
|
|
|
|
if card["received"].month == datetime.datetime.now().month and card["received"].year == datetime.datetime.now().year:
|
|
|
|
content.write(printcard(card))
|
|
|
|
content.write(printcard(card))
|
|
|
|
elif card["colour"] == colour:
|
|
|
|
elif card["colour"] == colour:
|
|
|
|
content.write(printcard(card))
|
|
|
|
content.write(printcard(card))
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
content.write(printcard(card))
|
|
|
|
content.write(printcard(card))
|
|
|
|
content.write("</p>\n")
|
|
|
|
content.write("</p>\n")
|
|
|
|