From d640025f17b586752a1f1c8cac24f53b1007a1b8 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Mon, 5 Aug 2019 18:40:45 -0700 Subject: [PATCH] Fixing "spotting" of stacked cards --- .../com/gempukku/lotro/cards/set40/moria/Card40_164.java | 7 ++++++- .../com/gempukku/lotro/cards/set40/moria/Card40_182.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_164.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_164.java index 477ed4f90..4d5e59e19 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_164.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_164.java @@ -29,6 +29,11 @@ public class Card40_164 extends AbstractMinion { @Override public int getTwilightCostModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard self) { - return -Filters.countSpottable(gameState, modifiersQuerying, Filters.stackedOn(Culture.MORIA, CardType.CONDITION), Race.GOBLIN); + int count = 0; + for (PhysicalCard physicalCard : Filters.filterActive(gameState, modifiersQuerying, Culture.MORIA, CardType.CONDITION)) { + count += Filters.filter(gameState.getStackedCards(physicalCard), gameState, modifiersQuerying, Race.GOBLIN).size(); + } + + return -count; } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_182.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_182.java index 78ce83cb6..0c1d262b2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_182.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set40/moria/Card40_182.java @@ -28,7 +28,7 @@ public class Card40_182 extends AbstractEvent { @Override public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) { return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile) - && PlayConditions.canSpot(game, Race.GOBLIN, Filters.stackedOn(Culture.MORIA, CardType.CONDITION)); + && PlayConditions.canSpot(game, Culture.MORIA, CardType.CONDITION, Filters.hasStacked(Race.GOBLIN)); } @Override