peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fixed waiting piece move bug

Browse Source
This commit is contained in:
Fleischer Hanno
2024-12-08 21:14:20 +01:00
parent 2d7fddf09a
commit 992efd403d
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -85,7 +85,7 @@ public Game() {
gameStatistics = new Statistic(); gameStatistics = new Statistic();
initializeDrawPile(); initializeDrawPile();
board = new Board(); board = new Board();
die = new Die(2,1,2,2,1,3); die = new Die(2,5,6,3,6);
} }
/** /**

9
Projekte/mdga/model/src/main/java/pp/mdga/game/Player.java
View File

@@ -348,4 +348,13 @@ public void setPieceInHome(int index, Piece piece) {
public String toString() { public String toString() {
return "Player: " + name + " Color: " + color; return "Player: " + name + " Color: " + color;
} }
public void removeWaitingPiece(Piece piece) {
for (int i = 0; i < Resources.MAX_PIECES; i++) {
if (piece.equals(this.waitingArea[i])) {
this.waitingArea[i] = null;
return;
}
}
}
} }

1
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/game/turn/choosepiece/WaitingPieceState.java
View File

@@ -40,6 +40,7 @@ public void enter() {
@Override @Override
public void received(RequestMoveMessage msg, int from){ public void received(RequestMoveMessage msg, int from){
if (msg.getPiece().equals(this.piece)) { if (msg.getPiece().equals(this.piece)) {
logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).removeWaitingPiece(this.piece);
piece.setState(PieceState.ACTIVE); piece.setState(PieceState.ACTIVE);
Piece thrownOcc = logic.getGame().getBoard().getInfield()[logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex()].getOccupant(); Piece thrownOcc = logic.getGame().getBoard().getInfield()[logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex()].getOccupant();
if (thrownOcc != null) { if (thrownOcc != null) {