diff --git a/src/backend/Board.java b/src/backend/Board.java index 098347c..453c1d7 100644 --- a/src/backend/Board.java +++ b/src/backend/Board.java @@ -4,14 +4,14 @@ import java.util.ArrayList; public class Board { - private int cNum; - private int lNum; - private Piece newPiece; - private Piece[][]Board; + private int cNum; // nb de colonnes du damier + private int lNum; // nb de ligne du damier + private Piece[][] cells; public Board(int colNum, int lineNum) { cNum=colNum; lNum=lineNum; + cells = new Piece[cNum][lNum]; // creation du tableau de pieces } public int getWidth() { @@ -40,37 +40,56 @@ public class Board { } public void setPiece(PieceType type, boolean isWhite, int x, int y) { - this.newPiece= new Piece(x,y,type,isWhite); + Piece newPiece= new Piece(type,isWhite,x,y); + + cells[x][y] = newPiece; } public void populateBoard() { - //Black pieces populating - Board[1][1] = new Piece(1,1,PieceType.Rook,false); - Board[2][1] = new Piece(2,1,PieceType.Knight,false); - Board[3][1] = new Piece(3,1,PieceType.Bishop,false); - Board[4][1] = new Piece(4,1,PieceType.Queen,false); - Board[7][1] = new Piece(5,1,PieceType.King,false); - Board[6][1] = new Piece(6,1,PieceType.Bishop,false); - Board[8][1] = new Piece(7,1,PieceType.Knight,false); - Board[9][1] = new Piece(8,1,PieceType.Rook,false); + final int startWhite = 0; + final int startBlack = lNum-1; - for (int x = 1; x < 8; x++) { - Board[x][2] = new Piece(x,2,PieceType.Pawn,false); + //Black pieces populating + setPiece(PieceType.Rook,false,0,startWhite); + setPiece(PieceType.Knight,false, 1,startWhite); + setPiece(PieceType.Bishop,false,2,startWhite); + setPiece(PieceType.Queen,false,3,startWhite); + setPiece(PieceType.King,false,4,startWhite); + setPiece(PieceType.Bishop,false,5,startWhite); + setPiece(PieceType.Knight,false,6,startWhite); + setPiece(PieceType.Rook,false,7,startWhite); + + for (int x = 0; x < cNum; x++) { + setPiece(PieceType.Pawn,false,x,startWhite+1); } //White pieces populating - Board[1][8] = new Piece(1,8,PieceType.Rook,true); - Board[2][8] = new Piece(2,8,PieceType.Knight,true); - Board[3][8] = new Piece(3,8,PieceType.Bishop,true); - Board[4][8] = new Piece(4,8,PieceType.Queen,true); - Board[7][8] = new Piece(5,8,PieceType.King,true); - Board[6][8] = new Piece(6,8,PieceType.Bishop,true); - Board[8][8] = new Piece(7,8,PieceType.Knight,true); - Board[9][8] = new Piece(8,8,PieceType.Rook,true); + setPiece(PieceType.Rook,true,0,startBlack); + setPiece(PieceType.Knight,true,1,startBlack); + setPiece(PieceType.Bishop,true,2,startBlack); + setPiece(PieceType.Queen,true,3,startBlack); + setPiece(PieceType.King,true,4,startBlack); + setPiece(PieceType.Bishop,true,5,startBlack); + setPiece(PieceType.Knight,true,6,startBlack); + setPiece(PieceType.Rook,true,7,startBlack); - for (int x = 1; x < 8; x++) { + for (int x = 0; x < cNum; x++) { - Board[x][7] = new Piece(x,7,PieceType.Pawn,true); + setPiece(PieceType.Pawn,true,x,startBlack-1); + } + + + for (int x = 0; x < cNum; x++) { + for(int y=0;y