Skip to content

Commit

Permalink
Add currency prize
Browse files Browse the repository at this point in the history
  • Loading branch information
Glazelf committed May 14, 2024
1 parent 7211a3d commit 482153b
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion commands/api/pokemon.js
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ exports.run = async (client, interaction, logger, ephemeral = true) => {
!pokemon.name.startsWith("Pumpkaboo-") &&
!["Flapple-Gmax", "Appletun-Gmax", "Toxtricity-Gmax", "Toxtricity-Low-Key-Gmax"].includes(pokemon.name)
);
let whosThatPokemonMessageObject = await getWhosThatPokemon({ pokemonList: allPokemon });
let whosThatPokemonMessageObject = await getWhosThatPokemon({ client: client, pokemonList: allPokemon });
returnString = whosThatPokemonMessageObject.content;
pokemonFiles = whosThatPokemonMessageObject.files;
pokemonButtons = whosThatPokemonMessageObject.components;
Expand Down
4 changes: 2 additions & 2 deletions events/interactionCreate.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ module.exports = async (client, interaction) => {
if (interaction.customId.startsWith("pkmQuizReveal")) {
// Response in case of forfeit/reveal
let pkmQuizRevealCorrectAnswer = interaction.message.components[0].components[0].customId.split("|")[1];
let pkmQuizRevealMessageObject = await getWhosThatPokemon({ pokemon: pkmQuizRevealCorrectAnswer, winner: interaction.user, reveal: true });
let pkmQuizRevealMessageObject = await getWhosThatPokemon({ client: client, pokemon: pkmQuizRevealCorrectAnswer, winner: interaction.user, reveal: true });
return interaction.update({ content: pkmQuizRevealMessageObject.content, files: pkmQuizRevealMessageObject.files, embeds: pkmQuizRevealMessageObject.embeds, components: [] });
} else if (interaction.customId.startsWith(pkmQuizGuessButtonIdStart)) {
// Who's That Pokémon? modal
Expand Down Expand Up @@ -656,7 +656,7 @@ module.exports = async (client, interaction) => {
const pkmQuizModalGuess = interaction.fields.getTextInputValue(pkmQuizButtonID);

if (pkmQuizModalGuess.toLowerCase() == pkmQuizCorrectAnswer.toLowerCase()) {
let pkmQuizMessageObject = await getWhosThatPokemon({ pokemon: pkmQuizCorrectAnswer, winner: interaction.user });
let pkmQuizMessageObject = await getWhosThatPokemon({ client: client, pokemon: pkmQuizCorrectAnswer, winner: interaction.user });
interaction.update({ content: pkmQuizMessageObject.content, files: pkmQuizMessageObject.files, components: [] });
} else {
return sendMessage({ client: client, interaction: interaction, content: `${interaction.user} guessed incorrectly: \`${pkmQuizModalGuess}\`.`, ephemeral: pkmQuizGuessResultEphemeral });
Expand Down
7 changes: 5 additions & 2 deletions util/pokemon/getWhosThatPokemon.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
module.exports = async ({ pokemonList, winner, pokemon, reveal }) => {
module.exports = async ({ client, pokemonList, winner, pokemon, reveal }) => {
const Discord = require("discord.js");
const Canvas = require('canvas');
const { Dex } = require('pokemon-showdown');
const imageExists = require('../imageExists');
const getCleanPokemonID = require('./getCleanPokemonID');
const getRandomObjectItem = require('../getRandomObjectItem');
const api_user = require('../../database/dbServices/user.api');
let pokemonButtons = new Discord.ActionRowBuilder();
let doesRenderExist = false;
returnString = `# Who's That Pokémon?`;
Expand All @@ -26,7 +27,9 @@ module.exports = async ({ pokemonList, winner, pokemon, reveal }) => {
returnString += `\n${winner} chose to reveal the answer.`;
} else {
// Format winning message update
returnString += `\n${winner} guessed correctly!`;
let pkmQuizPrize = 10;
returnString += `\n${winner} guessed correctly and won ${pkmQuizPrize}${client.globalVars.currency}!`;
api_user.addMoney(winner.id, pkmQuizPrize);
};
returnString += `\nThe answer was **${pokemon.name}**!`;
} else {
Expand Down

0 comments on commit 482153b

Please sign in to comment.