Fix: orderLogicCard & Board
This commit is contained in:
@@ -19,10 +19,10 @@ import java.util.stream.Collectors;
|
||||
public class Board {
|
||||
private List<Slot> slotList;
|
||||
private Queue<TribeCard> tribeDeck;
|
||||
private List<TribeCard> upperListTribe;
|
||||
private List<TribeCard> lowerListTribe;
|
||||
private List<BuildingCard> upperListBuilding;
|
||||
private List<BuildingCard> lowerListBuilding;
|
||||
public List<TribeCard> upperListTribe;
|
||||
public List<TribeCard> lowerListTribe;
|
||||
public List<BuildingCard> upperListBuilding;
|
||||
public List<BuildingCard> lowerListBuilding;
|
||||
private int nTotem;
|
||||
private int era;
|
||||
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));
|
||||
}
|
||||
|
||||
public boolean containsUpperTribeCard(TribeCard tribeCard) {
|
||||
return upperListTribe.contains(tribeCard);
|
||||
}
|
||||
public boolean removeUpperTribeCard(TribeCard tribeCard) {
|
||||
return upperListTribe.remove(tribeCard);
|
||||
}
|
||||
public boolean containsLowerTribeCard(TribeCard tribeCard) {
|
||||
return upperListTribe.contains(tribeCard);
|
||||
}
|
||||
public boolean removeLowerTribeCard(TribeCard tribeCard) {
|
||||
return upperListTribe.remove(tribeCard);
|
||||
}
|
||||
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 removeLowerBuildingCard(BuildingCard buildingCard) {
|
||||
return upperListTribe.remove(buildingCard);
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@ public abstract class OrderLogicCard {
|
||||
players.add(player);
|
||||
}
|
||||
public Player pull(){
|
||||
return players.remove();
|
||||
return players.poll();
|
||||
}
|
||||
public Player getFirst()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user