TestMerge 3 #6

Merged
j23f0712 merged 5 commits from development into dev/test 2024-11-19 12:48:07 +01:00
Showing only changes of commit 9cd9cc871c - Show all commits

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);
} }
} }