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

Fix: orderLogicCard & Board

Browse Source
This commit is contained in:
rubenpirreram
2026-04-02 15:57:51 +02:00
parent fe25c7cf49
commit 8d015b4eaf
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java
+4 -12
View File
@@ -19,10 +19,10 @@ import java.util.stream.Collectors;
public class Board { public class Board {
private List<Slot> slotList; private List<Slot> slotList;
private Queue<TribeCard> tribeDeck; private Queue<TribeCard> tribeDeck;
private List<TribeCard> upperListTribe; public List<TribeCard> upperListTribe;
private List<TribeCard> lowerListTribe; public List<TribeCard> lowerListTribe;
private List<BuildingCard> upperListBuilding; public List<BuildingCard> upperListBuilding;
private List<BuildingCard> lowerListBuilding; public List<BuildingCard> lowerListBuilding;
private int nTotem; private int nTotem;
private int era; private int era;
public List<Slot> getSlotList(){ public List<Slot> getSlotList(){
@@ -85,23 +85,15 @@ public class Board {
return lowerListTribe.stream().filter(TribeCard::IsEventCard).map(x->(EventCard)x).collect(Collectors.toCollection(LinkedList::new)); return lowerListTribe.stream().filter(TribeCard::IsEventCard).map(x->(EventCard)x).collect(Collectors.toCollection(LinkedList::new));
} }
public boolean containsUpperTribeCard(TribeCard tribeCard) {
return upperListTribe.contains(tribeCard);
}
public boolean removeUpperTribeCard(TribeCard tribeCard) { public boolean removeUpperTribeCard(TribeCard tribeCard) {
return upperListTribe.remove(tribeCard); return upperListTribe.remove(tribeCard);
} }
public boolean containsLowerTribeCard(TribeCard tribeCard) {
return upperListTribe.contains(tribeCard);
}
public boolean removeLowerTribeCard(TribeCard tribeCard) { public boolean removeLowerTribeCard(TribeCard tribeCard) {
return upperListTribe.remove(tribeCard); return upperListTribe.remove(tribeCard);
} }
public boolean containsUpperBuildingCard(BuildingCard buildingCard) {return upperListTribe.contains(buildingCard);}
public boolean removeUpperBuildingCard(BuildingCard buildingCard) { public boolean removeUpperBuildingCard(BuildingCard buildingCard) {
return upperListTribe.remove(buildingCard); return upperListTribe.remove(buildingCard);
} }
public boolean containsLowerBuildingCard(BuildingCard buildingCard) {return upperListTribe.contains(buildingCard);}
public boolean removeLowerBuildingCard(BuildingCard buildingCard) { public boolean removeLowerBuildingCard(BuildingCard buildingCard) {
return upperListTribe.remove(buildingCard); return upperListTribe.remove(buildingCard);
} }
src/main/java/it/polimi/ingsw/gc14/Model/OrderLogicCard.java
+1 -1
View File
@@ -15,7 +15,7 @@ public abstract class OrderLogicCard {
players.add(player); players.add(player);
} }
public Player pull(){ public Player pull(){
return players.remove(); return players.poll();
} }
public Player getFirst() public Player getFirst()
{ {