From 553868c7274bbff00f031ea89dc06c06e0a8d385 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Mon, 3 Sep 2018 12:30:12 -0400 Subject: [PATCH] Remove inhale, make eat be like sleep --- .env.example | 1 - README.md | 3 +-- assets/json/temmie.json | 1 - commands/roleplay/eat.js | 7 ++++--- commands/roleplay/inhale.js | 26 -------------------------- package.json | 2 +- 6 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 commands/roleplay/inhale.js diff --git a/.env.example b/.env.example index 6573d385..a33a4af1 100644 --- a/.env.example +++ b/.env.example @@ -55,7 +55,6 @@ HIGH_FIVE_ALBUM_ID= HIT_WITH_SHOVEL_ALBUM_ID= HOLD_HANDS_ALBUM_ID= HUG_ALBUM_ID= -INHALE_ALBUM_ID= KILL_ALBUM_ID= KISS_ALBUM_ID= MARRY_ALBUM_ID= diff --git a/README.md b/README.md index 78b1d02a..d2816313 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 (305) +## Commands (304) ### Utility: * **eval**: Executes JavaScript code. @@ -352,7 +352,6 @@ on the [home server](https://discord.gg/sbMe32W). * **hit-with-shovel**: Hits a user with a shovel. * **hold-hands**: Holds hands with a user. * **hug**: Hugs a user. -* **inhale**: Inhales a user. * **kill**: Kills a user. * **kiss**: Kisses a user. * **marry**: Marries a user. diff --git a/assets/json/temmie.json b/assets/json/temmie.json index 202d6642..94aa44a6 100644 --- a/assets/json/temmie.json +++ b/assets/json/temmie.json @@ -85,7 +85,6 @@ "badguy": "special enemy", "school": "skool", "um": "p...", - "elizabeth": "ebears", "yeah": "yaya", "yea": "yaya", "uh-huh": "yaya", diff --git a/commands/roleplay/eat.js b/commands/roleplay/eat.js index e20e1b66..d4ddc735 100644 --- a/commands/roleplay/eat.js +++ b/commands/roleplay/eat.js @@ -7,20 +7,21 @@ module.exports = class EatCommand extends RoleplayCommand { name: 'eat', group: 'roleplay', memberName: 'eat', - description: 'Eats a user.', + description: 'Feeds a user.', clientPermissions: ['ATTACH_FILES'], albumID: EAT_ALBUM_ID, args: [ { key: 'user', prompt: 'What user do you want to roleplay with?', - type: 'user' + type: 'user', + default: msg => msg.author } ] }); } generateText(msg, user) { - return `_**${msg.author.username}** eats **${user.username}**._`; + return `_**${user.username}** eats._`; } }; diff --git a/commands/roleplay/inhale.js b/commands/roleplay/inhale.js deleted file mode 100644 index 6e904a34..00000000 --- a/commands/roleplay/inhale.js +++ /dev/null @@ -1,26 +0,0 @@ -const RoleplayCommand = require('../../structures/commands/Roleplay'); -const { INHALE_ALBUM_ID } = process.env; - -module.exports = class InhaleCommand extends RoleplayCommand { - constructor(client) { - super(client, { - name: 'inhale', - group: 'roleplay', - memberName: 'inhale', - description: 'Inhales a user.', - clientPermissions: ['ATTACH_FILES'], - albumID: INHALE_ALBUM_ID, - args: [ - { - key: 'user', - prompt: 'What user do you want to roleplay with?', - type: 'user' - } - ] - }); - } - - generateText(msg, user) { - return `_**${msg.author.username}** inhales **${user.username}** but gained no ability..._`; - } -}; diff --git a/package.json b/package.json index 43827040..ffd0dbdb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "88.6.0", + "version": "89.0.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {