Add:No Optional Card

src/main/java/it/polimi/ingsw/gc14/Network/EventType.java

@@ -8,5 +8,6 @@ public enum EventType {
     DRAW_UPPER_BUILD,
     DRAW_LOWER_BUILD,
     PICK_OPTIONAL_TRIBE,
-    PICK_OPTIONAL_BUILD
+    PICK_OPTIONAL_BUILD,
+    NO_OPTIONAL_CARD
 }

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

@@ -29,8 +29,4 @@ public class AddPlayer extends NetworkEvent implements  Serializable {
     {
         return gameController.addPlayer(username);
     }
-    public String apply(IView gameController)
-    {
-        return gameController.toString();
-    }
 }

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

@@ -24,8 +24,4 @@ public class DrawLowerBuildingCard extends NetworkEvent implements  Serializable
         return gameController.drawLowerBuildingCard(username, pos);
     }
 
-    //TODO javadoc
-    public String apply(IView gameController){
-        return gameController.toString();
-    }
 }

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

@@ -23,8 +23,4 @@ public class DrawLowerTribeCard extends NetworkEvent implements  Serializable{
         return gameController.drawLowerTribeCard(username, pos);
     }
 
-    //TODO javadoc
-    public String apply(IView gameController){
-        return gameController.toString();
-    }
 }

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

@@ -24,8 +24,4 @@ public class DrawUpperBuildingCard extends NetworkEvent implements  Serializable
         return gameController.drawUpperBuildingCard(username, pos);
     }
 
-    //TODO javadoc
-    public String apply(IView gameController){
-        return gameController.toString();
-    }
 }

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

@@ -24,8 +24,5 @@ public class DrawUpperTribeCard extends NetworkEvent implements  Serializable{
         return gameController.drawUpperTribeCard(username, pos);
     }
 
-    //TODO javadoc
-    public String apply(IView gameController){
-        return gameController.toString();
-    }
+
 }

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

@@ -0,0 +1,22 @@
+package it.polimi.ingsw.gc14.Network.NetworkEvents;
+
+import it.polimi.ingsw.gc14.Controller.GameController;
+import it.polimi.ingsw.gc14.Network.EventType;
+import it.polimi.ingsw.gc14.Network.NetworkEvent;
+import it.polimi.ingsw.gc14.View.IView;
+
+import java.io.Serializable;
+
+//TODO javadoc
+public class NoOptionalCard extends NetworkEvent implements  Serializable{
+    //TODO javadoc
+    public NoOptionalCard(String username){
+        super(username, EventType.NO_OPTIONAL_CARD, false);
+    }
+
+    //TODO javadoc
+    @Override
+    public boolean apply(GameController gameController){
+        return gameController.noOptionalCard(username);
+    }
+}

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

@@ -23,9 +23,4 @@ public class PickOptionalBuildingCard extends NetworkEvent implements  Serializa
     public boolean apply(GameController gameController){
         return gameController.pickOptionalBuildingCard(username, pos);
     }
-
-    //TODO javadoc
-    public String apply(IView gameController){
-        return gameController.toString();
-    }
 }

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

@@ -25,8 +25,4 @@ public class PickOptionalTribeCard extends NetworkEvent implements  Serializable
         return gameController.pickOptionalTribeCard(username, pos);
     }
 
-    //TODO javadoc
-    public String apply(IView gameController){
-        return gameController.toString();
-    }
 }

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

@@ -24,8 +24,4 @@ public class SlotChoice extends NetworkEvent implements  Serializable {
         return gameController.slotChoice(username, pos);
     }
 
-    //TODO javadoc
-    public String apply(IView gameController) {
-        return gameController.toString();
-    }
 }