diff --git a/assets/images/illegal.png b/assets/images/illegal.png deleted file mode 100644 index e407d1cc..00000000 Binary files a/assets/images/illegal.png and /dev/null differ diff --git a/assets/json/airhorn.json b/assets/json/airhorn.json deleted file mode 100644 index e359c852..00000000 --- a/assets/json/airhorn.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - "clownfull.mp3", - "clownshort.mp3", - "clownspam.mp3", - "default.mp3", - "distant.mp3", - "echo.mp3", - "fourtap.mp3", - "highfartlong.mp3", - "highfartshort.mp3", - "midshort.mp3", - "reverb.mp3", - "spam.mp3", - "tripletap.mp3", - "truck.mp3" -] diff --git a/assets/json/guesspionage.json b/assets/json/guesspionage.json index f945d000..798f5328 100644 --- a/assets/json/guesspionage.json +++ b/assets/json/guesspionage.json @@ -138,8 +138,7 @@ }, { "text": "What percentage of people would, if offered by a sexy vampire, seize the chance to become vampires themselves?", - "answer": 45, - "nsfw": true + "answer": 45 }, { "text": "What percentage of people have accidentally walked in on their parents having sex?", @@ -584,8 +583,7 @@ }, { "text": "What percentage of people have knowingly eaten dishes that contain testicles?", - "answer": 6, - "nsfw": true + "answer": 6 }, { "text": "What percentage of people have worn bathing suits under their clothes because they were out of underwear?", diff --git a/assets/json/porn.json b/assets/json/porn.json index 144cc4f1..0df965fc 100644 --- a/assets/json/porn.json +++ b/assets/json/porn.json @@ -26,5 +26,7 @@ "plastt", "bustypetite", "cumsluts", - "amateur" + "amateur", + "bbw", + "bbwgw" ] diff --git a/assets/json/xiao-fact.json b/assets/json/xiao-fact.json index 1986e109..d2a8737a 100644 --- a/assets/json/xiao-fact.json +++ b/assets/json/xiao-fact.json @@ -67,5 +67,8 @@ "The `ship` command will call you a narcissist if you test yourself with yourself.", "Whenever Dragon Fire gets a real fortune cookie, he adds the fortune to the `fortune` command.", "The `whos-that-pokemon` command will play a sound effect and the Pokémon's cry if both you and the bot are in a voice channel when the command is used.", - "The `pokedex` command will play the Pokémon's cry if both you and the bot are in a voice channel when the command is used." + "The `pokedex` command will play the Pokémon's cry if both you and the bot are in a voice channel when the command is used.", + "Answers from `would-you-rather` and `will-you-press-the-button` are sent to their respective sites in order to improve their results.", + "Reminders in the `remind` command have a maximum length of ~24.84 days. This is due to how JavaScript timeouts work, anything higher than this will fire early, or possibly even instantly.", + "For a very long time, `yu-gi-oh-gen` only supported Effect Monsters. `yu-gi-oh-token` was also a seperate command, and did not allow any customization outside of the image." ] diff --git a/commands/edit-image/yu-gi-oh-gen.js b/commands/edit-image/yu-gi-oh-gen.js index fa23c990..31e091c4 100644 --- a/commands/edit-image/yu-gi-oh-gen.js +++ b/commands/edit-image/yu-gi-oh-gen.js @@ -183,7 +183,8 @@ module.exports = class YuGiOhGenCommand extends Command { return res.toLowerCase(); } - async determineName(msg) { + async determineName(msg, monsterType) { + if (monsterType === 'token') return 'Token'; await msg.reply(stripIndents` What name should your card have? Respond with \`cancel\` to cancel the command. The command will automatically be cancelled in 60 seconds. diff --git a/commands/util-public/help.js b/commands/util-public/help.js index 112c5238..a2f2b04b 100644 --- a/commands/util-public/help.js +++ b/commands/util-public/help.js @@ -30,7 +30,10 @@ module.exports = class HelpCommand extends Command { const nsfw = msg.channel.nsfw || this.client.isOwner(msg.author); const embed = new MessageEmbed() .setTitle(`Command List (Page ${i + 1})`) - .setDescription(nsfw ? '' : 'Use in an NSFW channel to see NSFW commands.') + .setDescription(stripIndents` + To run a command, use ${msg.anyUsage('')}. + ${nsfw ? '' : 'Use in an NSFW channel to see NSFW commands.'} + `) .setColor(0x00AE86); embeds.push(embed); } @@ -52,7 +55,6 @@ module.exports = class HelpCommand extends Command { embeds[embedIndex].addField(`❯ ${group.name}`, commands.map(cmd => `\`${cmd.name}\``).join(' ')); } const allShown = cmdCount === this.client.registry.commands.size; - embeds[0].setDescription(`To run a command, use ${msg.anyUsage('')}.`); embeds[embeds.length - 1] .setFooter(`${this.client.registry.commands.size} Commands${allShown ? '' : ` (${cmdCount} Shown)`}`); try { diff --git a/commands/voice/airhorn.js b/commands/voice/airhorn.js index 9b5b4da6..1a7ba764 100644 --- a/commands/voice/airhorn.js +++ b/commands/voice/airhorn.js @@ -1,7 +1,8 @@ const Command = require('../../structures/Command'); const path = require('path'); const { reactIfAble } = require('../../util/Util'); -const sounds = require('../../assets/json/airhorn'); +const fs = require('fs'); +const sounds = fs.readdirSync(path.join(__dirname, '..', '..', 'assets', 'sounds', 'airhorn')); module.exports = class AirhornCommand extends Command { constructor(client) { diff --git a/package.json b/package.json index e59df5ca..40bb3d08 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "120.0.1", + "version": "120.0.2", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {