From 4fe0a8a6d79407230b63c51e4b859c6b2ece4d08 Mon Sep 17 00:00:00 2001 From: mez Date: Sat, 17 May 2025 10:08:24 +0100 Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20remove=20pending=20trades=20out?= =?UTF-8?q?=20from=20card=20count?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- colors.py | 755 +++++++++++++++++++++++++++++++++++++----------------- tools.py | 6 +- 2 files changed, 525 insertions(+), 236 deletions(-) diff --git a/colors.py b/colors.py index b49c9ef..5f569bd 100644 --- a/colors.py +++ b/colors.py @@ -256,6 +256,133 @@ for event in log.log: logitems = logitems[::-1] coupons = coupons[::-1] +tradepend = len(list(Counter(tradeout).elements())) - len(list(Counter(tradein).elements())) + +print("Calculating level") + +if len(cardlist) + tradepend > 14400: + rankcode = "rainbow" + extra = len(cardlist) + tradepend - 14400 + plusranks = int(extra / 300) + if plusranks > 0: + rank = "rainbow + " + str(plusranks) + else: + rank = "rainbow" +else: + if len(cardlist) + tradepend > 14100: + rank = "himalayan" + elif len(cardlist) + tradepend > 13800: + rank = "puma" + elif len(cardlist) + tradepend > 13500: + rank = "chartreux" + elif len(cardlist) + tradepend > 13200: + rank = "russian blue" + elif len(cardlist) + tradepend > 12900: + rank = "panther" + elif len(cardlist) + tradepend > 12600: + rank = "cheetah" + elif len(cardlist) + tradepend > 12300: + rank = "tiger" + elif len(cardlist) + tradepend > 12000: + rank = "lion" + elif len(cardlist) + tradepend > 11700: + rank = "metal" + elif len(cardlist) + tradepend > 11400: + rank = "ground" + elif len(cardlist) + tradepend > 11100: + rank = "darkness" + elif len(cardlist) + tradepend > 10800: + rank = "water" + elif len(cardlist) + tradepend > 10500: + rank = "nature" + elif len(cardlist) + tradepend > 10200: + rank = "light" + elif len(cardlist) + tradepend > 9900: + rank = "wind" + elif len(cardlist) + tradepend > 9600: + rank = "fire" + elif len(cardlist) + tradepend > 9300: + rank = "mercury" + elif len(cardlist) + tradepend > 9000: + rank = "jupiter" + elif len(cardlist) + tradepend > 8700: + rank = "uranus" + elif len(cardlist) + tradepend > 8400: + rank = "neptune" + elif len(cardlist) + tradepend > 8100: + rank = "earth" + elif len(cardlist) + tradepend > 7800: + rank = "venus" + elif len(cardlist) + tradepend > 7500: + rank = "saturn" + elif len(cardlist) + tradepend > 7200: + rank = "mars" + elif len(cardlist) + tradepend > 6900: + rank = "magnolia" + elif len(cardlist) + tradepend > 6600: + rank = "chocolate cosmos" + elif len(cardlist) + tradepend > 6300: + rank = "lilac" + elif len(cardlist) + tradepend > 6000: + rank = "hydrangea" + elif len(cardlist) + tradepend > 5700: + rank = "clover" + elif len(cardlist) + tradepend > 5400: + rank = "daffodil" + elif len(cardlist) + tradepend > 5100: + rank = "tiger lily" + elif len(cardlist) + tradepend > 4800: + rank = "sakura" + elif len(cardlist) + tradepend > 4500: + rank = "silver" + elif len(cardlist) + tradepend > 4200: + rank = "bronze" + elif len(cardlist) + tradepend > 3900: + rank = "amethyst" + elif len(cardlist) + tradepend > 3600: + rank = "sapphire" + elif len(cardlist) + tradepend > 3300: + rank = "emerald" + elif len(cardlist) + tradepend > 3000: + rank = "gold" + elif len(cardlist) + tradepend > 2700: + rank = "amber" + elif len(cardlist) + tradepend > 2400: + rank = "ruby" + elif len(cardlist) + tradepend > 2200: + rank = "dragon fruit" + elif len(cardlist) + tradepend > 2000: + rank = "apricot" + elif len(cardlist) + tradepend > 1800: + rank = "grape" + elif len(cardlist) + tradepend > 1600: + rank = "blueberry" + elif len(cardlist) + tradepend > 1400: + rank = "lime" + elif len(cardlist) + tradepend > 1200: + rank = "lemon" + elif len(cardlist) + tradepend > 1000: + rank = "tangerine" + elif len(cardlist) + tradepend > 800: + rank = "strawberry" + elif len(cardlist) + tradepend > 700: + rank = "gray" + elif len(cardlist) + tradepend > 600: + rank = "brown" + elif len(cardlist) + tradepend > 500: + rank = "purple" + elif len(cardlist) + tradepend > 400: + rank = "blue" + elif len(cardlist) + tradepend > 300: + rank = "green" + elif len(cardlist) + tradepend > 200: + rank = "yellow" + elif len(cardlist) + tradepend > 100: + rank = "orange" + else: + rank = "red" +rankcode = re.sub(" ","",rank) + print("Getting list of owned decks") portdecks = [] @@ -1004,128 +1131,6 @@ def indexgen(): headerwrite(thefile,"index") content = open(thefile,"a") firstdate = log.log[0]["date"] - if len(cardlist) > 14400: - rankcode = "rainbow" - extra = len(cardlist) - 14400 - plusranks = int(extra / 300) - if plusranks > 0: - rank = "rainbow + " + str(plusranks) - else: - rank = "rainbow" - else: - if len(cardlist) > 14100: - rank = "himalayan" - elif len(cardlist) > 13800: - rank = "puma" - elif len(cardlist) > 13500: - rank = "chartreux" - elif len(cardlist) > 13200: - rank = "russian blue" - elif len(cardlist) > 12900: - rank = "panther" - elif len(cardlist) > 12600: - rank = "cheetah" - elif len(cardlist) > 12300: - rank = "tiger" - elif len(cardlist) > 12000: - rank = "lion" - elif len(cardlist) > 11700: - rank = "metal" - elif len(cardlist) > 11400: - rank = "ground" - elif len(cardlist) > 11100: - rank = "darkness" - elif len(cardlist) > 10800: - rank = "water" - elif len(cardlist) > 10500: - rank = "nature" - elif len(cardlist) > 10200: - rank = "light" - elif len(cardlist) > 9900: - rank = "wind" - elif len(cardlist) > 9600: - rank = "fire" - elif len(cardlist) > 9300: - rank = "mercury" - elif len(cardlist) > 9000: - rank = "jupiter" - elif len(cardlist) > 8700: - rank = "uranus" - elif len(cardlist) > 8400: - rank = "neptune" - elif len(cardlist) > 8100: - rank = "earth" - elif len(cardlist) > 7800: - rank = "venus" - elif len(cardlist) > 7500: - rank = "saturn" - elif len(cardlist) > 7200: - rank = "mars" - elif len(cardlist) > 6900: - rank = "magnolia" - elif len(cardlist) > 6600: - rank = "chocolate cosmos" - elif len(cardlist) > 6300: - rank = "lilac" - elif len(cardlist) > 6000: - rank = "hydrangea" - elif len(cardlist) > 5700: - rank = "clover" - elif len(cardlist) > 5400: - rank = "daffodil" - elif len(cardlist) > 5100: - rank = "tiger lily" - elif len(cardlist) > 4800: - rank = "sakura" - elif len(cardlist) > 4500: - rank = "silver" - elif len(cardlist) > 4200: - rank = "bronze" - elif len(cardlist) > 3900: - rank = "amethyst" - elif len(cardlist) > 3600: - rank = "sapphire" - elif len(cardlist) > 3300: - rank = "emerald" - elif len(cardlist) > 3000: - rank = "gold" - elif len(cardlist) > 2700: - rank = "amber" - elif len(cardlist) > 2400: - rank = "ruby" - elif len(cardlist) > 2200: - rank = "dragon fruit" - elif len(cardlist) > 2000: - rank = "apricot" - elif len(cardlist) > 1800: - rank = "grape" - elif len(cardlist) > 1600: - rank = "blueberry" - elif len(cardlist) > 1400: - rank = "lime" - elif len(cardlist) > 1200: - rank = "lemon" - elif len(cardlist) > 1000: - rank = "tangerine" - elif len(cardlist) > 800: - rank = "strawberry" - elif len(cardlist) > 700: - rank = "gray" - elif len(cardlist) > 600: - rank = "brown" - elif len(cardlist) > 500: - rank = "purple" - elif len(cardlist) > 400: - rank = "blue" - elif len(cardlist) > 300: - rank = "green" - elif len(cardlist) > 200: - rank = "yellow" - elif len(cardlist) > 100: - rank = "orange" - else: - rank = "red" - rankcode = re.sub(" ","",rank) content.write(" 0: content.write("/" + variables.subfolder) @@ -1143,7 +1148,7 @@ def indexgen(): if len(variables.subfolder) > 0: content.write("/" + variables.subfolder) content.write("/assets/banner.png\" loading=\"lazy\">") - content.write("\n