From 406ad713f460748c9382fa24efe26c73ff2d80dd Mon Sep 17 00:00:00 2001 From: michiel301b Date: Wed, 3 Dec 2025 22:47:17 +0100 Subject: [PATCH] turn updates --- .../gameControllers/ReversiController.java | 2 +- .../gameControllers/TicTacToeController.java | 2 +- .../org/toop/app/widget/view/GameView.java | 131 ++++++++++++++---- .../localization/localization_ar.properties | 2 + .../localization/localization_de.properties | 1 + .../localization/localization_en.properties | 2 +- .../localization/localization_es.properties | 1 + .../localization/localization_fr.properties | 1 + .../localization/localization_hi.properties | 1 + .../localization/localization_it.properties | 1 + .../localization/localization_ja.properties | 1 + .../localization/localization_ko.properties | 1 + .../localization/localization_nl.properties | 1 + .../localization/localization_ru.properties | 1 + .../localization/localization_zh.properties | 1 + 15 files changed, 118 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/org/toop/app/gameControllers/ReversiController.java b/app/src/main/java/org/toop/app/gameControllers/ReversiController.java index 3c46306..1f6842f 100644 --- a/app/src/main/java/org/toop/app/gameControllers/ReversiController.java +++ b/app/src/main/java/org/toop/app/gameControllers/ReversiController.java @@ -99,7 +99,7 @@ public class ReversiController extends AbstractGameController { }); animation.play(); - primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName()); + primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName(), 'R'); } @Override diff --git a/app/src/main/java/org/toop/app/gameControllers/TicTacToeController.java b/app/src/main/java/org/toop/app/gameControllers/TicTacToeController.java index 6bd6fb0..eb8d8c9 100644 --- a/app/src/main/java/org/toop/app/gameControllers/TicTacToeController.java +++ b/app/src/main/java/org/toop/app/gameControllers/TicTacToeController.java @@ -39,7 +39,7 @@ public class TicTacToeController extends AbstractGameController { public void updateUI() { canvas.clearAll(); // TODO: wtf is even this pile of poop temp fix - primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName()); + primary.nextPlayer(true, getCurrentPlayer().getName(), game.getCurrentTurn() == 0 ? "X" : "O", getPlayer((game.getCurrentTurn() + 1) % 2).getName(), 'T'); drawMoves(); } 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 b866ef4..bf1d2f0 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 @@ -1,34 +1,44 @@ package org.toop.app.widget.view; +import javafx.scene.paint.Color; +import javafx.scene.shape.Circle; +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.function.Consumer; - import javafx.application.Platform; import javafx.geometry.Pos; import javafx.scene.control.Button; import javafx.scene.control.TextField; import javafx.scene.text.Text; -import org.toop.app.widget.tutorial.BaseTutorialWidget; import org.toop.app.widget.tutorial.Connect4TutorialWidget; import org.toop.app.widget.tutorial.ReversiTutorialWidget; import org.toop.app.widget.tutorial.TicTacToeTutorialWidget; +import org.toop.local.AppContext; public final class GameView extends ViewWidget { - private final Text currentPlayerHeader; - private final Text currentMoveHeader; - private final Text nextPlayerHeader; + private final Text playerHeader; + private final Text turnHeader; + private final Text player1Header; + private final Text player2Header; + private Circle player1Icon; + private Circle player2Icon; private final Button forfeitButton; private final Button exitButton; private final Button tutorialButton; private final TextField chatInput; + private final Text keyThingy; + private boolean hasSet = false; public GameView(Runnable onForfeit, Runnable onExit, Consumer onMessage, String gameType) { - currentPlayerHeader = Primitive.header(""); - currentMoveHeader = Primitive.header(""); - nextPlayerHeader = Primitive.header(""); + playerHeader = Primitive.header(""); + turnHeader = Primitive.header(""); + keyThingy = Primitive.text("turnof"); + player1Header = Primitive.header(""); + player2Header = Primitive.header(""); + player1Icon = new Circle(); + player2Icon = new Circle(); if (onForfeit != null) { forfeitButton = Primitive.button("forfeit", () -> onForfeit.run()); @@ -66,17 +76,11 @@ public final class GameView extends ViewWidget { } private void setupLayout() { - var playerInfo = Primitive.vbox( - currentPlayerHeader, - Primitive.hbox( - Primitive.separator(), - currentMoveHeader, - Primitive.separator() - ), - nextPlayerHeader - ); + var turnInfo = Primitive.vbox( + turnHeader + ); - add(Pos.TOP_RIGHT, playerInfo); + add(Pos.TOP_CENTER, turnInfo); var buttons = Primitive.vbox( forfeitButton, @@ -94,21 +98,92 @@ public final class GameView extends ViewWidget { } } - public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer) { + public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer, char GameType) { Platform.runLater(() -> { - currentPlayerHeader.setText(currentPlayer); - currentMoveHeader.setText(currentMove); - nextPlayerHeader.setText(nextPlayer); + if (!(hasSet)) { + playerHeader.setText(currentPlayer + " vs. " + nextPlayer); + hasSet = true; + setPlayerHeaders(isMe, currentPlayer, nextPlayer, GameType); + } + //TODO idk if theres any way to check this? only EN uses 's and the rest doesnt. if theres a better way to do this pls let me know + if (AppContext.getLocale().toLanguageTag().equals("en")) { + turnHeader.setText(currentPlayer + keyThingy.getText()); + } + else { + turnHeader.setText(currentPlayer + " " + keyThingy.getText()); + } - if (isMe) { - currentPlayerHeader.getStyleClass().add("my-turn"); - } else { - currentPlayerHeader.getStyleClass().remove("my-turn"); - } + if (isMe) { + turnHeader.getStyleClass().add("my-turn"); + } + else { + turnHeader.getStyleClass().remove("my-turn"); + } }); } public void gameOver(boolean iWon, String winner) { new GameOverPopup(iWon, winner).show(Pos.CENTER); } + + private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, char GameType) { + if (GameType == 'T') { + if (isMe) { + player1Header.setText("X: " + currentPlayer); + player2Header.setText("O: " + nextPlayer); + } + else { + player1Header.setText("X: " + nextPlayer); + player2Header.setText("O: " + currentPlayer); + } + setPlayerInfoTTT(); + } + else if (GameType == 'R') { + if (isMe) { + player1Header.setText(currentPlayer); + player2Header.setText(nextPlayer); + } + else { + player1Header.setText(nextPlayer); + player2Header.setText(currentPlayer); + } + setPlayerInfoReversi(); + } + } + + private void setPlayerInfoTTT() { + var playerInfo = Primitive.vbox( + playerHeader, + Primitive.separator(), + player1Header, + player2Header + ); + + add(Pos.TOP_RIGHT, playerInfo); + } + + private void setPlayerInfoReversi() { + var player1box = Primitive.hbox( + player1Icon, + player1Header + ); + + var player2box = Primitive.hbox( + player2Icon, + player2Header + ); + + var playerInfo = Primitive.vbox( + playerHeader, + Primitive.separator(), + player1box, + player2box + ); + + player1Icon.setRadius(player1Header.fontProperty().map(Font::getSize).getValue()); + player2Icon.setRadius(player2Header.fontProperty().map(Font::getSize).getValue()); + player1Icon.setFill(Color.BLACK); + player2Icon.setFill(Color.WHITE); + add(Pos.TOP_RIGHT, playerInfo); + } } \ No newline at end of file diff --git a/app/src/main/resources/localization/localization_ar.properties b/app/src/main/resources/localization/localization_ar.properties index 703994b..215ee4c 100644 --- a/app/src/main/resources/localization/localization_ar.properties +++ b/app/src/main/resources/localization/localization_ar.properties @@ -85,6 +85,8 @@ reversi4=\u0627\u0644\u0644\u0627\u0639\u0628 \u0627\u0644\u0630\u064a \u064a\u0 tutorialstring=\u0627\u0644\u062f\u0631\u0633 \u0627\u0644\u062a\u0648\u0636\u064a\u062d\u064a startgame=\u0627\u0628\u062f\u0623 \u0627\u0644\u0644\u0639\u0628\u0629! goback=\u0627\u0631\u062c\u0639 +turnof=\u062F\u0648\u0631\u0647 + arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 chinese=\u4e2d\u6587 (\u0627\u0644\u0635\u064a\u0646\u064a\u0629) diff --git a/app/src/main/resources/localization/localization_de.properties b/app/src/main/resources/localization/localization_de.properties index c8babb4..3a64fdc 100644 --- a/app/src/main/resources/localization/localization_de.properties +++ b/app/src/main/resources/localization/localization_de.properties @@ -87,6 +87,7 @@ reversi4=Der Spieler, der am Ende die meisten Steine auf dem Brett hat, gewinnt. tutorialstring=Tutorial startgame=Spiel starten! goback=Zurück +turnof=ist dran arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabisch) chinese=\u4e2d\u6587 (Chinesisch) diff --git a/app/src/main/resources/localization/localization_en.properties b/app/src/main/resources/localization/localization_en.properties index 0d70ace..72c8c2d 100644 --- a/app/src/main/resources/localization/localization_en.properties +++ b/app/src/main/resources/localization/localization_en.properties @@ -88,7 +88,7 @@ reversi4=The player who wins at the end of the game is the one who has the most tutorialstring=Tutorial startgame=Start game! goback=Go back - +turnof='s turn arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabic) chinese=\u4e2d\u6587 (Chinese) diff --git a/app/src/main/resources/localization/localization_es.properties b/app/src/main/resources/localization/localization_es.properties index dd4cdf7..dee7fd8 100644 --- a/app/src/main/resources/localization/localization_es.properties +++ b/app/src/main/resources/localization/localization_es.properties @@ -86,6 +86,7 @@ reversi4=El jugador que gane al final del juego es quien tenga m tutorialstring=Tutorial startgame=\u00a1Iniciar juego! goback=Volver +turnof=le toca arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Ar\u00e1bigo) diff --git a/app/src/main/resources/localization/localization_fr.properties b/app/src/main/resources/localization/localization_fr.properties index 4a06650..8653a49 100644 --- a/app/src/main/resources/localization/localization_fr.properties +++ b/app/src/main/resources/localization/localization_fr.properties @@ -86,6 +86,7 @@ reversi4=Le joueur qui a le plus de pions tutorialstring=Tutoriel startgame=D\u00e9marrer le jeu! goback=Retour +turnof=\u00E0 son tour arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabe) chinese=\u4e2d\u6587 (Chinois) diff --git a/app/src/main/resources/localization/localization_hi.properties b/app/src/main/resources/localization/localization_hi.properties index 668378a..36d733f 100644 --- a/app/src/main/resources/localization/localization_hi.properties +++ b/app/src/main/resources/localization/localization_hi.properties @@ -86,6 +86,7 @@ reversi4=\u0916\u0941\u092f \u0915\u093f \u0915\u0940 \u0928\u093f\u092e\u0940 \ tutorialstring=\u0924\u0942\u091f\u0949\u0930\u093f\u092f\u0932 startgame=\u0916\u0947\u0932 \u0936\u0941\u0930\u0942 \u0915\u0930\u0947\u0902! goback=\u0935\u093e\u092a\u0938 \u091c\u093e\u090f\u0901 +turnof=\u0915\u0940 \u092C\u093E\u0930\u0940 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0905\u0930\u092c\u0940) chinese=\u4e2d\u6587 (\u091a\u0940\u0928\u0940) diff --git a/app/src/main/resources/localization/localization_it.properties b/app/src/main/resources/localization/localization_it.properties index 63b27ba..34b691e 100644 --- a/app/src/main/resources/localization/localization_it.properties +++ b/app/src/main/resources/localization/localization_it.properties @@ -85,6 +85,7 @@ reversi4=Il giocatore che alla fine del gioco ha pi tutorialstring=Tutorial startgame=Avvia il gioco! goback=Indietro +turnof=\u00E8 il suo turno arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabo) chinese=\u4e2d\u6587 (Cinese) diff --git a/app/src/main/resources/localization/localization_ja.properties b/app/src/main/resources/localization/localization_ja.properties index d2360ea..8bd3e37 100644 --- a/app/src/main/resources/localization/localization_ja.properties +++ b/app/src/main/resources/localization/localization_ja.properties @@ -85,6 +85,7 @@ reversi4=\u672c\u6b21\u306b\u30dc\u30fc\u30c9\u4e0a\u3067\u6700\u591a\u306e\u8ca tutorialstring=\u30c1\u30e5\u30fc\u30c8\u30ea\u30a2\u30eb startgame=\u30b2\u30fc\u30e0\u3092\u958b\u59cb\uff01 goback=\u623b\u308b +turnof=\u306E\u756A arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u30a2\u30e9\u30d3\u30a2\u8a9e) chinese=\u4e2d\u6587 (\u4e2d\u6587) diff --git a/app/src/main/resources/localization/localization_ko.properties b/app/src/main/resources/localization/localization_ko.properties index 571e24a..7284b6a 100644 --- a/app/src/main/resources/localization/localization_ko.properties +++ b/app/src/main/resources/localization/localization_ko.properties @@ -85,6 +85,7 @@ reversi4=\uacbd\uc6b0 \uc5d0\uc11c \ucd5c\ub300 \ud648\uc744 \uac00\uc838\ub294 tutorialstring=\ud14c\ud2b8\ub9ad startgame=\uac8c\uc784 \uc2dc\uc791! goback=\ub4a4\ub85c \uac00\uae30 +turnof=\uC758 \uCC28\uB840 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0639\u0631\u0628\u064a\u0629) chinese=\u4e2d\u6587 (\u4e2d\u6587) diff --git a/app/src/main/resources/localization/localization_nl.properties b/app/src/main/resources/localization/localization_nl.properties index a025cf4..451e8cd 100644 --- a/app/src/main/resources/localization/localization_nl.properties +++ b/app/src/main/resources/localization/localization_nl.properties @@ -85,6 +85,7 @@ reversi4=De speler die aan het einde van het spel de meeste stukken op het bord tutorialstring=Tutorial startgame=Spel starten! goback=Ga terug +turnof=is aan de beurt arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (Arabisch) chinese=\u4e2d\u6587 (Chinees) diff --git a/app/src/main/resources/localization/localization_ru.properties b/app/src/main/resources/localization/localization_ru.properties index 48093fd..437742f 100644 --- a/app/src/main/resources/localization/localization_ru.properties +++ b/app/src/main/resources/localization/localization_ru.properties @@ -85,6 +85,7 @@ reversi4=\u0418043 \u0433043 \u0440043 \u043e043 \u043a043 \u043e043 \u0442043 \ tutorialstring=\u0423\u0447\u0435\u0431\u043d\u0438\u043a startgame=\u041d\u0430\u0447\u0430\u0442\u044c \u0438\u0433\u0440\u0443! goback=\u041d\u0430\u0437\u0430\u0434 +turnof=\u0445\u043E\u0434\u0438\u0442 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u0410\u0440\u0430\u0431\u0441\u043a\u0438\u0439) chinese=\u4e2d\u6587 (\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439) diff --git a/app/src/main/resources/localization/localization_zh.properties b/app/src/main/resources/localization/localization_zh.properties index 865380d..96d97c6 100644 --- a/app/src/main/resources/localization/localization_zh.properties +++ b/app/src/main/resources/localization/localization_zh.properties @@ -85,6 +85,7 @@ reversi4=\u672c\u6e38\u620f\u7ed3\u675f\u65f6\u8d62\u5f97\u6ee1\u8fc7\u76d8\u976 tutorialstring=\u6559\u7a0b startgame=\u5f00\u59cb\u6e38\u620f\uff01 goback=\u8fd4\u56de +turnof=\u7684\u56DE\u5408 arabic=\u0627\u0644\u0639\u0631\u0628\u064a\u0629 (\u963f\u62c9\u4f2f\u8bed) chinese=\u4e2d\u6587