a few small changes

4 files changed, 51 insertions, 63 deletions

diff --git a/src/commands/fun/coinflip.ts b/src/commands/fun/coinflip.ts
index 83de5ba..cd436f8 100644
--- a/src/commands/fun/coinflip.ts
+++ b/src/commands/fun/coinflip.ts
@@ -5,11 +5,9 @@ export default class CoinFlipCommand extends BushCommand {
 		super('coinflip', {
 			aliases: ['coinflip', 'cf'],
 			category: 'fun',
-			description: {
-				content: 'Flip a virtual coin.',
-				usage: ['coinflip'],
-				examples: ['coinflip']
-			},
+			description: 'Flip a virtual coin.',
+			usage: ['coinflip'],
+			examples: ['coinflip'],
 			clientPermissions: (m) => util.clientSendAndPermCheck(m),
 			userPermissions: [],
 			slash: true
diff --git a/src/commands/fun/dice.ts b/src/commands/fun/dice.ts
index 74f387e..2f96e1c 100644
--- a/src/commands/fun/dice.ts
+++ b/src/commands/fun/dice.ts
@@ -5,11 +5,9 @@ export default class EightBallCommand extends BushCommand {
 		super('dice', {
 			aliases: ['dice', 'die'],
 			category: 'fun',
-			description: {
-				content: 'Roll virtual dice.',
-				usage: ['dice'],
-				examples: ['dice']
-			},
+			description: 'Roll virtual dice.',
+			usage: ['dice'],
+			examples: ['dice'],
 			clientPermissions: (m) => util.clientSendAndPermCheck(m),
 			userPermissions: [],
 			slash: true
diff --git a/src/commands/fun/eightBall.ts b/src/commands/fun/eightBall.ts
index fc662ad..d6b0b8c 100644
--- a/src/commands/fun/eightBall.ts
+++ b/src/commands/fun/eightBall.ts
@@ -5,31 +5,21 @@ export default class EightBallCommand extends BushCommand {
 		super('eightBall', {
 			aliases: ['8ball', 'eightball'],
 			category: 'fun',
-			description: {
-				content: 'Ask questions for a randomly generated response.',
-				usage: ['8Ball <question>'],
-				examples: ['8Ball does anyone love me?']
-			},
+			description: 'Ask questions for a randomly generated response.',
+			usage: ['8Ball <question>'],
+			examples: ['8Ball does anyone love me?'],
 			args: [
 				{
 					id: 'question',
+					description: 'The question to have answered.',
 					type: 'string',
 					match: 'rest',
-					prompt: {
-						start: 'What question would you like answered?',
-						retry: '{error} Invalid question.'
-					}
+					prompt: 'What question would you like answered?',
+					retry: '{error} Invalid question.',
+					slashType: 'STRING'
 				}
 			],
 			slash: true,
-			slashOptions: [
-				{
-					name: 'question',
-					description: 'What question would you like answered?',
-					type: 'STRING',
-					required: true
-				}
-			],
 			clientPermissions: (m) => util.clientSendAndPermCheck(m),
 			userPermissions: []
 		});
diff --git a/src/commands/fun/minesweeper.ts b/src/commands/fun/minesweeper.ts
index 9b511a3..7ef1de7 100644
--- a/src/commands/fun/minesweeper.ts
+++ b/src/commands/fun/minesweeper.ts
@@ -6,58 +6,60 @@ export default class MinesweeperCommand extends BushCommand {
 		super('minesweeper', {
 			aliases: ['minesweeper'],
 			category: 'fun',
-			description: {
-				content: 'minesweeper command.',
-				usage: ['minesweeper <rows> <columns> <mines> [--spaces] [--revealFirstCell]'],
-				examples: ['minesweeper 10 10 2']
-			},
+			description: 'minesweeper command.',
+			usage: ['minesweeper <rows> <columns> <mines> [--spaces] [--revealFirstCell]'],
+			examples: ['minesweeper 10 10 2'],
 			args: [
 				{
 					id: 'rows',
+					description: 'The number of rows to generate.',
 					type: 'integer',
-					prompt: {
-						start: 'How many rows would you like?',
-						retry: '{error} Choose a valid number of rows',
-						optional: true
-					},
-					default: 9
+					prompt: 'How many rows would you like?',
+					retry: '{error} Choose a valid number of rows',
+					optional: true,
+					default: 9,
+					slashType: 'INTEGER'
 				},
 				{
 					id: 'columns',
+					description: 'The number of columns to generate.',
 					type: 'integer',
-					prompt: {
-						start: 'How many columns would you like?',
-						retry: '{error} Choose a valid number of columns',
-						optional: true
-					},
-					default: 9
+					prompt: 'How many columns would you like?',
+					retry: '{error} Choose a valid number of columns',
+					optional: true,
+					default: 9,
+					slashType: 'INTEGER'
 				},
 				{
 					id: 'mines',
+					description: 'The number of mines to generate.',
 					type: 'integer',
-					prompt: {
-						start: 'How many mines would you like?',
-						retry: '{error} Choose a valid number of mines',
-						optional: true
-					},
-					default: 10
+					prompt: 'How many mines would you like?',
+					retry: '{error} Choose a valid number of mines',
+					optional: true,
+					default: 10,
+					slashType: 'INTEGER'
 				},
-				{ id: 'spaces', match: 'flag', flag: '--spaces' },
-				{ id: 'reveal_first_cell', match: 'flag', flag: '--revealFirstCell' }
-			],
-			slash: true,
-			slashOptions: [
-				{ name: 'rows', description: 'How many rows would you like?', type: 'INTEGER', required: false },
-				{ name: 'columns', description: 'How many rows would you like?', type: 'INTEGER', required: false },
-				{ name: 'mines', description: 'How many rows would you like?', type: 'INTEGER', required: false },
-				{ name: 'spaces', description: 'Would you like there to be spaces?', type: 'BOOLEAN', required: false },
 				{
-					name: 'reveal_first_cell',
-					description: 'Would you like to automatically reveal the first cell?',
-					type: 'BOOLEAN',
-					required: false
+					id: 'spaces',
+					description: 'Whether or not to put a space between cells.',
+					match: 'flag',
+					flag: '--spaces',
+					prompt: 'Would you like there to be spaces?',
+					slashType: 'BOOLEAN',
+					optional: true
+				},
+				{
+					id: 'reveal_first_cell',
+					description: 'Whether or not to reveal the first cell automatically.',
+					match: 'flag',
+					flag: '--revealFirstCell',
+					prompt: 'Would you like to automatically reveal the first cell?',
+					slashType: 'BOOLEAN',
+					optional: true
 				}
 			],
+			slash: true,
 			clientPermissions: (m) => util.clientSendAndPermCheck(m),
 			userPermissions: []
 		});