Compare commits
4 commits
5c6c0e65c3
...
1395a65344
Author | SHA1 | Date | |
---|---|---|---|
1395a65344 | |||
fd16500315 | |||
a581bf9d80 | |||
1b707c4517 |
10 changed files with 5977 additions and 11778 deletions
|
@ -17,9 +17,10 @@ jobs:
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.x
|
node-version: 18.x
|
||||||
- run: npm ci
|
- run: yarn install --frozen-lockfile
|
||||||
- run: npm run build
|
- run: yarn build
|
||||||
- run: npm test
|
- run: yarn 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 }}
|
||||||
|
|
|
@ -17,9 +17,10 @@ jobs:
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.x
|
node-version: 18.x
|
||||||
- run: npm ci
|
- run: yarn install --frozen-lockfile
|
||||||
- run: npm run build
|
- run: yarn build
|
||||||
- run: npm test
|
- run: yarn 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 }}
|
||||||
|
|
|
@ -19,6 +19,7 @@ jobs:
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 18.x
|
node-version: 18.x
|
||||||
- run: npm ci
|
- run: yarn install --frozen-lockfile
|
||||||
- run: npm run build
|
- run: yarn build
|
||||||
- run: npm test
|
- run: yarn test
|
||||||
|
- run: yarn lint
|
11758
package-lock.json
generated
11758
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -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);
|
||||||
|
|
||||||
let userBalance = user != null ? user.Currency : 0;
|
const userBalance = user != null ? user.Currency : 0;
|
||||||
|
|
||||||
const embed = new EmbedBuilder()
|
const embed = new EmbedBuilder()
|
||||||
.setColor(EmbedColours.Ok)
|
.setColor(EmbedColours.Ok)
|
||||||
|
|
|
@ -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.getUser("user", true);
|
const user = interaction.options.get("user", true).user!;
|
||||||
|
|
||||||
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.getUser("user", true);
|
const user = interaction.options.get("user", true).user!;
|
||||||
|
|
||||||
AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`);
|
AppLogger.LogSilly("Commands/Give/GiveCurrency", `Parameters: amount=${amount.value} user=${user.id}`);
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,9 @@ 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 user = interaction.options.getUser("user") || interaction.user;
|
const userOption = interaction.options.get("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}`);
|
||||||
|
|
||||||
|
|
|
@ -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.getUser("user")!;
|
const user = interaction.options.get("user", true).user!;
|
||||||
const give = interaction.options.get("give")!;
|
const give = interaction.options.get("give", true);
|
||||||
const receive = interaction.options.get("receive")!;
|
const receive = interaction.options.get("receive", true);
|
||||||
|
|
||||||
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}`);
|
||||||
|
|
||||||
|
|
|
@ -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 15;
|
return 10;
|
||||||
case CardRarity.Gold:
|
case CardRarity.Gold:
|
||||||
return 30;
|
return 30;
|
||||||
case CardRarity.Manga:
|
case CardRarity.Manga:
|
||||||
return 50;
|
return 40;
|
||||||
case CardRarity.Legendary:
|
case CardRarity.Legendary:
|
||||||
return 100;
|
return 100;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in a new issue