This commit is contained in:
Dragon Fire
2021-01-18 18:06:57 -05:00
parent d38a2d76d6
commit bba0d2d87c
+3 -3
View File
@@ -54,13 +54,14 @@ module.exports = class PokedexCommand extends Command {
const data = await this.client.pokemon.fetch(pokemon); const data = await this.client.pokemon.fetch(pokemon);
if (!data) return msg.say('Could not find any results.'); if (!data) return msg.say('Could not find any results.');
if (!data.gameDataCached) await data.fetchGameData(); if (!data.gameDataCached) await data.fetchGameData();
const variety = data.varieties.find(vrity => { const displayForms = data.varieties.filter(vrity => vrity.statsDiffer);
const variety = displayForms.find(vrity => {
if (!form || form === 'normal') return vrity.default; if (!form || form === 'normal') return vrity.default;
if (!vrity.name) return false; if (!vrity.name) return false;
return vrity.name.toLowerCase() === form; return vrity.name.toLowerCase() === form;
}); });
if (!variety) { if (!variety) {
const varieties = data.varieties.map(vrity => vrity.name || 'Normal'); const varieties = displayForms.map(vrity => vrity.name || 'Normal');
return msg.say(`Invalid form. The forms available for this Pokémon are: ${list(varieties, 'and')}`); return msg.say(`Invalid form. The forms available for this Pokémon are: ${list(varieties, 'and')}`);
} }
const statTotal = data.baseStatTotal(variety.id); const statTotal = data.baseStatTotal(variety.id);
@@ -73,7 +74,6 @@ module.exports = class PokedexCommand extends Command {
spd: Math.round((variety.stats.spd / 255) * 10) * 2, spd: Math.round((variety.stats.spd / 255) * 10) * 2,
total: Math.round((statTotal / 1125) * 10) * 2 total: Math.round((statTotal / 1125) * 10) * 2
}; };
const displayForms = data.varieties.filter(vrity => vrity.statsDiffer);
const embed = new MessageEmbed() const embed = new MessageEmbed()
.setColor(0xED1C24) .setColor(0xED1C24)
.setAuthor(`#${data.displayID} - ${data.name}`, data.boxImageURL, data.serebiiURL) .setAuthor(`#${data.displayID} - ${data.name}`, data.boxImageURL, data.serebiiURL)