diff --git a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java index 8303dd4..cc67bd5 100644 --- a/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java +++ b/src/main/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitual.java @@ -24,11 +24,13 @@ public class ShamanicRitual extends EventCard { public void activateEvent (ArrayList playerList){ Map playerMap = new HashMap<>(); int tmpIcons = 0; + int tmpCount = 0; for (Player player : playerList) { tmpIcons = player.shamans.stream().mapToInt(sh -> sh.getIcon()).sum(); - if (player.buildingCards.stream().anyMatch(b -> b.getEffectId() == 5)) { - tmpIcons = tmpIcons+3; + tmpCount = (int) player.buildingCards.stream().filter(b -> b.getEffectId() == 5).count(); + if (tmpCount > 1) { + tmpIcons = tmpIcons+(3*tmpCount); } playerMap.put(player, tmpIcons); } diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java new file mode 100644 index 0000000..5e682a6 --- /dev/null +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building11Test.java @@ -0,0 +1,16 @@ +package it.polimi.ingsw.gc14.Model.Cards.Building.Effects; + +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class Building11Test { + + @Test + void Building11() { + } + + @Test + void applyEffect() { + } +} \ No newline at end of file diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java index f1bd5a7..f3367e7 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/Building/Effects/Building13Test.java @@ -9,7 +9,7 @@ class Building13Test { @Test - void testClone() { + void Building13() { assertThrows(IllegalArgumentException.class, () -> { Building13 b2 = new Building13(0, 15); }); @@ -33,9 +33,15 @@ class Building13Test { Building13 b1 = new Building13(1, 10); assertEquals(1, b1.getEra()); + } @Test void applyEffect() { + Player p1 = new Player("gigi"); + p1.addPrestige(10); + Building13 b1 = new Building13(1, 10); + b1.applyEffect(p1); + assertEquals(35, p1.getPrestigeValue()); } } \ No newline at end of file