From acae49521ddeb67ec0c478adc0462c6f789ae09c Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Thu, 10 Jan 2013 19:55:11 +0000 Subject: [PATCH] Removing abuse of "canSpot". --- .../main/java/com/gempukku/lotro/cards/PlayConditions.java | 4 ++-- .../main/java/com/gempukku/lotro/cards/TriggerConditions.java | 2 +- .../gempukku/lotro/cards/effects/CancelSkirmishEffect.java | 2 +- .../gempukku/lotro/cards/effects/ReplaceInSkirmishEffect.java | 2 +- .../cards/effects/choose/ChooseAndExertCharactersEffect.java | 2 +- .../effects/choose/ChooseAndTransferAttachableEffect.java | 2 +- .../lotro/logic/timing/processes/turn/ArcheryGameProcess.java | 2 +- .../logic/timing/processes/turn/AssignmentGameProcess.java | 2 +- .../logic/timing/processes/turn/ManeuverGameProcess.java | 2 +- .../processes/turn/skirmish/AfterSkirmishesGameProcess.java | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) 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 8edcac94a..619902cd8 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 @@ -116,7 +116,7 @@ public class PlayConditions { LotroCardBlueprint blueprint = self.getBlueprint(); return (!blueprint.isUnique() || ( - !Filters.canSpot(gameState, modifiersQuerying, Filters.name(blueprint.getName())) + Filters.countActive(gameState, modifiersQuerying, Filters.name(blueprint.getName()))==0 && (ignoreCheckingDeadPile || (Filters.filter(gameState.getDeadPile(self.getOwner()), gameState, modifiersQuerying, Filters.name(blueprint.getName())).size() == 0)))); } @@ -351,7 +351,7 @@ public class PlayConditions { public static boolean canRemoveAnyCultureTokens(LotroGame game, int count, Filterable... fromFilters) { return !game.getModifiersQuerying().hasFlagActive(game.getGameState(), ModifierFlag.CANT_TOUCH_CULTURE_TOKENS) - && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.and(fromFilters, Filters.hasAnyCultureTokens(count))); + && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.and(fromFilters, Filters.hasAnyCultureTokens(count)))>0; } public static boolean canRemoveTokens(LotroGame game, PhysicalCard from, Token token) { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java index add8faeaa..2fd34d56b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/TriggerConditions.java @@ -281,7 +281,7 @@ public class TriggerConditions { public static boolean forEachKilledInASkirmish(LotroGame game, EffectResult effectResult, Filterable killedBy, Filterable... killed) { if (effectResult.getType() == EffectResult.Type.FOR_EACH_KILLED && game.getGameState().getCurrentPhase() == Phase.SKIRMISH - && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.inSkirmish, killedBy)) { + && Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.inSkirmish, killedBy)>0) { ForEachKilledResult killResult = (ForEachKilledResult) effectResult; return Filters.and(killed).accepts(game.getGameState(), game.getModifiersQuerying(), killResult.getKilledCard()); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelSkirmishEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelSkirmishEffect.java index 27cae80e9..8e9fe2af0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelSkirmishEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/CancelSkirmishEffect.java @@ -31,7 +31,7 @@ public class CancelSkirmishEffect extends AbstractEffect { return game.getGameState().getSkirmish() != null && !game.getGameState().getSkirmish().isCancelled() && (_involvementFilter == null || Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.and(_involvementFilter, Filters.inSkirmish)) > 0) - && (game.getFormat().canCancelRingBearerSkirmish() || !Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.inSkirmish)); + && (game.getFormat().canCancelRingBearerSkirmish() || Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.ringBearer, Filters.inSkirmish)==0); } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReplaceInSkirmishEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReplaceInSkirmishEffect.java index a61e15fd4..7bdc0ef6c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReplaceInSkirmishEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/ReplaceInSkirmishEffect.java @@ -27,7 +27,7 @@ public class ReplaceInSkirmishEffect extends AbstractEffect { @Override public boolean isPlayableInFull(LotroGame game) { - return Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.and(_replacingFilter, Filters.inSkirmish)); + return Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.and(_replacingFilter, Filters.inSkirmish))>0; } @Override diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java index 455e4cfce..eb63a7ae8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndExertCharactersEffect.java @@ -43,7 +43,7 @@ public class ChooseAndExertCharactersEffect extends ChooseActiveCardsEffect { && modifiersQuerying.getVitality(gameState, physicalCard) > exertTimes; } }; - if (Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.and(_filters, filter))) + if (Filters.countActive(game.getGameState(), game.getModifiersQuerying(), Filters.and(_filters, filter))>0) return filter; times--; } while (times > 0); diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndTransferAttachableEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndTransferAttachableEffect.java index ce19cbf3a..02221956c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndTransferAttachableEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/choose/ChooseAndTransferAttachableEffect.java @@ -88,7 +88,7 @@ public class ChooseAndTransferAttachableEffect extends AbstractEffect { return false; AbstractAttachable attachable = (AbstractAttachable) transferredCard.getBlueprint(); - return Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), getValidTargetFilter(game, transferredCard, attachable)); + return Filters.countActive(game.getGameState(), game.getModifiersQuerying(), getValidTargetFilter(game, transferredCard, attachable))>0; } }); } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java index 21b3395fc..99053fc50 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ArcheryGameProcess.java @@ -15,7 +15,7 @@ public class ArcheryGameProcess implements GameProcess { @Override public void process(LotroGame game) { - if (!Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), CardType.MINION) + if (Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.MINION)==0 || game.getModifiersQuerying().shouldSkipPhase(game.getGameState(), Phase.ARCHERY, null)) _followingGameProcess = new AssignmentGameProcess(); else diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java index d65a983a6..dd4e2c1c5 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/AssignmentGameProcess.java @@ -16,7 +16,7 @@ public class AssignmentGameProcess implements GameProcess { @Override public void process(LotroGame game) { - if (!Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), CardType.MINION) + if (Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.MINION)==0 || game.getModifiersQuerying().shouldSkipPhase(game.getGameState(), Phase.ASSIGNMENT, null)) _followingGameProcess = new RegroupGameProcess(); else diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java index b95db7563..9c40023a2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/ManeuverGameProcess.java @@ -14,7 +14,7 @@ public class ManeuverGameProcess implements GameProcess { @Override public void process(LotroGame game) { - if (!Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), CardType.MINION) + if (Filters.countActive(game.getGameState(), game.getModifiersQuerying(), CardType.MINION)==0 || game.getModifiersQuerying().shouldSkipPhase(game.getGameState(), Phase.MANEUVER, null)) _followingGameProcess = new ArcheryGameProcess(); else diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java index 45ebe1470..998933e54 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/skirmish/AfterSkirmishesGameProcess.java @@ -18,7 +18,7 @@ public class AfterSkirmishesGameProcess implements GameProcess { if (gameState.isExtraSkirmishes()) { gameState.setExtraSkirmishes(false); _followingGameProcess = new RegroupGameProcess(); - } else if (!gameState.isFierceSkirmishes() && Filters.canSpot(gameState, game.getModifiersQuerying(), CardType.MINION, Keyword.FIERCE)) { + } else if (!gameState.isFierceSkirmishes() && Filters.countActive(gameState, game.getModifiersQuerying(), CardType.MINION, Keyword.FIERCE)>0) { gameState.setFierceSkirmishes(true); _followingGameProcess = new AssignmentGameProcess(); } else {