From eb51ba6a95721b93d2e7ade43944d58d3b97d9fa Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Thu, 28 Mar 2024 22:03:11 -0400 Subject: [PATCH] Nicer pokedex embed --- commands/pokedex/pokedex.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/commands/pokedex/pokedex.js b/commands/pokedex/pokedex.js index cef2095b..212ed182 100644 --- a/commands/pokedex/pokedex.js +++ b/commands/pokedex/pokedex.js @@ -1,7 +1,7 @@ const Command = require('../../framework/Command'); const { MessageEmbed } = require('discord.js'); const { stripIndents } = require('common-tags'); -const { arrayEquals, reactIfAble } = require('../../util/Util'); +const { arrayEquals, reactIfAble, firstUpperCase } = require('../../util/Util'); const { MEGA_EVOLVE_EMOJI_NAME, MEGA_EVOLVE_EMOJI_ID } = process.env; const genGames = [null, 'rb', 'gs', 'rs', 'dp', 'bw', 'xy', 'sm', 'ss', 'sv']; const games = { @@ -111,14 +111,15 @@ module.exports = class PokedexCommand extends Command { .addField('❯ Types', typesShown.map(variety => { const showParens = variety.name && typesShown.length > 1; return `${variety.types.join('/')}${showParens ? ` (${variety.name})` : ''}`; - }).join('\n')) + }).join('\n'), true) + .addField('❯ Class', firstUpperCase(pokemon.class), true) + .addField('❯ Gender Rate', pokemon.genderRate.genderless + ? 'Genderless' + : `♂️ ${pokemon.genderRate.male}% ♀️ ${pokemon.genderRate.female}%`, true) .addField('❯ Evolution Chain', `${evoChain}${pokemon.mega ? ` -> ${this.megaEvolveEmoji}` : ''}`) .addField('❯ Held Items', pokemon.heldItems.length ? pokemon.heldItems.map(item => `${item.data.name} (${item.rarity}%)`).join('\n') - : 'None') - .addField('❯ Gender Rate', pokemon.genderRate.genderless - ? 'Genderless' - : `♂️ ${pokemon.genderRate.male}% ♀️ ${pokemon.genderRate.female}%`); + : 'None'); if (msg.guild && pokemon.cry) { const connection = msg.guild ? this.client.dispatchers.get(msg.guild.id) : null; if (connection) {