diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherers.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java similarity index 79% rename from src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherers.java rename to src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java index 475d2b2..4a1dc98 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherers.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java @@ -4,16 +4,16 @@ import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Character; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Player; -public class Gatherers extends Character { +public class Gatherer extends Character { /** * * @param Era gatherers era */ - public Gatherers(int Era) { + public Gatherer(int Era) { super(Era, CharacterType.GATHERERS); } - public Gatherers(int Era,int nMin) { + public Gatherer(int Era, int nMin) { super(Era, CharacterType.GATHERERS,nMin); } @Override @@ -23,7 +23,7 @@ public class Gatherers extends Character { @Override public Character clone() { - return new Gatherers(getEra()); + return new Gatherer(getEra()); } public void insert(Player player) { player.gatherers.add(this); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/DecksCreator.java b/src/main/java/it/polimi/ingsw/gc14/Model/DecksCreator.java index 2f728c7..689ce88 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/DecksCreator.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/DecksCreator.java @@ -1,10 +1,8 @@ package it.polimi.ingsw.gc14.Model; import com.google.gson.*; -import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; import it.polimi.ingsw.gc14.Model.Cards.TribeCard; -import it.polimi.ingsw.gc14.Model.Cards.TribeCards.EventType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events.CavePaintings; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events.Hunt; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events.ShamanicRitual; @@ -61,10 +59,10 @@ public class DecksCreator { case 3 -> new Builder(era, p[0], p[1], p[2]); default -> throw new IllegalArgumentException("Builder: parametri non validi"); }; - case "Gatherers" -> switch (p.length) { - case 0 -> new Gatherers(era); - case 1 -> new Gatherers(era, p[0]); - default -> throw new IllegalArgumentException("Gatherers: parametri non validi"); + case "Gatherer" -> switch (p.length) { + case 0 -> new Gatherer(era); + case 1 -> new Gatherer(era, p[0]); + default -> throw new IllegalArgumentException("Gatherer: parametri non validi"); }; case "Artist" -> switch (p.length) { case 0 -> new Artist(era); diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java index 93f7f74..24bcf11 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -37,7 +37,7 @@ public class Player { public ArrayList artists; public ArrayList builders; public ArrayList inventors; - public ArrayList gatherers; + public ArrayList gatherers; public ArrayList shamans; public ArrayList hunters; diff --git a/src/main/resources/Cards/cards_era1.json b/src/main/resources/Cards/cards_era1.json index 3a63ef5..de2e57e 100644 --- a/src/main/resources/Cards/cards_era1.json +++ b/src/main/resources/Cards/cards_era1.json @@ -81,21 +81,21 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 1, "armed": false, "params": [] }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 1, "armed": false, "params": [] }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 1, "armed": false, "params": [ @@ -104,7 +104,7 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 1, "armed": false, "params": [ diff --git a/src/main/resources/Cards/cards_era2.json b/src/main/resources/Cards/cards_era2.json index 9927df9..0650796 100644 --- a/src/main/resources/Cards/cards_era2.json +++ b/src/main/resources/Cards/cards_era2.json @@ -88,14 +88,14 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 2, "armed": false, "params": [] }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 2, "armed": false, "params": [ @@ -104,7 +104,7 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 2, "armed": false, "params": [ @@ -113,7 +113,7 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 2, "armed": false, "params": [ diff --git a/src/main/resources/Cards/cards_era3.json b/src/main/resources/Cards/cards_era3.json index 571556a..d1d2a02 100644 --- a/src/main/resources/Cards/cards_era3.json +++ b/src/main/resources/Cards/cards_era3.json @@ -72,7 +72,7 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 3, "armed": false, "params": [ @@ -81,7 +81,7 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 3, "armed": false, "params": [ @@ -90,7 +90,7 @@ }, { "isEvent": false, - "type": "Gatherers", + "type": "Gatherer", "era": 3, "armed": false, "params": [] diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java index b8aa879..e74d389 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java @@ -23,7 +23,7 @@ class Building0Test { assertEquals(0, p.getFoodValue()); Artist a = new Artist(Era); Builder b = new Builder(Era, 0, 0); - Gatherers g = new Gatherers(Era); + Gatherer g = new Gatherer(Era); Hunter h = new Hunter(Era, true); Inventor i = new Inventor(Era, 1); Shaman s = new Shaman(Era,1); @@ -46,7 +46,7 @@ class Building0Test { assertEquals(0, p.getFoodValue()); Artist a = new Artist(Era); Builder b = new Builder(Era, 0, 0); - Gatherers g = new Gatherers(Era); + Gatherer g = new Gatherer(Era); Hunter h = new Hunter(Era, true); Inventor i = new Inventor(Era, 1); Shaman s = new Shaman(Era,1); diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building10Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building10Test.java index af40070..13e589a 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building10Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building10Test.java @@ -1,8 +1,6 @@ package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; -import it.polimi.ingsw.gc14.Model.Cards.TribeCard; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; -import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events.Hunt; import it.polimi.ingsw.gc14.Model.Player; import org.junit.jupiter.api.Test; @@ -24,7 +22,7 @@ class Building10Test { ArrayList Artists = new ArrayList<>(); ArrayList Builders = new ArrayList<>(); - ArrayList Gatherers = new ArrayList<>(); + ArrayList Gatherers = new ArrayList<>(); ArrayList Hunters = new ArrayList<>(); ArrayList Inventors = new ArrayList<>(); ArrayList Shamans = new ArrayList<>(); @@ -32,7 +30,7 @@ class Building10Test { for(int i = 0; i < Nset; i++) { Artists.add(new Artist(Era)); Builders.add(new Builder(Era, 0, 0)); - Gatherers.add(new Gatherers(Era)); + Gatherers.add(new Gatherer(Era)); Hunters.add(new Hunter(Era, true)); Inventors.add(new Inventor(Era, 1)); Shamans.add(new Shaman(Era, 1));