Add a currency along with various uses #296

flaree · 2024-06-27T14:19:49Z

Adds a currency (configurable name in config).

TODO:

Add configurable currency and name.
Add rarity tiers and assignable value and coin amount.
Gain X coins on each countryball catch, depending on ball rarity.
Add balls dispose - dispose of a ball for 1/2 the worth.
Add player balance to view your balance.
Add ability to use coins in trades.
Wandering 'salesman' who will sell random countryballs, will be a random spawn similar to countryballs but rarer. (possibly out of scope)

Future work for later additions:

Marketplace with buying, selling and auctions
Achievements will give coins depending on their 'hardness'

This reverts commit 3c2d869.

Added ability to trade with coins

Kowlin · 2024-08-21T13:09:26Z

Mention me when this is ready for review. Wanna have a second pair of eyes on it.

Kowlin

The issue from packages/trade/menu#L318 has to be fixed before this can be merged.

Kowlin · 2024-08-21T13:36:23Z

ballsdex/core/models.py

+        if self.coins < amount:
+            raise ValueError("Not enough coins")
+        self.coins -= amount
+        await self.save(update_fields=("coins",))


add_coins and remove_coins should probably return some output on its status as confirmation.

I think raising an error is appropriate as a way to confirm things went well

Kowlin · 2024-08-21T13:39:51Z

ballsdex/packages/balls/cog.py

@@ -621,6 +621,44 @@ async def count(
            f"{country}{settings.collectible_name}{plural}{guild}."
        )

+    @app_commands.command()
+    async def dispose(self, interaction: discord.Interaction, ball: BallInstanceTransform):


Not sure if dispose is the best naming for this command, it seems a bit negative. perhaps exchange

dispose sounds fine to me, exchange may be confused with trading. What about sell maybe?

ballsdex/packages/trade/cog.py

ballsdex/packages/trade/menu.py

Admin only

Added a way to add or remove coins from a user

MaxxMXSZ · 2024-10-16T15:28:36Z

About the wandering trader it would be better to make a separate pr for it after coin have been merge. Mainly to evaluate how much members value the coin to give the set value for shops!

imtherealF1

this pr also breaks the trade display and that needs some fixes

ballsdex/packages/balls/cog.py

ballsdex/packages/trade/cog.py

ballsdex/settings.py

Co-authored-by: imtherealF1 <[email protected]>

MaxxMXSZ · 2024-10-27T14:54:43Z

Putting this as DRAFT again, i will run through all the changes myself and fix some broken stuff.

OLi51 · 2024-12-12T15:10:20Z

