From 7c502e2ba9a47e4ba183707c3a709fef278e9fb1 Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Thu, 18 Oct 2018 00:01:59 +0000
Subject: [PATCH] Add names to pokemon-fusion

---
 commands/image-edit/pokemon-fusion.js | 11 ++++++++---
 package.json                          |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/commands/image-edit/pokemon-fusion.js b/commands/image-edit/pokemon-fusion.js
index 0705c2bb..6030bb4e 100644
--- a/commands/image-edit/pokemon-fusion.js
+++ b/commands/image-edit/pokemon-fusion.js
@@ -1,5 +1,6 @@
 const Command = require('../../structures/Command');
 const pokemon = require('../../assets/json/pokemon-fusion');
+const { firstUpperCase } = require('../../util/Util');
 
 module.exports = class PokemonFusionCommand extends Command {
 	constructor(client) {
@@ -19,7 +20,7 @@ module.exports = class PokemonFusionCommand extends Command {
 						if (pokemon[body.toLowerCase()]) return true;
 						return 'Invalid body, only Pokémon from Generation I may be used.';
 					},
-					parse: body => pokemon[body.toLowerCase()]
+					parse: body => body.toLowerCase()
 				},
 				{
 					key: 'palette',
@@ -29,13 +30,17 @@ module.exports = class PokemonFusionCommand extends Command {
 						if (pokemon[palette.toLowerCase()]) return true;
 						return 'Invalid palette, only Pokémon from Generation I may be used.';
 					},
-					parse: palette => pokemon[palette.toLowerCase()]
+					parse: palette => palette.toLowerCase()
 				}
 			]
 		});
 	}
 
 	run(msg, { body, palette }) {
-		return msg.say({ files: [`http://images.alexonsager.net/pokemon/fused/${body}/${body}.${palette}.png`] });
+		const prefix = body.slice(0, Math.round(body.length / 2));
+		const suffix = palette.slice(Math.round(palette.length / 2), palette.length);
+		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 a8a1fb63..5744e76e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "95.1.1",
+	"version": "95.1.2",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {