Merge pull request #574 from beanbeanjuice/572-8ball-rename

Renamed the 8 Ball Command

README-small.md

@@ -128,8 +128,8 @@ As you can see, this was shown using the command `/help order`. It shows each pa
 * `rate` - Rate the percentages of someone! (*somewhat* NSFW)
 * `snipe` - Snipe a recently deleted message! (30 Seconds)
 * `tea-meme` - Get a tea meme!
+* `8ball` - Ask a yes or no question!
 ##### 4. **GAMES**
-* `8-ball` - Ask a yes or no question!
 * `coin-flip` - Flip a coin!
 * `connect-4` - Play connect four with someone!
 * `dice-roll` - Roll a dice!

README.md

@@ -162,8 +162,8 @@ As you can see, this was shown using the command `/help order`. It shows each pa
 * `rate` - Rate the percentages of someone! (*somewhat* NSFW)
 * `snipe` - Snipe a recently deleted message! (30 Seconds)
 * `tea-meme` - Get a tea meme!
+* `8ball` - Ask a yes or no question!
 ##### 4. **GAMES**
-* `8-ball` - Ask a yes or no question!
 * `coin-flip` - Flip a coin!
 * `connect-4` - Play connect four with someone!
 * `dice-roll` - Roll a dice!

src/main/java/com/beanbeanjuice/command/games/EightBallCommand.java → src/main/java/com/beanbeanjuice/command/fun/EightBallCommand.java

@@ -1,4 +1,4 @@
-package com.beanbeanjuice.command.games;
+package com.beanbeanjuice.command.fun;
 
 import com.beanbeanjuice.utility.command.CommandCategory;
 import com.beanbeanjuice.utility.command.ICommand;
@@ -44,6 +44,7 @@ private String getAnswer() {
         yesAnswers.add("Of course.");
         yesAnswers.add("More than likely.");
         yesAnswers.add("YES ABSOLUTELY.");
+        yesAnswers.add("Hmmm... I think so.");
 
         ArrayList<String> noAnswers = new ArrayList<>();
         noAnswers.add("Of course not.");
@@ -52,8 +53,9 @@ private String getAnswer() {
         noAnswers.add("There is some doubt...");
         noAnswers.add("Less than likely.");
         noAnswers.add("ABSOLUTELY NOT.");
+        noAnswers.add("Are you kidding? No!");
 
-        if (Helper.getRandomNumber(1, 3) == 1)
+        if (Helper.getRandomNumber(0, 2) == 1)
             return yesAnswers.get(Helper.getRandomNumber(0, yesAnswers.size()));
         else
             return noAnswers.get(Helper.getRandomNumber(0, noAnswers.size()));
@@ -62,13 +64,13 @@ private String getAnswer() {
     @NotNull
     @Override
     public String getDescription() {
-        return "Ask 8-ball a yes or no question!";
+        return "Ask the 8 ball a yes or no question!";
     }
 
     @NotNull
     @Override
     public String exampleUsage() {
-        return "`/8-ball Will I ever be real?`";
+        return "`/8ball Will I ever be real?`";
     }
 
     @NotNull
@@ -82,7 +84,7 @@ public ArrayList<OptionData> getOptions() {
     @NotNull
     @Override
     public CommandCategory getCategoryType() {
-        return CommandCategory.GAMES;
+        return CommandCategory.FUN;
     }
 
     @NotNull

src/main/java/com/beanbeanjuice/utility/command/CommandHandler.java

@@ -72,12 +72,12 @@ public CommandHandler(@NotNull JDA jda) {
         commands.put("meme", new MemeCommand());
         commands.put("snipe", new SnipeCommand());
         commands.put("tea-meme", new TeaMemeCommand());
+        commands.put("8ball", new EightBallCommand());
 
         // Games
         commands.put("coin-flip", new CoinFlipCommand());
         commands.put("connect-4", new ConnectFourCommand());
         commands.put("dice-roll", new DiceRollCommand());
-        commands.put("8-ball", new EightBallCommand());
         commands.put("get-game-data", new GetGameDataCommand());
         commands.put("tic-tac-toe", new TicTacToeCommand());