From 8d98d1286c073ac667e52bd15ab3b5346033c061 Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 10:32:26 -0600 Subject: [PATCH 1/9] Replace explicit type with diamond type --- src/tel/discord/rtab/MinigameTournament.java | 4 ++-- src/tel/discord/rtab/Player.java | 2 +- src/tel/discord/rtab/games/BumperGrab.java | 2 +- src/tel/discord/rtab/games/RaceDeal.java | 2 +- src/tel/discord/rtab/games/Stardust.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tel/discord/rtab/MinigameTournament.java b/src/tel/discord/rtab/MinigameTournament.java index b37a18e3..f0c745e4 100644 --- a/src/tel/discord/rtab/MinigameTournament.java +++ b/src/tel/discord/rtab/MinigameTournament.java @@ -116,7 +116,7 @@ void loadConfigFile() minigameList = new Game[gameList.length]; for(int i=0; i(); + rankList = new LinkedList<>(); for(int i=4; i()); + runTournamentRound(player, new HashSet<>()); } @SuppressWarnings("unlikely-arg-type") diff --git a/src/tel/discord/rtab/Player.java b/src/tel/discord/rtab/Player.java index aad15c07..1be347e6 100644 --- a/src/tel/discord/rtab/Player.java +++ b/src/tel/discord/rtab/Player.java @@ -433,7 +433,7 @@ public StringBuilder blowUp(int penalty, boolean holdLoot) else { //Remove all their minigames, other than designated 'negative minigames' - LinkedList gamesToKeep = new LinkedList(); + LinkedList gamesToKeep = new LinkedList<>(); for(Game nextGame : games) { if(nextGame.isNegative()) diff --git a/src/tel/discord/rtab/games/BumperGrab.java b/src/tel/discord/rtab/games/BumperGrab.java index d02b2b5b..da812135 100644 --- a/src/tel/discord/rtab/games/BumperGrab.java +++ b/src/tel/discord/rtab/games/BumperGrab.java @@ -301,7 +301,7 @@ void playNextTurn(String input) private LinkedList move(Direction direction, LinkedList output) { - LinkedList> currentSegment = new LinkedList>(); + LinkedList> currentSegment = new LinkedList<>(); currentSegment.add(Pair.of(playerX, playerY)); return move(direction, output, currentSegment); } diff --git a/src/tel/discord/rtab/games/RaceDeal.java b/src/tel/discord/rtab/games/RaceDeal.java index b8b10c30..805dc915 100644 --- a/src/tel/discord/rtab/games/RaceDeal.java +++ b/src/tel/discord/rtab/games/RaceDeal.java @@ -48,7 +48,7 @@ void startGame() casesLeft = 26; round = 0; //Start by adding the fixed values - valueList = new ArrayList>(casesLeft); + valueList = new ArrayList<>(casesLeft); valueList.add(Pair.of(applyBaseMultiplier(-10_000_000), SpecialType.CASH)); valueList.add(Pair.of(1, SpecialType.CASH)); //Just like the regular DoND minigame, this isn't multiplied valueList.add(Pair.of(applyBaseMultiplier(1_000_000), SpecialType.CASH)); //Lowest Red Value diff --git a/src/tel/discord/rtab/games/Stardust.java b/src/tel/discord/rtab/games/Stardust.java index ef69a0db..0221adc1 100644 --- a/src/tel/discord/rtab/games/Stardust.java +++ b/src/tel/discord/rtab/games/Stardust.java @@ -372,7 +372,7 @@ private LinkedList endOfStage() stage ++; //Get list of eligible options for the next stage - stageOptions = new ArrayList(); + stageOptions = new ArrayList<>(); stageOptions.addAll(Arrays.asList(Galaxy.values())); stageOptions.removeIf((g) -> !g.eligibleStages[stage]); stageOptions.removeAll(previousStages); From 8e81ab95de74ee43858a714e02594fae14f43c56 Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 10:37:16 -0600 Subject: [PATCH 2/9] Remove concatenation with empty string --- src/tel/discord/rtab/games/ColourOfMoney.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tel/discord/rtab/games/ColourOfMoney.java b/src/tel/discord/rtab/games/ColourOfMoney.java index 1c02913a..e70c9bf9 100644 --- a/src/tel/discord/rtab/games/ColourOfMoney.java +++ b/src/tel/discord/rtab/games/ColourOfMoney.java @@ -291,7 +291,7 @@ else if(winner < 0) output.add(extraResult.toString()); //and the closer output.add(" from " + (gameMultiplier > 1 ? String.format("%d copies of ", gameMultiplier) : "") - + getName() + ""); + + getName()); sendMessages = true; sendMessages(output); checkLuckyCharm(players.get(player), playerBank); From b0d0471f328990779626eadce46ba512bacc38aa Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 10:40:54 -0600 Subject: [PATCH 3/9] Remove redundant default branches As they will never be reached, they're not included in compilation and can be safely removed. --- src/tel/discord/rtab/GameController.java | 3 +-- src/tel/discord/rtab/games/LoserWheel.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tel/discord/rtab/GameController.java b/src/tel/discord/rtab/GameController.java index 55899be2..2202dddf 100644 --- a/src/tel/discord/rtab/GameController.java +++ b/src/tel/discord/rtab/GameController.java @@ -1293,8 +1293,7 @@ public SpaceType usePeek(int playerID, int space) case BOOSTER -> "a **BOOSTER**"; case EVENT, GRAB_BAG -> "an **EVENT**"; case BOMB, GB_BOMB -> "a **BOMB**"; - default -> "an **ERROR**"; - }; + }; peeker.user.openPrivateChannel().queue( (channel) -> channel.sendMessage(String.format("Space %d is %s.",space+1,peekClaim)).queue()); } diff --git a/src/tel/discord/rtab/games/LoserWheel.java b/src/tel/discord/rtab/games/LoserWheel.java index b8aa2ba9..aa6c9629 100644 --- a/src/tel/discord/rtab/games/LoserWheel.java +++ b/src/tel/discord/rtab/games/LoserWheel.java @@ -196,8 +196,7 @@ private String displayRoulette(int index) case PERCENTAGE -> String.format("-%d%% Bank", spaceValues[wheelPosition]); case ANNUITY -> String.format("-$%,d/turn", spaceValues[wheelPosition]); case BIG_JUMBLE -> "Loan Repayment"; - default -> ""; - }); + }); board.append("\n"); } board.append("```"); From 53e901c6b0c630e891bcc9dc1bed6db8001bc6ed Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 10:43:21 -0600 Subject: [PATCH 4/9] Replace with String.format --- src/tel/discord/rtab/games/ColourOfMoney.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tel/discord/rtab/games/ColourOfMoney.java b/src/tel/discord/rtab/games/ColourOfMoney.java index e70c9bf9..3ba55f8b 100644 --- a/src/tel/discord/rtab/games/ColourOfMoney.java +++ b/src/tel/discord/rtab/games/ColourOfMoney.java @@ -346,7 +346,7 @@ String generateBoard() board.append("```\n"); //Start by figuring out the lengths of things and printing the header int nameLength = Math.max(players.get(player).getName().length(), players.get(opponent).getName().length()); - int moneyLength = String.valueOf(String.format("%,d",adjustedBase*BOARD_SIZE*MAX_TURNS/2)).length(); + int moneyLength = String.format("%,d", adjustedBase * BOARD_SIZE * MAX_TURNS / 2).length(); int headerSpaces = (nameLength + moneyLength - 10)/2; board.append(" ".repeat(Math.max(0, headerSpaces))); board.append("THE COLOUR OF MONEY\n"); From d41e7672d87b1f6c4978d7119a83aba99621a0cb Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 11:03:19 -0600 Subject: [PATCH 5/9] Replace with .isEmpty() --- src/tel/discord/rtab/GameController.java | 2 +- src/tel/discord/rtab/Player.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tel/discord/rtab/GameController.java b/src/tel/discord/rtab/GameController.java index 2202dddf..57a664f1 100644 --- a/src/tel/discord/rtab/GameController.java +++ b/src/tel/discord/rtab/GameController.java @@ -1966,7 +1966,7 @@ void gameOver() if(next.status == PlayerStatus.WINNER || next.status == PlayerStatus.ALIVE) next.addWinstreak((5 - (playersAlive-1)*5/(players.size()-1)) * (players.size() - playersAlive)); //Award bounties to everyone who gets credit - if(next.bounty > 0 && next.bountyCredit.size() > 0) + if(next.bounty > 0 && !next.bountyCredit.isEmpty()) { try { Thread.sleep(1000); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } //If environmental credit, add to wager pool diff --git a/src/tel/discord/rtab/Player.java b/src/tel/discord/rtab/Player.java index 1be347e6..0a44264f 100644 --- a/src/tel/discord/rtab/Player.java +++ b/src/tel/discord/rtab/Player.java @@ -516,7 +516,7 @@ public StringBuilder blowUp(int penalty, boolean holdLoot) bountyCredit.add(i); } //If no one has credit by now, mark as such - if(bountyCredit.size() == 0) + if(bountyCredit.isEmpty()) bountyCredit.add(-1); //Dumb easter egg if(money <= -1000000000) From 6cb8e43fbd76096659891af3f74f3803d309f5d3 Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 11:23:45 -0600 Subject: [PATCH 6/9] Replace with equality --- src/tel/discord/rtab/GameController.java | 2 +- src/tel/discord/rtab/events/SomethingForEveryone.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tel/discord/rtab/GameController.java b/src/tel/discord/rtab/GameController.java index 57a664f1..b801deb2 100644 --- a/src/tel/discord/rtab/GameController.java +++ b/src/tel/discord/rtab/GameController.java @@ -2170,7 +2170,7 @@ public void runFinalEndGameTasks() if(!winners.isEmpty()) { //Got a single winner, crown them! - if(winners.size() <= 1) + if(winners.size() == 1) { players.addAll(winners); currentTurn = 0; diff --git a/src/tel/discord/rtab/events/SomethingForEveryone.java b/src/tel/discord/rtab/events/SomethingForEveryone.java index 2d2959bf..67bb6346 100644 --- a/src/tel/discord/rtab/events/SomethingForEveryone.java +++ b/src/tel/discord/rtab/events/SomethingForEveryone.java @@ -61,14 +61,14 @@ public void execute(GameController game, int player) } } } - else if(rng <= 1) + else if(rng == 1) { //peek? game.channel.sendMessage(nextPlayer.getSafeMention() + " gets **an Extra Peek**!").queue(); nextPlayer.peeks++; } - else if(rng <= 2) + else if(rng == 2) { //Million int cashGiven = game.applyBaseMultiplier(1_000_000); From 1b2abb12ab7ab3c3f81eaad234ee06661c2ecebe Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 11:27:27 -0600 Subject: [PATCH 7/9] Remove redundant method These have the same code in super and are not overridden, so they can be deleted. --- src/tel/discord/rtab/games/MoneyCards.java | 18 ++---------------- src/tel/discord/rtab/games/PunchABunch.java | 12 +----------- src/tel/discord/rtab/games/ShutTheBox.java | 15 +-------------- src/tel/discord/rtab/games/TriplePlay.java | 17 ++--------------- 4 files changed, 6 insertions(+), 56 deletions(-) diff --git a/src/tel/discord/rtab/games/MoneyCards.java b/src/tel/discord/rtab/games/MoneyCards.java index 0d88f0d4..2fade0b3 100644 --- a/src/tel/discord/rtab/games/MoneyCards.java +++ b/src/tel/discord/rtab/games/MoneyCards.java @@ -373,22 +373,8 @@ private String printBoardRow(int start, int end, boolean fullReveal) { display.append("\n"); return display.toString(); } - - boolean isNumber(String message) - { - try - { - //If this doesn't throw an exception we're good - Integer.parseInt(message); - return true; - } - catch(NumberFormatException e1) - { - return false; - } - } - - private void changeCard() { + + private void changeCard() { layout[stage] = deck.dealCard(); } diff --git a/src/tel/discord/rtab/games/PunchABunch.java b/src/tel/discord/rtab/games/PunchABunch.java index c1bbcaab..f67f240a 100644 --- a/src/tel/discord/rtab/games/PunchABunch.java +++ b/src/tel/discord/rtab/games/PunchABunch.java @@ -162,17 +162,7 @@ private boolean checkValidNumber(int number) return (number > 0 && number <= BOARD_SIZE); } - boolean isNumber(String message) { - try { - //If this doesn't throw an exception we're good - Integer.parseInt(message); - return true; - } catch(NumberFormatException e1) { - return false; - } - } - - boolean isGameOver() { + boolean isGameOver() { return !isAlive || turnsTaken == MAX_TURNS; } diff --git a/src/tel/discord/rtab/games/ShutTheBox.java b/src/tel/discord/rtab/games/ShutTheBox.java index 43d39378..116d320a 100644 --- a/src/tel/discord/rtab/games/ShutTheBox.java +++ b/src/tel/discord/rtab/games/ShutTheBox.java @@ -199,20 +199,7 @@ void abortGame() { awardMoneyWon(getMoneyWon()); } - boolean isNumber(String message) - { - try - { - //If this doesn't throw an exception we're good - Integer.parseInt(message); - return true; - } - catch(NumberFormatException e1) - { - return false; - } - } - boolean checkValidNumber(String message) + boolean checkValidNumber(String message) { int location = Integer.parseInt(message)-1; return (location >= 0 && location < BOARD_SIZE && !closedSpaces diff --git a/src/tel/discord/rtab/games/TriplePlay.java b/src/tel/discord/rtab/games/TriplePlay.java index 03c42431..b1fa87e6 100644 --- a/src/tel/discord/rtab/games/TriplePlay.java +++ b/src/tel/discord/rtab/games/TriplePlay.java @@ -125,21 +125,8 @@ else if(total > target) else getInput(); } - - boolean isNumber(String message) - { - try - { - Integer.parseInt(message); - return true; - } - catch(NumberFormatException e1) - { - return false; - } - } - - boolean checkValidNumber(String message) + + boolean checkValidNumber(String message) { int location = Integer.parseInt(message)-1; return (location >= 0 && location < money.size() && !pickedSpaces[location]); From f4a65914b6effb68806a9df8e84296862b3480d3 Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 13:18:20 -0600 Subject: [PATCH 8/9] Clean up some redundant code This simplifies stuff that can be replaced with constants and gets rid of redundant initializers and assignments. --- src/tel/discord/rtab/GameController.java | 11 +++--- src/tel/discord/rtab/MinigameTournament.java | 2 +- src/tel/discord/rtab/Player.java | 2 +- src/tel/discord/rtab/SuperBotChallenge.java | 2 +- .../discord/rtab/commands/HistoryCommand.java | 2 +- .../commands/ListAchievementsCommand.java | 39 ++++--------------- .../rtab/commands/channel/ChannelSetting.java | 4 +- .../rtab/commands/hidden/BlammoCommand.java | 4 +- .../rtab/commands/hidden/DefuseCommand.java | 4 +- .../rtab/commands/hidden/FailsafeCommand.java | 4 +- .../rtab/commands/hidden/FoldCommand.java | 4 +- .../commands/hidden/MinesweeperCommand.java | 4 +- .../rtab/commands/hidden/RepelCommand.java | 4 +- .../commands/hidden/TruesightCommand.java | 4 +- .../rtab/commands/hidden/WagerCommand.java | 4 +- src/tel/discord/rtab/events/Bowser.java | 16 +++----- .../discord/rtab/games/BowserTicTacBomb.java | 2 +- src/tel/discord/rtab/games/CloseShave.java | 10 ++--- src/tel/discord/rtab/games/CoinFlip.java | 3 +- src/tel/discord/rtab/games/ColourOfMoney.java | 24 ++++-------- src/tel/discord/rtab/games/Gamble.java | 2 +- .../discord/rtab/games/MinefieldMulti.java | 2 +- .../discord/rtab/games/MiniGameWrapper.java | 2 +- src/tel/discord/rtab/games/Optimise.java | 2 +- src/tel/discord/rtab/games/TicTacBomb.java | 3 +- src/tel/discord/rtab/games/Zilch.java | 2 +- 26 files changed, 52 insertions(+), 110 deletions(-) diff --git a/src/tel/discord/rtab/GameController.java b/src/tel/discord/rtab/GameController.java index b801deb2..59f1a77d 100644 --- a/src/tel/discord/rtab/GameController.java +++ b/src/tel/discord/rtab/GameController.java @@ -1110,13 +1110,13 @@ private void runAITurn(int player) { safeSpaces.remove(truesightIndex); //We know there's another so this is fine String truesightIdentity = useTruesight(player,truesightSpace); - boolean badPeek = false; + boolean badPeek; if(truesightIdentity.startsWith("-") || truesightIdentity.contains("BOMB")) badPeek = true; else badPeek = switch (truesightIdentity) { case "BLAMMO", "Split & Share", "Bowser Event", "Reverse", "Minefield" -> true; - default -> badPeek; + default -> false; }; if(!badPeek) { @@ -1527,8 +1527,7 @@ public void awardBomb(int player, BombType bombType) //Don't deduct if negative, to allow for unlimited joker if(players.get(player).jokers > 0) players.get(player).jokers --; - bombType = BombType.DUD; - } + } else { resolvingBomb = true; @@ -2060,7 +2059,7 @@ private void runNextEndGamePlayer() } channel.sendMessage(players.get(currentTurn).getName() + " receives a win bonus of **$" + String.format("%,d",winBonus) + "**.").queue(); - StringBuilder extraResult = null; + StringBuilder extraResult; extraResult = players.get(currentTurn).addMoney(winBonus,MoneyMultipliersToUse.BONUS_ONLY); if(extraResult != null) channel.sendMessage(extraResult).queue(); @@ -2429,7 +2428,7 @@ public String listPlayers(boolean waitingOn) resultString.append(String.format("**%d PLAYERS**", players.size())); for(Player next : players) { - if(!waitingOn || (waitingOn && next.status == PlayerStatus.OUT)) + if(!waitingOn || next.status == PlayerStatus.OUT) { resultString.append(" | "); resultString.append(next.getName()); diff --git a/src/tel/discord/rtab/MinigameTournament.java b/src/tel/discord/rtab/MinigameTournament.java index f0c745e4..c1e13870 100644 --- a/src/tel/discord/rtab/MinigameTournament.java +++ b/src/tel/discord/rtab/MinigameTournament.java @@ -99,7 +99,7 @@ public MinigameTournament(TextChannel channel, String[] record, TextChannel resu void loadConfigFile() { - List list = null; + List list; try { list = Files.readAllLines(Paths.get("scores","tournament"+channel.getId()+".csv")); diff --git a/src/tel/discord/rtab/Player.java b/src/tel/discord/rtab/Player.java index 0a44264f..470acab4 100644 --- a/src/tel/discord/rtab/Player.java +++ b/src/tel/discord/rtab/Player.java @@ -318,7 +318,7 @@ public void addBooster(int amount) { booster += amount; //Convert excess boost to cash - int excessBoost = 0; + int excessBoost; if(booster > MAX_BOOSTER && game != null) { excessBoost = game.applyBaseMultiplier(10000) * (booster - MAX_BOOSTER); diff --git a/src/tel/discord/rtab/SuperBotChallenge.java b/src/tel/discord/rtab/SuperBotChallenge.java index c7715a65..082402e6 100644 --- a/src/tel/discord/rtab/SuperBotChallenge.java +++ b/src/tel/discord/rtab/SuperBotChallenge.java @@ -63,7 +63,7 @@ public GameController initialise(TextChannel gameChannel, String[] record, TextC } public void loadGames() { - List list = null; + List list; try { list = Files.readAllLines(Paths.get("scores","schedule"+channel.getId()+".csv")); diff --git a/src/tel/discord/rtab/commands/HistoryCommand.java b/src/tel/discord/rtab/commands/HistoryCommand.java index d8710eee..10fd379d 100644 --- a/src/tel/discord/rtab/commands/HistoryCommand.java +++ b/src/tel/discord/rtab/commands/HistoryCommand.java @@ -102,7 +102,7 @@ public String getHistoryMessage(String uID, String name, TextChannel channel) int rankWidth = maxRank == 1 ? 1 : (int)Math.log10(maxRank-1)+1; //season stops at the first one that doesn't exist, so we subtract 1 //and if there's no history data at all (so season 1 is the first that doesn't exist) we have a failsave to avoid div-by-0 - int seasonWidth = season == 1 ? 1 : (int)Math.log10(season-1)+1; + int seasonWidth = (int)Math.log10(season-1)+1; int seasonsPlayed = 0; long thisSeason; long totalCash = 0; diff --git a/src/tel/discord/rtab/commands/ListAchievementsCommand.java b/src/tel/discord/rtab/commands/ListAchievementsCommand.java index 45ff4672..9038eba7 100644 --- a/src/tel/discord/rtab/commands/ListAchievementsCommand.java +++ b/src/tel/discord/rtab/commands/ListAchievementsCommand.java @@ -31,51 +31,26 @@ protected void execute(CommandEvent event) AchievementType desiredAchievementType = null; switch (event.getArgs().toUpperCase()) { case "1", "A", "MILESTONE" -> { - desiredAchievementType = AchievementType.MILESTONE; - output.append("Milestone Achievements - ").append(name).append("\n\n"); + output.append("Milestone Achievements - ").append(name).append("\n\n"); } case "2", "B", "EVENT" -> { - desiredAchievementType = AchievementType.EVENT; - output.append("Event Achievements - ").append(name).append("\n\n"); + output.append("Event Achievements - ").append(name).append("\n\n"); } case "3", "C", "MINIGAME" -> { - desiredAchievementType = AchievementType.MINIGAME; - output.append("Minigame Achivements - ").append(name).append("\n\n"); + output.append("Minigame Achivements - ").append(name).append("\n\n"); } case "4", "D", "LUCKY", "CHARMS", "LUCKY CHARMS" -> { - desiredAchievementType = AchievementType.CHARM; - output.append("Lucky Charms - ").append(name).append("\n\n"); + output.append("Lucky Charms - ").append(name).append("\n\n"); } default -> { //Display a summary of achievements earned output = getAchievementSummary(record, name); - replyInDm = false; - } + } } //Get a list of the desired achievements - if(desiredAchievementType != null) - { - int achievementFlags = Integer.parseInt(record[desiredAchievementType.recordLocation]); - for(Achievement next : Achievement.values()) - { - if(next.achievementType == desiredAchievementType) - { - //Don't show retired achievements unless they're earned - if(!next.retired || (achievementFlags>>>next.bitLocation)%2 == 1) - { - output.append("[").append((achievementFlags >>> next.bitLocation) % 2 == 1 ? "X" : " ").append("] "); - output.append(next.publicName).append(next.retired ? " (hidden)" : "").append("\n"); - output.append(" ").append(next.unlockCondition).append("\n\n"); - } - } - } - } - //Close off the output and send it + //Close off the output and send it output.append("```"); - if(replyInDm) - event.replyInDm(output.toString()); - else - event.reply(output.toString()); + event.reply(output.toString()); } catch(IOException e) { diff --git a/src/tel/discord/rtab/commands/channel/ChannelSetting.java b/src/tel/discord/rtab/commands/channel/ChannelSetting.java index 6f2ee22c..a133f1de 100644 --- a/src/tel/discord/rtab/commands/channel/ChannelSetting.java +++ b/src/tel/discord/rtab/commands/channel/ChannelSetting.java @@ -35,8 +35,8 @@ boolean isValidSetting(String newString) //Check each part individually, and make sure they're both positive try { - int numerator = 0; - int denominator = 0; + int numerator; + int denominator; numerator = Integer.parseInt(settingHalves[0]); if(settingHalves.length == 2) { diff --git a/src/tel/discord/rtab/commands/hidden/BlammoCommand.java b/src/tel/discord/rtab/commands/hidden/BlammoCommand.java index e6bd5a3b..5938fdb8 100644 --- a/src/tel/discord/rtab/commands/hidden/BlammoCommand.java +++ b/src/tel/discord/rtab/commands/hidden/BlammoCommand.java @@ -27,9 +27,7 @@ protected void execute(CommandEvent event) int player = game.findPlayerInGame(event.getAuthor().getId()); HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; //Check that it's valid (the game is running, they're alive, they have the command, and there's no blammo already waiting) - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 || game.futureBlammo - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.BLAMMO && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || game.futureBlammo || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.BLAMMO && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); else game.useBlammoSummoner(player); diff --git a/src/tel/discord/rtab/commands/hidden/DefuseCommand.java b/src/tel/discord/rtab/commands/hidden/DefuseCommand.java index 3f019d23..bd26fd20 100644 --- a/src/tel/discord/rtab/commands/hidden/DefuseCommand.java +++ b/src/tel/discord/rtab/commands/hidden/DefuseCommand.java @@ -29,9 +29,7 @@ protected void execute(CommandEvent event) HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; String rawSpace = event.getArgs(); //Check that it's valid (the game is running, the space is legit, they're alive, and they have the command) - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 || !game.checkValidNumber(rawSpace) - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.DEFUSE && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || !game.checkValidNumber(rawSpace) || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.DEFUSE && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); //Cool, we're good, pass it over else diff --git a/src/tel/discord/rtab/commands/hidden/FailsafeCommand.java b/src/tel/discord/rtab/commands/hidden/FailsafeCommand.java index 960b17c7..66af7191 100644 --- a/src/tel/discord/rtab/commands/hidden/FailsafeCommand.java +++ b/src/tel/discord/rtab/commands/hidden/FailsafeCommand.java @@ -30,9 +30,7 @@ protected void execute(CommandEvent event) HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; //Make sure the player is in the game and the game is mid-round but not mid-turn //Also, that the player is alive, and they have a failsafe to use - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 || game.resolvingTurn - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.FAILSAFE && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || game.resolvingTurn || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.FAILSAFE && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); else //We schedule a timer here so it uses the same thread as the turn timeout (hence blocking the two from overlapping) diff --git a/src/tel/discord/rtab/commands/hidden/FoldCommand.java b/src/tel/discord/rtab/commands/hidden/FoldCommand.java index 1bebafc5..8f59ceef 100644 --- a/src/tel/discord/rtab/commands/hidden/FoldCommand.java +++ b/src/tel/discord/rtab/commands/hidden/FoldCommand.java @@ -28,9 +28,7 @@ protected void execute(CommandEvent event) HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; //Make sure the player is in the game and the game is mid-round but not mid-turn //Also, that the player is alive, and they have a fold to use - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 || game.resolvingTurn - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.FOLD && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || game.resolvingTurn || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.FOLD && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); else game.useFold(player); diff --git a/src/tel/discord/rtab/commands/hidden/MinesweeperCommand.java b/src/tel/discord/rtab/commands/hidden/MinesweeperCommand.java index c818243c..d8d611f5 100644 --- a/src/tel/discord/rtab/commands/hidden/MinesweeperCommand.java +++ b/src/tel/discord/rtab/commands/hidden/MinesweeperCommand.java @@ -29,9 +29,7 @@ protected void execute(CommandEvent event) HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; String rawSpace = event.getArgs(); //Check that it's valid (the game is running, the space is legit, they're alive, and they have the command) - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 || !game.checkValidNumber(rawSpace) - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.MINESWEEP && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || !game.checkValidNumber(rawSpace) || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.MINESWEEP && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); //Cool, we're good, pass it over else diff --git a/src/tel/discord/rtab/commands/hidden/RepelCommand.java b/src/tel/discord/rtab/commands/hidden/RepelCommand.java index e35822fe..2ee283bf 100644 --- a/src/tel/discord/rtab/commands/hidden/RepelCommand.java +++ b/src/tel/discord/rtab/commands/hidden/RepelCommand.java @@ -27,9 +27,7 @@ protected void execute(CommandEvent event) int player = game.findPlayerInGame(event.getAuthor().getId()); HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; //Check that it's valid (the game is running, they're alive, and they have the command) - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.REPEL && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.REPEL && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); else game.useRepel(player); diff --git a/src/tel/discord/rtab/commands/hidden/TruesightCommand.java b/src/tel/discord/rtab/commands/hidden/TruesightCommand.java index d28ae00c..07f05aee 100644 --- a/src/tel/discord/rtab/commands/hidden/TruesightCommand.java +++ b/src/tel/discord/rtab/commands/hidden/TruesightCommand.java @@ -29,9 +29,7 @@ protected void execute(CommandEvent event) HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; String rawSpace = event.getArgs(); //Check that it's valid (the game is running, the space is legit, they're alive, and they have the command) - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 || !game.checkValidNumber(rawSpace) - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.TRUESIGHT && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || !game.checkValidNumber(rawSpace) || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.TRUESIGHT && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); //Cool, we're good, pass it over else diff --git a/src/tel/discord/rtab/commands/hidden/WagerCommand.java b/src/tel/discord/rtab/commands/hidden/WagerCommand.java index 56189985..70d5a3eb 100644 --- a/src/tel/discord/rtab/commands/hidden/WagerCommand.java +++ b/src/tel/discord/rtab/commands/hidden/WagerCommand.java @@ -27,9 +27,7 @@ protected void execute(CommandEvent event) int player = game.findPlayerInGame(event.getAuthor().getId()); HiddenCommand chosenCommand = game.players.get(player).hiddenCommand; //Check that it's valid (the game is running, they're alive, and they have the command) - if(game.gameStatus != GameStatus.IN_PROGRESS || player == -1 || game.resolvingBomb - || game.players.get(player).status != PlayerStatus.ALIVE || - (chosenCommand != HiddenCommand.WAGER && chosenCommand != HiddenCommand.WILD)) + if(game.gameStatus != GameStatus.IN_PROGRESS || game.resolvingBomb || game.players.get(player).status != PlayerStatus.ALIVE || chosenCommand != HiddenCommand.WAGER && chosenCommand != HiddenCommand.WILD) event.reply("You can't do this right now."); else game.useWager(player); diff --git a/src/tel/discord/rtab/events/Bowser.java b/src/tel/discord/rtab/events/Bowser.java index edcbd256..951f8fd0 100644 --- a/src/tel/discord/rtab/events/Bowser.java +++ b/src/tel/discord/rtab/events/Bowser.java @@ -396,16 +396,12 @@ private void awardJackpot() for(Player next : game.players) if(next.money < threshold) { - awardJP = false; - game.channel.sendMessage("Bowser left you **ABSOLUTELY NOTHING**! PSYCHE!").queue(); + game.channel.sendMessage("Bowser left you **ABSOLUTELY NOTHING**! PSYCHE!").queue(); return; } - if(awardJP) - { - game.channel.sendMessage("Bowser left you **all the money he has collected**!!").queue(); - game.channel.sendMessage(String.format("**$%,d**!!",bowserJackpot)).queue(); - getCurrentPlayer().addMoney(bowserJackpot, MoneyMultipliersToUse.NOTHING); - bowserJackpot = Jackpots.BOWSER.resetValue; - } - } + game.channel.sendMessage("Bowser left you **all the money he has collected**!!").queue(); + game.channel.sendMessage(String.format("**$%,d**!!",bowserJackpot)).queue(); + getCurrentPlayer().addMoney(bowserJackpot, MoneyMultipliersToUse.NOTHING); + bowserJackpot = Jackpots.BOWSER.resetValue; + } } diff --git a/src/tel/discord/rtab/games/BowserTicTacBomb.java b/src/tel/discord/rtab/games/BowserTicTacBomb.java index 5bb27566..b7c32a28 100644 --- a/src/tel/discord/rtab/games/BowserTicTacBomb.java +++ b/src/tel/discord/rtab/games/BowserTicTacBomb.java @@ -323,7 +323,7 @@ private void endGame(boolean majorWin) resultString.append(String.format("%d copies of ",gameMultiplier)); resultString.append(getName()).append("."); //and goodbye money - StringBuilder extraResult = null; + StringBuilder extraResult; extraResult = getPlayer().addMoney(-1*playerTotal, MoneyMultipliersToUse.BOOSTER_OR_BONUS); sendMessages = true; sendMessage(resultString.toString()); diff --git a/src/tel/discord/rtab/games/CloseShave.java b/src/tel/discord/rtab/games/CloseShave.java index f472190d..b8c98665 100644 --- a/src/tel/discord/rtab/games/CloseShave.java +++ b/src/tel/discord/rtab/games/CloseShave.java @@ -176,7 +176,7 @@ LinkedList revealSpaces() output.add("Would you like to pick one more space? Pick again if so, or type STOP to end the game."); output.add(generateBoard()); } - else if (i == picks && !enhanced) + else if (i == picks) { output.add("And that's all! Congratulations!"); output.addAll(congratulateWinner()); @@ -204,22 +204,22 @@ LinkedList congratulateWinner() { output.add(String.format("You'll keep your bank of **$%,d**.",total)); } - else if (total >= 30_000 && total <= 39_999) + else if (total <= 39_999) { total *= 3; output.add(String.format("We'll multiply your bank by 3; it becomes **$%,d**.",total)); } - else if (total >= 40_000 && total <= 44_999) + else if (total <= 44_999) { total *= 10; output.add(String.format("We'll multiply your bank by 10; it becomes **$%,d**!",total)); } - else if (total >= 45_000 && total <= 47_999) + else if (total <= 47_999) { total *= 25; output.add(String.format("We'll multiply your bank by 25; it becomes **$%,d**!",total)); } - else if (total >= 48_000 && total <= 50_000) + else if (total <= 50_000) { total *= 50; output.add(String.format("We'll multiply your bank by 50! That means it becomes **$%,d**!",total)); diff --git a/src/tel/discord/rtab/games/CoinFlip.java b/src/tel/discord/rtab/games/CoinFlip.java index beab549a..2aad9ef1 100644 --- a/src/tel/discord/rtab/games/CoinFlip.java +++ b/src/tel/discord/rtab/games/CoinFlip.java @@ -98,8 +98,7 @@ void playNextTurn(String pick) output.add(String.format("Flipping %d coin"+(coins!=1?"s":"")+"...", coins)); if (heads) output.add(String.format("You got %d HEADS"+(newCoins==0?".":(coins/newCoins>=2?".":"!")), newCoins)); - else if (tails) - output.add(String.format("You got %d TAILS"+(newCoins==0?".":(coins/newCoins>=2?".":"!")), newCoins)); + else output.add(String.format("You got %d TAILS"+(newCoins==0?".":(coins/newCoins>=2?".":"!")), newCoins)); if(newCoins == 0) { alive = false; diff --git a/src/tel/discord/rtab/games/ColourOfMoney.java b/src/tel/discord/rtab/games/ColourOfMoney.java index 3ba55f8b..b237909b 100644 --- a/src/tel/discord/rtab/games/ColourOfMoney.java +++ b/src/tel/discord/rtab/games/ColourOfMoney.java @@ -244,7 +244,7 @@ void endGame() if(gameMultiplier > 1) resultString.append(String.format("%d copies of ",gameMultiplier)); resultString.append(getName()).append("."); - StringBuilder extraResult = null; + StringBuilder extraResult; extraResult = players.get(player).addMoney(totalWin, MoneyMultipliersToUse.BOOSTER_OR_BONUS); //We want the endgame result to show up unconditionally sendMessages = true; @@ -267,7 +267,7 @@ else if(winner < 0) if(gameMultiplier > 1) resultString.append(String.format("%d copies of ",gameMultiplier)); resultString.append(getName()).append("."); - StringBuilder extraResult = null; + StringBuilder extraResult; extraResult = players.get(opponent).addMoney(totalWin, MoneyMultipliersToUse.BOOSTER_OR_BONUS); //We want the endgame result to show up unconditionally sendMessages = true; @@ -397,40 +397,30 @@ String getBotPick() int withdrawal; //Position factor is whatever we would currently need to win plus 1 int positionFactor = getOtherBank() - getMyBank() + adjustedBase; - if(debug) - sendMessage(String.format("AI position factor = $%,d", positionFactor)); - //Average factor is based on the remaining values plus a bit of random variance + //Average factor is based on the remaining values plus a bit of random variance int averageFactor = 0; for(int next : remainingValues) averageFactor += next; averageFactor /= remainingValues.size(); //Throw in a random factor to keep it interesting averageFactor += 4*(RtaBMath.random()-0.5) * adjustedBase; - if(debug) - sendMessage(String.format("AI average factor = $%,d", averageFactor)); - //Now combine the two factors into something suitable for the current turn + //Now combine the two factors into something suitable for the current turn //We want to focus mostly average factor until the endgame, where suddenly position factor is all-important int factorRatio = (int)Math.pow(getOtherTurnCount(), 2); withdrawal = positionFactor * factorRatio / 25 + averageFactor * (25-factorRatio) / 25; - if(debug) - sendMessage(String.format("AI withdrawal target = $%,d", withdrawal)); - //If we're so far ahead that we don't think we need anything at all, try some backup ideas + //If we're so far ahead that we don't think we need anything at all, try some backup ideas if(withdrawal < 0) { //If we've mathematically clinched victory, just play solitaire if(positionFactor + (adjustedBase * BOARD_SIZE * (5-getOtherTurnCount())) < 0) { withdrawal = averageFactor; - if(debug) - sendMessage("AI victory certain. Using average factor only."); - } + } //Otherwise, engage Protocol Killshot and let's get 21k ahead of them else { withdrawal = positionFactor + (adjustedBase * BOARD_SIZE); - if(debug) - sendMessage("AI attempting a killshot."); - } + } } //Round our withdrawal off as required int remainder = withdrawal % adjustedBase; diff --git a/src/tel/discord/rtab/games/Gamble.java b/src/tel/discord/rtab/games/Gamble.java index 1d7c0e9c..ea7d1cb6 100644 --- a/src/tel/discord/rtab/games/Gamble.java +++ b/src/tel/discord/rtab/games/Gamble.java @@ -148,7 +148,7 @@ public String getBotPick() //We don't need to check if we need to stop if we haven't even picked once yet if(lastPick > 0) { - boolean willStop = false; + boolean willStop; //Get number of values lower than current pick int pickPosition = Arrays.binarySearch(money.toArray(),lastPick); int spacesPicked = 0; diff --git a/src/tel/discord/rtab/games/MinefieldMulti.java b/src/tel/discord/rtab/games/MinefieldMulti.java index f35d42cd..9dc706a8 100644 --- a/src/tel/discord/rtab/games/MinefieldMulti.java +++ b/src/tel/discord/rtab/games/MinefieldMulti.java @@ -125,7 +125,7 @@ else if(!checkValidNumber(choice)) { if(lastPick > 3 || lastPick < 0) output.add("..."); - int win = 0; + int win; switch(lastPick) { case -10: diff --git a/src/tel/discord/rtab/games/MiniGameWrapper.java b/src/tel/discord/rtab/games/MiniGameWrapper.java index a7e66516..5a2e2fad 100644 --- a/src/tel/discord/rtab/games/MiniGameWrapper.java +++ b/src/tel/discord/rtab/games/MiniGameWrapper.java @@ -234,7 +234,7 @@ void awardMoneyWon(int moneyWon) if(gameMultiplier > 1) resultString.append(String.format("%d copies of ",gameMultiplier)); resultString.append(getName()).append("."); - StringBuilder extraResult = null; + StringBuilder extraResult; extraResult = getPlayer().addMoney(moneyWon, isBonus() ? MoneyMultipliersToUse.NOTHING : MoneyMultipliersToUse.BOOSTER_OR_BONUS); //We want the endgame result to show up unconditionally diff --git a/src/tel/discord/rtab/games/Optimise.java b/src/tel/discord/rtab/games/Optimise.java index f09b699a..04ecfcc7 100644 --- a/src/tel/discord/rtab/games/Optimise.java +++ b/src/tel/discord/rtab/games/Optimise.java @@ -271,7 +271,7 @@ boolean isGameOver() void playEndGame() { - int chosenColour = -1; + int chosenColour; if(collapses == 2) { if(goldsLeft[0] > 0) diff --git a/src/tel/discord/rtab/games/TicTacBomb.java b/src/tel/discord/rtab/games/TicTacBomb.java index 1e2a019c..0e5495dd 100644 --- a/src/tel/discord/rtab/games/TicTacBomb.java +++ b/src/tel/discord/rtab/games/TicTacBomb.java @@ -185,8 +185,7 @@ else if(playerBomb == -1) playerTurn = false; endGame(false); } - else if(opponentBomb == -1) - { + else { playerTurn = true; endGame(false); } diff --git a/src/tel/discord/rtab/games/Zilch.java b/src/tel/discord/rtab/games/Zilch.java index a25dc1f8..c14b8a74 100644 --- a/src/tel/discord/rtab/games/Zilch.java +++ b/src/tel/discord/rtab/games/Zilch.java @@ -193,7 +193,7 @@ int scoreDice(int[] diceFaces) { //Descending array so we can find the proper place for 'and' in the string for (int i = (diceCount.length-1); i >= 0; i--) { - int faceScore = 0; + int faceScore; if(diceCount[i] >= 3) faceScore = TRIPLE_DICE_SCORE[i] * BASE_TRIPLE_MULTIPLIER[diceCount[i]-3]; else From 91af23604b6da2c3a625a107318b541ae7f58d3e Mon Sep 17 00:00:00 2001 From: Jeffrey Hope Date: Sun, 17 Nov 2024 10:42:32 -0600 Subject: [PATCH 9/9] Unwrap code block of labeled rule --- src/tel/discord/rtab/RaceToABillionBot.java | 4 +- .../commands/ListAchievementsCommand.java | 22 +++------- src/tel/discord/rtab/events/CursedBomb.java | 8 +--- src/tel/discord/rtab/games/DoubleTrouble.java | 40 ++++--------------- src/tel/discord/rtab/games/DoubleZeroes.java | 20 ++-------- src/tel/discord/rtab/games/Overflow.java | 35 ++++------------ 6 files changed, 28 insertions(+), 101 deletions(-) diff --git a/src/tel/discord/rtab/RaceToABillionBot.java b/src/tel/discord/rtab/RaceToABillionBot.java index fd2df97f..8f0fd9f2 100644 --- a/src/tel/discord/rtab/RaceToABillionBot.java +++ b/src/tel/discord/rtab/RaceToABillionBot.java @@ -189,9 +189,7 @@ public static boolean connectToChannel(Guild guild, String channelString) challenge.add(challengeHandler); game.add(challengeHandler.initialise(gameChannel, record, resultChannel)); } - case "minigame" -> { - tournament.add(new MinigameTournament(gameChannel, record, resultChannel)); - } + case "minigame" -> tournament.add(new MinigameTournament(gameChannel, record, resultChannel)); case "enabled" -> { GameController newGame = new GameController(gameChannel, record, resultChannel); if (newGame.initialised()) diff --git a/src/tel/discord/rtab/commands/ListAchievementsCommand.java b/src/tel/discord/rtab/commands/ListAchievementsCommand.java index 9038eba7..12ed58fa 100644 --- a/src/tel/discord/rtab/commands/ListAchievementsCommand.java +++ b/src/tel/discord/rtab/commands/ListAchievementsCommand.java @@ -30,22 +30,12 @@ protected void execute(CommandEvent event) output.append("```\n"); AchievementType desiredAchievementType = null; switch (event.getArgs().toUpperCase()) { - case "1", "A", "MILESTONE" -> { - output.append("Milestone Achievements - ").append(name).append("\n\n"); - } - case "2", "B", "EVENT" -> { - output.append("Event Achievements - ").append(name).append("\n\n"); - } - case "3", "C", "MINIGAME" -> { - output.append("Minigame Achivements - ").append(name).append("\n\n"); - } - case "4", "D", "LUCKY", "CHARMS", "LUCKY CHARMS" -> { - output.append("Lucky Charms - ").append(name).append("\n\n"); - } - default -> { - //Display a summary of achievements earned - output = getAchievementSummary(record, name); - } + case "1", "A", "MILESTONE" -> output.append("Milestone Achievements - ").append(name).append("\n\n"); + case "2", "B", "EVENT" -> output.append("Event Achievements - ").append(name).append("\n\n"); + case "3", "C", "MINIGAME" -> output.append("Minigame Achivements - ").append(name).append("\n\n"); + case "4", "D", "LUCKY", "CHARMS", "LUCKY CHARMS" -> output.append("Lucky Charms - ").append(name).append("\n\n"); + default -> //Display a summary of achievements earned + output = getAchievementSummary(record, name); } //Get a list of the desired achievements //Close off the output and send it diff --git a/src/tel/discord/rtab/events/CursedBomb.java b/src/tel/discord/rtab/events/CursedBomb.java index 8f3a6aa9..f03156a0 100644 --- a/src/tel/discord/rtab/events/CursedBomb.java +++ b/src/tel/discord/rtab/events/CursedBomb.java @@ -39,12 +39,8 @@ public void execute(GameController game, int player) game.channel.sendMessage("But no one else *is* cursed either.").queue(); return; //no one's cursed for some reason, so abort } - case 1 -> { - game.channel.sendMessage("So you get to steal from the cursed player!").queue(); - } - case 2 -> { - game.channel.sendMessage("So you get to steal from everyone who is cursed!").queue(); - } + case 1 -> game.channel.sendMessage("So you get to steal from the cursed player!").queue(); + case 2 -> game.channel.sendMessage("So you get to steal from everyone who is cursed!").queue(); } for(int next : cursedPlayers) { diff --git a/src/tel/discord/rtab/games/DoubleTrouble.java b/src/tel/discord/rtab/games/DoubleTrouble.java index 4b3f926c..fab3045a 100644 --- a/src/tel/discord/rtab/games/DoubleTrouble.java +++ b/src/tel/discord/rtab/games/DoubleTrouble.java @@ -179,38 +179,14 @@ private String generateBoard() display.append(String.format("%02d: ",(i+1))); switch (money.get(i)) { - case -1 -> - { - display.append("Trouble"); - } - case 0 -> - { - display.append("BOMB! "); - } - case 1 -> - { - display.append("Mystery"); - } - case 2 -> - { - display.append("Double "); - } - case 2500 -> - { - display.append("$2,500 "); - } - case 5000 -> - { - display.append("$5,000 "); - } - case 10000 -> - { - display.append("$10,000"); - } - default -> - { - display.append("Uh oh! "); - } + case -1 -> display.append("Trouble"); + case 0 -> display.append("BOMB! "); + case 1 -> display.append("Mystery"); + case 2 -> display.append("Double "); + case 2500 -> display.append("$2,500 "); + case 5000 -> display.append("$5,000 "); + case 10000 -> display.append("$10,000"); + default -> display.append("Uh oh! "); } display.append(i%2==1 ? "\n" : " "); } diff --git a/src/tel/discord/rtab/games/DoubleZeroes.java b/src/tel/discord/rtab/games/DoubleZeroes.java index 4229dba3..e2a3436e 100644 --- a/src/tel/discord/rtab/games/DoubleZeroes.java +++ b/src/tel/discord/rtab/games/DoubleZeroes.java @@ -242,22 +242,10 @@ private String generateBoard() { switch (numbers.get(i)) { - case -2 -> - { - display.append("JZ"); - } - case -1 -> - { - display.append("00"); - } - case 0 -> - { - display.append("0."); - } - default -> - { - display.append(String.format("%0%1",(i+1),(i+1))); - } + case -2 -> display.append("JZ"); + case -1 -> display.append("00"); + case 0 -> display.append("0."); + default -> display.append(String.format("%0%1",(i+1),(i+1))); } } } diff --git a/src/tel/discord/rtab/games/Overflow.java b/src/tel/discord/rtab/games/Overflow.java index b0c4eb49..a1d03047 100644 --- a/src/tel/discord/rtab/games/Overflow.java +++ b/src/tel/discord/rtab/games/Overflow.java @@ -369,34 +369,13 @@ String generateBoard(boolean reveal) { switch (board.get(i)/10) { - case 1 -> - { - display.append("$$"); - } - case 2 -> - { - display.append("St"); - } - case 3 -> - { - display.append("%%"); - } - case 4 -> - { - display.append("An"); - } - case 5 -> - { - display.append("Ch"); - } - case 7 -> - { - display.append("J!"); - } - default -> - { - display.append("XX"); - } + case 1 -> display.append("$$"); + case 2 -> display.append("St"); + case 3 -> display.append("%%"); + case 4 -> display.append("An"); + case 5 -> display.append("Ch"); + case 7 -> display.append("J!"); + default -> display.append("XX"); } }