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

Merge branch 'OtherGames' into Demo3

Browse Source
This commit is contained in:
ramollia
2025-10-27 17:22:07 +01:00
parent caa812217f 7b5c188280
commit 95d7ea5e1d
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -87,6 +87,7 @@ public class Connect4Game {
if (onForfeit == null || onExit == null) {
new Thread(this::localGameThread).start();
setGameLabels(information.players[0].isHuman);
} else {
new EventFlow()
.listen(NetworkEvents.GameMoveResponse.class, this::onMoveResponse)
@@ -104,7 +105,13 @@ public class Connect4Game {
private void localGameThread() {
while (isRunning.get()) {
final int currentTurn = game.getCurrentTurn();
setGameLabels(information.players[currentTurn].isHuman);
final String currentValue = currentTurn == 0? "RED" : "BLUE";
final int nextTurn = (currentTurn + 1) % GameInformation.Type.playerCount(information.type);
view.nextPlayer(information.players[currentTurn].isHuman,
information.players[currentTurn].name,
currentValue,
information.players[nextTurn].name);
Game.Move move = null;

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

@@ -91,6 +91,7 @@ public final class ReversiGame {
if (onForfeit == null || onExit == null) {
new Thread(this::localGameThread).start();
setGameLabels(information.players[0].isHuman);
} else {
new EventFlow()
.listen(NetworkEvents.GameMoveResponse.class, this::onMoveResponse)
@@ -118,7 +119,13 @@ public final class ReversiGame {
}
final int currentTurn = game.getCurrentTurn();
setGameLabels(information.players[currentTurn].isHuman);
final String currentValue = currentTurn == 0? "BLACK" : "WHITE";
final int nextTurn = (currentTurn + 1) % GameInformation.Type.playerCount(information.type);
view.nextPlayer(information.players[currentTurn].isHuman,
information.players[currentTurn].name,
currentValue,
information.players[nextTurn].name);
Game.Move move = null;

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

@@ -103,7 +103,13 @@ public final class TicTacToeGame {
private void localGameThread() {
while (isRunning.get()) {
final int currentTurn = game.getCurrentTurn();
setGameLabels(information.players[currentTurn].isHuman);
final String currentValue = currentTurn == 0? "X" : "O";
final int nextTurn = (currentTurn + 1) % GameInformation.Type.playerCount(information.type);
view.nextPlayer(information.players[currentTurn].isHuman,
information.players[currentTurn].name,
currentValue,
information.players[nextTurn].name);
Game.Move move = null;