We did the clear thing

This commit is contained in:
k1ntas 2022-03-17 09:08:44 +01:00
parent 9097a966f0
commit f070ae87a4
2 changed files with 27 additions and 12 deletions

View File

@ -82,6 +82,7 @@ public class Board extends JPanel implements MouseListener {
g2.fillOval(point.x * SIZE_OF_TILE, point.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE); g2.fillOval(point.x * SIZE_OF_TILE, point.y * SIZE_OF_TILE, SIZE_OF_TILE, SIZE_OF_TILE);
} }
}); });
// Draw piece // Draw piece
Arrays.stream(pieces).forEach(pieceArr -> Arrays.stream(pieceArr).forEach(piece -> { Arrays.stream(pieces).forEach(pieceArr -> Arrays.stream(pieceArr).forEach(piece -> {
if (piece != null) { if (piece != null) {
@ -171,32 +172,46 @@ public class Board extends JPanel implements MouseListener {
// Ifall vi har tryckt en pjäs och sedan ska dit // Ifall vi har tryckt en pjäs och sedan ska dit
if (validMovesToDraw.contains(clicked)) { if (validMovesToDraw.contains(clicked)) {
System.out.println("1");
try { try {
Piece p = pieces[selectedPiece.x][selectedPiece.y]; Piece p = pieces[selectedPiece.x][selectedPiece.y];
System.out.println("2");
p.move(pieces, clicked, selectedPiece); p.move(pieces, clicked, selectedPiece);
validMovesToDraw.clear(); System.out.println("3");
System.out.println("came here");
System.out.println("4");
} catch (Exception e) { } catch (Exception e) {
validMovesToDraw.clear();
} }
} else { } else {
System.out.println("5");
selectedPiece = new Point(clicked); selectedPiece = new Point(clicked);
System.out.println("6");
validMovesToDraw.clear(); validMovesToDraw.clear();
System.out.println("7");
} }
System.out.println("X: " + mouseCoordinateX + ", Y: " + mouseCoordinateY); System.out.println("X: " + mouseCoordinateX + ", Y: " + mouseCoordinateY);
try { if (!validMovesToDraw.contains(clicked)) {
Piece p = pieces[mouseCoordinateX][mouseCoordinateY]; System.out.println("8");
LinkedHashSet validMoves = p.validMoves(pieces); try {
System.out.println("valid moves " + validMoves); Piece p = pieces[mouseCoordinateX][mouseCoordinateY];
validMovesToDraw.addAll(validMoves); System.out.println("9");
System.out.println("valid moves to draw " + validMovesToDraw); LinkedHashSet validMoves = p.validMoves(pieces);
System.out.println("10");
validMovesToDraw.addAll(validMoves);
System.out.println("11");
} catch (Exception e) { } catch (Exception e) {
System.out.println("12");
validMovesToDraw.clear();
System.out.println("13");
}
} else{
validMovesToDraw.clear(); validMovesToDraw.clear();
} }
} }

View File

@ -9,7 +9,7 @@ public class Queen extends Piece {
public Queen(boolean isWhite, Point point) throws IOException { public Queen(boolean isWhite, Point point) throws IOException {
super(isWhite, point); super(isWhite, point);
setPieceIcon("Queen"); setPieceIcon("Queen");
} }
@Override @Override
public LinkedHashSet<Point> validMoves(Piece[][] pieces) { public LinkedHashSet<Point> validMoves(Piece[][] pieces) {