Merge Test to Development #8

Merged
j23f0712 merged 4 commits from development into dev/test 2024-11-22 13:56:52 +01:00
2 changed files with 15 additions and 1 deletions
Showing only changes of commit 04501de11c - Show all commits

View File

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

View File

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