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

Clearing the "assigned to skirmish [quality]" filter.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-04-03 15:16:21 +00:00
parent da8ad822dd
commit 95db45a4cf
4 changed files with 6 additions and 4 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/set4/gondor/Card4_122.java
View File

@@ -34,6 +34,6 @@ public class Card4_122 extends AbstractCompanion {
@Override
public List<? extends Modifier> getAlwaysOnModifiers(LotroGame game, PhysicalCard self) {
return Collections.singletonList(
new MinionSiteNumberModifier(self, Filters.inSkirmishAgainst(Filters.and(Race.MAN, Keyword.RING_BOUND)), null, 2));
new MinionSiteNumberModifier(self, Filters.assignedToSkirmishAgainst(Filters.and(Race.MAN, Keyword.RING_BOUND)), null, 2));
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set5/dwarven/Card5_007.java
View File

@@ -37,7 +37,7 @@ public class Card5_007 extends AbstractCompanion {
if (TriggerConditions.winsSkirmish(game, effectResult, self)) {
OptionalTriggerAction action = new OptionalTriggerAction(self);
action.appendEffect(
new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.assignedAgainst(Filters.unboundCompanion)));
new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION, Filters.assignedToSkirmishAgainst(Filters.unboundCompanion)));
return Collections.singletonList(action);
}
return null;

2
gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set7/raider/Card7_135.java
View File

@@ -13,7 +13,6 @@ import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.actions.OptionalTriggerAction;
import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect;
import com.gempukku.lotro.logic.timing.EffectResult;
import com.gempukku.lotro.logic.timing.results.AssignmentResult;
import java.util.Collections;
import java.util.List;
@@ -42,7 +41,6 @@ public class Card7_135 extends AbstractMinion {
if (TriggerConditions.assignedAgainst(game, effectResult, Side.FREE_PEOPLE, Filters.any, self)
&& PlayConditions.hasInitiative(game, Side.SHADOW)) {
OptionalTriggerAction action = new OptionalTriggerAction(self);
AssignmentResult assignment = (AssignmentResult) effectResult;
action.appendEffect(
new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, Filters.assignedAgainst(self)));
return Collections.singletonList(action);

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
View File

@@ -458,6 +458,10 @@ public class Filters {
public static final Filter assignedToSkirmish = Filters.not(Filters.notAssignedToSkirmish);
public static final Filter assignedToSkirmishAgainst(final Filterable... againstFilters) {
return Filters.or(Filters.assignedAgainst(againstFilters), Filters.inSkirmishAgainst(againstFilters));
}
public static final Filter assignedAgainst(final Filterable... againstFilters) {
return new Filter() {
@Override