From 9c0a68ec4624e7656152339349d101fff4e4e477 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 27 Sep 2011 23:29:05 +0000 Subject: [PATCH] "No Business of Ours" --- .../cards/AbstractAttachableFPPossession.java | 2 +- .../cards/AbstractLotroCardBlueprint.java | 2 +- ...pponentsCantLookOrRevealCardsFromHand.java | 6 ++- .../gempukku/lotro/cards/set1/Card1_001.java | 2 +- .../gempukku/lotro/cards/set1/Card1_002.java | 2 +- .../lotro/cards/set1/moria/Card1_166.java | 2 +- .../lotro/cards/set1/moria/Card1_190.java | 2 +- .../lotro/cards/set1/wraith/Card1_221.java | 2 +- .../lotro/cards/set1/wraith/Card1_225.java | 2 +- .../lotro/cards/set2/elven/Card2_016.java | 2 +- .../lotro/cards/set2/isengard/Card2_043.java | 2 +- .../lotro/cards/set2/isengard/Card2_044.java | 41 +++++++++++++++++++ .../lotro/game/LotroCardBlueprint.java | 2 +- .../gempukku/lotro/game/PhysicalCardImpl.java | 2 +- 14 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java index b9fc45d21..4d67379d3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachableFPPossession.java @@ -64,7 +64,7 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable } @Override - public final List getAlwaysOnModifiers(PhysicalCard self) { + public final List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); if (_strength != 0) modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), _strength)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java index 6c17512a6..33f239bf6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractLotroCardBlueprint.java @@ -84,7 +84,7 @@ public abstract class AbstractLotroCardBlueprint implements LotroCardBlueprint { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { Modifier modifier = getAlwaysOnModifier(self); if (modifier != null) return Collections.singletonList(modifier); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OpponentsCantLookOrRevealCardsFromHand.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OpponentsCantLookOrRevealCardsFromHand.java index 3c7224698..6c8ff4ddb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OpponentsCantLookOrRevealCardsFromHand.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/OpponentsCantLookOrRevealCardsFromHand.java @@ -14,9 +14,13 @@ public class OpponentsCantLookOrRevealCardsFromHand extends AbstractModifier { _playerId = playerId; } + public OpponentsCantLookOrRevealCardsFromHand(PhysicalCard source) { + this(source, null); + } + @Override public boolean canLookOrRevealCardsInHand(GameState gameState, ModifiersQuerying modifiersQuerying, String playerId) { - if (_playerId.equals(playerId)) + if (_playerId == null || _playerId.equals(playerId)) return false; return true; } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java index 1bf9c0160..0a48661ac 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java @@ -46,7 +46,7 @@ public class Card1_001 extends AbstractAttachable { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), 1)); modifiers.add(new VitalityModifier(self, Filters.hasAttached(self), 1)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java index e8e123d6d..4d794e1fa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_002.java @@ -45,7 +45,7 @@ public class Card1_002 extends AbstractAttachable { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), 1)); modifiers.add(new KeywordModifier(self, Filters.hasAttached(self), Keyword.RING_BEARER)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java index 22c529ec2..3f8d5b2e9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_166.java @@ -36,7 +36,7 @@ public class Card1_166 extends AbstractAttachable { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), 3)); modifiers.add(new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java index 071e85b1f..8066c9f27 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/moria/Card1_190.java @@ -40,7 +40,7 @@ public class Card1_190 extends AbstractAttachable { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), 2)); modifiers.add(new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java index db3ef590b..6c93488b3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_221.java @@ -47,7 +47,7 @@ public class Card1_221 extends AbstractAttachable { @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), 3)); modifiers.add(new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java index 42d3c05df..b2dee1d30 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_225.java @@ -43,7 +43,7 @@ public class Card1_225 extends AbstractAttachable { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add(new StrengthModifier(self, Filters.hasAttached(self), 2)); modifiers.add(new KeywordModifier(self, Filters.hasAttached(self), Keyword.DAMAGE)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java index 9bd92fdec..7e75c04a5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/elven/Card2_016.java @@ -37,7 +37,7 @@ public class Card2_016 extends AbstractPermanent { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add( new StrengthModifier(self, Filters.race(Race.URUK_HAI), -2)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_043.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_043.java index 21186c516..93826a0fa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_043.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_043.java @@ -42,7 +42,7 @@ public class Card2_043 extends AbstractAttachable { } @Override - public List getAlwaysOnModifiers(PhysicalCard self) { + public List getAlwaysOnModifiers(PhysicalCard self) { List modifiers = new LinkedList(); modifiers.add( new StrengthModifier(self, Filters.hasAttached(self), 2)); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java new file mode 100644 index 000000000..ffeb1d3e5 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/isengard/Card2_044.java @@ -0,0 +1,41 @@ +package com.gempukku.lotro.cards.set2.isengard; + +import com.gempukku.lotro.cards.AbstractPermanent; +import com.gempukku.lotro.cards.modifiers.OpponentsCantLookOrRevealCardsFromHand; +import com.gempukku.lotro.common.CardType; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Side; +import com.gempukku.lotro.common.Zone; +import com.gempukku.lotro.filters.Filters; +import com.gempukku.lotro.game.PhysicalCard; +import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.modifiers.Modifier; + +import java.util.Collections; +import java.util.List; + +/** + * Set: Mines of Moria + * Side: Shadow + * Culture: Isengard + * Twilight Cost: 0 + * Type: Condition + * Game Text: To play, spot an [ISENGARD] minion. Plays to your support area. The Free Peoples player may not look at + * or reveal cards in any Shadow player's hand. + */ +public class Card2_044 extends AbstractPermanent { + public Card2_044() { + super(Side.SHADOW, 0, CardType.CONDITION, Culture.ISENGARD, Zone.SHADOW_SUPPORT, "No Business of Ours"); + } + + @Override + public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int twilightModifier) { + return super.checkPlayRequirements(playerId, game, self, twilightModifier) + && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.culture(Culture.ISENGARD), Filters.type(CardType.MINION)); + } + + @Override + public List getAlwaysOnModifiers(PhysicalCard self) { + return Collections.singletonList(new OpponentsCantLookOrRevealCardsFromHand(self)); + } +} diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java index 501ce2cec..96e2284b6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprint.java @@ -38,7 +38,7 @@ public interface LotroCardBlueprint { public int getResistance(); - public List getAlwaysOnModifiers(PhysicalCard self); + public List getAlwaysOnModifiers(PhysicalCard self); public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int twilightModifier); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java index 88c55fa0a..2604ca901 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/PhysicalCardImpl.java @@ -50,7 +50,7 @@ public class PhysicalCardImpl implements PhysicalCard { } public void startAffectingGame(ModifiersEnvironment modifiersEnvironment) { - List modifiers = _blueprint.getAlwaysOnModifiers(this); + List modifiers = _blueprint.getAlwaysOnModifiers(this); if (modifiers != null) { _modifierHooks = new LinkedList(); for (Modifier modifier : modifiers)