Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
MagicTheDev committed Jan 23, 2025
2 parents 1a29709 + 77a499a commit ad2c9fb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions commands/utility/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -40,4 +40,4 @@ stringcase==1.2.0
uvicorn==0.34.0
Wand==0.6.7
websockets==10.3
XlsxWriter==3.0.3
XlsxWriter==3.0.3

0 comments on commit ad2c9fb

Please sign in to comment.