mirror of
https://github.com/lov3b/Schack.git
synced 2025-12-14 08:10:08 +01:00
Nu funkar checken ifall man står i schak lite mer
This commit is contained in:
@@ -12,13 +12,13 @@ public class Queen extends Piece {
|
||||
}
|
||||
|
||||
@Override
|
||||
public LinkedHashSet<Point> validMoves(Piece[][] pieces) {
|
||||
public LinkedHashSet<Point> validMoves(Piece[][] pieces, boolean isSelected) {
|
||||
LinkedHashSet<Point> movable = new LinkedHashSet<>();
|
||||
|
||||
// Vänster
|
||||
for (int loopX = this.position.x - 1; loopX >= 0; loopX--) {
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces);
|
||||
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces, isSelected);
|
||||
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
@@ -26,7 +26,7 @@ public class Queen extends Piece {
|
||||
|
||||
// Höger
|
||||
for (int loopX = this.position.x + 1; loopX <= 7; loopX++) {
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces);
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, this.position.y), movable, pieces, isSelected);
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
@@ -34,7 +34,7 @@ public class Queen extends Piece {
|
||||
|
||||
// Ner
|
||||
for (int loopY = this.position.y + 1; loopY <= 7; loopY++) {
|
||||
boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces);
|
||||
boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces, isSelected);
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
@@ -42,14 +42,14 @@ public class Queen extends Piece {
|
||||
|
||||
// Upp
|
||||
for (int loopY = this.position.y - 1; loopY >= 0; loopY--) {
|
||||
boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces);
|
||||
boolean shouldBreak = addMovesIfCan(new Point(this.position.x, loopY), movable, pieces, isSelected);
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
// Upp vänster
|
||||
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);
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces, isSelected);
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
@@ -58,7 +58,7 @@ public class Queen extends Piece {
|
||||
|
||||
// Upp höger
|
||||
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);
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces, isSelected);
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
@@ -66,7 +66,7 @@ public class Queen extends Piece {
|
||||
}
|
||||
// Ner höger
|
||||
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);
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces, isSelected);
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
@@ -74,7 +74,7 @@ public class Queen extends Piece {
|
||||
}
|
||||
// Ner vänster
|
||||
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);
|
||||
boolean shouldBreak = addMovesIfCan(new Point(loopX, loopY), movable, pieces, isSelected);
|
||||
if (shouldBreak) {
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user