love/Schack
1
0
Fork 0
mirror of https://github.com/lov3b/Schack.git synced 2025-11-04 07:00:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed to Point signature

Browse Source
This commit is contained in:
lov3b
2022-03-22 17:01:19 +01:00
parent caa7ad4cef
commit ae634b89c1
5 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/schack/Bishop.java
View File

@@ -19,7 +19,7 @@ public class Bishop extends Piece {
// Upp vänster
for (int bishopX = this.position.x - 1, bishopY = this.position.y - 1; bishopX >= 0 && bishopY >= 0; bishopX--, bishopY--) {
boolean shouldBreak = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -28,7 +28,7 @@ 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 = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -36,7 +36,7 @@ public class Bishop extends Piece {
}
// Ner höger
for (int bishopX = this.position.x + 1, bishopY = this.position.y + 1; bishopX <= 7 && bishopY <= 7; bishopX++, bishopY++) {
boolean shouldBreak = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -44,7 +44,7 @@ public class Bishop extends Piece {
}
// Ner vänster
for (int bishopX = this.position.x - 1, bishopY = this.position.y + 1; bishopX >= 0 && bishopY <= 7; bishopX--, bishopY++) {
boolean shouldBreak = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -53,8 +53,6 @@ public class Bishop extends Piece {
return movable;
}
@Override
public String toString() {
return "Bishop{" + "position=" + position + ", isWhite=" + isWhite + '}';

2
src/schack/Horse.java
View File

@@ -37,7 +37,7 @@ public class Horse extends Piece {
for (Point pos : positions) {
// Ifall en är blockerad så ska vi inte sluta kolla
checkMove(pos.x, pos.y, movable, pieces);
checkMove(pos, movable, pieces);
}
return movable;

3
src/schack/Piece.java
View File

@@ -61,8 +61,7 @@ public abstract class Piece extends Component {
}
}
protected boolean checkMove(int x, int y, LinkedHashSet movable, Piece[][] pieces) {
Point pos = new Point(x, y);
protected boolean checkMove(Point pos, LinkedHashSet movable, Piece[][] pieces) {
// Instead of checking index and null, try-catch
try {

19
src/schack/Queen.java
View File

@@ -17,7 +17,7 @@ public class Queen extends Piece {
// Vänster
for (int rookX = this.position.x - 1; rookX >= 0; rookX--) {
boolean shouldBreak = checkMove(rookX, this.position.y, movable, pieces);
boolean shouldBreak = checkMove(new Point(rookX, this.position.y), movable, pieces);
if (shouldBreak) {
break;
}
@@ -25,7 +25,7 @@ public class Queen extends Piece {
// Höger
for (int rookX = this.position.x + 1; rookX <= 7; rookX++) {
boolean shouldBreak = checkMove(rookX, this.position.y, movable, pieces);
boolean shouldBreak = checkMove(new Point(rookX, this.position.y), movable, pieces);
if (shouldBreak) {
break;
}
@@ -33,7 +33,7 @@ public class Queen extends Piece {
// Ner
for (int rookY = this.position.y + 1; rookY <= 7; rookY++) {
boolean shouldBreak = checkMove(this.position.x, rookY, movable, pieces);
boolean shouldBreak = checkMove(new Point(this.position.x, rookY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -41,14 +41,14 @@ public class Queen extends Piece {
// Upp
for (int rookY = this.position.y - 1; rookY >= 0; rookY--) {
boolean shouldBreak = checkMove(this.position.x, rookY, movable, pieces);
boolean shouldBreak = checkMove(new Point(this.position.x, rookY), movable, pieces);
if (shouldBreak) {
break;
}
}
// Upp vänster
// Upp vänster
for (int bishopX = this.position.x - 1, bishopY = this.position.y - 1; bishopX >= 0 && bishopY >= 0; bishopX--, bishopY--) {
boolean shouldBreak = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -57,7 +57,7 @@ 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 = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -65,7 +65,7 @@ public class Queen extends Piece {
}
// Ner höger
for (int bishopX = this.position.x + 1, bishopY = this.position.y + 1; bishopX <= 7 && bishopY <= 7; bishopX++, bishopY++) {
boolean shouldBreak = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -73,13 +73,12 @@ public class Queen extends Piece {
}
// Ner vänster
for (int bishopX = this.position.x - 1, bishopY = this.position.y + 1; bishopX >= 0 && bishopY <= 7; bishopX--, bishopY++) {
boolean shouldBreak = checkMove(bishopX, bishopY, movable, pieces);
boolean shouldBreak = checkMove(new Point(bishopX, bishopY), movable, pieces);
if (shouldBreak) {
break;
}
}
return movable;
}
}

10
src/schack/Rook.java
View File

@@ -21,7 +21,7 @@ public class Rook extends Piece {
// Vänster
for (int rookX = this.position.x - 1; rookX >= 0; rookX--) {
boolean shouldBreak = checkMove(rookX, this.position.y, movable, pieces);
boolean shouldBreak = checkMove(new Point(rookX, this.position.y), movable, pieces);
if (shouldBreak) {
break;
}
@@ -29,7 +29,7 @@ public class Rook extends Piece {
// Höger
for (int rookX = this.position.x + 1; rookX <= 7; rookX++) {
boolean shouldBreak = checkMove(rookX, this.position.y, movable, pieces);
boolean shouldBreak = checkMove(new Point(rookX, this.position.y), movable, pieces);
if (shouldBreak) {
break;
}
@@ -37,7 +37,7 @@ public class Rook extends Piece {
// Ner
for (int rookY = this.position.y + 1; rookY <= 7; rookY++) {
boolean shouldBreak = checkMove(this.position.x, rookY, movable, pieces);
boolean shouldBreak = checkMove(new Point(this.position.x, rookY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -45,7 +45,7 @@ public class Rook extends Piece {
// Upp
for (int rookY = this.position.y - 1; rookY >= 0; rookY--) {
boolean shouldBreak = checkMove(this.position.x, rookY, movable, pieces);
boolean shouldBreak = checkMove(new Point(this.position.x, rookY), movable, pieces);
if (shouldBreak) {
break;
}
@@ -55,6 +55,4 @@ public class Rook extends Piece {
}
}