Aleandro/Progetto-ingegneria-del-software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: DecksCreator, Board, Slot, BoardTest

Browse Source
This commit is contained in:
AleandroPagani
2026-03-27 18:13:09 +01:00
parent c4a521b19a
commit e3cbee7ba0
4 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java
+6 -9
View File
@@ -25,7 +25,7 @@ public class Board {
private List<BuildingCard> lowerListBuilding;
private int nTotem;
private int era;
public List<Slot> getSlotList(){//Da chiedere
public List<Slot> getSlotList(){
return slotList.stream().map(x->new Slot(x.getSlotId())).collect(Collectors.toList());
}
@@ -66,11 +66,12 @@ public class Board {
private Queue<TribeCard> getTribeDeck(int nPlayers) {
ArrayList<TribeCard> era1= DecksCreator.loadTribeDeckByEra(1).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
List<TribeCard> era2= DecksCreator.loadTribeDeckByEra(2).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
List<TribeCard> era3= DecksCreator.loadTribeDeckByEra(3).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
ArrayList<TribeCard> era2= DecksCreator.loadTribeDeckByEra(2).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
ArrayList<TribeCard> era3= DecksCreator.loadTribeDeckByEra(3).stream().filter(x->x.getNMin()<=nPlayers).collect(Collectors.toCollection(ArrayList::new));
Collections.shuffle(era1);
Collections.shuffle(era2);
Collections.shuffle(era3);
Queue<TribeCard> tribeDeck_temp=new LinkedList<>();
tribeDeck_temp.addAll(era1);
tribeDeck_temp.addAll(era2);
@@ -96,15 +97,11 @@ public class Board {
public boolean removeLowerTribeCard(TribeCard tribeCard) {
return upperListTribe.remove(tribeCard);
}
public boolean containsUpperBuildingCard(BuildingCard buildingCard) {
return upperListTribe.contains(buildingCard);
}
public boolean containsUpperBuildingCard(BuildingCard buildingCard) {return upperListTribe.contains(buildingCard);}
public boolean removeUpperBuildingCard(BuildingCard buildingCard) {
return upperListTribe.remove(buildingCard);
}
public boolean containsLowerBuildingCard(BuildingCard buildingCard) {
return upperListTribe.contains(buildingCard);
}
public boolean containsLowerBuildingCard(BuildingCard buildingCard) {return upperListTribe.contains(buildingCard);}
public boolean removeLowerBuildingCard(BuildingCard buildingCard) {
return upperListTribe.remove(buildingCard);
}