ElnuDev/Chess
Archived
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: ElnuDev:419d33bc884fe81eb002a722a86c9833a9d701e1
Branches Tags
ElnuDev:main
...
compare: ElnuDev:0c40eba66fe49e2de4fd0c33cf31385ff1c3b646
Branches Tags
ElnuDev:main

2 commits
419d33bc88 ... 0c40eba66f

Author SHA1 Message Date
ElnuDev
0c40eba66f Add queen promotion, fix pawn taking two squares ahead 2023-03-15 23:40:45 -07:00
jylkyle
9063667ca5 Movement restriction for Knight 2023-03-15 22:57:06 -07:00
3 changed files with 35 additions and 6 deletions
Show stats Expand all files Collapse all files

7
src/Board.java
View file

@ -131,9 +131,11 @@ public class Board {
// White pieces disappear if new move isn't created, don't know why // White pieces disappear if new move isn't created, don't know why
Move copiedMove = new Move(new BoardCoordinate(move.from.x, move.from.y), new BoardCoordinate(move.to.x, move.to.y), get(move.to.x, move.to.y)); Move copiedMove = new Move(new BoardCoordinate(move.from.x, move.from.y), new BoardCoordinate(move.to.x, move.to.y), get(move.to.x, move.to.y));
copiedMove.submove = move.submove; copiedMove.submove = move.submove;
copiedMove.isPromotion = move.isPromotion;
moveHistory.add(copiedMove); moveHistory.add(copiedMove);
// moveHistory.add(move); // moveHistory.add(move);
set(move.to, get(move.from)); Piece movedPiece = get(move.from);
set(move.to, move.isPromotion ? new Queen(movedPiece.black, panel) : movedPiece);
set(move.from, null); set(move.from, null);
move(move.submove); move(move.submove);
if (move.submove != null) moveHistory.pop(); if (move.submove != null) moveHistory.pop();
@ -148,7 +150,8 @@ public class Board {
void undoMove(Move move) { void undoMove(Move move) {
if (move == null) return; if (move == null) return;
set(move.from, get(move.to)); Piece movedPiece = get(move.to);
set(move.from, move.isPromotion ? new Pawn(movedPiece.black, panel) : movedPiece);
set(move.to, move.captured); set(move.to, move.captured);
} }

1
src/Move.java
View file

@ -6,6 +6,7 @@ public class Move {
public Piece captured; public Piece captured;
// e.g. castling, castle move. Done after. // e.g. castling, castle move. Done after.
public Move submove; public Move submove;
public boolean isPromotion;
public Move(BoardCoordinate from, BoardCoordinate to) { public Move(BoardCoordinate from, BoardCoordinate to) {
this.from = from; this.from = from;

33
src/Pawn.java
View file

@ -12,11 +12,36 @@ public class Pawn extends Piece {
public ArrayList<Move> getPossibleMoves(BoardCoordinate position, Board board) { public ArrayList<Move> getPossibleMoves(BoardCoordinate position, Board board) {
ArrayList<Move> possibleMoves = new ArrayList<>(); ArrayList<Move> possibleMoves = new ArrayList<>();
if (this.black) { if (this.black) {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x, position.y + 1))); if (board.get(position.x, position.y + 1) == null) {
if (!moved && board.get(position.x, position.y + 1) == null) possibleMoves.add(new Move(position, new BoardCoordinate(position.x, position.y + 2))); Move oneForward = new Move(position, new BoardCoordinate(position.x, position.y + 1));
oneForward.isPromotion = position.y + 1 == Board.BOARD_SIZE - 1;
possibleMoves.add(oneForward);
if (!moved && board.get(position.x, position.y + 2) == null) {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x, position.y + 2)));
}
}
if (board.get(position.x - 1, position.y + 1) != null) {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x - 1,position.y + 1)));
}
if (board.get(position.x + 1, position.y + 1) != null) {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x + 1,position.y + 1)));
}
} else { } else {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x, position.y - 1))); if (board.get(position.x, position.y - 1) == null) {
if (!moved && board.get(position.x, position.y - 1) == null) possibleMoves.add(new Move(position, new BoardCoordinate(position.x, position.y - 2))); Move oneForward = new Move(position, new BoardCoordinate(position.x, position.y - 1));
oneForward.isPromotion = position.y - 1 == 0;
possibleMoves.add(oneForward);
if (!moved && board.get(position.x, position.y - 2) == null) {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x, position.y - 2)));
}
}
if (board.get(position.x - 1, position.y - 1) != null) {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x - 1,position.y - 1)));
}
if (board.get(position.x + 1, position.y - 1) != null) {
possibleMoves.add(new Move(position, new BoardCoordinate(position.x + 1,position.y - 1)));
}
} }
return possibleMoves; return possibleMoves;
} }