From 9fcbe7d298385306f4029e7b4bb8e8e0b2f55467 Mon Sep 17 00:00:00 2001 From: Ticho Hidding Date: Mon, 12 Jan 2026 12:56:37 +0100 Subject: [PATCH] Turn information --- .../app/gameControllers/GenericGameController.java | 2 ++ .../java/org/toop/app/widget/view/GameView.java | 14 ++++++++------ .../toop/app/widget/view/LocalMultiplayerView.java | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java index 0c68a74..673e9e1 100644 --- a/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java +++ b/app/src/main/java/org/toop/app/gameControllers/GenericGameController.java @@ -154,5 +154,7 @@ public class GenericGameController implements GameController { @Override public void updateUI() { canvas.redraw(game.deepCopy()); + String gameType = game.getClass().getSimpleName().replace("Bitboard",""); + gameView.nextPlayer(true, getCurrentPlayer().getName(), game.getPlayer(1-getCurrentPlayerIndex()).getName(),gameType); } } diff --git a/app/src/main/java/org/toop/app/widget/view/GameView.java b/app/src/main/java/org/toop/app/widget/view/GameView.java index 441cc0e..8362603 100644 --- a/app/src/main/java/org/toop/app/widget/view/GameView.java +++ b/app/src/main/java/org/toop/app/widget/view/GameView.java @@ -6,6 +6,8 @@ import javafx.scene.text.Font; import org.toop.app.widget.Primitive; import org.toop.app.widget.complex.ViewWidget; import org.toop.app.widget.popup.GameOverPopup; + +import java.util.Objects; import java.util.function.Consumer; import javafx.application.Platform; import javafx.geometry.Pos; @@ -94,7 +96,7 @@ public final class GameView extends ViewWidget { } } - public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer, char GameType) { + public void nextPlayer(boolean isMe, String currentPlayer, String nextPlayer, String GameType) { Platform.runLater(() -> { if (!(hasSet)) { playerHeader.setText(currentPlayer + " vs. " + nextPlayer); @@ -112,8 +114,8 @@ public final class GameView extends ViewWidget { new GameOverPopup(iWon, winner).show(Pos.CENTER); } - private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, char GameType) { - if (GameType == 'T') { + private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, String GameType) { + if (Objects.equals(GameType, "TicTacToe")) { if (isMe) { player1Header.setText("X: " + currentPlayer); player2Header.setText("O: " + nextPlayer); @@ -124,7 +126,7 @@ public final class GameView extends ViewWidget { } setPlayerInfoTTT(); } - else if (GameType == 'R') { + else if (Objects.equals(GameType, "Reversi")) { if (isMe) { player1Header.setText(currentPlayer); player2Header.setText(nextPlayer); @@ -172,8 +174,8 @@ public final class GameView extends ViewWidget { player1Icon.setRadius(player1Header.fontProperty().map(Font::getSize).getValue()); player2Icon.setRadius(player2Header.fontProperty().map(Font::getSize).getValue()); - player1Icon.setFill(Color.BLACK); - player2Icon.setFill(Color.WHITE); + player1Icon.setFill(Color.WHITE); + player2Icon.setFill(Color.BLACK); add(Pos.TOP_RIGHT, playerInfo); } } \ No newline at end of file diff --git a/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java b/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java index 9139720..afee3f2 100644 --- a/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java +++ b/app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java @@ -88,7 +88,7 @@ public class LocalMultiplayerView extends ViewWidget { if (information.players[1].isHuman) { players[1] = new LocalPlayer(information.players[1].name); } else { - players[1] = new ArtificialPlayer(new MCTSAI2(50), "MCTS V2 AI"); + players[1] = new ArtificialPlayer(new MCTSAI(50), "MCTS V1 AI"); } if (AppSettings.getSettings().getTutorialFlag() && AppSettings.getSettings().getFirstReversi()) { new ShowEnableTutorialWidget(