Znachor/Chess
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Improved coverage maps & Queen loop bugfix

Browse source
This commit is contained in:
Filip Znachor 2023-04-18 17:29:31 +02:00
parent 830d53f615
commit bb9c4a9467
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/AbstractPiece.java
View file

@ -203,7 +203,7 @@ public abstract class AbstractPiece implements IPiece {
if(x == this.x && y == this.y) return;
if(x < 0 || x >= moves.length || y < 0 || y >= moves.length) return;
IPiece piece = chessboard.getPiece(new PiecePosition(x, y));
if(piece != null && player == piece.getPlayer()) return;
if(piece != null && piece != chessboard.getFloatingPiece() && player == piece.getPlayer()) return;
moves[y][x] = true;
}
@ -231,7 +231,8 @@ public abstract class AbstractPiece implements IPiece {
int j = y + yDirection;
while(i >= 0 && i < moves.length && j >= 0 && j < moves.length) {
setPossibleMove(moves, i, j);
if(chessboard.getPiece(new PiecePosition(i, j)) != null) break;
IPiece piece = chessboard.getPiece(new PiecePosition(i, j));
if(piece != null && piece != chessboard.getFloatingPiece()) break;
i += xDirection;
j += yDirection;
}

2
src/Chessboard.java
View file

@ -305,7 +305,7 @@ public class Chessboard extends JPanel {
boolean[][] player2Area = new boolean[SQUARE_COUNT][SQUARE_COUNT];
for (IPiece[] pieces2 : pieces) {
for (IPiece piece : pieces2) {
if(piece != null) {
if(piece != null && piece != floating) {
if(piece.getPlayer() == player1) mergeCoverageAreas(player1Area, piece.getPossibleMoves(true));
if(piece.getPlayer() == player2) mergeCoverageAreas(player2Area, piece.getPossibleMoves(true));
}

1
src/ChessboardMouseAdapter.java
View file

@ -17,6 +17,7 @@ public class ChessboardMouseAdapter extends MouseAdapter {
if (piece != null) {
if(piece.getPlayer() != c.getActivePlayer()) return;
c.grabPiece(pos);
c.generateCoverageAreas();
double totalScale = c.pieceScale * c.boardScale;
piece.setOverride(me.getX() - 50 * totalScale, me.getY() - 50 * totalScale);
c.repaint();

2
src/Queen.java
View file

@ -47,7 +47,7 @@ public class Queen extends AbstractPiece {
int[] directions = new int[]{-1, 0, 1};
for (int xDirection : directions) {
for (int yDirection : directions) {
tracePath(moves, xDirection, yDirection);
if(yDirection != xDirection || yDirection != 0) tracePath(moves, xDirection, yDirection);
}
}
return moves;