github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactored ControllerPredicate

Browse source
This commit is contained in:
Evan Kranzler 2020-01-06 20:04:56 -05:00
parent c14a079cc5
commit 9c3b923b3f
783 changed files with 829 additions and 1689 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Mage.Sets/src/mage/cards/a/AbzanAscendancy.java
View file

@ -14,7 +14,6 @@ import mage.counters.CounterType;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.TokenPredicate; import mage.filter.predicate.permanent.TokenPredicate;
import mage.game.permanent.token.SpiritWhiteToken; import mage.game.permanent.token.SpiritWhiteToken;
@ -27,7 +26,7 @@ public final class AbzanAscendancy extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(Predicates.not(TokenPredicate.instance)); filter.add(Predicates.not(TokenPredicate.instance));
} }

3
Mage.Sets/src/mage/cards/a/AbzanBattlePriest.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.CounterPredicate; import mage.filter.predicate.permanent.CounterPredicate;
import java.util.UUID; import java.util.UUID;
@ -26,7 +25,7 @@ public final class AbzanBattlePriest extends CardImpl {
static { static {
filter.add(CardType.CREATURE.getPredicate()); filter.add(CardType.CREATURE.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1)); filter.add(new CounterPredicate(CounterType.P1P1));
} }

3
Mage.Sets/src/mage/cards/a/AbzanFalconer.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.CounterPredicate; import mage.filter.predicate.permanent.CounterPredicate;
/** /**
@ -25,7 +24,7 @@ public final class AbzanFalconer extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent(); private static final FilterPermanent filter = new FilterPermanent();
static { static {
filter.add(CardType.CREATURE.getPredicate()); filter.add(CardType.CREATURE.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1)); filter.add(new CounterPredicate(CounterType.P1P1));
} }

3
Mage.Sets/src/mage/cards/a/ActOfAggression.java
View file

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -24,7 +23,7 @@ public final class ActOfAggression extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ActOfAggression(UUID ownerId, CardSetInfo setInfo) { public ActOfAggression(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AdaptiveAutomaton.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* @author nantuko * @author nantuko
@ -23,7 +22,7 @@ public final class AdaptiveAutomaton extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control of the chosen type");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public AdaptiveAutomaton(UUID ownerId, CardSetInfo setInfo) { public AdaptiveAutomaton(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AdelizTheCinderWind.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import java.util.UUID; import java.util.UUID;
@ -24,7 +23,7 @@ public final class AdelizTheCinderWind extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizards"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Wizards");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(SubType.WIZARD.getPredicate()); filter.add(SubType.WIZARD.getPredicate());
} }

3
Mage.Sets/src/mage/cards/a/AdmiralBeckettBrass.java
View file

@ -14,7 +14,6 @@ import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.Predicate; import mage.filter.predicate.Predicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.DamagedPlayerEvent; import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
@ -33,7 +32,7 @@ public final class AdmiralBeckettBrass extends CardImpl {
static { static {
filter.add(SubType.PIRATE.getPredicate()); filter.add(SubType.PIRATE.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter2.add(new ControllerDealtDamageByPiratesPredicate()); filter2.add(new ControllerDealtDamageByPiratesPredicate());
} }

3
Mage.Sets/src/mage/cards/a/AdvocateOfTheBeast.java
View file

@ -13,7 +13,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.Target; import mage.target.Target;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -25,7 +24,7 @@ public final class AdvocateOfTheBeast extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Beast creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Beast creature you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(SubType.BEAST.getPredicate()); filter.add(SubType.BEAST.getPredicate());
} }

3
Mage.Sets/src/mage/cards/a/AetherTradewinds.java
View file

@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
@ -22,7 +21,7 @@ public final class AetherTradewinds extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("permanent you don't control"); private static final FilterPermanent filter = new FilterPermanent("permanent you don't control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public AetherTradewinds(UUID ownerId, CardSetInfo setInfo) { public AetherTradewinds(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AffectionateIndrik.java
View file

@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -24,7 +23,7 @@ public final class AffectionateIndrik extends CardImpl {
= new FilterCreaturePermanent("creature you don't control"); = new FilterCreaturePermanent("creature you don't control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public AffectionateIndrik(UUID ownerId, CardSetInfo setInfo) { public AffectionateIndrik(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AggressiveInstinct.java
View file

@ -7,7 +7,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -20,7 +19,7 @@ public final class AggressiveInstinct extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public AggressiveInstinct(UUID ownerId, CardSetInfo setInfo) { public AggressiveInstinct(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AinokBondKin.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.CounterPredicate; import mage.filter.predicate.permanent.CounterPredicate;
/** /**
@ -26,7 +25,7 @@ public final class AinokBondKin extends CardImpl {
static { static {
filter.add(CardType.CREATURE.getPredicate()); filter.add(CardType.CREATURE.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1)); filter.add(new CounterPredicate(CounterType.P1P1));
} }

3
Mage.Sets/src/mage/cards/a/AinokSurvivalist.java
View file

@ -15,7 +15,6 @@ import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.common.FilterArtifactOrEnchantmentPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
/** /**
@ -27,7 +26,7 @@ public final class AinokSurvivalist extends CardImpl {
private static final FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment an opponent controls"); private static final FilterArtifactOrEnchantmentPermanent filter = new FilterArtifactOrEnchantmentPermanent("artifact or enchantment an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AinokSurvivalist(UUID ownerId, CardSetInfo setInfo) { public AinokSurvivalist(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java
View file

@ -19,7 +19,6 @@ import mage.counters.CounterType;
import mage.filter.FilterCard; import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanentAmount; import mage.target.common.TargetCreaturePermanentAmount;
/** /**
@ -32,7 +31,7 @@ public final class AjaniMentorOfHeroes extends CardImpl {
private static final FilterCard filterCard = new FilterCard("an Aura, creature, or planeswalker card"); private static final FilterCard filterCard = new FilterCard("an Aura, creature, or planeswalker card");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filterCard.add(Predicates.or( filterCard.add(Predicates.or(
SubType.AURA.getPredicate(), SubType.AURA.getPredicate(),
CardType.CREATURE.getPredicate(), CardType.CREATURE.getPredicate(),

3
Mage.Sets/src/mage/cards/a/AjaniSteadfast.java
View file

@ -23,7 +23,6 @@ import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.common.FilterPlaneswalkerPermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.command.emblems.AjaniSteadfastEmblem; import mage.game.command.emblems.AjaniSteadfastEmblem;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -37,7 +36,7 @@ public final class AjaniSteadfast extends CardImpl {
static { static {
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public AjaniSteadfast(UUID ownerId, CardSetInfo setInfo) { public AjaniSteadfast(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AjaniStrengthOfThePride.java
View file

@ -16,7 +16,6 @@ import mage.constants.*;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.token.AjanisPridemateToken; import mage.game.permanent.token.AjanisPridemateToken;
import mage.players.Player; import mage.players.Player;
@ -88,7 +87,7 @@ class AjaniStrengthOfThePrideEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent(); private static final FilterPermanent filter = new FilterPermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
filter.add(Predicates.or( filter.add(Predicates.or(
CardType.ARTIFACT.getPredicate(), CardType.ARTIFACT.getPredicate(),
CardType.CREATURE.getPredicate() CardType.CREATURE.getPredicate()

3
Mage.Sets/src/mage/cards/a/AjaniUnyielding.java
View file

@ -20,7 +20,6 @@ import mage.filter.common.FilterPermanentCard;
import mage.filter.common.FilterPlaneswalkerPermanent; import mage.filter.common.FilterPlaneswalkerPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -33,7 +32,7 @@ public final class AjaniUnyielding extends CardImpl {
static { static {
nonlandPermanentFilter.add(Predicates.not(CardType.LAND.getPredicate())); nonlandPermanentFilter.add(Predicates.not(CardType.LAND.getPredicate()));
planeswalkerFilter.add(new ControllerPredicate(TargetController.YOU)); planeswalkerFilter.add(TargetController.YOU.getControllerPredicate());
planeswalkerFilter.add(AnotherPredicate.instance); planeswalkerFilter.add(AnotherPredicate.instance);
} }

3
Mage.Sets/src/mage/cards/a/AkoumBattlesinger.java
View file

@ -13,7 +13,6 @@ import mage.constants.Duration;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -25,7 +24,7 @@ public final class AkoumBattlesinger extends CardImpl {
static { static {
filter.add(SubType.ALLY.getPredicate()); filter.add(SubType.ALLY.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public AkoumBattlesinger(UUID ownerId, CardSetInfo setInfo) { public AkoumBattlesinger(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AkroanHoplite.java
View file

@ -15,7 +15,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.AttackingPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -26,7 +25,7 @@ public final class AkroanHoplite extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("attacking creatures you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(AttackingPredicate.instance); filter.add(AttackingPredicate.instance);
} }

3
Mage.Sets/src/mage/cards/a/AkronLegionnaire.java
View file

@ -12,7 +12,6 @@ import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.NamePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -23,7 +22,7 @@ public final class AkronLegionnaire extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(Predicates.not(new NamePredicate("Akron Legionnaire"))); filter.add(Predicates.not(new NamePredicate("Akron Legionnaire")));
filter.add(Predicates.not(CardType.ARTIFACT.getPredicate())); filter.add(Predicates.not(CardType.ARTIFACT.getPredicate()));
} }

3
Mage.Sets/src/mage/cards/a/AkuDjinn.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -24,7 +23,7 @@ public final class AkuDjinn extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature each opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature each opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AkuDjinn(UUID ownerId, CardSetInfo setInfo) { public AkuDjinn(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AlelaArtfulProvocateur.java
View file

@ -15,7 +15,6 @@ import mage.filter.FilterSpell;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.permanent.token.FaerieToken; import mage.game.permanent.token.FaerieToken;
import java.util.UUID; import java.util.UUID;
@ -31,7 +30,7 @@ public final class AlelaArtfulProvocateur extends CardImpl {
static { static {
filter.add(new AbilityPredicate(FlyingAbility.class)); filter.add(new AbilityPredicate(FlyingAbility.class));
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter2.add(Predicates.or( filter2.add(Predicates.or(
CardType.ARTIFACT.getPredicate(), CardType.ARTIFACT.getPredicate(),
CardType.ENCHANTMENT.getPredicate() CardType.ENCHANTMENT.getPredicate()

3
Mage.Sets/src/mage/cards/a/AllThatGlitters.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterArtifactOrEnchantmentPermanent; import mage.filter.common.FilterArtifactOrEnchantmentPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -26,7 +25,7 @@ public final class AllThatGlitters extends CardImpl {
private static final FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent(); private static final FilterPermanent filter = new FilterArtifactOrEnchantmentPermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter); private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter);

3
Mage.Sets/src/mage/cards/a/AlluringSiren.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -24,7 +23,7 @@ public final class AlluringSiren extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AlluringSiren(UUID ownerId, CardSetInfo setInfo) { public AlluringSiren(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AlphaBrawl.java
View file

@ -10,7 +10,6 @@ import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -25,7 +24,7 @@ public final class AlphaBrawl extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AlphaBrawl(UUID ownerId, CardSetInfo setInfo) { public AlphaBrawl(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AlpineMoon.java
View file

@ -13,7 +13,6 @@ import mage.filter.FilterPermanent;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.NamePredicate; import mage.filter.predicate.mageobject.NamePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -49,7 +48,7 @@ class AlpineMoonEffect extends ContinuousEffectImpl {
private static final FilterPermanent filter = new FilterLandPermanent(); private static final FilterPermanent filter = new FilterLandPermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
filter.add(Predicates.not(SuperType.BASIC.getPredicate())); filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
} }

3
Mage.Sets/src/mage/cards/a/AltacBloodseeker.java
View file

@ -17,7 +17,6 @@ import mage.constants.Duration;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -28,7 +27,7 @@ public final class AltacBloodseeker extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AltacBloodseeker(UUID ownerId, CardSetInfo setInfo) { public AltacBloodseeker(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/Ambuscade.java
View file

@ -11,7 +11,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -24,7 +23,7 @@ public final class Ambuscade extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public Ambuscade(UUID ownerId, CardSetInfo setInfo) { public Ambuscade(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AmuletOfSafekeeping.java
View file

@ -15,7 +15,6 @@ import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterStackObject; import mage.filter.FilterStackObject;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.stack.StackObject; import mage.game.stack.StackObject;
@ -58,7 +57,7 @@ class AmuletOfSafekeepingTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterStackObject filter = new FilterStackObject(); private static final FilterStackObject filter = new FilterStackObject();
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AmuletOfSafekeepingTriggeredAbility() { public AmuletOfSafekeepingTriggeredAbility() {

3
Mage.Sets/src/mage/cards/a/AngelOfDeliverance.java
View file

@ -18,7 +18,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
@ -32,7 +31,7 @@ public final class AngelOfDeliverance extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AngelOfDeliverance(UUID ownerId, CardSetInfo setInfo) { public AngelOfDeliverance(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AngelOfSanctions.java
View file

@ -17,7 +17,6 @@ import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
/** /**
@ -29,7 +28,7 @@ public final class AngelOfSanctions extends CardImpl {
private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); private static final FilterNonlandPermanent filter = new FilterNonlandPermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AngelOfSanctions(UUID ownerId, CardSetInfo setInfo) { public AngelOfSanctions(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AngelicVoices.java
View file

@ -16,7 +16,6 @@ import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import java.util.UUID; import java.util.UUID;
@ -34,7 +33,7 @@ public final class AngelicVoices extends CardImpl {
new ColorPredicate(ObjectColor.WHITE) new ColorPredicate(ObjectColor.WHITE)
) )
)); ));
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
private static final Condition condition = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter)); private static final Condition condition = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter));

3
Mage.Sets/src/mage/cards/a/AnglerTurtle.java
View file

@ -8,7 +8,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.watchers.common.AttackedThisTurnWatcher; import mage.watchers.common.AttackedThisTurnWatcher;
import java.util.UUID; import java.util.UUID;
@ -21,7 +20,7 @@ public final class AnglerTurtle extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AnglerTurtle(UUID ownerId, CardSetInfo setInfo) { public AnglerTurtle(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AngryMob.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -25,7 +24,7 @@ public final class AngryMob extends CardImpl {
static { static {
filter.add(SubType.SWAMP.getPredicate()); filter.add(SubType.SWAMP.getPredicate());
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AngryMob(UUID ownerId, CardSetInfo setInfo) { public AngryMob(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ApexAltisaur.java
View file

@ -13,7 +13,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.UUID; import java.util.UUID;
@ -26,7 +25,7 @@ public final class ApexAltisaur extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control"); private static final FilterPermanent filter = new FilterCreaturePermanent("creature you don't control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public ApexAltisaur(UUID ownerId, CardSetInfo setInfo) { public ApexAltisaur(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AppealAuthority.java
View file

@ -17,7 +17,6 @@ import mage.constants.SpellAbilityType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import java.util.UUID; import java.util.UUID;
@ -45,7 +44,7 @@ public final class AppealAuthority extends SplitCard {
// Tap up to two target creatures your opponents control. Creatures you control gain vigilance until end of turn. // Tap up to two target creatures your opponents control. Creatures you control gain vigilance until end of turn.
getRightHalfCard().getSpellAbility().addEffect(new TapTargetEffect()); getRightHalfCard().getSpellAbility().addEffect(new TapTargetEffect());
FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control");
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2, filter, false)); getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(0, 2, filter, false));
getRightHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(), getRightHalfCard().getSpellAbility().addEffect(new GainAbilityControlledEffect(VigilanceAbility.getInstance(),
Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures"))); Duration.EndOfTurn, new FilterControlledCreaturePermanent("creatures")));

5
Mage.Sets/src/mage/cards/a/ArahboRoarOfTheWorld.java
View file

@ -20,7 +20,6 @@ import mage.constants.*;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -39,10 +38,10 @@ public final class ArahboRoarOfTheWorld extends CardImpl {
static { static {
filter.add(SubType.CAT.getPredicate()); filter.add(SubType.CAT.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
filter2.add(SubType.CAT.getPredicate()); filter2.add(SubType.CAT.getPredicate());
filter2.add(new ControllerPredicate(TargetController.YOU)); filter2.add(TargetController.YOU.getControllerPredicate());
filter2.add(AnotherPredicate.instance); filter2.add(AnotherPredicate.instance);
} }

3
Mage.Sets/src/mage/cards/a/ArborColossus.java
View file

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AbilityPredicate; import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.Target; import mage.target.Target;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -29,7 +28,7 @@ public final class ArborColossus extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with flying an opponent controls");
static { static {
filter.add(new AbilityPredicate(FlyingAbility.class)); filter.add(new AbilityPredicate(FlyingAbility.class));
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArborColossus(UUID ownerId, CardSetInfo setInfo) { public ArborColossus(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArcadesSabboth.java
View file

@ -17,7 +17,6 @@ import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.AttackingPredicate; import mage.filter.predicate.permanent.AttackingPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TappedPredicate;
/** /**
@ -28,7 +27,7 @@ public final class ArcadesSabboth extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped nonattacking creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped nonattacking creatures you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(Predicates.not(TappedPredicate.instance)); filter.add(Predicates.not(TappedPredicate.instance));
filter.add(Predicates.not(AttackingPredicate.instance)); filter.add(Predicates.not(AttackingPredicate.instance));
} }

3
Mage.Sets/src/mage/cards/a/ArcaneLighthouse.java
View file

@ -18,7 +18,6 @@ import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -30,7 +29,7 @@ public final class ArcaneLighthouse extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArcaneLighthouse(UUID ownerId, CardSetInfo setInfo) { public ArcaneLighthouse(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchangelAvacyn.java
View file

@ -19,7 +19,6 @@ import mage.constants.*;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.targetpointer.FixedTarget; import mage.target.targetpointer.FixedTarget;
@ -34,7 +33,7 @@ public final class ArchangelAvacyn extends CardImpl {
static { static {
filter.add(Predicates.not(SubType.ANGEL.getPredicate())); filter.add(Predicates.not(SubType.ANGEL.getPredicate()));
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public ArchangelAvacyn(UUID ownerId, CardSetInfo setInfo) { public ArchangelAvacyn(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchdemonOfGreed.java
View file

@ -15,7 +15,6 @@ import mage.constants.Outcome;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -32,7 +31,7 @@ public final class ArchdemonOfGreed extends CardImpl {
static { static {
filter.add(SubType.HUMAN.getPredicate()); filter.add(SubType.HUMAN.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public ArchdemonOfGreed(UUID ownerId, CardSetInfo setInfo) { public ArchdemonOfGreed(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchetypeOfAggression.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -23,7 +22,7 @@ public final class ArchetypeOfAggression extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArchetypeOfAggression(UUID ownerId, CardSetInfo setInfo) { public ArchetypeOfAggression(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchetypeOfCourage.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -22,7 +21,7 @@ public final class ArchetypeOfCourage extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArchetypeOfCourage(UUID ownerId, CardSetInfo setInfo) { public ArchetypeOfCourage(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchetypeOfEndurance.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -23,7 +22,7 @@ public final class ArchetypeOfEndurance extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArchetypeOfEndurance(UUID ownerId, CardSetInfo setInfo) { public ArchetypeOfEndurance(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchetypeOfFinality.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -23,7 +22,7 @@ public final class ArchetypeOfFinality extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArchetypeOfFinality(UUID ownerId, CardSetInfo setInfo) { public ArchetypeOfFinality(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchetypeOfImagination.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -22,7 +21,7 @@ public final class ArchetypeOfImagination extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArchetypeOfImagination(UUID ownerId, CardSetInfo setInfo) { public ArchetypeOfImagination(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArchonOfTheTriumvirate.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetNonlandPermanent; import mage.target.common.TargetNonlandPermanent;
/** /**
@ -25,7 +24,7 @@ public final class ArchonOfTheTriumvirate extends CardImpl {
private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanents your opponents control"); private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanents your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArchonOfTheTriumvirate(UUID ownerId, CardSetInfo setInfo) { public ArchonOfTheTriumvirate(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArenaAthlete.java
View file

@ -13,7 +13,6 @@ import mage.constants.Duration;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -25,7 +24,7 @@ public final class ArenaAthlete extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public ArenaAthlete(UUID ownerId, CardSetInfo setInfo) { public ArenaAthlete(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArmamentCorps.java
View file

@ -13,7 +13,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanentAmount; import mage.target.common.TargetCreaturePermanentAmount;
/** /**
@ -25,7 +24,7 @@ public final class ArmamentCorps extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public ArmamentCorps(UUID ownerId, CardSetInfo setInfo) { public ArmamentCorps(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/ArmoredAscension.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -27,7 +26,7 @@ public final class ArmoredAscension extends CardImpl {
static { static {
filter.add(SubType.PLAINS.getPredicate()); filter.add(SubType.PLAINS.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public ArmoredAscension(UUID ownerId, CardSetInfo setInfo) { public ArmoredAscension(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AssassinsTrophy.java
View file

@ -14,7 +14,6 @@ import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -29,7 +28,7 @@ public final class AssassinsTrophy extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls"); private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AssassinsTrophy(UUID ownerId, CardSetInfo setInfo) { public AssassinsTrophy(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AtarkaPummeler.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -24,7 +23,7 @@ public final class AtarkaPummeler extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public AtarkaPummeler(UUID ownerId, CardSetInfo setInfo) { public AtarkaPummeler(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/Atogatog.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
/** /**
@ -24,7 +23,7 @@ public final class Atogatog extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an Atog creature"); private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an Atog creature");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(SubType.ATOG.getPredicate()); filter.add(SubType.ATOG.getPredicate());
} }

3
Mage.Sets/src/mage/cards/a/AttendantOfVraska.java
View file

@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -24,7 +23,7 @@ public final class AttendantOfVraska extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("a Vraska planeswalker"); private static final FilterPermanent filter = new FilterPermanent("a Vraska planeswalker");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(CardType.PLANESWALKER.getPredicate()); filter.add(CardType.PLANESWALKER.getPredicate());
filter.add(SubType.VRASKA.getPredicate()); filter.add(SubType.VRASKA.getPredicate());
} }

3
Mage.Sets/src/mage/cards/a/AuntiesSnitch.java
View file

@ -15,7 +15,6 @@ import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.DamagedPlayerEvent; import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
@ -58,7 +57,7 @@ class AuntiesSnitchTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin or Rogue you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Goblin or Rogue you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(Predicates.or(SubType.GOBLIN.getPredicate(), SubType.ROGUE.getPredicate())); filter.add(Predicates.or(SubType.GOBLIN.getPredicate(), SubType.ROGUE.getPredicate()));
} }

3
Mage.Sets/src/mage/cards/a/AuraFinesse.java
View file

@ -12,7 +12,6 @@ import mage.constants.Outcome;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.common.FilterEnchantmentPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Player; import mage.players.Player;
@ -29,7 +28,7 @@ public final class AuraFinesse extends CardImpl {
private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Aura you control"); private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("Aura you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(SubType.AURA.getPredicate()); filter.add(SubType.AURA.getPredicate());
} }

3
Mage.Sets/src/mage/cards/a/AuthorityOfTheConsuls.java
View file

@ -11,7 +11,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent; import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
@ -26,7 +25,7 @@ public final class AuthorityOfTheConsuls extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AuthorityOfTheConsuls(UUID ownerId, CardSetInfo setInfo) { public AuthorityOfTheConsuls(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AysenCrusader.java
View file

@ -17,7 +17,6 @@ import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -32,7 +31,7 @@ public final class AysenCrusader extends CardImpl {
SubType.SOLDIER.getPredicate(), SubType.SOLDIER.getPredicate(),
SubType.WARRIOR.getPredicate() SubType.WARRIOR.getPredicate()
)); ));
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public AysenCrusader(UUID ownerId, CardSetInfo setInfo) { public AysenCrusader(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AyulaQueenAmongBears.java
View file

@ -17,7 +17,6 @@ import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent; import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetControlledPermanent; import mage.target.common.TargetControlledPermanent;
@ -36,7 +35,7 @@ public final class AyulaQueenAmongBears extends CardImpl {
static { static {
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
filter3.add(SubType.BEAR.getPredicate()); filter3.add(SubType.BEAR.getPredicate());
filter4.add(new ControllerPredicate(TargetController.NOT_YOU)); filter4.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public AyulaQueenAmongBears(UUID ownerId, CardSetInfo setInfo) { public AyulaQueenAmongBears(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AzoriusArrester.java
View file

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -24,7 +23,7 @@ public final class AzoriusArrester extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AzoriusArrester(UUID ownerId, CardSetInfo setInfo) { public AzoriusArrester(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/a/AzoriusJusticiar.java
View file

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -24,7 +23,7 @@ public final class AzoriusJusticiar extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public AzoriusJusticiar(UUID ownerId, CardSetInfo setInfo) { public AzoriusJusticiar(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BafflingEnd.java
View file

@ -14,7 +14,6 @@ import mage.constants.ComparisonType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate; import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.permanent.token.DinosaurToken; import mage.game.permanent.token.DinosaurToken;
import mage.target.Target; import mage.target.Target;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
@ -30,7 +29,7 @@ public final class BafflingEnd extends CardImpl {
static { static {
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4)); filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BafflingEnd(UUID ownerId, CardSetInfo setInfo) { public BafflingEnd(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BanisherPriest.java
View file

@ -16,7 +16,6 @@ import mage.constants.Outcome;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -31,7 +30,7 @@ public final class BanisherPriest extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BanisherPriest(UUID ownerId, CardSetInfo setInfo) { public BanisherPriest(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BanishingLight.java
View file

@ -12,7 +12,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
/** /**
@ -24,7 +23,7 @@ public final class BanishingLight extends CardImpl {
private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); private static final FilterNonlandPermanent filter = new FilterNonlandPermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BanishingLight(UUID ownerId, CardSetInfo setInfo) { public BanishingLight(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BarrageOfBoulders.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import java.util.UUID; import java.util.UUID;
@ -27,7 +26,7 @@ public final class BarrageOfBoulders extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public BarrageOfBoulders(UUID ownerId, CardSetInfo setInfo) { public BarrageOfBoulders(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BaruFistOfKrosa.java
View file

@ -19,7 +19,6 @@ import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.ColorPredicate; import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.token.BaruFistOfKrosaToken; import mage.game.permanent.token.BaruFistOfKrosaToken;
import mage.game.permanent.token.Token; import mage.game.permanent.token.Token;
@ -35,7 +34,7 @@ public final class BaruFistOfKrosa extends CardImpl {
static { static {
forestFilter.add(SubType.FOREST.getPredicate()); forestFilter.add(SubType.FOREST.getPredicate());
greenCreatureFilter.add(new ControllerPredicate(TargetController.YOU)); greenCreatureFilter.add(TargetController.YOU.getControllerPredicate());
greenCreatureFilter.add(new ColorPredicate(ObjectColor.GREEN)); greenCreatureFilter.add(new ColorPredicate(ObjectColor.GREEN));
} }

3
Mage.Sets/src/mage/cards/b/BeastmastersMagemark.java
View file

@ -15,7 +15,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.EnchantedPredicate; import mage.filter.predicate.permanent.EnchantedPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -30,7 +29,7 @@ public final class BeastmastersMagemark extends CardImpl {
static { static {
filter.add(EnchantedPredicate.instance); filter.add(EnchantedPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public BeastmastersMagemark(UUID ownerId, CardSetInfo setInfo) { public BeastmastersMagemark(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BelligerentSliver.java
View file

@ -11,7 +11,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -22,7 +21,7 @@ public final class BelligerentSliver extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Sliver creatures you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(SubType.SLIVER.getPredicate()); filter.add(SubType.SLIVER.getPredicate());
} }

3
Mage.Sets/src/mage/cards/b/BellowingAegisaur.java
View file

@ -14,7 +14,6 @@ import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -25,7 +24,7 @@ public final class BellowingAegisaur extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
} }

3
Mage.Sets/src/mage/cards/b/BenthicExplorers.java
View file

@ -16,7 +16,6 @@ import mage.choices.Choice;
import mage.choices.ChoiceColor; import mage.choices.ChoiceColor;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TappedPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -36,7 +35,7 @@ public final class BenthicExplorers extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("tapped land an opponent controls"); private static final FilterLandPermanent filter = new FilterLandPermanent("tapped land an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
filter.add(TappedPredicate.instance); filter.add(TappedPredicate.instance);
} }

3
Mage.Sets/src/mage/cards/b/Betrayal.java
View file

@ -12,7 +12,6 @@ import mage.constants.Outcome;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -26,7 +25,7 @@ public final class Betrayal extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public Betrayal(UUID ownerId, CardSetInfo setInfo) { public Betrayal(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BishopOfBinding.java
View file

@ -22,7 +22,6 @@ import mage.constants.Outcome;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.ExileZone; import mage.game.ExileZone;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -38,7 +37,7 @@ public final class BishopOfBinding extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BishopOfBinding(UUID ownerId, CardSetInfo setInfo) { public BishopOfBinding(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BishopOfTheBloodstained.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetOpponent; import mage.target.common.TargetOpponent;
/** /**
@ -26,7 +25,7 @@ public final class BishopOfTheBloodstained extends CardImpl {
static { static {
filter.add(SubType.VAMPIRE.getPredicate()); filter.add(SubType.VAMPIRE.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public BishopOfTheBloodstained(UUID ownerId, CardSetInfo setInfo) { public BishopOfTheBloodstained(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BlackMarketDealer.java
View file

@ -17,7 +17,6 @@ import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPlayer; import mage.target.TargetPlayer;
import mage.target.common.TargetOpponentsCreaturePermanent; import mage.target.common.TargetOpponentsCreaturePermanent;
@ -32,7 +31,7 @@ public final class BlackMarketDealer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Rogue or Hunter creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a Rogue or Hunter creature you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(Predicates.or(SubType.ROGUE.getPredicate(), SubType.HUNTER.getPredicate())); filter.add(Predicates.or(SubType.ROGUE.getPredicate(), SubType.HUNTER.getPredicate()));
} }

3
Mage.Sets/src/mage/cards/b/BlessedReincarnation.java
View file

@ -11,7 +11,6 @@ import mage.constants.Outcome;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.players.Library; import mage.players.Library;
@ -27,7 +26,7 @@ public final class BlessedReincarnation extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BlessedReincarnation(UUID ownerId, CardSetInfo setInfo) { public BlessedReincarnation(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BlindingSpray.java
View file

@ -10,7 +10,6 @@ import mage.constants.CardType;
import mage.constants.Duration; import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -21,7 +20,7 @@ public final class BlindingSpray extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BlindingSpray(UUID ownerId, CardSetInfo setInfo) { public BlindingSpray(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BloodChinRager.java
View file

@ -13,7 +13,6 @@ import mage.constants.Duration;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -24,7 +23,7 @@ public final class BloodChinRager extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR,"Warrior creatures you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR,"Warrior creatures you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public BloodChinRager(UUID ownerId, CardSetInfo setInfo) { public BloodChinRager(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/Bloodbriar.java
View file

@ -13,7 +13,6 @@ import mage.constants.TargetController;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -24,7 +23,7 @@ public final class Bloodbriar extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("another permanent"); private static final FilterPermanent filter = new FilterPermanent("another permanent");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
} }

3
Mage.Sets/src/mage/cards/b/BloodcrazedHoplite.java
View file

@ -16,7 +16,6 @@ import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.counters.CounterType; import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
@ -31,7 +30,7 @@ public final class BloodcrazedHoplite extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BloodcrazedHoplite(UUID ownerId, CardSetInfo setInfo) { public BloodcrazedHoplite(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/Blustersquall.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
@ -28,7 +27,7 @@ public final class Blustersquall extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public Blustersquall(UUID ownerId, CardSetInfo setInfo) { public Blustersquall(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BoggartShenanigans.java
View file

@ -11,7 +11,6 @@ import mage.constants.CardType;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetPlayerOrPlaneswalker; import mage.target.common.TargetPlayerOrPlaneswalker;
/** /**
@ -23,7 +22,7 @@ public final class BoggartShenanigans extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another Goblin you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another Goblin you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
filter.add(SubType.GOBLIN.getPredicate()); filter.add(SubType.GOBLIN.getPredicate());
} }

3
Mage.Sets/src/mage/cards/b/BoilingEarth.java
View file

@ -9,7 +9,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -20,7 +19,7 @@ public final class BoilingEarth extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BoilingEarth(UUID ownerId, CardSetInfo setInfo) { public BoilingEarth(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BondsOfMortality.java
View file

@ -18,7 +18,6 @@ import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
/** /**
* *
@ -29,7 +28,7 @@ public final class BondsOfMortality extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BondsOfMortality(UUID ownerId, CardSetInfo setInfo) { public BondsOfMortality(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BoneyardScourge.java
View file

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent; import mage.game.events.ZoneChangeEvent;
@ -33,7 +32,7 @@ public final class BoneyardScourge extends CardImpl {
static { static {
filter.add(SubType.DRAGON.getPredicate()); filter.add(SubType.DRAGON.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public BoneyardScourge(UUID ownerId, CardSetInfo setInfo) { public BoneyardScourge(UUID ownerId, CardSetInfo setInfo) {

5
Mage.Sets/src/mage/cards/b/BoomBust.java
View file

@ -12,7 +12,6 @@ import mage.constants.SpellAbilityType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
public final class BoomBust extends SplitCard { public final class BoomBust extends SplitCard {
@ -21,8 +20,8 @@ public final class BoomBust extends SplitCard {
private static final FilterLandPermanent filter2 = new FilterLandPermanent("land you don't control"); private static final FilterLandPermanent filter2 = new FilterLandPermanent("land you don't control");
static { static {
filter1.add(new ControllerPredicate(TargetController.YOU)); filter1.add(TargetController.YOU.getControllerPredicate());
filter2.add(new ControllerPredicate(TargetController.NOT_YOU)); filter2.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public BoomBust(UUID ownerId, CardSetInfo setInfo) { public BoomBust(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BorderlandBehemoth.java
View file

@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.PermanentIdPredicate; import mage.filter.predicate.permanent.PermanentIdPredicate;
/** /**
@ -36,7 +35,7 @@ public final class BorderlandBehemoth extends CardImpl {
FilterCreaturePermanent filter = new FilterCreaturePermanent("other Giant you control"); FilterCreaturePermanent filter = new FilterCreaturePermanent("other Giant you control");
filter.add(SubType.GIANT.getPredicate()); filter.add(SubType.GIANT.getPredicate());
filter.add(Predicates.not(new PermanentIdPredicate(this.getId()))); filter.add(Predicates.not(new PermanentIdPredicate(this.getId())));
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
DynamicValue xValue = new PermanentsOnBattlefieldCount(filter, 4); DynamicValue xValue = new PermanentsOnBattlefieldCount(filter, 4);
Effect effect = new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield, false); Effect effect = new BoostSourceEffect(xValue, xValue, Duration.WhileOnBattlefield, false);
effect.setText("{this} gets +4/+4 for each other Giant you control"); effect.setText("{this} gets +4/+4 for each other Giant you control");

3
Mage.Sets/src/mage/cards/b/BoundlessRealms.java
View file

@ -13,7 +13,6 @@ import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.filter.common.FilterLandPermanent; import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.players.Player; import mage.players.Player;
import mage.target.common.TargetCardInLibrary; import mage.target.common.TargetCardInLibrary;
@ -66,7 +65,7 @@ class BoundlessRealmsEffect extends OneShotEffect {
return false; return false;
} }
FilterLandPermanent filter = new FilterLandPermanent(); FilterLandPermanent filter = new FilterLandPermanent();
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
int amount = new PermanentsOnBattlefieldCount(filter).calculate(game, source, this); int amount = new PermanentsOnBattlefieldCount(filter).calculate(game, source, this);
TargetCardInLibrary target = new TargetCardInLibrary(0, amount, StaticFilters.FILTER_CARD_BASIC_LAND); TargetCardInLibrary target = new TargetCardInLibrary(0, amount, StaticFilters.FILTER_CARD_BASIC_LAND);

3
Mage.Sets/src/mage/cards/b/BrazenBorrower.java
View file

@ -12,7 +12,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.UUID; import java.util.UUID;
@ -26,7 +25,7 @@ public final class BrazenBorrower extends AdventureCard {
= new FilterNonlandPermanent("nonland permanent an opponent controls"); = new FilterNonlandPermanent("nonland permanent an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BrazenBorrower(UUID ownerId, CardSetInfo setInfo) { public BrazenBorrower(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BreakOpen.java
View file

@ -9,7 +9,6 @@ import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.other.FaceDownPredicate; import mage.filter.predicate.other.FaceDownPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -22,7 +21,7 @@ public final class BreakOpen extends CardImpl {
static { static {
filter.add(FaceDownPredicate.instance); filter.add(FaceDownPredicate.instance);
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BreakOpen(UUID ownerId, CardSetInfo setInfo) { public BreakOpen(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/b/BrutalHordechief.java
View file

@ -16,7 +16,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -33,7 +32,7 @@ public final class BrutalHordechief extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public BrutalHordechief(UUID ownerId, CardSetInfo setInfo) { public BrutalHordechief(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/b/ButcherOfMalakir.java
View file

@ -23,7 +23,7 @@ public final class ButcherOfMalakir extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control");
static { static {
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public ButcherOfMalakir(UUID ownerId, CardSetInfo setInfo) { public ButcherOfMalakir(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/c/CalmingVerse.java
View file

@ -13,7 +13,6 @@ import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledEnchantmentPermanent; import mage.filter.common.FilterControlledEnchantmentPermanent;
import mage.filter.common.FilterEnchantmentPermanent; import mage.filter.common.FilterEnchantmentPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.filter.predicate.permanent.TappedPredicate; import mage.filter.predicate.permanent.TappedPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -55,7 +54,7 @@ class CalmingVerseEffect extends OneShotEffect {
private static final FilterEnchantmentPermanent opponentEnchantmentsFilter = new FilterEnchantmentPermanent("enchantments you don't control"); private static final FilterEnchantmentPermanent opponentEnchantmentsFilter = new FilterEnchantmentPermanent("enchantments you don't control");
static { static {
opponentEnchantmentsFilter.add(new ControllerPredicate(TargetController.OPPONENT)); opponentEnchantmentsFilter.add(TargetController.OPPONENT.getControllerPredicate());
} }
private static final FilterControlledEnchantmentPermanent controlledEnchantmentsFilter = new FilterControlledEnchantmentPermanent("enchantments you control"); private static final FilterControlledEnchantmentPermanent controlledEnchantmentsFilter = new FilterControlledEnchantmentPermanent("enchantments you control");

5
Mage.Sets/src/mage/cards/c/CapriciousEfreet.java
View file

@ -12,7 +12,6 @@ import mage.constants.SubType;
import mage.constants.Outcome; import mage.constants.Outcome;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
@ -32,8 +31,8 @@ public final class CapriciousEfreet extends CardImpl {
private static final FilterNonlandPermanent filterNotControlled = new FilterNonlandPermanent("nonland permanent you don't control"); private static final FilterNonlandPermanent filterNotControlled = new FilterNonlandPermanent("nonland permanent you don't control");
static { static {
filterControlled.add(new ControllerPredicate(TargetController.YOU)); filterControlled.add(TargetController.YOU.getControllerPredicate());
filterNotControlled.add(new ControllerPredicate(TargetController.NOT_YOU)); filterNotControlled.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public CapriciousEfreet(UUID ownerId, CardSetInfo setInfo) { public CapriciousEfreet(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/c/CaptainLanneryStorm.java
View file

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.constants.SuperType; import mage.constants.SuperType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.permanent.token.TreasureToken; import mage.game.permanent.token.TreasureToken;
/** /**
@ -29,7 +28,7 @@ public final class CaptainLanneryStorm extends CardImpl {
static { static {
filter.add(SubType.TREASURE.getPredicate()); filter.add(SubType.TREASURE.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public CaptainLanneryStorm(UUID ownerId, CardSetInfo setInfo) { public CaptainLanneryStorm(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/c/CaptivatingCrew.java
View file

@ -19,7 +19,6 @@ import mage.constants.Duration;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.constants.Zone; import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
/** /**
@ -31,7 +30,7 @@ public final class CaptivatingCrew extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public CaptivatingCrew(UUID ownerId, CardSetInfo setInfo) { public CaptivatingCrew(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/c/CapturedByTheConsulate.java
View file

@ -15,7 +15,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo; import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
@ -36,7 +35,7 @@ public final class CapturedByTheConsulate extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.NOT_YOU)); filter.add(TargetController.NOT_YOU.getControllerPredicate());
} }
public CapturedByTheConsulate(UUID ownerId, CardSetInfo setInfo) { public CapturedByTheConsulate(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/c/CarelessCelebrant.java
View file

@ -11,7 +11,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.FilterPermanent; import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates; import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import java.util.UUID; import java.util.UUID;
@ -25,7 +24,7 @@ public final class CarelessCelebrant extends CardImpl {
= new FilterPermanent("creature or planeswalker an opponent controls"); = new FilterPermanent("creature or planeswalker an opponent controls");
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
filter.add(Predicates.or( filter.add(Predicates.or(
CardType.CREATURE.getPredicate(), CardType.CREATURE.getPredicate(),
CardType.PLANESWALKER.getPredicate() CardType.PLANESWALKER.getPredicate()

3
Mage.Sets/src/mage/cards/c/CastOut.java
View file

@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType; import mage.constants.CardType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterNonlandPermanent; import mage.filter.common.FilterNonlandPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
/** /**
@ -27,7 +26,7 @@ public final class CastOut extends CardImpl {
private static final FilterNonlandPermanent filter = new FilterNonlandPermanent(); private static final FilterNonlandPermanent filter = new FilterNonlandPermanent();
static { static {
filter.add(new ControllerPredicate(TargetController.OPPONENT)); filter.add(TargetController.OPPONENT.getControllerPredicate());
} }
public CastOut(UUID ownerId, CardSetInfo setInfo) { public CastOut(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/c/CatacombSifter.java
View file

@ -15,7 +15,6 @@ import mage.constants.SubType;
import mage.constants.TargetController; import mage.constants.TargetController;
import mage.filter.common.FilterCreaturePermanent; import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate; import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.permanent.token.EldraziScionToken; import mage.game.permanent.token.EldraziScionToken;
/** /**
@ -27,7 +26,7 @@ public final class CatacombSifter extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control");
static { static {
filter.add(AnotherPredicate.instance); filter.add(AnotherPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU)); filter.add(TargetController.YOU.getControllerPredicate());
} }
public CatacombSifter(UUID ownerId, CardSetInfo setInfo) { public CatacombSifter(UUID ownerId, CardSetInfo setInfo) {

Some files were not shown because too many files have changed in this diff Show more