Crabs/3DChess
2
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix en passant

Browse Source
This commit is contained in:
Simon Pribylski
2025-04-15 21:33:49 +02:00
parent 87992b181e
commit edf95a1691
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/chess/model/ChessBoard.java
View File

@@ -70,6 +70,7 @@ public class ChessBoard {
pieceComes(movingPiece, move.getStart());
pieceLeaves(move.getFinish());
pieceComes(deadPiece, move.getDeadPieceCoords());
assert movingPiece != null;
movingPiece.unMove();
}

9
app/src/main/java/chess/model/Move.java
View File

@@ -30,7 +30,7 @@ public class Move {
int diffY = getFinish().getY() - getStart().getY();
assert Math.abs(diffX) < Coordinate.VALUE_MAX : "Move is too big!";
assert Math.abs(diffX) < Coordinate.VALUE_MAX : "Move is too big!";
assert Math.abs(diffY) < Coordinate.VALUE_MAX : "Move is too big!";
if (diffX == 0)
return Math.abs(diffY);
@@ -53,4 +53,11 @@ public class Move {
return deadPieceCoords;
}
@Override
public boolean equals(Object obj) {
if (obj instanceof Move other)
return this.start.equals(other.start) && this.finish.equals(other.finish);
return false;
}
}

9
app/src/main/java/chess/model/visitor/PiecePathChecker.java
View File

@@ -96,7 +96,14 @@ public class PiecePathChecker implements PieceVisitor<Boolean> {
if (pieceToEat.getColor() == pawn.getColor())
return false;
if (lastMove.getMiddle().equals(this.move.getFinish())
Direction lastMoveDir = Direction.findDirection(lastMove);
if ((lastMoveDir != Direction.Front && lastMoveDir != Direction.Back) || lastMove.traversedCells() != 2)
return false;
Coordinate middle = lastMove.getMiddle();
if (middle.equals(this.move.getFinish())
&& new PawnIdentifier(pieceToEat.getColor()).isPawn(pieceToEat)) {
this.move.setDeadPieceCoords(lastMove.getFinish());
return true;