diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java index db70423..c0dc691 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/CavePaintings.java @@ -40,7 +40,7 @@ public class CavePaintings extends EventCard { player.removePrestige(NPrestigeRem); } else{ - player.addPrestige(NPrestigeMul * NUpper); + player.addPrestige(NPrestigeMul * NArtists); } } } 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 9ac693c..be962bc 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 @@ -21,6 +21,7 @@ public class Sustenance extends EventCard { this.PrestigeDebt = PrestigeDebt; } + // Sustenence va eseguito per ultimo tra gli eventi @Override public void activateEvent (ArrayList playerList) throws NullPointerException { for(Player player : playerList){ 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 new file mode 100644 index 0000000..6707367 --- /dev/null +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building0Test.java @@ -0,0 +1,58 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import it.polimi.ingsw.gc14.Model.Cards.TribeCards.Characters.*; +import it.polimi.ingsw.gc14.Model.Player; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class Building0Test { + + @Test + @DisplayName("After") + void applyEffect() { + Building0 b0 = new Building0(1, 0); + int Era = 1; + Player p = new Player("test"); + b0.applyEffect(p); + assertEquals(0, p.getFoodValue()); + Artist a = new Artist(Era); + Builder b = new Builder(Era, 0, 0); + Gatherers g = new Gatherers(Era); + Hunter h = new Hunter(Era, true); + Inventor i = new Inventor(Era, 1); + Shaman s = new Shaman(Era,1); + p.artists.add(a); + p.builders.add(b); + p.gatherers.add(g); + p.hunters.add(h); + p.inventors.add(i); + p.shamans.add(s); + b0.applyEffect(p); + assertEquals(5, p.getFoodValue()); + } + + @Test + @DisplayName("Before") + void applyEffect2() { + int Era = 1; + Player p = new Player("test"); + assertEquals(0, p.getFoodValue()); + Artist a = new Artist(Era); + Builder b = new Builder(Era, 0, 0); + Gatherers g = new Gatherers(Era); + Hunter h = new Hunter(Era, true); + Inventor i = new Inventor(Era, 1); + Shaman s = new Shaman(Era,1); + p.artists.add(a); + p.builders.add(b); + p.gatherers.add(g); + p.hunters.add(h); + p.inventors.add(i); + p.shamans.add(s); + Building0 b0 = new Building0(1, 0); + b0.applyEffect(p); + assertEquals(0, p.getFoodValue()); + } +} \ No newline at end of file