ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removing abuse of "canSpot".

Browse Source
This commit is contained in:
marcins78@gmail.com
2013-01-10 19:56:45 +00:00
parent acae49521d
commit 8adab86adb
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractFollower.java
View File

@@ -73,7 +73,7 @@ public abstract class AbstractFollower extends AbstractPermanent {
public final List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) { public final List<OptionalTriggerAction> getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, final PhysicalCard self) {
if (TriggerConditions.startOfPhase(game, effectResult, Phase.MANEUVER) if (TriggerConditions.startOfPhase(game, effectResult, Phase.MANEUVER)
&& canPayAidCost(game, self) && canPayAidCost(game, self)
&& PlayConditions.canSpot(game, getFollowerTarget(game, self))) { && PlayConditions.isActive(game, getFollowerTarget(game, self))) {
final OptionalTriggerAction action = new OptionalTriggerAction(self); final OptionalTriggerAction action = new OptionalTriggerAction(self);
action.appendCost( action.appendCost(
getAidCost(game, action, self)); getAidCost(game, action, self));

4
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/PlayConditions.java
View File

@@ -184,6 +184,10 @@ public class PlayConditions {
return canSpot(game, 1, filters); return canSpot(game, 1, filters);
} }
public static boolean isActive(LotroGame game, Filterable... filters) {
return Filters.countActive(game.getGameState(), game.getModifiersQuerying(), filters)>0;
}
public static boolean canSpot(LotroGame game, int count, Filterable... filters) { public static boolean canSpot(LotroGame game, int count, Filterable... filters) {
return Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), count, filters); return Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), count, filters);
} }