Compare commits

...

3 commits

Author SHA1 Message Date
f812467f5e v0.8.2
All checks were successful
Deploy To Production / build (push) Successful in 10s
Deploy To Production / deploy (push) Successful in 14s
2024-10-12 20:53:05 +01:00
2b3649eb39 0.8.2 2024-10-12 20:52:24 +01:00
ffdf2eb04c Fix Trade command not giving a card if they don't already have it in their inventory
All checks were successful
Test / build (push) Successful in 9s
2024-10-12 20:51:22 +01:00
4 changed files with 12 additions and 8 deletions

View file

@ -7,7 +7,7 @@
# any secret values.
BOT_TOKEN=
BOT_VER=0.8.1
BOT_VER=0.8.2
BOT_AUTHOR=Vylpes
BOT_OWNERID=147392775707426816
BOT_CLIENTID=682942374040961060

View file

@ -1,6 +1,6 @@
{
"name": "card-drop",
"version": "0.8.1",
"version": "0.8.2",
"main": "./dist/bot.js",
"typings": "./dist",
"scripts": {

View file

@ -72,8 +72,8 @@ export default class Trade extends ButtonEvent {
return;
}
user1UserInventory1.SetQuantity(user1UserInventory1.Quantity - 1);
user2UserInventory1.SetQuantity(user2UserInventory1.Quantity - 1);
user1UserInventory1.RemoveQuantity(1);
user2UserInventory1.RemoveQuantity(1);
await user1UserInventory1.Save(Inventory, user1UserInventory1);
await user2UserInventory1.Save(Inventory, user2UserInventory1);
@ -82,15 +82,15 @@ export default class Trade extends ButtonEvent {
let user2UserInventory2 = await Inventory.FetchOneByCardNumberAndUserId(user2UserId, user1CardNumber);
if (!user1UserInventory2) {
user1UserInventory2 = new Inventory(user1UserId, user1CardNumber, 1);
user1UserInventory2 = new Inventory(user1UserId, user2CardNumber, 1);
} else {
user1UserInventory2.SetQuantity(user1UserInventory2.Quantity + 1);
user1UserInventory2.AddQuantity(1);
}
if (!user2UserInventory2) {
user2UserInventory2 = new Inventory(user2UserId, user2CardNumber, 1);
user2UserInventory2 = new Inventory(user2UserId, user1CardNumber, 1);
} else {
user2UserInventory2.SetQuantity(user2UserInventory2.Quantity + 1);
user2UserInventory2.AddQuantity(1);
}
await user1UserInventory2.Save(Inventory, user1UserInventory2);

View file

@ -29,6 +29,10 @@ export default class Inventory extends AppBaseEntity {
this.Quantity = quantity;
}
public AddQuantity(amount: number) {
this.Quantity += amount;
}
public RemoveQuantity(amount: number) {
if (this.Quantity < amount) return;