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.

Sign up for GitHub

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

[trade] adding a check for locked for trade + favorited balls for bulk add #419

Merged
merged 6 commits into from
Sep 28, 2024
Merged

[trade] adding a check for locked for trade + favorited balls for bulk add #419

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ee8197d
not allowing locked balls to be added to a trade with bulk add
imtherealF1 Sep 16, 2024
0d368cf
Merge branch 'master' into bug/tradeable-locked-balls
ltzmax Sep 23, 2024
75f2fda
undo change
imtherealF1 Sep 24, 2024
31773be
re-adding the check + favorited ball check
imtherealF1 Sep 24, 2024
39855f6
Merge branch 'master' into bug/tradeable-locked-balls
imtherealF1 Sep 24, 2024
ff3f383
adding the await i forgot to add
imtherealF1 Sep 25, 2024
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
2 changes: 2 additions & 0 deletions ballsdex/packages/trade/menu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,8 @@ def set_options(self, balls: List[BallInstance]):
for ball in balls:
if ball.is_tradeable is False:
continue
if ball.is_locked():
continue
emoji = self.bot.get_emoji(int(ball.countryball.emoji_id))
favorite = "❤️ " if ball.favorite else ""
shiny = "✨ " if ball.shiny else ""
Expand Down
Loading