Fix: event construct with imgID

src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Hunt.java

@@ -37,7 +37,7 @@ public class Hunt extends EventCard {
      * @param prestigeMultiplier    prestige points multiplicator used during the event
      */
     public Hunt(String idIMG,int Era, int prestigeMultiplier) {
-        super(Era, EventType.HUNT);
+        super(idIMG,Era, EventType.HUNT);
         this.foodMultiplier = 1;
         this.prestigeMultiplier = prestigeMultiplier;
     }

src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java

@@ -42,7 +42,7 @@ public class ShamanicRitual extends EventCard {
      * @param prestigeToRemove prestige points removed from the player with the fewest icons
      */
     public ShamanicRitual(String idIMG,int Era, int prestigeToAdd, int prestigeToRemove) {
-        super(Era, EventType.SHAMANIC_RITUAL);
+        super(idIMG,Era, EventType.SHAMANIC_RITUAL);
         this.prestigeToAdd = prestigeToAdd;
         this.prestigeToRemove = prestigeToRemove;
 

src/main/java/it/polimi/ingsw/gc14/Model/GamePackage/Board.java

@@ -176,8 +176,8 @@ public class Board implements Serializable {
         tribeDeck_temp.addAll(era1);
         tribeDeck_temp.addAll(era2);
         tribeDeck_temp.addAll(era3);
-        tribeDeck_temp.add(new Sustenance(3,3));
-        tribeDeck_temp.add(new ShamanicRitual(3,15,7));
+        tribeDeck_temp.add(new Sustenance("95",3,3));
+        tribeDeck_temp.add(new ShamanicRitual("96",3,15,7));
         return tribeDeck_temp;
     }
 

src/test/java/it/polimi/ingsw/gc14/Model/DecksCreatorTest.java

@@ -14,6 +14,9 @@ class DecksCreatorTest {
     void loadDeck() {
         List<TribeCard> cards = DecksCreator.loadTribeDeck("/Cards/tribe_era1.json");
         assertEquals(33,cards.size());
+        for( int i = 0; i < 29; i++ ) {
+            assertEquals(i+1,Integer.parseInt(cards.get(i).getIdIMG()));
+        }
         List<TribeCard> cards2 = DecksCreator.loadTribeDeck("/Cards/tribe_era2.json");
         assertEquals(32,cards2.size());
         List<TribeCard> cards3 = DecksCreator.loadTribeDeck("/Cards/tribe_era3.json");

src/test/java/it/polimi/ingsw/gc14/Model/GamePackage/BoardTest.java

@@ -75,7 +75,12 @@ class BoardTest {
         Board bd3 = new Board(3);
         Board bd4 = new Board(4);
         Board bd5 = new Board(5);
+        for(TribeCard tribe : bd2.upperListTribe)
+        {
+            System.out.println(tribe.getIdIMG() +" "+tribe.toStringBoard());
+            assertNotEquals("-1",tribe.getIdIMG());
 
+        }
         assertEquals(61 + 2 - (2+4) - (2+1), bd2.getTribeDeckSize());
         assertEquals(72 + 2 - (3+4) - (3+1), bd3.getTribeDeckSize());
         assertEquals(83 + 2 - (4+4) - (4+1), bd4.getTribeDeckSize());