From c728b9ed7c350f6346e2845c3bb12c69eac2ff7f Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Wed, 18 Mar 2020 19:39:36 -0400 Subject: [PATCH] (mp/sp)-games -> games-(mp/sp) --- Xiao.js | 4 ++-- commands/{mp-games => games-mp}/balloon-pop.js | 2 +- commands/{mp-games => games-mp}/battle.js | 2 +- commands/{mp-games => games-mp}/connect-four.js | 2 +- commands/{mp-games => games-mp}/emoji-emoji-revolution.js | 2 +- commands/{mp-games => games-mp}/gunfight.js | 2 +- commands/{mp-games => games-mp}/quiz-duel.js | 2 +- commands/{mp-games => games-mp}/russian-roulette.js | 2 +- commands/{mp-games => games-mp}/tic-tac-toe.js | 2 +- commands/{mp-games => games-mp}/word-chain.js | 2 +- commands/{sp-games => games-sp}/blackjack.js | 2 +- commands/{sp-games => games-sp}/box-choosing.js | 2 +- commands/{sp-games => games-sp}/captcha.js | 2 +- commands/{sp-games => games-sp}/chance.js | 2 +- commands/{sp-games => games-sp}/doors.js | 2 +- commands/{sp-games => games-sp}/fishy.js | 2 +- commands/{sp-games => games-sp}/google-feud.js | 2 +- commands/{sp-games => games-sp}/hangman.js | 2 +- commands/{sp-games => games-sp}/hunger-games.js | 2 +- commands/{sp-games => games-sp}/lottery.js | 2 +- commands/{sp-games => games-sp}/mad-libs.js | 2 +- commands/{sp-games => games-sp}/math-quiz.js | 2 +- commands/{sp-games => games-sp}/quiz.js | 2 +- commands/{sp-games => games-sp}/rock-paper-scissors.js | 2 +- commands/{sp-games => games-sp}/roulette.js | 2 +- commands/{sp-games => games-sp}/slots.js | 2 +- commands/{sp-games => games-sp}/sorting-hat.js | 2 +- commands/{sp-games => games-sp}/typing-test.js | 2 +- commands/{sp-games => games-sp}/whos-that-pokemon.js | 2 +- package.json | 2 +- 30 files changed, 31 insertions(+), 31 deletions(-) rename commands/{mp-games => games-mp}/balloon-pop.js (99%) rename commands/{mp-games => games-mp}/battle.js (99%) rename commands/{mp-games => games-mp}/connect-four.js (99%) rename commands/{mp-games => games-mp}/emoji-emoji-revolution.js (99%) rename commands/{mp-games => games-mp}/gunfight.js (98%) rename commands/{mp-games => games-mp}/quiz-duel.js (99%) rename commands/{mp-games => games-mp}/russian-roulette.js (99%) rename commands/{mp-games => games-mp}/tic-tac-toe.js (99%) rename commands/{mp-games => games-mp}/word-chain.js (99%) rename commands/{sp-games => games-sp}/blackjack.js (99%) rename commands/{sp-games => games-sp}/box-choosing.js (99%) rename commands/{sp-games => games-sp}/captcha.js (98%) rename commands/{sp-games => games-sp}/chance.js (96%) rename commands/{sp-games => games-sp}/doors.js (99%) rename commands/{sp-games => games-sp}/fishy.js (97%) rename commands/{sp-games => games-sp}/google-feud.js (99%) rename commands/{sp-games => games-sp}/hangman.js (99%) rename commands/{sp-games => games-sp}/hunger-games.js (99%) rename commands/{sp-games => games-sp}/lottery.js (97%) rename commands/{sp-games => games-sp}/mad-libs.js (98%) rename commands/{sp-games => games-sp}/math-quiz.js (98%) rename commands/{sp-games => games-sp}/quiz.js (99%) rename commands/{sp-games => games-sp}/rock-paper-scissors.js (98%) rename commands/{sp-games => games-sp}/roulette.js (99%) rename commands/{sp-games => games-sp}/slots.js (97%) rename commands/{sp-games => games-sp}/sorting-hat.js (99%) rename commands/{sp-games => games-sp}/typing-test.js (98%) rename commands/{sp-games => games-sp}/whos-that-pokemon.js (99%) diff --git a/Xiao.js b/Xiao.js index f0c903c2..950f0748 100644 --- a/Xiao.js +++ b/Xiao.js @@ -25,8 +25,8 @@ client.registry ['events', 'Events'], ['search', 'Search'], ['analyze', 'Analyzers'], - ['sp-games', 'Single-Player Games'], - ['mp-games', 'Multi-Player Games'], + ['games-sp', 'Single-Player Games'], + ['games-mp', 'Multi-Player Games'], ['image-edit', 'Image Manipulation'], ['avatar-edit', 'Avatar Manipulation'], ['meme-gen', 'Meme Generators'], diff --git a/commands/mp-games/balloon-pop.js b/commands/games-mp/balloon-pop.js similarity index 99% rename from commands/mp-games/balloon-pop.js rename to commands/games-mp/balloon-pop.js index 2896253f..e24e010a 100644 --- a/commands/mp-games/balloon-pop.js +++ b/commands/games-mp/balloon-pop.js @@ -5,7 +5,7 @@ module.exports = class BalloonPopCommand extends Command { constructor(client) { super(client, { name: 'balloon-pop', - group: 'mp-games', + group: 'games-mp', memberName: 'balloon-pop', description: 'Don\'t let yourself be the last one to pump the balloon before it pops!', credit: [ diff --git a/commands/mp-games/battle.js b/commands/games-mp/battle.js similarity index 99% rename from commands/mp-games/battle.js rename to commands/games-mp/battle.js index e3772665..683ef5b1 100644 --- a/commands/mp-games/battle.js +++ b/commands/games-mp/battle.js @@ -7,7 +7,7 @@ module.exports = class BattleCommand extends Command { super(client, { name: 'battle', aliases: ['fight', 'death-battle'], - group: 'mp-games', + group: 'games-mp', memberName: 'battle', description: 'Engage in a turn-based battle against another user or the AI.', args: [ diff --git a/commands/mp-games/connect-four.js b/commands/games-mp/connect-four.js similarity index 99% rename from commands/mp-games/connect-four.js rename to commands/games-mp/connect-four.js index a92acb58..807fecb5 100644 --- a/commands/mp-games/connect-four.js +++ b/commands/games-mp/connect-four.js @@ -11,7 +11,7 @@ module.exports = class ConnectFourCommand extends Command { super(client, { name: 'connect-four', aliases: ['connect-4', 'c4'], - group: 'mp-games', + group: 'games-mp', memberName: 'connect-four', description: 'Play a game of Connect Four with another user.', guildOnly: true, diff --git a/commands/mp-games/emoji-emoji-revolution.js b/commands/games-mp/emoji-emoji-revolution.js similarity index 99% rename from commands/mp-games/emoji-emoji-revolution.js rename to commands/games-mp/emoji-emoji-revolution.js index 33ef061b..165b8f46 100644 --- a/commands/mp-games/emoji-emoji-revolution.js +++ b/commands/games-mp/emoji-emoji-revolution.js @@ -9,7 +9,7 @@ module.exports = class EmojiEmojiRevolutionCommand extends Command { super(client, { name: 'emoji-emoji-revolution', aliases: ['eer'], - group: 'mp-games', + group: 'games-mp', memberName: 'emoji-emoji-revolution', description: 'Can you type arrow emoji faster than anyone else has ever typed them before?', guildOnly: true, diff --git a/commands/mp-games/gunfight.js b/commands/games-mp/gunfight.js similarity index 98% rename from commands/mp-games/gunfight.js rename to commands/games-mp/gunfight.js index 48a31a2d..c707964d 100644 --- a/commands/mp-games/gunfight.js +++ b/commands/games-mp/gunfight.js @@ -7,7 +7,7 @@ module.exports = class GunfightCommand extends Command { super(client, { name: 'gunfight', aliases: ['western-gunfight'], - group: 'mp-games', + group: 'games-mp', memberName: 'gunfight', description: 'Engage in a western gunfight against another user. High noon.', guildOnly: true, diff --git a/commands/mp-games/quiz-duel.js b/commands/games-mp/quiz-duel.js similarity index 99% rename from commands/mp-games/quiz-duel.js rename to commands/games-mp/quiz-duel.js index 94d92ac6..aeccbb80 100644 --- a/commands/mp-games/quiz-duel.js +++ b/commands/games-mp/quiz-duel.js @@ -9,7 +9,7 @@ module.exports = class QuizDuelCommand extends Command { super(client, { name: 'quiz-duel', aliases: ['trivia-duel'], - group: 'mp-games', + group: 'games-mp', memberName: 'quiz-duel', description: 'Answer a series of quiz questions against an opponent.', credit: [ diff --git a/commands/mp-games/russian-roulette.js b/commands/games-mp/russian-roulette.js similarity index 99% rename from commands/mp-games/russian-roulette.js rename to commands/games-mp/russian-roulette.js index 917783cc..1b1e73a6 100644 --- a/commands/mp-games/russian-roulette.js +++ b/commands/games-mp/russian-roulette.js @@ -7,7 +7,7 @@ module.exports = class RussianRouletteCommand extends Command { super(client, { name: 'russian-roulette', aliases: ['r-roulette', 'russia-gun'], - group: 'mp-games', + group: 'games-mp', memberName: 'russian-roulette', description: 'Who will pull the trigger and die first?', args: [ diff --git a/commands/mp-games/tic-tac-toe.js b/commands/games-mp/tic-tac-toe.js similarity index 99% rename from commands/mp-games/tic-tac-toe.js rename to commands/games-mp/tic-tac-toe.js index 5ba94d14..5944c2c9 100644 --- a/commands/mp-games/tic-tac-toe.js +++ b/commands/games-mp/tic-tac-toe.js @@ -6,7 +6,7 @@ module.exports = class TicTacToeCommand extends Command { constructor(client) { super(client, { name: 'tic-tac-toe', - group: 'mp-games', + group: 'games-mp', memberName: 'tic-tac-toe', description: 'Play a game of tic-tac-toe with another user.', guildOnly: true, diff --git a/commands/mp-games/word-chain.js b/commands/games-mp/word-chain.js similarity index 99% rename from commands/mp-games/word-chain.js rename to commands/games-mp/word-chain.js index 14ab0fb6..70cf2519 100644 --- a/commands/mp-games/word-chain.js +++ b/commands/games-mp/word-chain.js @@ -10,7 +10,7 @@ module.exports = class WordChainCommand extends Command { super(client, { name: 'word-chain', aliases: ['shiritori', 'しりとり'], - group: 'mp-games', + group: 'games-mp', memberName: 'word-chain', description: 'Try to come up with words that start with the last letter of your opponent\'s word.', guildOnly: true, diff --git a/commands/sp-games/blackjack.js b/commands/games-sp/blackjack.js similarity index 99% rename from commands/sp-games/blackjack.js rename to commands/games-sp/blackjack.js index 232cd128..52d8f116 100644 --- a/commands/sp-games/blackjack.js +++ b/commands/games-sp/blackjack.js @@ -9,7 +9,7 @@ module.exports = class BlackjackCommand extends Command { super(client, { name: 'blackjack', aliases: ['twenty-one', '21', 'bj'], - group: 'sp-games', + group: 'games-sp', memberName: 'blackjack', description: 'Play a game of blackjack.', args: [ diff --git a/commands/sp-games/box-choosing.js b/commands/games-sp/box-choosing.js similarity index 99% rename from commands/sp-games/box-choosing.js rename to commands/games-sp/box-choosing.js index 1ccc90fd..7d7e7787 100644 --- a/commands/sp-games/box-choosing.js +++ b/commands/games-sp/box-choosing.js @@ -8,7 +8,7 @@ module.exports = class BoxChoosingCommand extends Command { super(client, { name: 'box-choosing', aliases: ['box-choose'], - group: 'sp-games', + group: 'games-sp', memberName: 'box-choosing', description: 'Do you believe that there are choices in life? Taken from Higurashi Chapter 4.', credit: [ diff --git a/commands/sp-games/captcha.js b/commands/games-sp/captcha.js similarity index 98% rename from commands/sp-games/captcha.js rename to commands/games-sp/captcha.js index 93f6b326..d5d75782 100644 --- a/commands/sp-games/captcha.js +++ b/commands/games-sp/captcha.js @@ -9,7 +9,7 @@ module.exports = class CaptchaCommand extends Command { super(client, { name: 'captcha', aliases: ['captcha-quiz'], - group: 'sp-games', + group: 'games-sp', memberName: 'captcha', description: 'Try to guess what the captcha says.', throttling: { diff --git a/commands/sp-games/chance.js b/commands/games-sp/chance.js similarity index 96% rename from commands/sp-games/chance.js rename to commands/games-sp/chance.js index b44cffc2..167e0eca 100644 --- a/commands/sp-games/chance.js +++ b/commands/games-sp/chance.js @@ -5,7 +5,7 @@ module.exports = class ChanceCommand extends Command { super(client, { name: 'chance', aliases: ['1-in', 'one-in'], - group: 'sp-games', + group: 'games-sp', memberName: 'chance', description: 'Attempt to win with a 1 in 1000 (or your choice) chance of winning.', args: [ diff --git a/commands/sp-games/doors.js b/commands/games-sp/doors.js similarity index 99% rename from commands/sp-games/doors.js rename to commands/games-sp/doors.js index eaeed644..2e9e4f29 100644 --- a/commands/sp-games/doors.js +++ b/commands/games-sp/doors.js @@ -8,7 +8,7 @@ module.exports = class DoorsCommand extends Command { super(client, { name: 'doors', aliases: ['door', 'door-opening', 'open-door', 'monty-hall'], - group: 'sp-games', + group: 'games-sp', memberName: 'doors', description: 'Open the right door, and you win the money! Make the wrong choice, and you get the fire!', credit: [ diff --git a/commands/sp-games/fishy.js b/commands/games-sp/fishy.js similarity index 97% rename from commands/sp-games/fishy.js rename to commands/games-sp/fishy.js index b5cfce45..8e717b81 100644 --- a/commands/sp-games/fishy.js +++ b/commands/games-sp/fishy.js @@ -7,7 +7,7 @@ module.exports = class FishyCommand extends Command { super(client, { name: 'fishy', aliases: ['fishing'], - group: 'sp-games', + group: 'games-sp', memberName: 'fishy', description: 'Go fishing.', credit: [ diff --git a/commands/sp-games/google-feud.js b/commands/games-sp/google-feud.js similarity index 99% rename from commands/sp-games/google-feud.js rename to commands/games-sp/google-feud.js index 709b9ecd..9c7e7c5b 100644 --- a/commands/sp-games/google-feud.js +++ b/commands/games-sp/google-feud.js @@ -7,7 +7,7 @@ module.exports = class GoogleFeudCommand extends Command { constructor(client) { super(client, { name: 'google-feud', - group: 'sp-games', + group: 'games-sp', memberName: 'google-feud', description: 'Attempt to determine the top suggestions for a Google search.', credit: [ diff --git a/commands/sp-games/hangman.js b/commands/games-sp/hangman.js similarity index 99% rename from commands/sp-games/hangman.js rename to commands/games-sp/hangman.js index ceb86f0b..dd1aeaa5 100644 --- a/commands/sp-games/hangman.js +++ b/commands/games-sp/hangman.js @@ -6,7 +6,7 @@ module.exports = class HangmanCommand extends Command { constructor(client) { super(client, { name: 'hangman', - group: 'sp-games', + group: 'games-sp', memberName: 'hangman', description: 'Prevent a man from being hanged by guessing a word as fast as you can.', credit: [ diff --git a/commands/sp-games/hunger-games.js b/commands/games-sp/hunger-games.js similarity index 99% rename from commands/sp-games/hunger-games.js rename to commands/games-sp/hunger-games.js index 952279e1..d7013774 100644 --- a/commands/sp-games/hunger-games.js +++ b/commands/games-sp/hunger-games.js @@ -8,7 +8,7 @@ module.exports = class HungerGamesCommand extends Command { super(client, { name: 'hunger-games', aliases: ['hunger-games-simulator', 'hunger-games-sim'], - group: 'sp-games', + group: 'games-sp', memberName: 'hunger-games', description: 'Simulate a Hunger Games match with up to 24 tributes.', credit: [ diff --git a/commands/sp-games/lottery.js b/commands/games-sp/lottery.js similarity index 97% rename from commands/sp-games/lottery.js rename to commands/games-sp/lottery.js index 911464e5..746adc4d 100644 --- a/commands/sp-games/lottery.js +++ b/commands/games-sp/lottery.js @@ -7,7 +7,7 @@ module.exports = class LotteryCommand extends Command { super(client, { name: 'lottery', aliases: ['lotto'], - group: 'sp-games', + group: 'games-sp', memberName: 'lottery', description: 'Attempt to win the lottery with 6 numbers.', args: [ diff --git a/commands/sp-games/mad-libs.js b/commands/games-sp/mad-libs.js similarity index 98% rename from commands/sp-games/mad-libs.js rename to commands/games-sp/mad-libs.js index a71290f3..d48b522a 100644 --- a/commands/sp-games/mad-libs.js +++ b/commands/games-sp/mad-libs.js @@ -6,7 +6,7 @@ module.exports = class MadLibsCommand extends Command { super(client, { name: 'mad-libs', aliases: ['mad-takes'], - group: 'sp-games', + group: 'games-sp', memberName: 'mad-libs', description: 'Choose words that fill in the blanks to create a crazy story!', credit: [ diff --git a/commands/sp-games/math-quiz.js b/commands/games-sp/math-quiz.js similarity index 98% rename from commands/sp-games/math-quiz.js rename to commands/games-sp/math-quiz.js index b5d08cec..e0414766 100644 --- a/commands/sp-games/math-quiz.js +++ b/commands/games-sp/math-quiz.js @@ -16,7 +16,7 @@ module.exports = class MathQuizCommand extends Command { constructor(client) { super(client, { name: 'math-quiz', - group: 'sp-games', + group: 'games-sp', memberName: 'math-quiz', description: 'See how fast you can answer a math problem in a given time limit.', details: `**Difficulties:** ${difficulties.join(', ')}`, diff --git a/commands/sp-games/quiz.js b/commands/games-sp/quiz.js similarity index 99% rename from commands/sp-games/quiz.js rename to commands/games-sp/quiz.js index ba22f4e5..0c879c65 100644 --- a/commands/sp-games/quiz.js +++ b/commands/games-sp/quiz.js @@ -11,7 +11,7 @@ module.exports = class QuizCommand extends Command { super(client, { name: 'quiz', aliases: ['trivia'], - group: 'sp-games', + group: 'games-sp', memberName: 'quiz', description: 'Answer a quiz question.', details: stripIndents` diff --git a/commands/sp-games/rock-paper-scissors.js b/commands/games-sp/rock-paper-scissors.js similarity index 98% rename from commands/sp-games/rock-paper-scissors.js rename to commands/games-sp/rock-paper-scissors.js index 953c0b40..58c858ec 100644 --- a/commands/sp-games/rock-paper-scissors.js +++ b/commands/games-sp/rock-paper-scissors.js @@ -6,7 +6,7 @@ module.exports = class RockPaperScissorsCommand extends Command { super(client, { name: 'rock-paper-scissors', aliases: ['rps'], - group: 'sp-games', + group: 'games-sp', memberName: 'rock-paper-scissors', description: 'Play Rock-Paper-Scissors.', args: [ diff --git a/commands/sp-games/roulette.js b/commands/games-sp/roulette.js similarity index 99% rename from commands/sp-games/roulette.js rename to commands/games-sp/roulette.js index 5f56685c..a635d11a 100644 --- a/commands/sp-games/roulette.js +++ b/commands/games-sp/roulette.js @@ -13,7 +13,7 @@ module.exports = class RouletteCommand extends Command { constructor(client) { super(client, { name: 'roulette', - group: 'sp-games', + group: 'games-sp', memberName: 'roulette', description: 'Play a game of roulette.', args: [ diff --git a/commands/sp-games/slots.js b/commands/games-sp/slots.js similarity index 97% rename from commands/sp-games/slots.js rename to commands/games-sp/slots.js index dbb5878a..24da0969 100644 --- a/commands/sp-games/slots.js +++ b/commands/games-sp/slots.js @@ -6,7 +6,7 @@ module.exports = class SlotsCommand extends Command { constructor(client) { super(client, { name: 'slots', - group: 'sp-games', + group: 'games-sp', memberName: 'slots', description: 'Play a game of slots.' }); diff --git a/commands/sp-games/sorting-hat.js b/commands/games-sp/sorting-hat.js similarity index 99% rename from commands/sp-games/sorting-hat.js rename to commands/games-sp/sorting-hat.js index dbd9d43d..6209ec9b 100644 --- a/commands/sp-games/sorting-hat.js +++ b/commands/games-sp/sorting-hat.js @@ -9,7 +9,7 @@ module.exports = class SortingHatCommand extends Command { super(client, { name: 'sorting-hat', aliases: ['sorting-hat-quiz', 'hogwarts', 'hogwarts-house'], - group: 'sp-games', + group: 'games-sp', memberName: 'sorting-hat', description: 'Take a quiz to determine your Hogwarts house.', credit: [ diff --git a/commands/sp-games/typing-test.js b/commands/games-sp/typing-test.js similarity index 98% rename from commands/sp-games/typing-test.js rename to commands/games-sp/typing-test.js index 9a5dd65f..f4d4e7b1 100644 --- a/commands/sp-games/typing-test.js +++ b/commands/games-sp/typing-test.js @@ -16,7 +16,7 @@ module.exports = class TypingTestCommand extends Command { constructor(client) { super(client, { name: 'typing-test', - group: 'sp-games', + group: 'games-sp', memberName: 'typing-test', description: 'See how fast you can type a sentence in a given time limit.', details: `**Difficulties:** ${difficulties.join(', ')}`, diff --git a/commands/sp-games/whos-that-pokemon.js b/commands/games-sp/whos-that-pokemon.js similarity index 99% rename from commands/sp-games/whos-that-pokemon.js rename to commands/games-sp/whos-that-pokemon.js index 46a47edc..6ae20b16 100644 --- a/commands/sp-games/whos-that-pokemon.js +++ b/commands/games-sp/whos-that-pokemon.js @@ -10,7 +10,7 @@ module.exports = class WhosThatPokemonCommand extends Command { super(client, { name: 'whos-that-pokemon', aliases: ['who-pokemon', 'whos-that-pokémon', 'who-pokémon'], - group: 'sp-games', + group: 'games-sp', memberName: 'whos-that-pokemon', description: 'Guess who that Pokémon is.', throttling: { diff --git a/package.json b/package.json index ecac48cb..9b1e4df3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "112.9.1", + "version": "112.9.2", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {