From 2578e8cf6fe91a7e6304b8db7afed0483575a1e6 Mon Sep 17 00:00:00 2001 From: Janet-Doe Date: Sun, 13 Apr 2025 17:17:34 +0200 Subject: [PATCH] finished todo console --- .../chess/view/consolerender/Console.java | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/chess/view/consolerender/Console.java b/app/src/main/java/chess/view/consolerender/Console.java index a1c2688..10a542f 100644 --- a/app/src/main/java/chess/view/consolerender/Console.java +++ b/app/src/main/java/chess/view/consolerender/Console.java @@ -72,8 +72,6 @@ public class Console implements GameListener { default -> false; }; } while (!endTurn); - System.out.println(Colors.RED + "Turn ended." + Colors.RESET); - onBoardUpdate(); } private boolean playerPickedSurrender(Color color) { @@ -88,12 +86,11 @@ public class Console implements GameListener { System.out.println("New position: "); Coordinate end = stringToCoordinate(scanner.nextLine()); Command.CommandResult result = sendCommand(new MoveCommand(new Move(start, end))); - switch (Objects.requireNonNull(result)) { - case Command.CommandResult.Moved: - case Command.CommandResult.ActionNeeded: return true; - default: - return false; - } + + return switch (Objects.requireNonNull(result)) { + case Command.CommandResult.Moved, Command.CommandResult.ActionNeeded -> true; + default -> false; + }; } catch (Exception e) { System.out.println(e.getMessage()); @@ -131,7 +128,6 @@ public class Console implements GameListener { @Override public void onKingInCheck() { System.out.println(Colors.RED + "Check!" + Colors.RESET); - // todo } @Override @@ -141,7 +137,7 @@ public class Console implements GameListener { @Override public void onPatSituation() { - // todo + System.out.println("Pat! It's a draw!"); } @Override @@ -171,10 +167,10 @@ public class Console implements GameListener { try { String promotion = scanner.next(); newPiece = switch (promotion) { - case ("B") -> PromoteCommand.PromoteType.Bishop; - case ("N") -> PromoteCommand.PromoteType.Knight; - case ("Q") -> PromoteCommand.PromoteType.Queen; - case ("R") -> PromoteCommand.PromoteType.Rook; + case "B", "b", "Bishop", "bishop" -> PromoteCommand.PromoteType.Bishop; + case "N", "n", "Knight", "knight" -> PromoteCommand.PromoteType.Knight; + case "Q", "q", "Queen", "queen" -> PromoteCommand.PromoteType.Queen; + case "R", "r", "Rook", "rook" -> PromoteCommand.PromoteType.Rook; default -> throw new Exception(); }; valid = true;