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

change draw

Browse Source
This commit is contained in:
Simon Pribylski
2025-04-16 11:25:31 +02:00
parent f54ddc1f59
commit ae55e0d94c
2 changed files with 17 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/chess/model/Game.java
View File

@@ -12,7 +12,7 @@ public class Game {
private final ChessBoard board;
private Color playerTurn;
private final Stack<PlayerCommand> movesHistory;
private final Map<Color, Map<Integer, Integer>> traitsPos;
private final Map<Integer, Integer> traitsPos;
private static final int DRAW_REPETITONS = 3;
@@ -37,13 +37,6 @@ public class Game {
public void reset() {
resetPlayerTurn();
this.traitsPos.clear();
initPlayer(Color.Black);
initPlayer(Color.White);
}
private void initPlayer(Color color) {
this.traitsPos.put(color, new HashMap<>());
saveTraitPiecesPos(color);
}
public void resetPlayerTurn() {
@@ -55,32 +48,18 @@ public class Game {
* @param color the current player turn
* @return true if a draw should be declared
*/
private void saveTraitPiecesPos(Color color) {
int piecesHash = this.board.hashPlayerPieces(color);
Integer count = this.traitsPos.get(color).get(piecesHash);
this.traitsPos.get(color).put(piecesHash, count == null ? 1 : count + 1);
}
public void saveTraitPiecesPos() {
saveTraitPiecesPos(playerTurn);
int piecesHash = this.board.hashCode();
Integer count = this.traitsPos.get(piecesHash);
this.traitsPos.put(piecesHash, count == null ? 1 : count + 1);
}
/**
*
* @param player the trait to check
* @return true if a position is repeated DRAW_REPETITONS times
*/
private boolean checkDraw(Color player) {
return this.traitsPos.get(player).containsValue(DRAW_REPETITONS);
}
/**
* @return whether the game is in a draw situation
*/
private boolean checkDraw() {
if (checkDraw(Color.White))
return true;
return checkDraw(Color.Black);
return this.traitsPos.containsValue(DRAW_REPETITONS);
}
/**
@@ -129,15 +108,11 @@ public class Game {
}
}
private void undoTraitPiecesPos(Color color) {
int piecesHash = this.board.hashPlayerPieces(color);
Integer count = this.traitsPos.get(color).get(piecesHash);
if (count != null)
this.traitsPos.get(color).put(piecesHash, count - 1);
}
public void undoTraitPiecesPos() {
undoTraitPiecesPos(Color.getEnemy(playerTurn));
int piecesHash = this.board.hashCode();
Integer count = this.traitsPos.get(piecesHash);
if (count != null)
this.traitsPos.put(piecesHash, count - 1);
}
public List<PlayerCommand> getMoves() {