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

merge

Browse Source
This commit is contained in:
Cedric Beck
2024-12-10 11:55:17 +01:00
parent 36c2f2efec b8d992590f
commit 8867e8156f
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,7 @@ public void selectPiece(Piece piece){
ArrayList<Piece> temp = new ArrayList<>(); ArrayList<Piece> temp = new ArrayList<>();
temp.add(selectedOwnPiece); temp.add(selectedOwnPiece);
temp.add(selectedEnemyPiece); temp.add(selectedEnemyPiece);
System.out.println("Client : Swap: temp: "+temp.get(0)+temp.get(1));
logic.send(new SelectedPiecesMessage(temp)); logic.send(new SelectedPiecesMessage(temp));
} }
} }

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

@@ -58,6 +58,7 @@ public void received(SelectedPiecesMessage msg, int from) {
if (msg.getPieces().size() == 2) { if (msg.getPieces().size() == 2) {
Piece selOwn = msg.getPieces().get(0); Piece selOwn = msg.getPieces().get(0);
Piece selEnemy = msg.getPieces().get(1); Piece selEnemy = msg.getPieces().get(1);
System.out.println("Server: Swapcard: ownPiece: "+selOwn+ " enemyPiece: "+selEnemy);
List<Piece> ownPieces = this.powerCardAutomaton.getVisitor().getSwapOwnPieces(); List<Piece> ownPieces = this.powerCardAutomaton.getVisitor().getSwapOwnPieces();
List<Piece> enemyPieces = this.powerCardAutomaton.getVisitor().getSwapOtherPieces(); List<Piece> enemyPieces = this.powerCardAutomaton.getVisitor().getSwapOtherPieces();