stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 10:54:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn information

Browse Source
This commit is contained in:
Ticho Hidding
2026-01-12 12:56:37 +01:00
parent 35f7a4fd13
commit 9fcbe7d298
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/toop/app/gameControllers/GenericGameController.java
View File

@@ -154,5 +154,7 @@ public class GenericGameController implements GameController {
@Override @Override
public void updateUI() { public void updateUI() {
canvas.redraw(game.deepCopy()); canvas.redraw(game.deepCopy());
String gameType = game.getClass().getSimpleName().replace("Bitboard","");
gameView.nextPlayer(true, getCurrentPlayer().getName(), game.getPlayer(1-getCurrentPlayerIndex()).getName(),gameType);
} }
} }

14
app/src/main/java/org/toop/app/widget/view/GameView.java
View File

@@ -6,6 +6,8 @@ import javafx.scene.text.Font;
import org.toop.app.widget.Primitive; import org.toop.app.widget.Primitive;
import org.toop.app.widget.complex.ViewWidget; import org.toop.app.widget.complex.ViewWidget;
import org.toop.app.widget.popup.GameOverPopup; import org.toop.app.widget.popup.GameOverPopup;
import java.util.Objects;
import java.util.function.Consumer; import java.util.function.Consumer;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.geometry.Pos; 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(() -> { Platform.runLater(() -> {
if (!(hasSet)) { if (!(hasSet)) {
playerHeader.setText(currentPlayer + " vs. " + nextPlayer); playerHeader.setText(currentPlayer + " vs. " + nextPlayer);
@@ -112,8 +114,8 @@ public final class GameView extends ViewWidget {
new GameOverPopup(iWon, winner).show(Pos.CENTER); new GameOverPopup(iWon, winner).show(Pos.CENTER);
} }
private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, char GameType) { private void setPlayerHeaders(boolean isMe, String currentPlayer, String nextPlayer, String GameType) {
if (GameType == 'T') { if (Objects.equals(GameType, "TicTacToe")) {
if (isMe) { if (isMe) {
player1Header.setText("X: " + currentPlayer); player1Header.setText("X: " + currentPlayer);
player2Header.setText("O: " + nextPlayer); player2Header.setText("O: " + nextPlayer);
@@ -124,7 +126,7 @@ public final class GameView extends ViewWidget {
} }
setPlayerInfoTTT(); setPlayerInfoTTT();
} }
else if (GameType == 'R') { else if (Objects.equals(GameType, "Reversi")) {
if (isMe) { if (isMe) {
player1Header.setText(currentPlayer); player1Header.setText(currentPlayer);
player2Header.setText(nextPlayer); player2Header.setText(nextPlayer);
@@ -172,8 +174,8 @@ public final class GameView extends ViewWidget {
player1Icon.setRadius(player1Header.fontProperty().map(Font::getSize).getValue()); player1Icon.setRadius(player1Header.fontProperty().map(Font::getSize).getValue());
player2Icon.setRadius(player2Header.fontProperty().map(Font::getSize).getValue()); player2Icon.setRadius(player2Header.fontProperty().map(Font::getSize).getValue());
player1Icon.setFill(Color.BLACK); player1Icon.setFill(Color.WHITE);
player2Icon.setFill(Color.WHITE); player2Icon.setFill(Color.BLACK);
add(Pos.TOP_RIGHT, playerInfo); add(Pos.TOP_RIGHT, playerInfo);
} }
} }

2
app/src/main/java/org/toop/app/widget/view/LocalMultiplayerView.java
View File

@@ -88,7 +88,7 @@ public class LocalMultiplayerView extends ViewWidget {
if (information.players[1].isHuman) { if (information.players[1].isHuman) {
players[1] = new LocalPlayer(information.players[1].name); players[1] = new LocalPlayer(information.players[1].name);
} else { } 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()) { if (AppSettings.getSettings().getTutorialFlag() && AppSettings.getSettings().getFirstReversi()) {
new ShowEnableTutorialWidget( new ShowEnableTutorialWidget(