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

Merge remote-tracking branch 'origin/development' into development

Browse Source
This commit is contained in:
Daniel Grigencha
2024-11-17 21:18:38 +01:00
parent e83ed1c835 9cd9cc871c
commit 04501de11c
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardView.java
View File

@@ -60,7 +60,7 @@ private void initMap() {
case cir -> addFigureToPlayerMap(assetToColor(BoardAsset.cir), assetOnMap); case cir -> addFigureToPlayerMap(assetToColor(BoardAsset.cir), assetOnMap);
case marine -> addFigureToPlayerMap(assetToColor(BoardAsset.marine), assetOnMap); case marine -> addFigureToPlayerMap(assetToColor(BoardAsset.marine), assetOnMap);
case node_normal, node_bonus, node_start -> case node_normal, node_bonus, node_start ->
infield.addLast(displayAndControl(assetOnMap, new NodeControl())); infield.add(displayAndControl(assetOnMap, new NodeControl()));
default -> displayAsset(assetOnMap); default -> displayAsset(assetOnMap);
} }
} }

14
Projekte/mdga/model/src/main/java/pp.mdga/game/PlayerData.java
View File

@@ -136,4 +136,18 @@ public int getIndexInHome(Piece piece) {
} }
return -1; return -1;
} }
/**
* This method returns the homeNodes
*
* @return the homeNodes
*/
public boolean hasPieceInWaitingArea() {
for (Piece piece : waitingArea) {
if (piece != null) {
return true;
}
}
return false;
}
} }