Removed: Board in MiniModel

Added: upperListTribe,lowerListTribe,upperListBuilding,lowerListBuilding

src/main/java/it/polimi/ingsw/gc14/Model/MiniModel.java

@@ -1,5 +1,7 @@
 package it.polimi.ingsw.gc14.Model;
 
+import it.polimi.ingsw.gc14.Model.Cards.BuildingCard;
+import it.polimi.ingsw.gc14.Model.Cards.TribeCard;
 import it.polimi.ingsw.gc14.Model.GamePackage.Board;
 import it.polimi.ingsw.gc14.Model.GamePackage.CurrentState;
 
@@ -15,10 +17,10 @@ import java.util.*;
  */
 public class MiniModel implements Serializable {
 
-    /**
+    public ArrayList<TribeCard> upperListTribeCards;
-     * Current game board.
+    public ArrayList<TribeCard> lowerListTribeCards;
-     */
+    public ArrayList<BuildingCard> upperListBuildingCards;
-    public Board board;
+    public ArrayList<BuildingCard> lowerListBuildingCards;
 
     /**
      * Map associating each occupied slot with the corresponding player.
@@ -56,13 +58,12 @@ public class MiniModel implements Serializable {
     public MiniModel() {
     }
 
-    /**
+    //TODO
-     * Constructs a mini model containing only the game board.
+    public MiniModel(ArrayList<TribeCard> upperListTribeCards,ArrayList<TribeCard>lowerListTribeCards,ArrayList<BuildingCard> upperListBuildingCards,ArrayList<BuildingCard>lowerListBuildingCards) {
-     *
+        this.upperListTribeCards = upperListTribeCards;
-     * @param board the current game board.
+        this.lowerListTribeCards = lowerListTribeCards;
-     */
+        this.upperListBuildingCards = upperListBuildingCards;
-    public MiniModel(Board board) {
+        this.lowerListBuildingCards = lowerListBuildingCards;
-        this.board = board;
     }
 
     /**
@@ -91,14 +92,6 @@ public class MiniModel implements Serializable {
         setPlayers(players);
     }
 
-    /**
-     * Sets the current game board.
-     *
-     * @param board the board to assign.
-     */
-    public void setBoard(Board board) {
-        this.board = board;
-    }
 
     /**
      * Sets the list of totems still available for selection.

src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DrawLowerBuildingCard.java

@@ -42,7 +42,7 @@ public class DrawLowerBuildingCard extends NetworkEvent implements  Serializable
         if(isError)
             return false;
 
-        miniModel.board.removeLowerBuildingCard(miniModel.board.lowerListBuilding.get(pos));
+        miniModel.lowerListBuildingCards.remove(pos);
         miniModel.setPlayer(player);
         miniModel.setOrderLogicCard(orderLogicCard);
         miniModel.setCurrentState(currentState);

src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DrawLowerTribeCard.java

@@ -41,7 +41,7 @@ public class DrawLowerTribeCard extends NetworkEvent implements  Serializable{
         if(isError)
             return false;
 
-        miniModel.board.removeLowerTribeCard(miniModel.board.lowerListTribe.get(pos));
+        miniModel.lowerListTribeCards.remove(pos);
         miniModel.setPlayer(player);
         miniModel.setOrderLogicCard(orderLogicCard);
         miniModel.setCurrentState(currentState);

src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DrawUpperBuildingCard.java

@@ -42,7 +42,7 @@ public class DrawUpperBuildingCard extends NetworkEvent implements  Serializable
         if(isError)
             return false;
 
-        miniModel.board.removeUpperBuildingCard(miniModel.board.upperListBuilding.get(pos));
+        miniModel.upperListBuildingCards.remove(pos);
         miniModel.setPlayer(player);
         miniModel.setOrderLogicCard(orderLogicCard);
         miniModel.setCurrentState(currentState);

src/main/java/it/polimi/ingsw/gc14/Network/NetworkEvents/DrawUpperTribeCard.java

@@ -40,7 +40,7 @@ public class DrawUpperTribeCard extends NetworkEvent implements  Serializable{
     public boolean apply(MiniModel miniModel){
         if(isError)
             return false;
-        miniModel.board.removeUpperTribeCard(miniModel.board.upperListTribe.get(pos));
+        miniModel.upperListTribeCards.remove(pos);
         miniModel.setPlayer(player);
         miniModel.setOrderLogicCard(orderLogicCard);
         miniModel.setCurrentState(currentState);