diff --git a/commands/response/8ballanswers.json b/assets/json/8ball.json similarity index 100% rename from commands/response/8ballanswers.json rename to assets/json/8ball.json diff --git a/commands/response/compliments.json b/assets/json/compliment.json similarity index 100% rename from commands/response/compliments.json rename to assets/json/compliment.json diff --git a/commands/numedit/currencycodes.json b/assets/json/currency.json similarity index 100% rename from commands/numedit/currencycodes.json rename to assets/json/currency.json diff --git a/commands/random/eastereggs.json b/assets/json/easteregg.json similarity index 100% rename from commands/random/eastereggs.json rename to assets/json/easteregg.json diff --git a/commands/response/facts.json b/assets/json/factcore.json similarity index 100% rename from commands/response/facts.json rename to assets/json/factcore.json diff --git a/commands/response/fortunes.json b/assets/json/fortune.json similarity index 100% rename from commands/response/fortunes.json rename to assets/json/fortune.json diff --git a/assets/json/magicconch.json b/assets/json/magicconch.json new file mode 100644 index 00000000..d8ff3a9a --- /dev/null +++ b/assets/json/magicconch.json @@ -0,0 +1,8 @@ +[ + "Maybe someday", + "Nothing", + "Neither", + "I don't think so", + "Yes", + "Try asking again" +] diff --git a/commands/random/memecodes.json b/assets/json/meme.json similarity index 100% rename from commands/random/memecodes.json rename to assets/json/meme.json diff --git a/commands/textedit/morsemappings.json b/assets/json/morse.json similarity index 100% rename from commands/textedit/morsemappings.json rename to assets/json/morse.json diff --git a/commands/response/names.json b/assets/json/name.json similarity index 100% rename from commands/response/names.json rename to assets/json/name.json diff --git a/commands/textedit/piratewords.json b/assets/json/pirate.json similarity index 100% rename from commands/textedit/piratewords.json rename to assets/json/pirate.json diff --git a/commands/response/roasts.json b/assets/json/roast.json similarity index 100% rename from commands/response/roasts.json rename to assets/json/roast.json diff --git a/commands/textedit/temmiewords.json b/assets/json/temmie.json similarity index 100% rename from commands/textedit/temmiewords.json rename to assets/json/temmie.json diff --git a/commands/games/sentences.json b/assets/json/typinggame.json similarity index 100% rename from commands/games/sentences.json rename to assets/json/typinggame.json diff --git a/commands/textedit/udmappings.json b/assets/json/upsidedown.json similarity index 100% rename from commands/textedit/udmappings.json rename to assets/json/upsidedown.json diff --git a/commands/randomimg/songs.json b/assets/json/vocaloid.json similarity index 100% rename from commands/randomimg/songs.json rename to assets/json/vocaloid.json diff --git a/commands/randomimg/xiaos.json b/assets/json/xiaopai.json similarity index 100% rename from commands/randomimg/xiaos.json rename to assets/json/xiaopai.json diff --git a/commands/games/typinggame.js b/commands/games/typinggame.js index 2292dc6f..4cce751b 100644 --- a/commands/games/typinggame.js +++ b/commands/games/typinggame.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { RichEmbed } = require('discord.js'); -const sentences = require('./sentences'); +const sentences = require('../../assets/json/typinggame'); module.exports = class TypingGameCommand extends Command { constructor(client) { diff --git a/commands/numedit/currency.js b/commands/numedit/currency.js index 70e46c37..71377c00 100644 --- a/commands/numedit/currency.js +++ b/commands/numedit/currency.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const request = require('superagent'); -const codes = require('./currencycodes'); +const codes = require('../../assets/json/currency'); module.exports = class CurrencyCommand extends Command { constructor(client) { diff --git a/commands/random/easteregg.js b/commands/random/easteregg.js index 13f6303a..e67c1eec 100644 --- a/commands/random/easteregg.js +++ b/commands/random/easteregg.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const eastereggs = require('./eastereggs'); +const eastereggs = require('../../assets/json/easteregg'); module.exports = class EasterEggCommand extends Command { constructor(client) { diff --git a/commands/random/meme.js b/commands/random/meme.js index 13237082..0c0ea30f 100644 --- a/commands/random/meme.js +++ b/commands/random/meme.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const codes = require('./memecodes'); +const codes = require('../../assets/json/meme'); module.exports = class MemeCommand extends Command { constructor(client) { diff --git a/commands/randomimg/vocaloid.js b/commands/randomimg/vocaloid.js index 3d90f6f3..a57e4d93 100644 --- a/commands/randomimg/vocaloid.js +++ b/commands/randomimg/vocaloid.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const songs = require('./songs'); +const songs = require('../../assets/json/vocaloid'); module.exports = class VocaloidCommand extends Command { constructor(client) { diff --git a/commands/randomimg/xiaopai.js b/commands/randomimg/xiaopai.js index b921de7f..72418fd9 100644 --- a/commands/randomimg/xiaopai.js +++ b/commands/randomimg/xiaopai.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const xiaos = require('./xiaos'); +const xiaos = require('../../assets/json/xiaopai'); module.exports = class XiaoCommand extends Command { constructor(client) { diff --git a/commands/response/8ball.js b/commands/response/8ball.js index 398fcd90..0405f7c5 100644 --- a/commands/response/8ball.js +++ b/commands/response/8ball.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { stripIndents } = require('common-tags'); -const answers = require('./8ballanswers'); +const answers = require('../../assets/json/8ball'); module.exports = class MagicBallCommand extends Command { constructor(client) { diff --git a/commands/response/compliment.js b/commands/response/compliment.js index 392a509e..06305a7a 100644 --- a/commands/response/compliment.js +++ b/commands/response/compliment.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const compliments = require('./compliments'); +const compliments = require('../../assets/json/compliment'); module.exports = class ComplimentCommand extends Command { constructor(client) { diff --git a/commands/response/factcore.js b/commands/response/factcore.js index cfb10ee9..5ba0726f 100644 --- a/commands/response/factcore.js +++ b/commands/response/factcore.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const facts = require('./facts'); +const facts = require('../../assets/json/factcore'); module.exports = class FactCoreCommand extends Command { constructor(client) { diff --git a/commands/response/fortune.js b/commands/response/fortune.js index 404da20d..bba4537c 100644 --- a/commands/response/fortune.js +++ b/commands/response/fortune.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const fortunes = require('./fortunes'); +const fortunes = require('../../assets/json/fortune'); module.exports = class FortuneCookieCommand extends Command { constructor(client) { diff --git a/commands/response/magicconch.js b/commands/response/magicconch.js new file mode 100644 index 00000000..41e76cdf --- /dev/null +++ b/commands/response/magicconch.js @@ -0,0 +1,30 @@ +const { Command } = require('discord.js-commando'); +const { stripIndents } = require('common-tags'); +const answers = require('../../assets/json/magicconch'); + +module.exports = class MagicConchCommand extends Command { + constructor(client) { + super(client, { + name: 'magic-conch', + group: 'response', + memberName: 'magic-conch', + description: 'Maybe Someday...', + args: [ + { + key: 'question', + prompt: 'What do you want to ask the magic conch?', + type: 'string' + } + ] + }); + } + + run(msg, args) { + const { question } = args; + const answer = answers[Math.floor(Math.random() * answers.length)]; + return msg.say(stripIndents` + Question: ${question} + :shell: ${answer} :shell: + `); + } +}; diff --git a/commands/response/name.js b/commands/response/name.js index 51837f61..bcc58d1f 100644 --- a/commands/response/name.js +++ b/commands/response/name.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const { lastNames, maleNames, femaleNames } = require('./names'); +const { lastNames, maleNames, femaleNames } = require('../../assets/json/name'); module.exports = class RandomNameCommand extends Command { constructor(client) { diff --git a/commands/response/roast.js b/commands/response/roast.js index c3e9cc5f..d97c17e3 100644 --- a/commands/response/roast.js +++ b/commands/response/roast.js @@ -1,5 +1,5 @@ const { Command } = require('discord.js-commando'); -const roasts = require('./roasts'); +const roasts = require('../../assets/json/roast'); module.exports = class RoastCommand extends Command { constructor(client) { diff --git a/commands/textedit/morse.js b/commands/textedit/morse.js index 06d68add..fe846bac 100644 --- a/commands/textedit/morse.js +++ b/commands/textedit/morse.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { letterTrans } = require('custom-translate'); -const dictionary = require('./morsemappings'); +const dictionary = require('../../assets/json/morse'); module.exports = class MorseCommand extends Command { constructor(client) { diff --git a/commands/textedit/pirate.js b/commands/textedit/pirate.js index 4a83d388..4615114a 100644 --- a/commands/textedit/pirate.js +++ b/commands/textedit/pirate.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { wordTrans } = require('custom-translate'); -const dictionary = require('./piratewords'); +const dictionary = require('../../assets/json/pirate'); module.exports = class PirateCommand extends Command { constructor(client) { diff --git a/commands/textedit/temmie.js b/commands/textedit/temmie.js index 34b28c1c..6116ec94 100644 --- a/commands/textedit/temmie.js +++ b/commands/textedit/temmie.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { wordTrans } = require('custom-translate'); -const dictionary = require('./temmiewords'); +const dictionary = require('../../assets/json/temmie'); module.exports = class TemmieCommand extends Command { constructor(client) { diff --git a/commands/textedit/upsidedown.js b/commands/textedit/upsidedown.js index 480ecaf4..66283f79 100644 --- a/commands/textedit/upsidedown.js +++ b/commands/textedit/upsidedown.js @@ -1,6 +1,6 @@ const { Command } = require('discord.js-commando'); const { letterTrans } = require('custom-translate'); -const dictionary = require('./udmappings'); +const dictionary = require('../../assets/json/upsidedown'); module.exports = class UpsideDownCommand extends Command { constructor(client) { diff --git a/package.json b/package.json index 65e9a1d0..9ed96b2e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "19.1.2", + "version": "19.2.0", "description": "A Discord Bot", "main": "shardingmanager.js", "scripts": {