From 55774b4605ef72038d387e558433862102c2f4d8 Mon Sep 17 00:00:00 2001 From: Persson-dev Date: Thu, 3 Apr 2025 22:15:50 +0200 Subject: [PATCH] refactor game --- app/src/main/java/chess/model/Game.java | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/chess/model/Game.java b/app/src/main/java/chess/model/Game.java index 52ea4eb..dc4df25 100644 --- a/app/src/main/java/chess/model/Game.java +++ b/app/src/main/java/chess/model/Game.java @@ -52,9 +52,8 @@ public class Game { if (destY != enemyLine) return false; - OnPromote.emit(pieceCoords); + this.OnPromote.emit(pieceCoords); return true; - } /** @@ -62,22 +61,21 @@ public class Game { * @return true if game should end */ public boolean checkGameStatus() { - final ChessBoard board = getBoard(); - final Color enemy = Color.getEnemy(getPlayerTurn()); - if (board.isKingInCheck(enemy)) { - if (board.hasAllowedMoves(enemy)) { - OnCheck.emit(); + if (this.board.isKingInCheck(enemy)) { + if (this.board.hasAllowedMoves(enemy)) { + this.OnCheck.emit(); } else { - OnMat.emit(); - OnWin.emit(getPlayerTurn()); + this.OnMat.emit(); + this.OnWin.emit(getPlayerTurn()); return true; } } else if (!board.hasAllowedMoves(enemy)) { - OnPat.emit(); + this.OnPat.emit(); return true; } + return false; } @@ -91,7 +89,7 @@ public class Game { int enemyLineY = color == Color.White ? 0 : 7; for (int x = 0; x < Coordinate.VALUE_MAX; x++) { - if(checkPromotion(new Coordinate(x, enemyLineY))) + if (checkPromotion(new Coordinate(x, enemyLineY))) return true; }