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

Version 1.0 #40

Merged
j23f0779 merged 947 commits from development2 into main 2024-12-13 10:26:49 +01:00
Conversation 2 Commits 947 Files Changed 528 +4 -2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4d31fc098b - Show all commits

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

@@ -55,7 +55,7 @@ public void setPossibleEnemyPieces(ArrayList<Piece> possibleEnemyPieces) {
} }
@Override @Override
public void selectPiece(Piece piece){ public void selectPiece(Piece piece) {
if (possibleOwnPieces.contains(piece)){ if (possibleOwnPieces.contains(piece)){
selectedOwnPiece = piece; selectedOwnPiece = piece;
} else if (possibleEnemyPieces.contains(piece)){ } else if (possibleEnemyPieces.contains(piece)){
@@ -67,6 +67,8 @@ public void selectPiece(Piece piece){
temp.add(selectedEnemyPiece); temp.add(selectedEnemyPiece);
System.out.println("Client : Swap: temp: "+temp.get(0)+temp.get(1)); System.out.println("Client : Swap: temp: "+temp.get(0)+temp.get(1));
logic.send(new SelectedPiecesMessage(temp)); logic.send(new SelectedPiecesMessage(temp));
selectedEnemyPiece = null;
selectedOwnPiece = null;
} }
} }

2
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -88,7 +88,7 @@ public Game() {
initializeDrawPile(); initializeDrawPile();
board = new Board(); board = new Board();
die = new Die(1,2, die = new Die(1,2,
5, 1,1,1 1,1,6,1
); );
} }