Various Fixes and Improvements

This commit is contained in:
Dragon Fire
2020-11-22 01:02:11 -05:00
parent 134836de7e
commit aa95415abb
9 changed files with 18 additions and 27 deletions
Binary file not shown.

Before

Width:  |  Height:  |  Size: 616 KiB

-16
View File
@@ -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"
]
+2 -4
View File
@@ -138,8 +138,7 @@
}, },
{ {
"text": "What percentage of people would, if offered by a sexy vampire, seize the chance to become vampires themselves?", "text": "What percentage of people would, if offered by a sexy vampire, seize the chance to become vampires themselves?",
"answer": 45, "answer": 45
"nsfw": true
}, },
{ {
"text": "What percentage of people have accidentally walked in on their parents having sex?", "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?", "text": "What percentage of people have knowingly eaten dishes that contain testicles?",
"answer": 6, "answer": 6
"nsfw": true
}, },
{ {
"text": "What percentage of people have worn bathing suits under their clothes because they were out of underwear?", "text": "What percentage of people have worn bathing suits under their clothes because they were out of underwear?",
+3 -1
View File
@@ -26,5 +26,7 @@
"plastt", "plastt",
"bustypetite", "bustypetite",
"cumsluts", "cumsluts",
"amateur" "amateur",
"bbw",
"bbwgw"
] ]
+4 -1
View File
@@ -67,5 +67,8 @@
"The `ship` command will call you a narcissist if you test yourself with yourself.", "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.", "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 `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."
] ]
+2 -1
View File
@@ -183,7 +183,8 @@ module.exports = class YuGiOhGenCommand extends Command {
return res.toLowerCase(); return res.toLowerCase();
} }
async determineName(msg) { async determineName(msg, monsterType) {
if (monsterType === 'token') return 'Token';
await msg.reply(stripIndents` await msg.reply(stripIndents`
What name should your card have? What name should your card have?
Respond with \`cancel\` to cancel the command. The command will automatically be cancelled in 60 seconds. Respond with \`cancel\` to cancel the command. The command will automatically be cancelled in 60 seconds.
+4 -2
View File
@@ -30,7 +30,10 @@ module.exports = class HelpCommand extends Command {
const nsfw = msg.channel.nsfw || this.client.isOwner(msg.author); const nsfw = msg.channel.nsfw || this.client.isOwner(msg.author);
const embed = new MessageEmbed() const embed = new MessageEmbed()
.setTitle(`Command List (Page ${i + 1})`) .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('<command>')}.
${nsfw ? '' : 'Use in an NSFW channel to see NSFW commands.'}
`)
.setColor(0x00AE86); .setColor(0x00AE86);
embeds.push(embed); embeds.push(embed);
} }
@@ -52,7 +55,6 @@ module.exports = class HelpCommand extends Command {
embeds[embedIndex].addField(` ${group.name}`, commands.map(cmd => `\`${cmd.name}\``).join(' ')); embeds[embedIndex].addField(` ${group.name}`, commands.map(cmd => `\`${cmd.name}\``).join(' '));
} }
const allShown = cmdCount === this.client.registry.commands.size; const allShown = cmdCount === this.client.registry.commands.size;
embeds[0].setDescription(`To run a command, use ${msg.anyUsage('<command>')}.`);
embeds[embeds.length - 1] embeds[embeds.length - 1]
.setFooter(`${this.client.registry.commands.size} Commands${allShown ? '' : ` (${cmdCount} Shown)`}`); .setFooter(`${this.client.registry.commands.size} Commands${allShown ? '' : ` (${cmdCount} Shown)`}`);
try { try {
+2 -1
View File
@@ -1,7 +1,8 @@
const Command = require('../../structures/Command'); const Command = require('../../structures/Command');
const path = require('path'); const path = require('path');
const { reactIfAble } = require('../../util/Util'); 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 { module.exports = class AirhornCommand extends Command {
constructor(client) { constructor(client) {
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "xiao", "name": "xiao",
"version": "120.0.1", "version": "120.0.2",
"description": "Your personal server companion.", "description": "Your personal server companion.",
"main": "Xiao.js", "main": "Xiao.js",
"scripts": { "scripts": {