this is my idea :(

OLi51 · 2024-12-12T15:12:02Z

except i used different command names

ballsdex/packages/admin/cog.py

ballsdex/packages/trade/cog.py

ballsdex/packages/trade/menu.py

imtherealF1 · 2024-12-12T16:26:48Z

also, if config.yml isn't updated hence no rarities, /dispose will give a KeyError: 'legendary', and in general settings.rarities = content.get("rarities", {}) doesnt work

laggron42 · 2024-12-13T15:14:05Z

this is my idea :(

@OLi51 This was considered since before Ballsdex was even released to the public. We haven't looked for any fork or other code for getting inspirations (unless they bring it up to us as suggestions), and besides it's not hard to get that kind of idea.

I don't really understand the goal of your comment? You don't have any code uploaded, there's no contribution from you. If you want to add features, you are free and welcome to open pull requests, then you'll be properly credited. I find it kinda sad to see people developing private features for themselves and wanting exclusivity, when I want to encourage sharing and contributions, that's why the bot is open source to begin with.

Copilot

Copilot reviewed 5 out of 13 changed files in this pull request and generated 1 comment.

Files not reviewed (8)

migrations/models/36_20241015161531_update.sql: Language not supported
ballsdex/packages/trade/display.py: Evaluated as low risk
ballsdex/packages/countryballs/components.py: Evaluated as low risk
ballsdex/core/utils/enums.py: Evaluated as low risk
ballsdex/packages/trade/trade_user.py: Evaluated as low risk
ballsdex/settings.py: Evaluated as low risk
ballsdex/core/admin/resources.py: Evaluated as low risk
ballsdex/core/models.py: Evaluated as low risk

Comments suppressed due to low confidence (3)

ballsdex/packages/trade/menu.py:203

The comment should be 'updates every 5 seconds'.

A loop task that updates each 5 second the menu with the new content.

ballsdex/packages/trade/menu.py:308

The error message for InvalidTradeOperation should be more descriptive.

raise InvalidTradeOperation()

ballsdex/packages/trade/menu.py:333

The comment should be 'This is an invalid mutation'.

// This is a invalid mutation, the player is not the owner of the countryball

ballsdex/packages/trade/menu.py

Co-authored-by: imtherealF1 <[email protected]>

laggron42 · 2024-12-17T15:47:00Z

ballsdex/core/models.py

+        if self.coins < amount:
+            raise ValueError("Not enough coins")
+        self.coins -= amount
+        await self.save(update_fields=("coins",))


I think raising an error is appropriate as a way to confirm things went well

laggron42 · 2024-12-17T15:49:20Z

ballsdex/packages/admin/cog.py

+        user: discord.User | None = None,
+        user_id: str | None = None,
+        amount: int = 0,


amount should be a required parameter

Suggested change

user: discord.User | None = None,

user_id: str | None = None,

amount: int = 0,

amount: int,

user: discord.User | None = None,

user_id: str | None = None,

laggron42 · 2024-12-17T15:49:58Z

ballsdex/packages/admin/cog.py

+        user: discord.User | None = None,
+        user_id: str | None = None,
+        amount: int = 0,


Same here

Suggested change

user: discord.User | None = None,

user_id: str | None = None,

amount: int = 0,

amount: int,

user: discord.User | None = None,

user_id: str | None = None,

laggron42 · 2024-12-17T15:50:37Z

ballsdex/packages/balls/cog.py

@@ -621,6 +621,44 @@ async def count(
            f"{country}{settings.collectible_name}{plural}{guild}."
        )

+    @app_commands.command()
+    async def dispose(self, interaction: discord.Interaction, ball: BallInstanceTransform):


dispose sounds fine to me, exchange may be confused with trading. What about sell maybe?

laggron42 · 2024-12-17T15:59:37Z

ballsdex/packages/trade/trade_user.py

+        self.coins -= amount
+
+    async def fetch_player_coins(self) -> int:
+        player, _ = await Player.get_or_create(discord_id=self.user.id)


Makes the query a little lighter. Could also reuse the existing Player model and call .refresh_from_db

Suggested change

player, _ = await Player.get_or_create(discord_id=self.user.id)

player, _ = await Player.get_or_create(discord_id=self.user.id).only("coins")

laggron42 · 2024-12-17T16:01:56Z

ballsdex/packages/trade/menu.py

+        self.initial_coins_trader1 = trader1.coins
+        self.initial_coins_trader2 = trader2.coins


These attributes are unused

flaree added 2 commits June 27, 2024 15:14

Initial work on coins

de1ab70

add back return

ec7b71d

flaree requested a review from laggron42 June 27, 2024 14:19

MaxxMXSZ and others added 10 commits June 30, 2024 18:55

Add coin trade feature and admin panel coin addition

3c2d869

Revert "Add coin trade feature and admin panel coin addition"

56d7b0e

This reverts commit 3c2d869.

hhh

c25a36a

yippie

ba3cb9a

comma

d0398de

mcchicken

710c995

quick fixes

2c320a7

sorry was trying something else forgot to remove

4650679

Merge pull request #5 from MaxxMXSZ/coin

fb28805

Added ability to trade with coins

add coins to trade - draft

c112f22

Kowlin self-requested a review August 21, 2024 13:08

Kowlin requested changes Aug 21, 2024

View reviewed changes

MaxxMXSZ and others added 4 commits August 21, 2024 15:55

Added a way to add or remove coins from a user

6e48da8

Admin only

Kowlin requested update

374a8ad

add false deleted stuff back

e412be0

Merge pull request #6 from flaree/Coins2.0

ebc4fad

Added a way to add or remove coins from a user

laggron42 added 3 commits October 15, 2024 15:46

admin: fixed coins command logic

856287a

history: fix coin display

12163dc

change line endings

710120e

laggron42 added 2 commits October 15, 2024 16:02

Merge branch 'master' into feat/coins

1aaca24

migrations: regenerate

0f4bfb7

MaxxMXSZ requested a review from Kowlin October 16, 2024 15:25

MaxxMXSZ marked this pull request as ready for review October 16, 2024 15:26

imtherealF1 suggested changes Oct 27, 2024

View reviewed changes

MaxxMXSZ and others added 6 commits October 27, 2024 15:40

Update ballsdex/packages/balls/cog.py

e5663ea

Co-authored-by: imtherealF1 <[email protected]>

Update ballsdex/packages/balls/cog.py

b75d286

Co-authored-by: imtherealF1 <[email protected]>

Update ballsdex/packages/trade/cog.py

ab3f5d3

Co-authored-by: imtherealF1 <[email protected]>

Update ballsdex/packages/trade/cog.py

f432b4e

Co-authored-by: imtherealF1 <[email protected]>

Update ballsdex/settings.py

9a421ad

Co-authored-by: imtherealF1 <[email protected]>

Update ballsdex/settings.py

e076313

Co-authored-by: imtherealF1 <[email protected]>

MaxxMXSZ marked this pull request as draft October 27, 2024 14:54

MaxxMXSZ added 2 commits October 27, 2024 16:56

Bug fixes regarding display, settings and trade's cog.py

6c3fe13

Bug fixes regardings display and changes to trade's cog.py and settings

f40926d

MaxxMXSZ marked this pull request as ready for review October 28, 2024 12:25

Merge branch 'master' into feat/coins

91c0b06

imtherealF1 suggested changes Dec 12, 2024

View reviewed changes

ballsdex/packages/admin/cog.py Outdated Show resolved Hide resolved

ballsdex/packages/trade/cog.py Outdated Show resolved Hide resolved

ballsdex/packages/trade/menu.py Outdated Show resolved Hide resolved

flaree requested a review from Copilot December 13, 2024 15:44

Copilot AI reviewed Dec 13, 2024

View reviewed changes

ballsdex/packages/trade/menu.py Show resolved Hide resolved

laggron42 and others added 3 commits December 17, 2024 16:37

Merge branch 'master' into feat/coins

f3deb78

Apply suggestions from code review

1034f6d

Co-authored-by: imtherealF1 <[email protected]>

oopsie during merge

84b80ab

laggron42 reviewed Dec 17, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add a currency along with various uses #296

Add a currency along with various uses #296

flaree commented Jun 27, 2024 •

edited by MaxxMXSZ

Loading

Kowlin commented Aug 21, 2024

Kowlin left a comment

Kowlin Aug 21, 2024

laggron42 Dec 17, 2024

Kowlin Aug 21, 2024

laggron42 Dec 17, 2024

MaxxMXSZ commented Oct 16, 2024

imtherealF1 left a comment

MaxxMXSZ commented Oct 27, 2024

OLi51 commented Dec 12, 2024

OLi51 commented Dec 12, 2024

imtherealF1 commented Dec 12, 2024

laggron42 commented Dec 13, 2024

Copilot AI left a comment

laggron42 Dec 17, 2024

laggron42 Dec 17, 2024

laggron42 Dec 17, 2024

laggron42 Dec 17, 2024

laggron42 Dec 17, 2024

laggron42 Dec 17, 2024

	player, _ = await Player.get_or_create(discord_id=self.user.id)
	player, _ = await Player.get_or_create(discord_id=self.user.id).only("coins")

		self.initial_coins_trader1 = trader1.coins
		self.initial_coins_trader2 = trader2.coins

Add a currency along with various uses #296

Are you sure you want to change the base?

Add a currency along with various uses #296

Conversation

flaree commented Jun 27, 2024 • edited by MaxxMXSZ Loading

Kowlin commented Aug 21, 2024

Kowlin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MaxxMXSZ commented Oct 16, 2024

imtherealF1 left a comment

Choose a reason for hiding this comment

MaxxMXSZ commented Oct 27, 2024

OLi51 commented Dec 12, 2024

OLi51 commented Dec 12, 2024

imtherealF1 commented Dec 12, 2024

laggron42 commented Dec 13, 2024

Copilot AI left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

flaree commented Jun 27, 2024 •

edited by MaxxMXSZ

Loading