From 905df40d98aed935934a7030f5e4a6da361451db Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Mon, 3 Sep 2018 12:44:09 -0400
Subject: [PATCH] Merge falcon punch with punch

---
 .env.example                      |  1 -
 README.md                         |  3 +--
 commands/roleplay/falcon-punch.js | 26 --------------------------
 commands/roleplay/punch.js        |  1 +
 package.json                      |  2 +-
 5 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 commands/roleplay/falcon-punch.js

diff --git a/.env.example b/.env.example
index a33a4af1..8dc66890 100644
--- a/.env.example
+++ b/.env.example
@@ -48,7 +48,6 @@ BRO_HOOF_ALBUM_ID=
 CUDDLE_ALBUM_ID=
 EAT_ALBUM_ID=
 EVOLVE_ALBUM_ID=
-FALCON_PUNCH_ALBUM_ID=
 FIDGET_ALBUM_ID=
 FIST_BUMP_ALBUM_ID=
 HIGH_FIVE_ALBUM_ID=
diff --git a/README.md b/README.md
index d2816313..00938d1e 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ Xiao is a Discord bot coded in JavaScript with
 The bot is no longer available for invite. You can self-host the bot, or use her
 on the [home server](https://discord.gg/sbMe32W).
 
-## Commands (304)
+## Commands (303)
 ### Utility:
 
 * **eval**: Executes JavaScript code.
@@ -346,7 +346,6 @@ on the [home server](https://discord.gg/sbMe32W).
 * **cuddle**: Cuddles a user.
 * **eat**: Eats a user.
 * **evolve**: Evolves a user.
-* **falcon-punch**: Falcon Punches a user.
 * **fist-bump**: Fistbumps a user.
 * **high-five**: High Fives a user.
 * **hit-with-shovel**: Hits a user with a shovel.
diff --git a/commands/roleplay/falcon-punch.js b/commands/roleplay/falcon-punch.js
deleted file mode 100644
index bbc2b3ac..00000000
--- a/commands/roleplay/falcon-punch.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const RoleplayCommand = require('../../structures/commands/Roleplay');
-const { FALCON_PUNCH_ALBUM_ID } = process.env;
-
-module.exports = class FalconPunchCommand extends RoleplayCommand {
-	constructor(client) {
-		super(client, {
-			name: 'falcon-punch',
-			group: 'roleplay',
-			memberName: 'falcon-punch',
-			description: 'Falcon Punches a user.',
-			clientPermissions: ['ATTACH_FILES'],
-			albumID: FALCON_PUNCH_ALBUM_ID,
-			args: [
-				{
-					key: 'user',
-					prompt: 'What user do you want to roleplay with?',
-					type: 'user'
-				}
-			]
-		});
-	}
-
-	generateText(msg, user) {
-		return `_**${msg.author.username}** falcon punches **${user.username}**._`;
-	}
-};
diff --git a/commands/roleplay/punch.js b/commands/roleplay/punch.js
index fbacdf59..1c3e74e2 100644
--- a/commands/roleplay/punch.js
+++ b/commands/roleplay/punch.js
@@ -5,6 +5,7 @@ module.exports = class PunchCommand extends RoleplayCommand {
 	constructor(client) {
 		super(client, {
 			name: 'punch',
+			aliases: ['falcon-punch'],
 			group: 'roleplay',
 			memberName: 'punch',
 			description: 'Punches a user.',
diff --git a/package.json b/package.json
index ffd0dbdb..a255a7d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "89.0.0",
+	"version": "89.0.1",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {