diff --git a/commands/search/pokedex.js b/commands/search/pokedex.js index a56d7034..e5b88943 100644 --- a/commands/search/pokedex.js +++ b/commands/search/pokedex.js @@ -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!`); diff --git a/structures/pokemon/Pokemon.js b/structures/pokemon/Pokemon.js index 5ab01ebc..6d73c463 100644 --- a/structures/pokemon/Pokemon.js +++ b/structures/pokemon/Pokemon.js @@ -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,