diff --git a/commands/image-edit/pokemon-fusion.js b/commands/image-edit/pokemon-fusion.js index 6030bb4e..6023bbb0 100644 --- a/commands/image-edit/pokemon-fusion.js +++ b/commands/image-edit/pokemon-fusion.js @@ -38,7 +38,7 @@ module.exports = class PokemonFusionCommand extends Command { run(msg, { body, palette }) { const prefix = body.slice(0, Math.round(body.length / 2)); - const suffix = palette.slice(Math.round(palette.length / 2), palette.length); + const suffix = palette.slice(Math.round(palette.length / 2)); return msg.say(firstUpperCase(`${prefix}${suffix}`), { files: [`http://images.alexonsager.net/pokemon/fused/${pokemon[body]}/${pokemon[body]}.${pokemon[palette]}.png`] }); diff --git a/package.json b/package.json index 5744e76e..987d6ad8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "95.1.2", + "version": "95.1.3", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { diff --git a/structures/pokemon/Pokemon.js b/structures/pokemon/Pokemon.js index 2ccf9865..3a291317 100644 --- a/structures/pokemon/Pokemon.js +++ b/structures/pokemon/Pokemon.js @@ -1,11 +1,11 @@ module.exports = class Pokemon { constructor(data) { this.id = data.id; - this.name = data.names.filter(entry => entry.language.name === 'en')[0].name; + this.name = data.names.find(entry => entry.language.name === 'en').name; this.entries = data.flavor_text_entries .filter(entry => entry.language.name === 'en') .map(entry => entry.flavor_text.replace(/\n|\f|\r/g, ' ')); - this.names = data.names; + 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}`; }