Fixing "spotting" of stacked cards

This commit is contained in:
marcin.sciesinski
2019-08-05 18:40:45 -07:00
parent 78a47b5fa5
commit d640025f17
2 changed files with 7 additions and 2 deletions

View File

@@ -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;
}
}

View File

@@ -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