diff --git a/assets/json/missingno.json b/assets/json/missingno.json index b1d44152..ee83ebac 100644 --- a/assets/json/missingno.json +++ b/assets/json/missingno.json @@ -42,7 +42,15 @@ "Bird", "Normal" ], - "abilities": ["N/A"] + "abilities": ["N/A"], + "stats": { + "hp": 33, + "atk": 136, + "def": 0, + "sAtk": 6, + "sDef": 6, + "spd": 29 + } }, { "is_default": false, @@ -53,7 +61,15 @@ "Normal", "999" ], - "abilities": ["N/A"] + "abilities": ["N/A"], + "stats": { + "hp": 178, + "atk": 19, + "def": 11, + "sAtk": 23, + "sDef": 23, + "spd": 0 + } } ], "evolution_chain": { @@ -63,14 +79,6 @@ "is_mythical": false, "is_baby": false, "gender_rate": -1, - "stats": { - "hp": 33, - "atk": 136, - "def": 0, - "sAtk": 6, - "sDef": 6, - "spd": 29 - }, "height": 120, "weight": 3507.2, "moveSet": [ diff --git a/commands/pokedex/pokedex-stats.js b/commands/pokedex/pokedex-stats.js index 2335070d..269cd854 100644 --- a/commands/pokedex/pokedex-stats.js +++ b/commands/pokedex/pokedex-stats.js @@ -1,7 +1,7 @@ const Command = require('../../structures/Command'); const { MessageEmbed } = require('discord.js'); const { stripIndents } = require('common-tags'); -const { arrayEquals } = require('../../util/Util'); +const { list } = require('../../util/Util'); module.exports = class PokedexCommand extends Command { constructor(client) { @@ -34,48 +34,60 @@ module.exports = class PokedexCommand extends Command { key: 'pokemon', prompt: 'What Pokémon would you like to get information on?', type: 'string' + }, + { + key: 'form', + prompt: 'What form do you want to get information for?', + type: 'string', + default: '', + parse: form => { + if (form.toLowerCase() === 'normal') return ''; + return form.toLowerCase(); + } } ] }); } - async run(msg, { pokemon }) { + async run(msg, { pokemon, form }) { try { const data = await this.client.pokemon.fetch(pokemon); if (!data) return msg.say('Could not find any results.'); if (!data.gameDataCached) await data.fetchGameData(); - const defaultVariety = data.varieties.find(variety => variety.default); - const abilitiesShown = data.varieties.filter(variety => { - if (variety.default) return true; - return !arrayEquals(defaultVariety.abilities, variety.abilities); - }); + const variety = data.varieties.find(vrity => form ? vrity.name.toLowerCase() === form : variety.default); + if (!variety) { + const varieties = data.varieties.map(vrity => vrity.name || 'Normal'); + return msg.say(`Invalid form. The forms available for this Pokémon are: ${list(varieties, 'and')}`); + } + const statTotal = data.baseStatTotal(variety.id); const repeat = { - hp: Math.round((data.stats.hp / 255) * 10) * 2, - atk: Math.round((data.stats.atk / 255) * 10) * 2, - def: Math.round((data.stats.def / 255) * 10) * 2, - sAtk: Math.round((data.stats.sAtk / 255) * 10) * 2, - sDef: Math.round((data.stats.sDef / 255) * 10) * 2, - spd: Math.round((data.stats.spd / 255) * 10) * 2, - total: Math.round((data.baseStatTotal / 720) * 10) * 2 + hp: Math.round((variety.stats.hp / 255) * 10) * 2, + atk: Math.round((variety.stats.atk / 255) * 10) * 2, + def: Math.round((variety.stats.def / 255) * 10) * 2, + sAtk: Math.round((variety.stats.sAtk / 255) * 10) * 2, + sDef: Math.round((variety.stats.sDef / 255) * 10) * 2, + spd: Math.round((variety.stats.spd / 255) * 10) * 2, + total: Math.round((statTotal / 720) * 10) * 2 }; const embed = new MessageEmbed() .setColor(0xED1C24) .setAuthor(`#${data.displayID} - ${data.name}`, data.boxImageURL, data.serebiiURL) .setThumbnail(data.spriteImageURL) - .addField('❯ Base Stats (Base Form)', stripIndents` - \`HP: [${'█'.repeat(repeat.hp)}${' '.repeat(20 - repeat.hp)}]\` **${data.stats.hp}** - \`Attack: [${'█'.repeat(repeat.atk)}${' '.repeat(20 - repeat.atk)}]\` **${data.stats.atk}** - \`Defense: [${'█'.repeat(repeat.def)}${' '.repeat(20 - repeat.def)}]\` **${data.stats.def}** - \`Sp. Attack: [${'█'.repeat(repeat.sAtk)}${' '.repeat(20 - repeat.sAtk)}]\` **${data.stats.sAtk}** - \`Sp. Defense: [${'█'.repeat(repeat.sDef)}${' '.repeat(20 - repeat.sDef)}]\` **${data.stats.sDef}** - \`Speed: [${'█'.repeat(repeat.spd)}${' '.repeat(20 - repeat.spd)}]\` **${data.stats.spd}** + .addField(`❯ Base Stats (${variety.name || 'Base'} Form)`, stripIndents` + \`HP: [${'█'.repeat(repeat.hp)}${' '.repeat(20 - repeat.hp)}]\` **${variety.stats.hp}** + \`Attack: [${'█'.repeat(repeat.atk)}${' '.repeat(20 - repeat.atk)}]\` **${variety.stats.atk}** + \`Defense: [${'█'.repeat(repeat.def)}${' '.repeat(20 - repeat.def)}]\` **${variety.stats.def}** + \`Sp. Attack: [${'█'.repeat(repeat.sAtk)}${' '.repeat(20 - repeat.sAtk)}]\` **${variety.stats.sAtk}** + \`Sp. Defense: [${'█'.repeat(repeat.sDef)}${' '.repeat(20 - repeat.sDef)}]\` **${variety.stats.sDef}** + \`Speed: [${'█'.repeat(repeat.spd)}${' '.repeat(20 - repeat.spd)}]\` **${variety.stats.spd}** \`-----------------------------------\` - \`Total: [${'█'.repeat(repeat.total)}${' '.repeat(20 - repeat.total)}]\` **${data.baseStatTotal}** + \`Total: [${'█'.repeat(repeat.total)}${' '.repeat(20 - repeat.total)}]\` **${statTotal}** `) - .addField('❯ Abilities', abilitiesShown.map(variety => { - const showParens = variety.name && abilitiesShown.length > 1; - return `${variety.abilities.join('/')}${showParens ? ` (${variety.name})` : ''}`; - }).join('\n')); + .addField('❯ Abilities', variety.abilities.join('/')) + .addField('❯ Other Forms', stripIndents` + Use ${this.usage(`${data.id}
`)} to get stats for another form. + Forms Available: ${data.varieties.map(vrity => vrity.name || 'Normal').join(', ')} + `); return msg.embed(embed); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); diff --git a/structures/pokemon/Pokemon.js b/structures/pokemon/Pokemon.js index 94a50ee0..fb305ae1 100644 --- a/structures/pokemon/Pokemon.js +++ b/structures/pokemon/Pokemon.js @@ -38,6 +38,7 @@ module.exports = class Pokemon { id: variety.pokemon.name, name: name || null, mega: data.missingno ? false : null, + stats: data.missingno ? variety.stats : {}, default: variety.is_default, types: data.missingno ? variety.types : [], abilities: data.missingno ? variety.abilities : [] @@ -49,7 +50,6 @@ module.exports = class Pokemon { }; this.encountersURL = null; this.encounters = data.missingno ? data.encounters : null; - this.stats = data.missingno ? data.stats : null; this.height = data.missingno ? data.height : null; this.weight = data.missingno ? data.weight : null; this.moveSet = data.missingno ? data.moveSet : []; @@ -61,15 +61,16 @@ module.exports = class Pokemon { : path.join(__dirname, '..', '..', 'assets', 'sounds', 'pokedex', `${data.id}.wav`); } - get baseStatTotal() { - if (!this.stats) return null; - return this.stats.hp + this.stats.atk + this.stats.def + this.stats.sAtk + this.stats.sDef + this.stats.spd; + baseStatTotal(variety) { + const found = this.varieties.find(vrity => variety ? vrity.id === variety.toLowerCase() : variety.default); + if (!found) return null; + return found.stats.hp + found.stats.atk + found.stats.def + found.stats.sAtk + found.stats.sDef + found.stats.spd; } get pseudo() { if (!this.gameDataCached) return null; if (this.legendary || this.mythical || this.baby || this.missingno) return false; - if (this.baseStatTotal !== 600) return false; + if (this.baseStatTotal() !== 600) return false; if (this.chain.data.length !== 3) return false; return true; } @@ -127,7 +128,7 @@ module.exports = class Pokemon { const { body: defaultBody } = await request.get(`https://pokeapi.co/api/v2/pokemon/${defaultVariety.id}`); defaultVariety.types.push(...defaultBody.types.map(type => firstUpperCase(type.type.name))); this.fetchAbilities(defaultBody.abilities); - this.stats = { + defaultVariety.stats = { hp: defaultBody.stats.find(stat => stat.stat.name === 'hp').base_stat, atk: defaultBody.stats.find(stat => stat.stat.name === 'attack').base_stat, def: defaultBody.stats.find(stat => stat.stat.name === 'defense').base_stat, @@ -154,6 +155,14 @@ module.exports = class Pokemon { const { body: formBody } = await request.get(`https://pokeapi.co/api/v2/pokemon-form/${variety.id}`); variety.types.push(...body.types.map(type => firstUpperCase(type.type.name))); variety.mega = formBody.is_mega || false; + variety.stats = { + hp: body.stats.find(stat => stat.stat.name === 'hp').base_stat, + atk: body.stats.find(stat => stat.stat.name === 'attack').base_stat, + def: body.stats.find(stat => stat.stat.name === 'defense').base_stat, + sAtk: body.stats.find(stat => stat.stat.name === 'special-attack').base_stat, + sDef: body.stats.find(stat => stat.stat.name === 'special-defense').base_stat, + spd: body.stats.find(stat => stat.stat.name === 'speed').base_stat + } await this.fetchAbilities(body.abilities); } return this.varieties;