From 0f2bb3befef0200f7e9bdf204aa893f70a08d856 Mon Sep 17 00:00:00 2001 From: MagicTheDev <82341152+MagicTheDev@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:23:08 -0600 Subject: [PATCH 1/3] feat: add super troops to CC options --- commands/utility/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/utility/utils.py b/commands/utility/utils.py index 5b643bd7..483ffbc0 100644 --- a/commands/utility/utils.py +++ b/commands/utility/utils.py @@ -90,7 +90,7 @@ async def generate_clan_castle(bot: CustomClient, clan_castle: str) -> tuple[str selections into a python readable dictionary """ user_prompt = f""" - These are the current troops & spells: {str(coc.enums.HOME_TROOP_ORDER + coc.enums.SPELL_ORDER)}, + These are the current troops & spells: {str(coc.enums.HOME_TROOP_ORDER + coc.enums.SPELL_ORDER + coc.enums.SUPER_TROOP_ORDER)}, these are my spells and troops: {clan_castle}. Give me a python readable dictionary like troop/spell: quantity, using the closest available options. If there is no available close and accurate option, please skip. Return ONLY a dictionary and nothing else, From 01ea58a46c89e718d2f2bfe1dc8ed014fbeedcce Mon Sep 17 00:00:00 2001 From: MagicTheDev <82341152+MagicTheDev@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:49:07 -0600 Subject: [PATCH 2/3] feat: add super troops cc options --- commands/utility/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/utility/utils.py b/commands/utility/utils.py index 483ffbc0..435143c6 100644 --- a/commands/utility/utils.py +++ b/commands/utility/utils.py @@ -108,7 +108,7 @@ async def generate_clan_castle(bot: CustomClient, clan_castle: str) -> tuple[str emoji = bot.fetch_emoji(item.name) if item.name in coc.enums.SPELL_ORDER: spells += f'{emoji}`x {str(quantity)}` {item.name}\n' - elif item.name in coc.enums.HOME_TROOP_ORDER: + elif item.name in coc.enums.HOME_TROOP_ORDER or item.name in coc.enums.SUPER_TROOP_ORDER: troops += f'{emoji}`x {str(quantity)}` {item.name}\n' if not item.is_siege_machine: cc_space += item.housing_space * int(quantity) From 77a499a0211fa589a995c98136edc127f974566b Mon Sep 17 00:00:00 2001 From: MagicTheDev <82341152+MagicTheDev@users.noreply.github.com> Date: Wed, 22 Jan 2025 06:42:51 -0600 Subject: [PATCH 3/3] chore: update dependencies --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 230a2363..7e6c201d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ aiocache==0.12.2 APScheduler==3.9.1 ballpark @ git+https://github.com/Mee6/python-ballpark.git chat-exporter==2.8.1 -coc.py==3.8.2 +coc.py==3.8.4 disnake @ git+https://github.com/MagicTheDev/disnake.git disnake-ext-fluent @ git+https://github.com/MagicTheDev/disnake-ext-fluent.git dnspython==2.6.1 @@ -40,4 +40,4 @@ stringcase==1.2.0 uvicorn==0.34.0 Wand==0.6.7 websockets==10.3 -XlsxWriter==3.0.3 \ No newline at end of file +XlsxWriter==3.0.3