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 +14037 -2669
264 changed files with 14037 additions and 2669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be8d4b2d6e - Show all commits

1
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/GameStates.java
View File

@@ -27,6 +27,7 @@ public GameStates(ClientState parent, ClientGameLogic logic) {
protected void handlePowerCard(PlayCardMessage msg) {
if (msg.getCard().getCard().equals(BonusCard.TURBO)) {
logic.getGame().setTurboFlag(true);
logic.getGame().setDiceModifier(msg.getDiceModifier());
} else if (msg.getCard().getCard().equals(BonusCard.SHIELD)) {
handleShield(msg.getPieces().get(0).getUuid());

1
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/SpectatorState.java
View File

@@ -94,6 +94,7 @@ public void received(MoveMessage msg) {
//set new node
logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece);
}
logic.getGame().setTurboFlag(false);
parent.setState(parent.getAnimation());
}
}

1
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/WaitingState.java
View File

@@ -111,6 +111,7 @@ public void received(MoveMessage msg) {
//set new node
logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece);
}
logic.getGame().setTurboFlag(false);
parent.setState(parent.getAnimation());
}
}

7
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/RollDiceState.java
View File

@@ -24,13 +24,6 @@ public RollDiceState(ClientState parent, ClientGameLogic logic) {
@Override
public void enter() {
logic.addNotification(new DiceNowNotification());
if (logic.getGame().getTurboFlag()){
if (parent.isCanChangeTurbo()){
logic.getGame().setTurboFlag(false);
} else {
parent.setCanChangeTurbo(true);
}
}
}
@Override

1
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/NoPieceState.java
View File

@@ -72,6 +72,7 @@ public void received(StartPieceMessage msg){
@Override
public void received(NoTurnMessage msg){
logic.getGame().setTurboFlag(false);
parent.getParent().getParent().setState(parent.getParent().getParent().getWaiting());
}
}

2
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/SelectPieceState.java
View File

@@ -71,7 +71,7 @@ public void received(MoveMessage msg) {
//set new node
logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(piece);
}
logic.getGame().setTurboFlag(false);
parent.getParent().setState(parent.getParent().getMovePiece());
}
}

2
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/StartPieceState.java
View File

@@ -65,7 +65,7 @@ public void received(MoveMessage msg){
targetNode.setOccupant(msg.getPiece());
logic.addNotification(new MovePieceNotification(msg.getPiece().getUuid(), oldIndex, targetIndex));
logic.getGame().setTurboFlag(false);
parent.getParent().setState(parent.getParent().getMovePiece());
}
}

2
Projekte/mdga/model/src/main/java/pp/mdga/client/gamestate/turnstate/choosepiecestate/WaitingPieceState.java
View File

@@ -49,7 +49,7 @@ public void received(MoveMessage msg){
logic.addNotification(new MovePieceNotification(pieceToMove.getUuid(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true));
logic.getGame().getBoard().getInfield()[msg.getTargetIndex()].setOccupant(msg.getPiece());
logic.getGame().setTurboFlag(false);
pieceToMove.setState(PieceState.ACTIVE);
parent.getParent().setState(parent.getParent().getMovePiece());
}