love/Schack
1
0
Fork 0
mirror of https://github.com/lov3b/Schack.git synced 2024-09-20 05:40:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ta bort fel jag gjorde förut

Browse Source
This commit is contained in:
lov3b 2022-05-14 16:42:36 +02:00
parent e2d4037654
commit ddbae03150
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/schack/Pawn.java
View File

@ -75,7 +75,9 @@ public class Pawn extends PieceKnownIfMoved {
Piece piece = pieces[pos.x][pos.y]; Piece piece = pieces[pos.x][pos.y];
// Ifall det är tomt här, gör ingenting // Ifall det är tomt här, gör ingenting
if (piece != null && piece.isWhite() != this.isWhite()) { if (piece != null && piece.isWhite() != this.isWhite()) {
movable.addAll(tryToMoveAndCheckIfCheck(pieces, pos)); if (!isInSchackHere(pieces, pos)) {
movable.add(pos);
}
} }
return movable; return movable;
} }
@ -88,7 +90,9 @@ public class Pawn extends PieceKnownIfMoved {
Piece pieceToCheck = pieces[pos.x][pos.y]; Piece pieceToCheck = pieces[pos.x][pos.y];
if (pieceToCheck == null) { if (pieceToCheck == null) {
movable.addAll(tryToMoveAndCheckIfCheck(pieces, pos)); if (!isInSchackHere(pieces, pos)) {
movable.add(pos);
}
return false; return false;
} }
return true; return true;

19
src/schack/Piece.java
View File

@ -69,7 +69,8 @@ public abstract class Piece {
* Ger tillbaks alla ställen pjäsen kan attackera * Ger tillbaks alla ställen pjäsen kan attackera
* *
* @param pieces * @param pieces
* @param shouldNotCareIfAttackSpaceIsEmptyOrNot Ifall man inte ska bry sig ifall * @param shouldNotCareIfAttackSpaceIsEmptyOrNot Ifall man inte ska bry sig
* ifall
* @return * @return
*/ */
public ArrayList<Point> validAttacks(Piece[][] pieces, boolean shouldNotCareIfAttackSpaceIsEmptyOrNot) { public ArrayList<Point> validAttacks(Piece[][] pieces, boolean shouldNotCareIfAttackSpaceIsEmptyOrNot) {
@ -131,7 +132,9 @@ public abstract class Piece {
if (!isSelected) { if (!isSelected) {
movable.add(pos); movable.add(pos);
} else { } else {
movable.addAll(tryToMoveAndCheckIfCheck(pieces, pos)); if (!isInSchackHere(pieces, pos)) {
movable.add(pos);
}
} }
// Fortsätt att gå // Fortsätt att gå
return false; return false;
@ -150,7 +153,9 @@ public abstract class Piece {
if (!isSelected) { if (!isSelected) {
movable.add(pos); movable.add(pos);
} else { } else {
movable.addAll(tryToMoveAndCheckIfCheck(pieces, pos)); if (!isInSchackHere(pieces, pos)) {
movable.add(pos);
}
} }
} }
return true; return true;
@ -165,8 +170,7 @@ public abstract class Piece {
* @param pos * @param pos
* @return * @return
*/ */
ArrayList<Point> tryToMoveAndCheckIfCheck(Piece[][] pieces, Point pos) { boolean isInSchackHere(Piece[][] pieces, Point pos) {
ArrayList<Point> movable = new ArrayList<>();
// Kom ihåg vart vi var // Kom ihåg vart vi var
Point previousPosition = new Point(this.position); Point previousPosition = new Point(this.position);
@ -185,10 +189,7 @@ public abstract class Piece {
pieces[pos.x][pos.y] = opponentPiece; pieces[pos.x][pos.y] = opponentPiece;
this.position = new Point(previousPosition); this.position = new Point(previousPosition);
if (!inSchack) { return inSchack;
movable.add(pos);
}
return movable;
} }
/** /**