From 4c0e13342f5351d915f35ccab336b294d21b1c89 Mon Sep 17 00:00:00 2001 From: AleandroPagani Date: Fri, 20 Mar 2026 17:13:40 +0100 Subject: [PATCH] Fix: ShamanicRitual, ShamanicRitualTest --- .../Cards/TribeCards/Events/ShamanicRitual.java | 2 +- .../TribeCards/Events/ShamanicRitualTest.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) 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 f8d1e0b..fad780d 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 @@ -38,7 +38,7 @@ public class ShamanicRitual extends EventCard { int minIcon = playerMap.values().stream().mapToInt(Integer::intValue).min().orElse(0); List maxIconsPlayer = playerMap.entrySet().stream().filter(e -> e.getValue() == maxIcon).map(Map.Entry::getKey).collect(Collectors.toList()); - List minIconsPlayer = playerMap.entrySet().stream().filter(e -> e.getValue() == minIcon).map(Map.Entry::getKey).collect(Collectors.toList()); + List minIconsPlayer = playerMap.entrySet().stream().filter(e -> e.getValue() == minIcon).map(Map.Entry::getKey).filter(player -> !maxIconsPlayer.contains(player)).collect(Collectors.toList()); for (Player player : maxIconsPlayer) { diff --git a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java index 9e02376..cb1c3e9 100644 --- a/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java +++ b/src/test/java/it/polimi/ingsw/gc14/Model/Cards/TribeCards/Events/ShamanicRitualTest.java @@ -39,19 +39,19 @@ class ShamanicRitualTest { @Test void tiedPlayersNoDoublePrestige() { - Player p1 = new Player("Marco"); - Player p2 = new Player("Luca"); + Player p3 = new Player("Marco"); + Player p4 = new Player("Luca"); - ArrayList players = new ArrayList<>(Arrays.asList(p1, p2)); + ArrayList players = new ArrayList<>(Arrays.asList(p3, p4)); - new Shaman(1, 3).insert(p1); - new Shaman(1, 3).insert(p2); + new Shaman(1, 3).insert(p3); + new Shaman(1, 3).insert(p4); ShamanicRitual ritual = new ShamanicRitual(1, 10, 5); ritual.activateEvent(players); - assertEquals(10, p1.getPrestigeValue()); - assertEquals(10, p2.getPrestigeValue()); + assertEquals(10, p3.getPrestigeValue()); + assertEquals(10, p4.getPrestigeValue()); } @Test @@ -64,7 +64,7 @@ class ShamanicRitualTest { new Shaman(1, 3).insert(p1); new Shaman(1, 1).insert(p2); - BuildingCard b = new BuildingCard(5, EffectType.ON_EVENT, 1, 6); + BuildingCard b = new BuildingCard(6, EffectType.ON_EVENT, 1, 5); p1.addFood(5); b.buy(p1);