diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/CharacterType.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/CharacterType.java index 75fbbc8..bd4869c 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/CharacterType.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/CharacterType.java @@ -1,5 +1,5 @@ package it.polimi.ingsw.gc14.Model.Cards.TribeCards; public enum CharacterType { - INVENTOR,BUILDER,GATHERERS,ARTIST,SHAMAN,HUNTER + INVENTOR,BUILDER, GATHERER,ARTIST,SHAMAN,HUNTER } diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java index 4a1dc98..6b39f54 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Characters/Gatherer.java @@ -11,10 +11,10 @@ public class Gatherer extends Character { * @param Era gatherers era */ public Gatherer(int Era) { - super(Era, CharacterType.GATHERERS); + super(Era, CharacterType.GATHERER); } public Gatherer(int Era, int nMin) { - super(Era, CharacterType.GATHERERS,nMin); + super(Era, CharacterType.GATHERER,nMin); } @Override public String toString() { diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java index be962bc..13ec285 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/Sustenance.java @@ -2,13 +2,11 @@ package it.polimi.ingsw.gc14.Model.Cards.TribeCards.Events; import it.polimi.ingsw.gc14.Model.Cards.Building.Effects.Building1; import it.polimi.ingsw.gc14.Model.Cards.BuildingCard; -import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Character; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.CharacterType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.EventType; import it.polimi.ingsw.gc14.Model.Cards.TribeCards.EventCard; import it.polimi.ingsw.gc14.Model.Player; import java.util.ArrayList; -import java.util.stream.Collectors; public class Sustenance extends EventCard { private int PrestigeDebt; @@ -26,7 +24,7 @@ public class Sustenance extends EventCard { public void activateEvent (ArrayList playerList) throws NullPointerException { for(Player player : playerList){ int NChar = player.getTotCharacters(); - int NGatherers = player.getNType(CharacterType.GATHERERS); + int NGatherers = player.getNType(CharacterType.GATHERER); int NCharDiscount = 0; for(Player p : playerList){ 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 24bcf11..e8e7b81 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Player.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Player.java @@ -28,7 +28,7 @@ public class Player { case HUNTER -> hunters.size(); case BUILDER -> builders.size(); case SHAMAN -> shamans.size(); - case GATHERERS -> gatherers.size(); + case GATHERER -> gatherers.size(); }; }