diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java index afcf47a..861211a 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Game.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Game.java @@ -7,7 +7,6 @@ import it.polimi.ingsw.gc14.Model.Orders.Order3; import it.polimi.ingsw.gc14.Model.Orders.Order4; import it.polimi.ingsw.gc14.Model.Orders.Order5; -import javax.smartcardio.Card; import java.util.ArrayList; import java.util.List; @@ -19,11 +18,25 @@ public class Game { private List lowerListTribe; private List upperListBuilding; private List lowerListBuilding; - private List playersList;//No Clone? + private ArrayList playersList; + + private int nPlayers; private OrderLogicCard orderLogicCard; - public Game(ArrayList playersList) { - switch (playersList.size()) { + public Game(int nPlayers) { + this.nPlayers = nPlayers; + + //Manca generazione slot ->this.slotList = slotList.stream().filter(slot -> slot.getNMinPlayer()>= nPlayers).toList(); + + upperListTribe = new ArrayList<>(); + lowerListTribe = new ArrayList<>(); + upperListBuilding = new ArrayList<>(); + lowerListBuilding = new ArrayList<>(); + playersList = new ArrayList<>(); + } + public void init() + { + switch (nPlayers) { case 2: orderLogicCard=new Order2(playersList); break; @@ -37,19 +50,21 @@ public class Game { orderLogicCard=new Order5(playersList); break; } - slotList = new ArrayList<>(); - tribeDeck = new ArrayList<>(); - buildingDeck = new ArrayList<>(); - upperListTribe = new ArrayList<>(); - lowerListTribe = new ArrayList<>(); - upperListBuilding = new ArrayList<>(); - lowerListBuilding = new ArrayList<>(); - this.playersList = playersList; - } - public void init() - { + } + public void addPlayer(Player player) + { + playersList.add(player); + if(playersList.size()>=nPlayers) + { + init(); + } + } + + + +