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

tourney ready

Browse Source
This commit is contained in:
Ticho Hidding
2025-10-27 17:14:36 +01:00
parent b506afdade
commit c115fb91af
8 changed files with 116 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/src/main/java/org/toop/app/Server.java
View File

@@ -20,6 +20,7 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
public final class Server {
private String user = "";
@@ -31,6 +32,8 @@ public final class Server {
private ServerView view;
private boolean isPolling = true;
private AtomicBoolean isSingleGame = new AtomicBoolean(false);
private ScheduledExecutorService scheduler;
public static GameInformation.Type gameToType(String game) {
@@ -93,9 +96,10 @@ public final class Server {
private void sendChallenge(String opponent) {
if (!isPolling) return;
ViewStack.push(new SendChallengeView(this, opponent, (playerInformation, gameType) -> {
new EventFlow().addPostEvent(new NetworkEvents.SendChallenge(clientId, opponent, gameType))
.listen(NetworkEvents.GameMatchResponse.class, e -> {
new EventFlow().addPostEvent(new NetworkEvents.SendChallenge(clientId, opponent, gameType)).postEvent();
/* .listen(NetworkEvents.GameMatchResponse.class, e -> {
if (e.clientId() == clientId) {
isPolling = false;
onlinePlayers.clear();
@@ -120,7 +124,9 @@ public final class Server {
default -> ViewStack.push(new ErrorView("Unsupported game type."));
}
}
}).postEvent();
}) */
ViewStack.pop();
isSingleGame.set(true);
}));
}
@@ -148,13 +154,16 @@ public final class Server {
information.players[0].computerDifficulty = 5;
information.players[1].name = response.opponent();
Runnable onGameOverRunnable = isSingleGame.get()? null: this::gameOver;
switch (type) {
case TICTACTOE ->
new TicTacToeGame(information, myTurn, this::forfeitGame, this::exitGame, this::sendMessage);
new TicTacToeGame(information, myTurn, this::forfeitGame, this::exitGame, this::sendMessage, onGameOverRunnable);
case REVERSI ->
new ReversiGame(information, myTurn, this::forfeitGame, this::exitGame, this::sendMessage);
new ReversiGame(information, myTurn, this::forfeitGame, this::exitGame, this::sendMessage, onGameOverRunnable);
case CONNECT4 ->
new Connect4Game(information, myTurn, this::forfeitGame, this::exitGame, this::sendMessage);
new Connect4Game(information, myTurn, this::forfeitGame, this::exitGame, this::sendMessage, onGameOverRunnable);
default -> ViewStack.push(new ErrorView("Unsupported game type."));
}
}
@@ -166,11 +175,11 @@ public final class Server {
String challengerName = extractQuotedValue(response.challengerName());
String gameType = extractQuotedValue(response.gameType());
final String finalGameType = gameType;
ViewStack.push(new ChallengeView(challengerName, gameType, (playerInformation) -> {
final int challengeId = Integer.parseInt(response.challengeId().replaceAll("\\D", ""));
new EventFlow().addPostEvent(new NetworkEvents.SendAcceptChallenge(clientId, challengeId)).postEvent();
ViewStack.pop();
isSingleGame.set(true);
//new EventFlow().listen(NetworkEvents.GameMatchResponse.class, e -> {
@@ -200,8 +209,16 @@ public final class Server {
startPopulateScheduler();
}
private void gameOver(){
ViewStack.pop();
ViewStack.push(view);
startPopulateScheduler();
}
private void startPopulateScheduler() {
isPolling = true;
isSingleGame.set(false);
stopScheduler();
new EventFlow()

17
app/src/main/java/org/toop/app/game/Connect4Game.java
View File

@@ -23,6 +23,7 @@ public class Connect4Game {
private final GameInformation information;
private final int myTurn;
private Runnable onGameOver;
private final BlockingQueue<Game.Move> moveQueue;
private final Connect4 game;
@@ -35,9 +36,10 @@ public class Connect4Game {
private final AtomicBoolean isRunning;
public Connect4Game(GameInformation information, int myTurn, Runnable onForfeit, Runnable onExit, Consumer<String> onMessage) {
public Connect4Game(GameInformation information, int myTurn, Runnable onForfeit, Runnable onExit, Consumer<String> onMessage, Runnable onGameOver) {
this.information = information;
this.myTurn = myTurn;
this.onGameOver = onGameOver;
moveQueue = new LinkedBlockingQueue<Game.Move>();
@@ -97,7 +99,7 @@ public class Connect4Game {
}
public Connect4Game(GameInformation information) {
this(information, 0, null, null, null);
this(information, 0, null, null, null, null);
}
private void localGameThread() {
while (isRunning.get()) {
@@ -179,11 +181,14 @@ public class Connect4Game {
if (state == Game.State.WIN) {
if (response.player().equalsIgnoreCase(information.players[0].name)) {
view.gameOver(true, information.players[0].name);
gameOver();
} else {
view.gameOver(false, information.players[1].name);
gameOver();
}
} else if (state == Game.State.DRAW) {
view.gameOver(false, "");
gameOver();
}
}
@@ -197,6 +202,14 @@ public class Connect4Game {
setGameLabels(game.getCurrentTurn() == myTurn);
}
private void gameOver() {
if (onGameOver == null){
return;
}
isRunning.set(false);
onGameOver.run();
}
private void onYourTurnResponse(NetworkEvents.YourTurnResponse response) {
new EventFlow().addPostEvent(new NetworkEvents.SendCommand(response.clientId(), "MESSAGE hoi"))
.postEvent();

21
app/src/main/java/org/toop/app/game/ReversiGame.java
View File

@@ -27,7 +27,8 @@ public final class ReversiGame {
private final GameInformation information;
private final int myTurn;
private final BlockingQueue<Game.Move> moveQueue;
private Runnable onGameOver;
private final BlockingQueue<Game.Move> moveQueue;
private final Reversi game;
private final ReversiAI ai;
@@ -38,11 +39,12 @@ public final class ReversiGame {
private final AtomicBoolean isRunning;
private final AtomicBoolean isPaused;
public ReversiGame(GameInformation information, int myTurn, Runnable onForfeit, Runnable onExit, Consumer<String> onMessage) {
public ReversiGame(GameInformation information, int myTurn, Runnable onForfeit, Runnable onExit, Consumer<String> onMessage, Runnable onGameOver) {
this.information = information;
this.myTurn = myTurn;
moveQueue = new LinkedBlockingQueue<Game.Move>();
this.onGameOver = onGameOver;
moveQueue = new LinkedBlockingQueue<Game.Move>();
game = new Reversi();
ai = new ReversiAI();
@@ -102,7 +104,7 @@ public final class ReversiGame {
}
public ReversiGame(GameInformation information) {
this(information, 0, null, null, null);
this(information, 0, null, null, null,null);
}
private void localGameThread() {
@@ -187,11 +189,14 @@ public final class ReversiGame {
if (state == Game.State.WIN) {
if (response.player().equalsIgnoreCase(information.players[0].name)) {
view.gameOver(true, information.players[0].name);
gameOver();
} else {
view.gameOver(false, information.players[1].name);
gameOver();
}
} else if (state == Game.State.DRAW) {
view.gameOver(false, "");
game.play(move);
}
}
@@ -199,6 +204,14 @@ public final class ReversiGame {
setGameLabels(game.getCurrentTurn() == myTurn);
}
private void gameOver() {
if (onGameOver == null){
return;
}
isRunning.set(false);
onGameOver.run();
}
private void onYourTurnResponse(NetworkEvents.YourTurnResponse response) {
if (!isRunning.get()) {
return;

30
app/src/main/java/org/toop/app/game/TicTacToeGame.java
View File

@@ -24,7 +24,8 @@ public final class TicTacToeGame {
private final GameInformation information;
private final int myTurn;
private final BlockingQueue<Game.Move> moveQueue;
private Runnable onGameOver;
private final BlockingQueue<Game.Move> moveQueue;
private final TicTacToe game;
private final TicTacToeAI ai;
@@ -34,11 +35,12 @@ public final class TicTacToeGame {
private final AtomicBoolean isRunning;
public TicTacToeGame(GameInformation information, int myTurn, Runnable onForfeit, Runnable onExit, Consumer<String> onMessage) {
public TicTacToeGame(GameInformation information, int myTurn, Runnable onForfeit, Runnable onExit, Consumer<String> onMessage, Runnable onGameOver) {
this.information = information;
this.myTurn = myTurn;
moveQueue = new LinkedBlockingQueue<Game.Move>();
this.onGameOver = onGameOver;
moveQueue = new LinkedBlockingQueue<Game.Move>();
game = new TicTacToe();
ai = new TicTacToeAI();
@@ -95,7 +97,7 @@ public final class TicTacToeGame {
}
public TicTacToeGame(GameInformation information) {
this(information, 0, null, null, null);
this(information, 0, null, null, null, null);
}
private void localGameThread() {
@@ -177,12 +179,15 @@ public final class TicTacToeGame {
if (state == Game.State.WIN) {
if (response.player().equalsIgnoreCase(information.players[0].name)) {
view.gameOver(true, information.players[0].name);
gameOver();
} else {
view.gameOver(false, information.players[1].name);
gameOver();
}
} else if (state == Game.State.DRAW) {
if(game.getLegalMoves().length == 0) { //only return draw in online multiplayer if the game is actually over.
view.gameOver(false, "");
gameOver();
}
}
}
@@ -196,6 +201,14 @@ public final class TicTacToeGame {
setGameLabels(game.getCurrentTurn() == myTurn);
}
private void gameOver() {
if (onGameOver == null){
return;
}
isRunning.set(false);
onGameOver.run();
}
private void onYourTurnResponse(NetworkEvents.YourTurnResponse response) {
if (!isRunning.get()) {
return;
@@ -210,7 +223,14 @@ public final class TicTacToeGame {
position = moveQueue.take().position();
} catch (InterruptedException _) {}
} else {
final Game.Move move = ai.findBestMove(game, information.players[0].computerDifficulty);
final Game.Move move;
IO.println(information.players[0].name + " " + information.players[1].name);
if (information.players[1].name.equalsIgnoreCase("pism")) {
IO.println("got worst move");
move = ai.findWorstMove(game,9);
}else{
move = ai.findBestMove(game, information.players[0].computerDifficulty);
}
assert move != null;
position = move.position();

2
app/src/main/java/org/toop/app/view/views/ChallengeView.java
View File

@@ -56,7 +56,7 @@ public final class ChallengeView extends View {
final Button denyButton = button();
denyButton.setText(AppContext.getString("deny"));
denyButton.setOnAction(_ -> {
ViewStack.pop();
ViewStack.pop();
});
final List<Node> nodes = new ArrayList<>();

20
app/src/main/java/org/toop/app/view/views/GameView.java
View File

@@ -1,5 +1,6 @@
package org.toop.app.view.views;
import javafx.application.Platform;
import org.toop.app.view.View;
import org.toop.app.view.ViewStack;
import org.toop.app.view.displays.SongDisplay;
@@ -151,16 +152,19 @@ public final class GameView extends View {
}
public void nextPlayer(boolean isMe, String currentPlayer, String currentMove, String nextPlayer) {
currentPlayerHeader.setText(currentPlayer);
currentMoveHeader.setText(currentMove);
Platform.runLater(() -> {
currentPlayerHeader.setText(currentPlayer);
currentMoveHeader.setText(currentMove);
nextPlayerHeader.setText(nextPlayer);
nextPlayerHeader.setText(nextPlayer);
if (isMe) {
currentPlayerHeader.getStyleClass().add("my-turn");
} else {
currentPlayerHeader.getStyleClass().remove("my-turn");
}
});
if (isMe) {
currentPlayerHeader.getStyleClass().add("my-turn");
} else {
currentPlayerHeader.getStyleClass().remove("my-turn");
}
}
public void updateChat(String message) {