diff --git a/src/schack/Bishop.java b/src/schack/Bishop.java index 5e2fdbd..225f25b 100644 --- a/src/schack/Bishop.java +++ b/src/schack/Bishop.java @@ -16,8 +16,8 @@ public class Bishop extends Piece { LinkedHashSet movable = new LinkedHashSet<>(); // Upp vänster - for (int bishopX = this.position.x - 1, bishopY = this.position.y - 1; bishopX >= 0 && bishopY >= 0; bishopX--, bishopY--) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x - 1, loopY = this.position.y - 1; loopX >= 0 && loopY >= 0; loopX--, loopY--) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } @@ -25,24 +25,24 @@ public class Bishop extends Piece { } // Upp höger - for (int bishopX = this.position.x + 1, bishopY = this.position.y - 1; bishopX <= 7 && bishopY >= 0; bishopX++, bishopY--) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x + 1, loopY = this.position.y - 1; loopX <= 7 && loopY >= 0; loopX++, loopY--) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } } // Ner höger - for (int bishopX = this.position.x + 1, bishopY = this.position.y + 1; bishopX <= 7 && bishopY <= 7; bishopX++, bishopY++) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x + 1, loopY = this.position.y + 1; loopX <= 7 && loopY <= 7; loopX++, loopY++) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } } // Ner vänster - for (int bishopX = this.position.x - 1, bishopY = this.position.y + 1; bishopX >= 0 && bishopY <= 7; bishopX--, bishopY++) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x - 1, loopY = this.position.y + 1; loopX >= 0 && loopY <= 7; loopX--, loopY++) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } diff --git a/src/schack/Board.java b/src/schack/Board.java index f57f1a6..8345020 100644 --- a/src/schack/Board.java +++ b/src/schack/Board.java @@ -20,6 +20,8 @@ public class Board extends JPanel implements MouseListener { private Point selectedPiece = new Point(); private Color moveableColor = new Color(255, 191, 0); private boolean turn = true; + private LinkedHashSet whiteAttacks = new LinkedHashSet<>(); + private LinkedHashSet blackAttacks = new LinkedHashSet<>(); public Board() throws IOException { @@ -129,6 +131,8 @@ public class Board extends JPanel implements MouseListener { if (p.isWhite() == turn) { LinkedHashSet validMoves = p.validMoves(pieces); validMovesToDraw.addAll(validMoves); + + } } catch (Exception e) { validMovesToDraw.clear(); diff --git a/src/schack/King.java b/src/schack/King.java index fbdbef0..3f5bf20 100644 --- a/src/schack/King.java +++ b/src/schack/King.java @@ -110,6 +110,15 @@ public final class King extends PieceKnownIfMoved { addCastlingIfCan(pieces, movable, position, position); return movable; } + + private boolean chechCheck(Piece[][] pieces, Point point ){ + + + + + + return false; + } @Override public String toString() { diff --git a/src/schack/Queen.java b/src/schack/Queen.java index b66b032..1da927a 100644 --- a/src/schack/Queen.java +++ b/src/schack/Queen.java @@ -16,39 +16,39 @@ public class Queen extends Piece { LinkedHashSet movable = new LinkedHashSet<>(); // Vänster - for (int rookX = this.position.x - 1; rookX >= 0; rookX--) { - boolean shouldBreak = addMovesIfCan(new Point(rookX, this.position.y), movable, pieces); + for (int loopX = this.position.x - 1; loopX >= 0; loopX--) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces); if (shouldBreak) { break; } } // Höger - for (int rookX = this.position.x + 1; rookX <= 7; rookX++) { - boolean shouldBreak = addMovesIfCan(new Point(rookX, this.position.y), movable, pieces); + for (int loopX = this.position.x + 1; loopX <= 7; loopX++) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces); if (shouldBreak) { break; } } // Ner - for (int rookY = this.position.y + 1; rookY <= 7; rookY++) { - boolean shouldBreak = addMovesIfCan(new Point(this.position.x, rookY), movable, pieces); + for (int loopY = this.position.y + 1; loopY <= 7; loopY++) { + boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces); if (shouldBreak) { break; } } // Upp - for (int rookY = this.position.y - 1; rookY >= 0; rookY--) { - boolean shouldBreak = addMovesIfCan(new Point(this.position.x, rookY), movable, pieces); + for (int loopY = this.position.y - 1; loopY >= 0; loopY--) { + boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces); if (shouldBreak) { break; } } // Upp vänster - for (int bishopX = this.position.x - 1, bishopY = this.position.y - 1; bishopX >= 0 && bishopY >= 0; bishopX--, bishopY--) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x - 1, loopY = this.position.y - 1; loopX >= 0 && loopY >= 0; loopX--, loopY--) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } @@ -56,24 +56,24 @@ public class Queen extends Piece { } // Upp höger - for (int bishopX = this.position.x + 1, bishopY = this.position.y - 1; bishopX <= 7 && bishopY >= 0; bishopX++, bishopY--) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x + 1, loopY = this.position.y - 1; loopX <= 7 && loopY >= 0; loopX++, loopY--) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } } // Ner höger - for (int bishopX = this.position.x + 1, bishopY = this.position.y + 1; bishopX <= 7 && bishopY <= 7; bishopX++, bishopY++) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x + 1, loopY = this.position.y + 1; loopX <= 7 && loopY <= 7; loopX++, loopY++) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } } // Ner vänster - for (int bishopX = this.position.x - 1, bishopY = this.position.y + 1; bishopX >= 0 && bishopY <= 7; bishopX--, bishopY++) { - boolean shouldBreak = addMovesIfCan(new Point(bishopX, bishopY), movable, pieces); + for (int loopX = this.position.x - 1, loopY = this.position.y + 1; loopX >= 0 && loopY <= 7; loopX--, loopY++) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces); if (shouldBreak) { break; } diff --git a/src/schack/Rook.java b/src/schack/Rook.java index b82603b..75455c3 100644 --- a/src/schack/Rook.java +++ b/src/schack/Rook.java @@ -19,32 +19,32 @@ public class Rook extends PieceKnownIfMoved { //men jag är trög och har spenderat alldles förmycket tid på att vara trög :^) // Vänster - for (int rookX = this.position.x - 1; rookX >= 0; rookX--) { - boolean shouldBreak = addMovesIfCan(new Point(rookX, this.position.y), movable, pieces); + for (int loopX = this.position.x - 1; loopX >= 0; loopX--) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces); if (shouldBreak) { break; } } // Höger - for (int rookX = this.position.x + 1; rookX <= 7; rookX++) { - boolean shouldBreak = addMovesIfCan(new Point(rookX, this.position.y), movable, pieces); + for (int loopX = this.position.x + 1; loopX <= 7; loopX++) { + boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces); if (shouldBreak) { break; } } // Ner - for (int rookY = this.position.y + 1; rookY <= 7; rookY++) { - boolean shouldBreak = addMovesIfCan(new Point(this.position.x, rookY), movable, pieces); + for (int loopY = this.position.y + 1; loopY <= 7; loopY++) { + boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces); if (shouldBreak) { break; } } // Upp - for (int rookY = this.position.y - 1; rookY >= 0; rookY--) { - boolean shouldBreak = addMovesIfCan(new Point(this.position.x, rookY), movable, pieces); + for (int loopY = this.position.y - 1; loopY >= 0; loopY--) { + boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces); if (shouldBreak) { break; }