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

Privated methods that didn't have to be public

Browse Source
This commit is contained in:
Stef
2025-10-29 18:05:01 +01:00
parent d7e370536e
commit ea30e20585
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -322,7 +322,6 @@ public final class ReversiGame {
if (isLegalMove) { if (isLegalMove) {
moves = game.getFlipsForPotentialMove( moves = game.getFlipsForPotentialMove(
new Point(cellEntered%game.getColumnSize(),cellEntered/game.getRowSize()), new Point(cellEntered%game.getColumnSize(),cellEntered/game.getRowSize()),
game.makeBoardAGrid(),
game.getCurrentPlayer()); game.getCurrentPlayer());
} }
canvas.drawHighlightDots(moves); canvas.drawHighlightDots(moves);

15
game/src/main/java/org/toop/game/reversi/Reversi.java
View File

@@ -53,7 +53,7 @@ public final class Reversi extends TurnBasedGame {
char currentPlayer = (this.getCurrentTurn()==0) ? 'B' : 'W'; char currentPlayer = (this.getCurrentTurn()==0) ? 'B' : 'W';
Set<Point> adjCell = getAdjacentCells(boardGrid); Set<Point> adjCell = getAdjacentCells(boardGrid);
for (Point point : adjCell){ for (Point point : adjCell){
Move[] moves = getFlipsForPotentialMove(point,boardGrid,currentPlayer); Move[] moves = getFlipsForPotentialMove(point,currentPlayer);
int score = moves.length; int score = moves.length;
if (score > 0){ if (score > 0){
legalMoves.add(new Move(point.x + point.y * this.getRowSize(), currentPlayer)); legalMoves.add(new Move(point.x + point.y * this.getRowSize(), currentPlayer));
@@ -81,14 +81,14 @@ public final class Reversi extends TurnBasedGame {
return possibleCells; return possibleCells;
} }
public Move[] getFlipsForPotentialMove(Point point, char[][] boardGrid, char currentPlayer) { public Move[] getFlipsForPotentialMove(Point point, char currentPlayer) {
final ArrayList<Move> movesToFlip = new ArrayList<>(); final ArrayList<Move> movesToFlip = new ArrayList<>();
for (int deltaColumn = -1; deltaColumn <= 1; deltaColumn++) { for (int deltaColumn = -1; deltaColumn <= 1; deltaColumn++) {
for (int deltaRow = -1; deltaRow <= 1; deltaRow++) { for (int deltaRow = -1; deltaRow <= 1; deltaRow++) {
if (deltaColumn == 0 && deltaRow == 0){ if (deltaColumn == 0 && deltaRow == 0){
continue; continue;
} }
Move[] moves = getFlipsInDirection(point,boardGrid,currentPlayer,deltaColumn,deltaRow); Move[] moves = getFlipsInDirection(point,makeBoardAGrid(),currentPlayer,deltaColumn,deltaRow);
if (moves != null) { if (moves != null) {
movesToFlip.addAll(Arrays.asList(moves)); movesToFlip.addAll(Arrays.asList(moves));
} }
@@ -123,13 +123,14 @@ public final class Reversi extends TurnBasedGame {
return x >= 0 && x < this.getColumnSize() && y >= 0 && y < this.getRowSize(); return x >= 0 && x < this.getColumnSize() && y >= 0 && y < this.getRowSize();
} }
public char[][] makeBoardAGrid() { private char[][] makeBoardAGrid() {
char[][] boardGrid = new char[this.getRowSize()][this.getColumnSize()]; char[][] boardGrid = new char[this.getRowSize()][this.getColumnSize()];
for (int i = 0; i < 64; i++) { for (int i = 0; i < 64; i++) {
boardGrid[i / this.getRowSize()][i % this.getColumnSize()] = this.getBoard()[i]; //boardGrid[y / row] [x / column] boardGrid[i / this.getRowSize()][i % this.getColumnSize()] = this.getBoard()[i]; //boardGrid[y / row] [x / column]
} }
return boardGrid; return boardGrid;
} }
@Override @Override
public GameState play(Move move) { public GameState play(Move move) {
Move[] legalMoves = getLegalMoves(); Move[] legalMoves = getLegalMoves();
@@ -141,7 +142,7 @@ public final class Reversi extends TurnBasedGame {
} }
} }
if (moveIsLegal) { if (moveIsLegal) {
Move[] moves = sortMovesFromCenter(getFlipsForPotentialMove(new Point(move.position()%this.getColumnSize(),move.position()/this.getRowSize()), makeBoardAGrid(), move.value()),move); Move[] moves = sortMovesFromCenter(getFlipsForPotentialMove(new Point(move.position()%this.getColumnSize(),move.position()/this.getRowSize()), move.value()),move);
mostRecentlyFlippedPieces = moves; mostRecentlyFlippedPieces = moves;
this.setBoard(move); this.setBoard(move);
for (Move m : moves) { for (Move m : moves) {
@@ -169,9 +170,9 @@ public final class Reversi extends TurnBasedGame {
return null; return null;
} }
public void skipMyTurn(){ private void skipMyTurn(){
IO.println("TURN " + getCurrentPlayer() + " SKIPPED"); IO.println("TURN " + getCurrentPlayer() + " SKIPPED");
//todo notify user that a turn has been skipped //TODO: notify user that a turn has been skipped
nextTurn(); nextTurn();
} }

8
game/src/test/java/org/toop/game/tictactoe/ReversiTest.java
View File

@@ -113,11 +113,11 @@ class ReversiTest {
Reversi.Score score = game.getScore(); Reversi.Score score = game.getScore();
IO.println(score.player1Score()); IO.println(score.player1Score());
IO.println(score.player2Score()); IO.println(score.player2Score());
char[][] grid = game.makeBoardAGrid();
for (char[] chars : grid) {
IO.println(Arrays.toString(chars));
}
for (int r = 0; r < game.getRowSize(); r++) {
char[] row = Arrays.copyOfRange(game.getBoard(), r * game.getColumnSize(), (r + 1) * game.getColumnSize());
IO.println(Arrays.toString(row));
}
} }
} }