This commit is contained in:
Dragon Fire
2020-03-24 22:16:54 -04:00
parent b5234d24ad
commit 5e94c9539d
2 changed files with 7 additions and 4 deletions
+4 -3
View File
@@ -51,9 +51,10 @@ module.exports = class PokedexCommand extends Command {
${data.entries[Math.floor(Math.random() * data.entries.length)]}
`)
.setThumbnail(data.spriteImageURL)
.addField(' Types', data.varieties.filter(variety => variety.display).map(
variety => `${variety.types.join('/')}${variety.name ? ` (${variety.name})` : ''}`
).join('\n'));
.addField(' Types', data.varieties.filter(variety => variety.display).map(variety => {
const showParens = variety.name && data.varieties.length > 1;
return `${variety.types.join('/')}${showParens ? ` (${variety.name})` : ''}`;
}).join('\n'));
return msg.embed(embed);
} catch (err) {
return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`);
+3 -1
View File
@@ -12,7 +12,9 @@ module.exports = class Pokemon {
this.names = data.names.map(entry => ({ name: entry.name, language: entry.language.name }));
this.genus = `The ${data.genera.filter(entry => entry.language.name === 'en')[0].genus}`;
this.varieties = data.varieties.map(variety => {
const name = firstUpperCase(variety.pokemon.name.replace(new RegExp(`${this.slug}-?`, 'i'), ''));
const name = firstUpperCase(variety.pokemon.name
.replace(new RegExp(`${this.slug}-?`, 'i'), '')
.replace(/-/g, ' '));
return {
id: variety.pokemon.name,
name: name || null,