Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add base custom artwork support #379

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use emote in listing
flaree committed Nov 22, 2024
commit ec95a3b243308048c5133b7379707365a2221529
6 changes: 5 additions & 1 deletion ballsdex/packages/balls/countryballs_paginator.py
Original file line number Diff line number Diff line change
@@ -35,9 +35,13 @@ def set_options(self, balls: List[BallInstance]):
favorite = "❤️ " if ball.favorite else ""
shiny = "✨ " if ball.shiny else ""
special = ball.special_emoji(self.bot, True)
custom_art = "🖼️" if "card" in ball.extra_data else ""
options.append(
discord.SelectOption(
label=f"{favorite}{shiny}{special}#{ball.pk:0X} {ball.countryball.country}",
label=(
f"{favorite}{shiny}{custom_art}{special}"
f"#{ball.pk:0X} {ball.countryball.country}"
),
description=(
f"ATK: {ball.attack}({ball.attack_bonus:+d}%) "
f"• HP: {ball.health}({ball.health_bonus:+d}%) • "
6 changes: 5 additions & 1 deletion ballsdex/packages/trade/menu.py
Original file line number Diff line number Diff line change
@@ -401,9 +401,13 @@ def set_options(self, balls: List[BallInstance]):
favorite = "❤️ " if ball.favorite else ""
shiny = "✨ " if ball.shiny else ""
special = ball.special_emoji(self.bot, True)
custom_art = "🖼️" if "card" in ball.extra_data else ""
options.append(
discord.SelectOption(
label=f"{favorite}{shiny}{special}#{ball.pk:0X} {ball.countryball.country}",
label=(
f"{favorite}{shiny}{custom_art}{special}"
f"#{ball.pk:0X} {ball.countryball.country}"
),
description=f"ATK: {ball.attack_bonus:+d}% • HP: {ball.health_bonus:+d}% • "
f"Caught on {ball.catch_date.strftime('%d/%m/%y %H:%M')}",
emoji=emoji,