From b920c4fbb3347f106b2d2fc78275c0af00c79c5e Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Mon, 7 Apr 2025 10:17:19 +0200 Subject: [PATCH] change board to cells --- app/src/main/java/chess/model/Board.java | 70 +++++++++++------------- 1 file changed, 33 insertions(+), 37 deletions(-) diff --git a/app/src/main/java/chess/model/Board.java b/app/src/main/java/chess/model/Board.java index 090aa5c..269fe59 100644 --- a/app/src/main/java/chess/model/Board.java +++ b/app/src/main/java/chess/model/Board.java @@ -3,70 +3,65 @@ package chess.model; import chess.model.pieces.*; public class Board { - private final Cell[][] board; + private final Cell[][] cells; private static final int WHITE = 0; private static final int BLACK = 1; - public Board(int size){ - board = new Cell[size][size]; + public Board(int size) { + cells = new Cell[size][size]; for (int y = 0; y < size; y++) { for (int x = 0; x < size; x++) { - board[y][x] = new Cell(); + cells[y][x] = new Cell(); } } setPieces(); } - public Board(){ + public Board() { this(8); } - public Cell getCell(Coordinates coordinates){ - return board[coordinates.getX()][coordinates.getY()]; + public Cell getCell(Coordinates coordinates) { + return cells[coordinates.getX()][coordinates.getY()]; } - public int getSize(){ - return board.length; + public int getSize() { + return cells.length; } public void setPieces() throws Error { if (this.getSize() == 8) { setPiecesSize8(); - } - else { + } else { throw new Error("Oops. This isn't implemented yet."); } } - public void setPiecesSize8(){ + public void setPiecesSize8() { for (int i = 0; i < 8; i++) { - board[i][1].setPiece(new Pawn(BLACK, this, board[i][1])); - board[i][6].setPiece(new Pawn(WHITE, this, board[i][6])); - if (i==0 || i==7) { - board[i][0].setPiece(new Rook(BLACK, this, board[i][0])); - board[i][7].setPiece(new Rook(WHITE, this, board[i][7])); - } - if (i==1 || i==6) { - board[i][0].setPiece(new Knight(BLACK, this, board[i][0])); - board[i][7].setPiece(new Knight(WHITE, this, board[i][7])); - } - if (i==2 || i==5) { - board[i][0].setPiece(new Bishop(BLACK, this, board[i][0])); - board[i][7].setPiece(new Bishop(WHITE, this, board[i][7])); - } - if (i==3) { - board[i][0].setPiece(new Queen(BLACK, this, board[i][0])); - board[i][7].setPiece(new Queen(WHITE, this, board[i][7])); - } - if (i==4) { - board[i][0].setPiece(new King(BLACK, this, board[i][0])); - board[i][7].setPiece(new King(WHITE, this, board[i][7])); - } - + cells[i][1].setPiece(new Pawn(BLACK, this, cells[i][1])); + cells[i][6].setPiece(new Pawn(WHITE, this, cells[i][6])); } + + for (int i = 0; i <= 7; i += 7) { + cells[i][0].setPiece(new Rook(BLACK, this, cells[i][0])); + cells[i][7].setPiece(new Rook(WHITE, this, cells[i][7])); + } + for (int i = 1; i <= 6; i += 5) { + cells[i][0].setPiece(new Knight(BLACK, this, cells[i][0])); + cells[i][7].setPiece(new Knight(WHITE, this, cells[i][7])); + } + for (int i = 2; i <= 5; i += 3) { + cells[i][0].setPiece(new Bishop(BLACK, this, cells[i][0])); + cells[i][7].setPiece(new Bishop(WHITE, this, cells[i][7])); + } + cells[3][0].setPiece(new Queen(BLACK, this, cells[3][0])); + cells[3][7].setPiece(new Queen(WHITE, this, cells[3][7])); + cells[4][0].setPiece(new King(BLACK, this, cells[4][0])); + cells[4][7].setPiece(new King(WHITE, this, cells[4][7])); } - public Piece getPiece(Coordinates coordinates){ + public Piece getPiece(Coordinates coordinates) { return getCell(coordinates).getPiece(); } @@ -78,8 +73,9 @@ public class Board { movingPiece.setPosition(arrivalCell); } - public Cell getRelativePosition(Coordinates coordinates, MovePattern mp){ + public Cell getRelativePosition(Coordinates coordinates) { // todo + return null; } }