From c5d04b4e3ae999c23210921bf99a448320fa6da5 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 11:36:20 +0000 Subject: [PATCH] 20_370 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/sauron/Card20_370.java | 36 +++++++++++++------ 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js index 2838ac5f0..14c70b16b 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js @@ -368,7 +368,7 @@ var set20 = { '20_367': 'http://lotrtcg.org/coreset/sauron/orcravager.png', '20_368': 'http://lotrtcg.org/coreset/sauron/orcraveners(r1).png', '20_369': 'http://lotrtcg.org/coreset/sauron/orcsavage(r1).png', - '20_370': 'http://lotrtcg.org/coreset/sauron/orcskulker.png', + '20_370': 'http://lotrtcg.org/coreset/sauron/orcskulker(r1).png', '20_371': 'http://lotrtcg.org/coreset/sauron/orcstalker.png', '20_372': 'http://lotrtcg.org/coreset/sauron/orcvillain.png', '20_373': 'http://lotrtcg.org/coreset/sauron/sauronsforces.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_370.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_370.java index 031944e4d..323b55710 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_370.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_370.java @@ -2,31 +2,47 @@ package com.gempukku.lotro.cards.set20.sauron; import com.gempukku.lotro.cards.AbstractMinion; import com.gempukku.lotro.cards.modifiers.PlayersCantUseCardPhaseSpecialAbilitiesModifier; -import com.gempukku.lotro.cards.modifiers.conditions.CanSpotFPCulturesCondition; -import com.gempukku.lotro.cards.modifiers.conditions.NotCondition; -import com.gempukku.lotro.common.Culture; -import com.gempukku.lotro.common.Phase; -import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.common.*; +import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.game.state.Skirmish; import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; /** * 3 * Orc Skulker - * Sauron Minion • Orc + * Minion • Orc * 9 3 6 - * While you cannot spot 3 Free Peoples cultures, characters skirmishing this minion may not use skirmish special abilities. + * Lurker. + * Companions of the same culture as the companion assigned to skirmish this minion may not use skirmish special abilities. + * http://lotrtcg.org/coreset/sauron/orcskulker(r1).png */ public class Card20_370 extends AbstractMinion { public Card20_370() { super(3, 9, 3, 6, Race.ORC, Culture.SAURON, "Orc Skulker"); + addKeyword(Keyword.LURKER); } @Override public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { - return new PlayersCantUseCardPhaseSpecialAbilitiesModifier(self, - new NotCondition(new CanSpotFPCulturesCondition(self.getOwner(), 3)), Phase.SKIRMISH, Filters.character, Filters.inSkirmishAgainst(self)); + return new PlayersCantUseCardPhaseSpecialAbilitiesModifier(self, Phase.SKIRMISH, + CardType.COMPANION, + new Filter() { + @Override + public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) { + final Skirmish skirmish = gameState.getSkirmish(); + if (skirmish != null) { + final PhysicalCard fellowshipCharacter = skirmish.getFellowshipCharacter(); + if (fellowshipCharacter != null) + if (fellowshipCharacter.getBlueprint().getCardType() == CardType.COMPANION) + return fellowshipCharacter.getBlueprint().getCulture() == physicalCard.getBlueprint().getCulture(); + } + + return false; + } + }); } }