Crabs/3DChess
2
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

refactor: move promote to chessboard

Browse Source
This commit is contained in:
Simon Pribylski
2025-04-06 12:43:11 +02:00
parent 6cb1dd826f
commit 6eae7e386f
5 changed files with 45 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/chess/controller/commands/CastlingCommand.java
View File

@@ -20,11 +20,11 @@ public class CastlingCommand extends PlayerCommand {
@Override
public CommandResult execute(Game game, OutputSystem outputSystem) {
// we must promote the pending pawn before
if (game.pawnShouldBePromoted())
return CommandResult.NotAllowed;
final ChessBoard board = game.getBoard();
// we must promote the pending pawn before
if (board.pawnShouldBePromoted())
return CommandResult.NotAllowed;
if (bigCastling && !board.canBigCastle(game.getPlayerTurn()))
return CommandResult.NotAllowed;

6
app/src/main/java/chess/controller/commands/MoveCommand.java
View File

@@ -28,7 +28,7 @@ public class MoveCommand extends PlayerCommand {
final ChessBoard board = game.getBoard();
// we must promote the pending pawn before
if (game.pawnShouldBePromoted())
if (board.pawnShouldBePromoted())
return CommandResult.NotAllowed;
Piece piece = board.pieceAt(move.getStart());
@@ -50,7 +50,7 @@ public class MoveCommand extends PlayerCommand {
return CommandResult.NotAllowed;
}
if (game.pawnShouldBePromoted())
if (board.pawnShouldBePromoted())
return CommandResult.ActionNeeded;
board.setLastMove(this.move);
@@ -71,7 +71,7 @@ public class MoveCommand extends PlayerCommand {
}
private void tryPromote(Game game, OutputSystem outputSystem) {
Coordinate pawnPos = game.pawnPromotePosition();
Coordinate pawnPos = game.getBoard().pawnPromotePosition();
if (pawnPos == null)
return;

2
app/src/main/java/chess/controller/commands/PromoteCommand.java
View File

@@ -36,7 +36,7 @@ public class PromoteCommand extends PlayerCommand {
public CommandResult execute(Game game, OutputSystem outputSystem) {
final ChessBoard board = game.getBoard();
this.pieceCoords = game.pawnPromotePosition();
this.pieceCoords = board.pawnPromotePosition();
if (this.pieceCoords == null)
return CommandResult.NotAllowed;