diff --git a/OOP_2B1_Project/src/backend/Board.java b/OOP_2B1_Project/src/backend/Board.java index 06ee583..5d33f03 100644 --- a/OOP_2B1_Project/src/backend/Board.java +++ b/OOP_2B1_Project/src/backend/Board.java @@ -4,16 +4,16 @@ import java.util.ArrayList; import java.util.LinkedList; public class Board { - public int width; - public int height; - public ArrayList> board = new ArrayList<>(); - public boolean select = false; - public int xm; - public int ym; - public int turnNumber; - public boolean turnColor; - public ArrayList> possibleMoves = new ArrayList<>(); - public LinkedList boardHistory = new LinkedList<>(); + private int width; + private int height; + private ArrayList> board = new ArrayList<>(); + private boolean select = false; + private int xm; + private int ym; + private int turnNumber; + private boolean turnColor; + private ArrayList> possibleMoves = new ArrayList<>(); + private LinkedList boardHistory = new LinkedList<>(); public Board(int colNum, int lineNum) { this.width = colNum; diff --git a/OOP_2B1_Project/src/backend/King.java b/OOP_2B1_Project/src/backend/King.java index 698ff4e..79feabd 100644 --- a/OOP_2B1_Project/src/backend/King.java +++ b/OOP_2B1_Project/src/backend/King.java @@ -44,7 +44,15 @@ public class King extends Piece { } } } - + //kingside method + if (x+3 < 8) { + Piece Rook = board.get(y).get(x+3); + if (Rook != null && Rook.getType()== PieceType.Rook && !Rook.movePiece() && Rook.isWhite()== this.isWhite) { + if(board.get(y).get(x+1) == null && board.get(y).get(x+2) == null) { + moves.get(y).set(x+2,true); + } + } + } return moves; } } \ No newline at end of file diff --git a/OOP_2B1_Project/src/backend/Piece.java b/OOP_2B1_Project/src/backend/Piece.java index cd63212..7dda487 100644 --- a/OOP_2B1_Project/src/backend/Piece.java +++ b/OOP_2B1_Project/src/backend/Piece.java @@ -36,5 +36,9 @@ public abstract class Piece { public String toString() { return "Piece [x=" + x + ", y=" + y + ", type=" + type + ", isWhite=" + isWhite + "]"; } + public boolean movePiece() { + boolean moved = false; + return moved; + } }