From 475096b7617bcb5496ee2829a2cbeeaf18601a31 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 10 Jan 2013 19:51:16 +0000 Subject: [PATCH] Removing abuse of "canSpot". --- .../java/com/gempukku/lotro/cards/AbstractAttachable.java | 2 +- .../lotro/cards/AbstractAttachableFPPossession.java | 4 ++-- .../java/com/gempukku/lotro/cards/PlayConditions.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java index 75a676792..2f502e849 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAttachable.java @@ -83,7 +83,7 @@ public abstract class AbstractAttachable extends AbstractLotroCardBlueprint { public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, Filter additionalAttachmentFilter, int twilightModifier) { return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, false, false) && (skipUniquenessCheck() || PlayConditions.checkUniqueness(game.getGameState(), game.getModifiersQuerying(), self, false)) - && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), getFullAttachValidTargetFilter(playerId, game, self), additionalAttachmentFilter); + && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), getFullAttachValidTargetFilter(playerId, game, self), additionalAttachmentFilter)>0; } @Override 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 68ee57207..5f5e013d9 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 @@ -37,7 +37,7 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable private void appendTransferPossessionAction(List actions, LotroGame game, final PhysicalCard self, Filter validTargetFilter) { GameState gameState = game.getGameState(); - if (Filters.canSpot(gameState, game.getModifiersQuerying(), validTargetFilter) + if (Filters.countActive(gameState, game.getModifiersQuerying(), validTargetFilter)>0 && gameState.getCurrentPhase() == Phase.FELLOWSHIP && self.getZone() == Zone.ATTACHED) { @@ -69,7 +69,7 @@ public abstract class AbstractAttachableFPPossession extends AbstractAttachable } }); - if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), validTransferFilter)) + if (Filters.countActive(game.getGameState(), game.getModifiersQuerying(), validTransferFilter)>0) actions.add(new TransferPermanentAction(self, validTransferFilter)); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java index 636871dfe..8edcac94a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java @@ -39,11 +39,11 @@ public class PlayConditions { } public static boolean canLiberateASite(LotroGame game) { - return PlayConditions.canSpot(game, Filters.siteControlledByShadowPlayer(game.getGameState().getCurrentPlayerId())); + return Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.siteControlledByShadowPlayer(game.getGameState().getCurrentPlayerId())) > 0; } public static boolean canLiberateASite(LotroGame game, String playerId) { - return PlayConditions.canSpot(game, Filters.siteControlled(playerId)); + return Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.siteControlled(playerId)) > 0; } public static boolean canDiscardFromHand(LotroGame game, String playerId, int count, Filterable... cardFilter) { @@ -69,13 +69,13 @@ public class PlayConditions { public static boolean canPlayCardDuringPhase(LotroGame game, Phase phase, PhysicalCard self) { return (phase == null || game.getGameState().getCurrentPhase() == phase) && self.getZone() == Zone.HAND - && (!self.getBlueprint().isUnique() || !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName()))); + && (!self.getBlueprint().isUnique() || Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName()))==0); } public static boolean canPlayCardDuringPhase(LotroGame game, Phase[] phases, PhysicalCard self) { return (phases == null || containsPhase(phases, game.getGameState().getCurrentPhase())) && self.getZone() == Zone.HAND - && (!self.getBlueprint().isUnique() || !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName()))); + && (!self.getBlueprint().isUnique() || Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName()))==0); } public static boolean canUseFPCardDuringPhase(LotroGame game, Phase phase, PhysicalCard self) {