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

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

@@ -49,7 +49,8 @@ public void received(SelectPieceMessage msg) {
@Override
public void received(WaitPieceMessage msg){
LOGGER.log(System.Logger.Level.INFO, "Received WaitPieceMessage");
logic.addNotification(new MovePieceNotification(msg.getPieceID(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true));
Piece piece = logic.getGame().getPieceThroughUUID(msg.getPieceID());
logic.addNotification(new SelectableMoveNotification(new ArrayList<>(List.of(msg.getPieceID())), new ArrayList<>(List.of(logic.getGame().getPlayerByColor(piece.getColor()).getStartNodeIndex())), new ArrayList<>(List.of(false))));
parent.setState(parent.getWaitingPiece());
}

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

@@ -26,6 +26,7 @@ public SelectPieceState(ClientState parent, ClientGameLogic logic) {
@Override
public void enter() {
}
@Override
@@ -39,7 +40,7 @@ public void setPossiblePieces(ArrayList<Piece> possiblePieces) {
@Override
public void selectPiece(Piece piece) {
if(possiblePieces.contains(piece)){
if (possiblePieces.contains(piece)) {
logic.send(new RequestMoveMessage(piece));
}
}

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

@@ -36,10 +36,8 @@ public void exit() {
@Override
public void selectPiece(Piece piece){
if(moveablePiece.equals(piece)){
logic.send(new RequestMoveMessage(piece));
}
}
@Override
public void received(MoveMessage msg){