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

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +13484 -2472
256 changed files with 13484 additions and 2472 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3040595193 - Show all commits

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

@@ -31,10 +31,12 @@ private void initialize(){
if (activePlayer.hasPieceInWaitingArea()){
if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getWaitingPieceState());
} else {
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState());
}
} else {
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState());
}
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getNoTurnState());
}
} else if (activePlayer.hasPieceInWaitingArea()) {
if (!logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].isOccupied(activePlayer.getColor())){
@@ -45,6 +47,8 @@ private void initialize(){
}
} else if (canMove(logic.getGame().getBoard().getInfield()[activePlayer.getStartNodeIndex()].getOccupant())){
this.choosePieceAutomaton.setCurrentState(this.choosePieceAutomaton.getStartPieceState());
} else {
checkSelectPiece(activePlayer);
}
} else {
checkSelectPiece(activePlayer);