Compare commits

..

No commits in common. "c0ac18515f56bad34b68a071800d1fc5349cbe01" and "6561a1c99818a8aa79d0acc70cfc31b5a62de867" have entirely different histories.

12 changed files with 11780 additions and 5979 deletions

View file

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

View file

@ -17,10 +17,9 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 18.x node-version: 18.x
- run: yarn install --frozen-lockfile - run: npm ci
- run: yarn build - run: npm run build
- run: yarn test - run: npm test
- run: yarn lint
- name: "Copy files over to location" - name: "Copy files over to location"
run: cp -r . ${{ secrets.PROD_REPO_PATH }} run: cp -r . ${{ secrets.PROD_REPO_PATH }}

View file

@ -17,10 +17,9 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 18.x node-version: 18.x
- run: yarn install --frozen-lockfile - run: npm ci
- run: yarn build - run: npm run build
- run: yarn test - run: npm test
- run: yarn lint
- name: "Copy files over to location" - name: "Copy files over to location"
run: cp -r . ${{ secrets.STAGE_REPO_PATH }} run: cp -r . ${{ secrets.STAGE_REPO_PATH }}

View file

@ -19,7 +19,6 @@ jobs:
uses: actions/setup-node@v4 uses: actions/setup-node@v4
with: with:
node-version: 18.x node-version: 18.x
- run: yarn install --frozen-lockfile - run: npm ci
- run: yarn build - run: npm run build
- run: yarn test - run: npm test
- run: yarn lint

11758
package-lock.json generated Normal file

File diff suppressed because it is too large Load diff

View file

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

View file

@ -8,14 +8,14 @@ export default class Balance extends Command {
super(); super();
this.CommandBuilder = new SlashCommandBuilder() this.CommandBuilder = new SlashCommandBuilder()
.setName("balance") .setName("balance")
.setDescription("Get your currency balance"); .setDescription("Get your currency balance");
} }
public override async execute(interaction: CommandInteraction) { public override async execute(interaction: CommandInteraction) {
const user = await User.FetchOneById(User, interaction.user.id); const user = await User.FetchOneById(User, interaction.user.id);
const userBalance = user != null ? user.Currency : 0; let userBalance = user != null ? user.Currency : 0;
const embed = new EmbedBuilder() const embed = new EmbedBuilder()
.setColor(EmbedColours.Ok) .setColor(EmbedColours.Ok)

View file

@ -77,7 +77,7 @@ export default class Give extends Command {
} }
const cardNumber = interaction.options.get("cardnumber", true); const cardNumber = interaction.options.get("cardnumber", true);
const user = interaction.options.get("user", true).user!; const user = interaction.options.getUser("user", true);
AppLogger.LogSilly("Commands/Give/GiveCard", `Parameters: cardNumber=${cardNumber.value}, user=${user.id}`); AppLogger.LogSilly("Commands/Give/GiveCard", `Parameters: cardNumber=${cardNumber.value}, user=${user.id}`);
@ -103,7 +103,7 @@ export default class Give extends Command {
private async GiveCurrency(interaction: CommandInteraction) { private async GiveCurrency(interaction: CommandInteraction) {
const amount = interaction.options.get("amount", true); const amount = interaction.options.get("amount", true);
const user = interaction.options.get("user", true).user!; const user = interaction.options.getUser("user", true);
AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`); AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`);

View file

@ -22,9 +22,7 @@ export default class Inventory extends Command {
public override async execute(interaction: CommandInteraction) { public override async execute(interaction: CommandInteraction) {
const page = interaction.options.get("page"); const page = interaction.options.get("page");
const userOption = interaction.options.get("user"); const user = interaction.options.getUser("user") || interaction.user;
const user = userOption ? userOption.user! : interaction.user;
AppLogger.LogSilly("Commands/Inventory", `Parameters: page=${page?.value}, user=${user.id}`); AppLogger.LogSilly("Commands/Inventory", `Parameters: page=${page?.value}, user=${user.id}`);

View file

@ -30,9 +30,9 @@ export default class Trade extends Command {
} }
public override async execute(interaction: CommandInteraction) { public override async execute(interaction: CommandInteraction) {
const user = interaction.options.get("user", true).user!; const user = interaction.options.getUser("user")!;
const give = interaction.options.get("give", true); const give = interaction.options.get("give")!;
const receive = interaction.options.get("receive", true); const receive = interaction.options.get("receive")!;
AppLogger.LogSilly("Commands/Trade", `Parameters: user=${user.id}, give=${give.value}, receive=${receive.value}`); AppLogger.LogSilly("Commands/Trade", `Parameters: user=${user.id}, give=${give.value}, receive=${receive.value}`);

View file

@ -65,11 +65,11 @@ export function GetSacrificeAmount(rarity: CardRarity): number {
case CardRarity.Bronze: case CardRarity.Bronze:
return 5; return 5;
case CardRarity.Silver: case CardRarity.Silver:
return 10; return 15;
case CardRarity.Gold: case CardRarity.Gold:
return 30; return 30;
case CardRarity.Manga: case CardRarity.Manga:
return 40; return 50;
case CardRarity.Legendary: case CardRarity.Legendary:
return 100; return 100;
default: default:

5952
yarn.lock

File diff suppressed because it is too large Load diff