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

Merge branch 'development2' of https://athene2.informatik.unibw-muenchen.de/progproj/gruppen-ht24/Gruppe-01 into development2

Browse Source
This commit is contained in:
Cedric Beck
2024-12-08 18:06:10 +01:00
parent 2ab19d0fc8 ab9de3acf8
commit 1be2d6aa13
5 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -152,6 +152,7 @@ public void received(RankingResponseMessage msg){
*/ */
@Override @Override
public void received(SelectPieceMessage msg){ public void received(SelectPieceMessage msg){
System.out.println("SelectPieceMessage received in GameState");
state.received(msg); state.received(msg);
} }

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

@@ -70,6 +70,7 @@ public void selectAnimationEnd(){
@Override @Override
public void received(SelectPieceMessage msg){ public void received(SelectPieceMessage msg){
System.out.println("SelectPieceMessage received in TurnState");
state.received(msg); state.received(msg);
} }

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

@@ -49,6 +49,7 @@ public void selectPiece(Piece piece){
@Override @Override
public void received(SelectPieceMessage msg){ public void received(SelectPieceMessage msg){
System.out.println("SelectPieceMessage received in ChoosePieceState");
currentState.received(msg); currentState.received(msg);
} }

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

@@ -6,6 +6,7 @@
import pp.mdga.game.Piece; import pp.mdga.game.Piece;
import pp.mdga.message.server.*; import pp.mdga.message.server.*;
import pp.mdga.message.server.StartPieceMessage; import pp.mdga.message.server.StartPieceMessage;
import pp.mdga.notification.MovePieceNotification;
import pp.mdga.notification.SelectableMoveNotification; import pp.mdga.notification.SelectableMoveNotification;
import pp.mdga.notification.WaitMoveNotification; import pp.mdga.notification.WaitMoveNotification;
@@ -48,7 +49,7 @@ public void received(SelectPieceMessage msg) {
@Override @Override
public void received(WaitPieceMessage msg){ public void received(WaitPieceMessage msg){
LOGGER.log(System.Logger.Level.INFO, "Received WaitPieceMessage"); LOGGER.log(System.Logger.Level.INFO, "Received WaitPieceMessage");
logic.addNotification(new WaitMoveNotification(msg.getPieceID())); logic.addNotification(new MovePieceNotification(msg.getPieceID(), logic.getGame().getPlayerByColor(logic.getGame().getActiveColor()).getStartNodeIndex(), true));
parent.setState(parent.getWaitingPiece()); parent.setState(parent.getWaitingPiece());
} }

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

@@ -27,6 +27,7 @@ public WaitingPieceState(ClientState parent, ClientGameLogic logic) {
@Override @Override
public void enter() { public void enter() {
moveablePiece = null; moveablePiece = null;
} }
@Override @Override