diff --git a/colors.py b/colors.py index 0464953..d1a7534 100644 --- a/colors.py +++ b/colors.py @@ -270,7 +270,17 @@ for event in log.log: logitems = logitems[::-1] coupons = coupons[::-1] -tradepend = len(list(Counter(tradeout).elements())) - len(list(Counter(tradein).elements())) +tradepend = len(tradeout) - len(tradein) +tradediff = tradeout.copy() +halftrades = [] +if tradepend > 0: + for trade in tradein: + if trade in tradediff: + tradediff.remove(trade) + tradediff = sorted(list(dict.fromkeys(tradediff))) + for trade in tradediff: + cuttrade = trade[11:] + halftrades.append(cuttrade) print("Calculating level") @@ -1310,7 +1320,7 @@ def indexgen(): content.write("rainbow" + " + " + str(levelcrayons - 56)) content.write("\">(" + rank + ")\n") if tradepend > 0: - content.write("
  • " + str(tradepend) + " card") + content.write("
  • " + str(tradepend) + " card") if tradepend > 1: content.write("s") content.write(" held for trades
  • \n")