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

Made the GameState enum it's own file and fixed imports

Browse Source
This commit is contained in:
Stef
2025-10-29 14:26:41 +01:00
parent ff611724e7
commit 44d8ffbef2
10 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ import org.toop.framework.networking.events.NetworkEvents;
import org.toop.game.Connect4.Connect4;
import org.toop.game.Connect4.Connect4AI;
import org.toop.game.Game;
import org.toop.game.enumerators.GameState;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -147,7 +148,7 @@ public class Connect4Game {
continue;
}
final Game.State state = game.play(move);
final GameState state = game.play(move);
updateCanvas();
/*
if (move.value() == 'X') {
@@ -156,10 +157,10 @@ public class Connect4Game {
canvas.drawO(Color.ROYALBLUE, move.position());
}
*/
if (state != Game.State.NORMAL) {
if (state == Game.State.WIN) {
if (state != GameState.NORMAL) {
if (state == GameState.WIN) {
view.gameOver(true, information.players[currentTurn].name);
} else if (state == Game.State.DRAW) {
} else if (state == GameState.DRAW) {
view.gameOver(false, "");
}
@@ -182,10 +183,10 @@ public class Connect4Game {
}
final Game.Move move = new Game.Move(Integer.parseInt(response.move()), playerChar);
final Game.State state = game.play(move);
final GameState state = game.play(move);
if (state != Game.State.NORMAL) {
if (state == Game.State.WIN) {
if (state != GameState.NORMAL) {
if (state == GameState.WIN) {
if (response.player().equalsIgnoreCase(information.players[0].name)) {
view.gameOver(true, information.players[0].name);
gameOver();
@@ -193,7 +194,7 @@ public class Connect4Game {
view.gameOver(false, information.players[1].name);
gameOver();
}
} else if (state == Game.State.DRAW) {
} else if (state == GameState.DRAW) {
view.gameOver(false, "");
gameOver();
}

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

@@ -10,6 +10,7 @@ import org.toop.app.view.views.LocalMultiplayerView;
import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.networking.events.NetworkEvents;
import org.toop.game.Game;
import org.toop.game.enumerators.GameState;
import org.toop.game.reversi.Reversi;
import org.toop.game.reversi.ReversiAI;
@@ -163,13 +164,13 @@ public final class ReversiGame {
}
canvas.setCurrentlyHighlightedMovesNull();
final Game.State state = game.play(move);
final GameState state = game.play(move);
updateCanvas(true);
if (state != Game.State.NORMAL) {
if (state == Game.State.WIN) {
if (state != GameState.NORMAL) {
if (state == GameState.WIN) {
view.gameOver(true, information.players[currentTurn].name);
} else if (state == Game.State.DRAW) {
} else if (state == GameState.DRAW) {
view.gameOver(false, "");
}
@@ -192,10 +193,10 @@ public final class ReversiGame {
}
final Game.Move move = new Game.Move(Integer.parseInt(response.move()), playerChar);
final Game.State state = game.play(move);
final GameState state = game.play(move);
if (state != Game.State.NORMAL) {
if (state == Game.State.WIN) {
if (state != GameState.NORMAL) {
if (state == GameState.WIN) {
if (response.player().equalsIgnoreCase(information.players[0].name)) {
view.gameOver(true, information.players[0].name);
gameOver();
@@ -203,7 +204,7 @@ public final class ReversiGame {
view.gameOver(false, information.players[1].name);
gameOver();
}
} else if (state == Game.State.DRAW) {
} else if (state == GameState.DRAW) {
view.gameOver(false, "");
game.play(move);
}

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

@@ -9,6 +9,7 @@ import org.toop.app.view.views.LocalMultiplayerView;
import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.networking.events.NetworkEvents;
import org.toop.game.Game;
import org.toop.game.enumerators.GameState;
import org.toop.game.tictactoe.TicTacToe;
import org.toop.game.tictactoe.TicTacToeAI;
@@ -145,7 +146,7 @@ public final class TicTacToeGame {
continue;
}
final Game.State state = game.play(move);
final GameState state = game.play(move);
if (move.value() == 'X') {
canvas.drawX(Color.INDIANRED, move.position());
@@ -153,10 +154,10 @@ public final class TicTacToeGame {
canvas.drawO(Color.ROYALBLUE, move.position());
}
if (state != Game.State.NORMAL) {
if (state == Game.State.WIN) {
if (state != GameState.NORMAL) {
if (state == GameState.WIN) {
view.gameOver(true, information.players[currentTurn].name);
} else if (state == Game.State.DRAW) {
} else if (state == GameState.DRAW) {
view.gameOver(false, "");
}
@@ -179,10 +180,10 @@ public final class TicTacToeGame {
}
final Game.Move move = new Game.Move(Integer.parseInt(response.move()), playerChar);
final Game.State state = game.play(move);
final GameState state = game.play(move);
if (state != Game.State.NORMAL) {
if (state == Game.State.WIN) {
if (state != GameState.NORMAL) {
if (state == GameState.WIN) {
if (response.player().equalsIgnoreCase(information.players[0].name)) {
view.gameOver(true, information.players[0].name);
gameOver();
@@ -190,7 +191,7 @@ public final class TicTacToeGame {
view.gameOver(false, information.players[1].name);
gameOver();
}
} else if (state == Game.State.DRAW) {
} else if (state == GameState.DRAW) {
if(game.getLegalMoves().length == 0) { //only return draw in online multiplayer if the game is actually over.
view.gameOver(false, "");
gameOver();