mirror of
https://github.com/magefree/mage.git
synced 2026-01-25 20:59:14 -08:00
[filters] Replaced TargetController condition with Predicate
This commit is contained in:
parent
021e2b59df
commit
4563e518a6
76 changed files with 235 additions and 191 deletions
|
|
@ -34,6 +34,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
|
|||
import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPlayer;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -48,7 +49,7 @@ public class Dreadwaters extends CardImpl<Dreadwaters> {
|
|||
private static final FilterLandPermanent filter = new FilterLandPermanent("lands you control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public Dreadwaters(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.Ability;
|
|||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.target.common.TargetControlledCreaturePermanent;
|
||||
|
|
@ -51,7 +52,7 @@ public class PeelFromReality extends CardImpl<PeelFromReality> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.NOT_YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.NOT_YOU));
|
||||
}
|
||||
|
||||
public PeelFromReality(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ import mage.abilities.keyword.IndestructibleAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.counters.CounterType;
|
||||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.watchers.common.CastFromHandWatcher;
|
||||
|
||||
/**
|
||||
|
|
@ -60,7 +61,7 @@ public class MyojinOfSeeingWinds extends CardImpl<MyojinOfSeeingWinds> {
|
|||
|
||||
private static final FilterPermanent filter = new FilterPermanent("permanent you control");
|
||||
static {
|
||||
filter.setTargetOwner(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public MyojinOfSeeingWinds(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ import mage.abilities.Ability;
|
|||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -50,7 +51,7 @@ public class AlphaBrawl extends CardImpl<AlphaBrawl> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(Constants.TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public AlphaBrawl(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.keyword.TrampleAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.GameEvent;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
|
@ -56,7 +57,7 @@ public class ArchdemonOfGreed extends CardImpl<ArchdemonOfGreed> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Human"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public ArchdemonOfGreed(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.effects.common.TapTargetEffect;
|
|||
import mage.abilities.keyword.FlyingAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.GameEvent;
|
||||
import mage.game.events.ZoneChangeEvent;
|
||||
|
|
@ -58,7 +59,7 @@ public class DungeonGeists extends CardImpl<DungeonGeists> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(Constants.TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public DungeonGeists(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ import mage.abilities.effects.OneShotEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterNonTokenPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.game.permanent.token.WolfToken;
|
||||
|
|
@ -77,7 +78,7 @@ class FeedThePackEffect extends OneShotEffect<FeedThePackEffect> {
|
|||
|
||||
static {
|
||||
filter.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public FeedThePackEffect() {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.effects.common.ExileTargetForSourceEffect;
|
|||
import mage.abilities.effects.common.ReturnFromExileForSourceEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetControlledCreaturePermanent;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
|
|
@ -52,7 +53,7 @@ public class Helvault extends CardImpl<Helvault> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.NOT_YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.NOT_YOU));
|
||||
}
|
||||
|
||||
public Helvault(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -38,9 +38,9 @@ import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
|
|||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.abilities.keyword.FlyingAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.Filter;
|
||||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.players.Player;
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ class EmissaryOfHopeEffect extends OneShotEffect<EmissaryOfHopeEffect> {
|
|||
|
||||
static {
|
||||
filter.add(new CardTypePredicate(CardType.ARTIFACT));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
EmissaryOfHopeEffect() {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.keyword.FlashbackAbility;
|
|||
import mage.cards.Card;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -80,7 +81,7 @@ class DivineReckoningEffect extends OneShotEffect<DivineReckoningEffect> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public DivineReckoningEffect() {
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@ import mage.filter.FilterPermanent;
|
|||
import mage.filter.common.FilterCreatureCard;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.game.permanent.token.WolfTokenWithDeathtouch;
|
||||
|
|
@ -136,7 +137,7 @@ class GarrukTheVeilCursedEffect extends OneShotEffect<GarrukTheVeilCursedEffect>
|
|||
|
||||
static {
|
||||
filterCreature.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filterCreature.setTargetController(Constants.TargetController.YOU);
|
||||
filterCreature.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public GarrukTheVeilCursedEffect() {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import mage.Constants.TargetController;
|
|||
import mage.abilities.effects.common.continious.BoostAllEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -45,7 +46,7 @@ public class HystericalBlindness extends CardImpl<HystericalBlindness> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public HystericalBlindness(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.keyword.FlyingAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.AbilityPredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -52,7 +53,7 @@ public class OneEyedScarecrow extends CardImpl<OneEyedScarecrow> {
|
|||
|
||||
static {
|
||||
filter.add(new AbilityPredicate(FlyingAbility.class));
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public OneEyedScarecrow(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ import mage.Constants.TargetController;
|
|||
import mage.abilities.effects.common.FightTargetsEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetControlledCreaturePermanent;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
|
|
@ -46,7 +47,7 @@ public class PreyUpon extends CardImpl<PreyUpon> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature you don't control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.NOT_YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.NOT_YOU));
|
||||
}
|
||||
|
||||
public PreyUpon(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
|
|||
import mage.abilities.effects.common.continious.BoostSourceEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -49,7 +50,7 @@ public class ScourgeOfGeierReach extends CardImpl<ScourgeOfGeierReach> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public ScourgeOfGeierReach(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.effects.OneShotEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -93,7 +94,7 @@ class TributeToHungerEffect extends OneShotEffect<TributeToHungerEffect> {
|
|||
|
||||
FilterControlledPermanent filter = new FilterControlledPermanent("creature");
|
||||
filter.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, false);
|
||||
|
||||
if (target.canChoose(player.getId(), game)) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.keyword.FirstStrikeAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
|
|
@ -49,7 +50,7 @@ public class VampiricFury extends CardImpl<VampiricFury> {
|
|||
|
||||
static {
|
||||
vampires.add(new SubtypePredicate("Vampire"));
|
||||
vampires.setTargetController(Constants.TargetController.YOU);
|
||||
vampires.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public VampiricFury(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ import mage.abilities.keyword.ShroudAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -54,7 +55,7 @@ public class ScionOfOona extends CardImpl<ScionOfOona> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Faerie"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public ScionOfOona(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.costs.common.TapSourceCost;
|
|||
import mage.abilities.effects.common.AttacksIfAbleTargetEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
/**
|
||||
|
|
@ -52,7 +53,7 @@ public class AlluringSiren extends CardImpl<AlluringSiren> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public AlluringSiren(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ import mage.abilities.keyword.FlyingAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPermanent;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
|
|
@ -58,7 +59,7 @@ public class ArmoredAscension extends CardImpl<ArmoredAscension> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Plains"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public ArmoredAscension(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
|
|||
import mage.abilities.effects.OneShotEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterNonlandPermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.target.TargetPermanent;
|
||||
|
|
@ -54,8 +55,8 @@ public class CapriciousEfreet extends CardImpl<CapriciousEfreet> {
|
|||
private static final FilterNonlandPermanent filterNotControlled = new FilterNonlandPermanent("nonland permanent you don't control");
|
||||
|
||||
static {
|
||||
filterControlled.setTargetController(TargetController.YOU);
|
||||
filterNotControlled.setTargetController(TargetController.NOT_YOU);
|
||||
filterControlled.add(new ControllerPredicate(TargetController.YOU));
|
||||
filterNotControlled.add(new ControllerPredicate(TargetController.NOT_YOU));
|
||||
}
|
||||
|
||||
public CapriciousEfreet(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import mage.Constants.TargetController;
|
|||
import mage.abilities.effects.common.PreventAllDamageToEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreatureOrPlayer;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -46,7 +47,7 @@ public class SafePassage extends CardImpl<SafePassage> {
|
|||
private static final FilterCreatureOrPlayer filter = new FilterCreatureOrPlayer("you and creatures you control");
|
||||
|
||||
static {
|
||||
filter.getCreatureFilter().setTargetController(TargetController.YOU);
|
||||
filter.getCreatureFilter().add(new ControllerPredicate(TargetController.YOU));
|
||||
filter.getPlayerFilter().setPlayerTarget(TargetController.YOU);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ import mage.abilities.effects.OneShotEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -90,7 +91,7 @@ class YawningFissureEffect extends OneShotEffect<YawningFissureEffect> {
|
|||
public boolean apply(Game game, Ability source) {
|
||||
FilterControlledPermanent filter = new FilterControlledPermanent("land you control");
|
||||
filter.add(new CardTypePredicate(CardType.LAND));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
|
||||
Set<UUID> opponents = game.getOpponents(source.getControllerId());
|
||||
for (UUID opponentId : opponents) {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ import mage.abilities.effects.OneShotEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -74,7 +75,7 @@ class CorruptEffect extends OneShotEffect<CorruptEffect> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Swamp"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public CorruptEffect() {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.effects.common.continious.BoostSourceEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -52,7 +53,7 @@ public class EarthServant extends CardImpl<EarthServant> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Mountain"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public EarthServant(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@ import mage.abilities.effects.common.ReturnFromExileEffect;
|
|||
import mage.abilities.mana.ColorlessManaAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterAttackingCreature;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
|
@ -57,7 +58,7 @@ public class MystifyingMaze extends CardImpl<MystifyingMaze> {
|
|||
private static final FilterAttackingCreature filter = new FilterAttackingCreature("attacking creature an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public MystifyingMaze(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ import mage.abilities.keyword.EnchantAbility;
|
|||
import mage.cards.Card;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.GameEvent.EventType;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
|
@ -175,7 +176,7 @@ class NecroticPlagueEffect2 extends OneShotEffect<NecroticPlagueEffect2> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public NecroticPlagueEffect2(UUID cardId) {
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ import mage.abilities.keyword.EnchantAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPermanent;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
|
|
@ -56,7 +57,7 @@ public class QuagSickness extends CardImpl<QuagSickness> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Swamp"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public QuagSickness(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.cards.CardImpl;
|
|||
import mage.counters.CounterType;
|
||||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -53,7 +54,7 @@ public class SteelOverseer extends CardImpl<SteelOverseer> {
|
|||
static {
|
||||
filter.add(new CardTypePredicate(CardType.ARTIFACT));
|
||||
filter.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public SteelOverseer(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.effects.OneShotEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -76,9 +77,9 @@ class SmallpoxEffect extends OneShotEffect<SmallpoxEffect> {
|
|||
|
||||
static {
|
||||
filterCreature.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filterCreature.setTargetController(Constants.TargetController.YOU);
|
||||
filterCreature.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
filterLand.add(new CardTypePredicate(CardType.LAND));
|
||||
filterLand.setTargetController(Constants.TargetController.YOU);
|
||||
filterLand.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
SmallpoxEffect() {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import mage.Constants.Rarity;
|
|||
import mage.abilities.effects.common.continious.BoostAllEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -45,7 +46,7 @@ public class CowerInFear extends CardImpl<CowerInFear> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures your opponents control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(Constants.TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public CowerInFear(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.cards.CardImpl;
|
|||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.game.permanent.token.SaprolingToken;
|
||||
|
|
@ -74,7 +75,7 @@ class FungalSproutingEffect extends OneShotEffect<FungalSproutingEffect> {
|
|||
|
||||
static {
|
||||
filter.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public FungalSproutingEffect() {
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ import mage.counters.CounterType;
|
|||
import mage.filter.common.FilterLandCard;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.command.Emblem;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
|
@ -127,7 +128,7 @@ class LilianaOfTheDarkRealmsEffect extends ContinuousEffectImpl<LilianaOfTheDark
|
|||
|
||||
FilterLandPermanent filter = new FilterLandPermanent("Swamps");
|
||||
filter.add(new SubtypePredicate("Swamp"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
this.amount = game.getBattlefield().count(filter, source.getControllerId(), game);
|
||||
|
||||
Player player = game.getPlayer(source.getControllerId());
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.effects.common.continious.BoostAllEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -48,7 +49,7 @@ public class Mutilate extends CardImpl<Mutilate> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Swamp"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public Mutilate(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.keyword.HasteAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.AbilityPredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
||||
|
|
@ -54,7 +55,7 @@ public class ThundermawHellkite extends CardImpl<ThundermawHellkite> {
|
|||
|
||||
static {
|
||||
filter.add(new AbilityPredicate(FlyingAbility.class));
|
||||
filter.setTargetController(Constants.TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public ThundermawHellkite(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ import mage.abilities.effects.ContinuousEffectImpl;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.NamePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
||||
|
|
@ -51,7 +52,7 @@ public class TimberpackWolf extends CardImpl<TimberpackWolf> {
|
|||
|
||||
static {
|
||||
filter.add(new NamePredicate("Timberpack Wolf"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public TimberpackWolf(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.keyword.EquipAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -50,7 +51,7 @@ public class NightmareLash extends CardImpl<NightmareLash> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Swamp"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public NightmareLash(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.effects.common.CreateTokenEffect;
|
|||
import mage.abilities.keyword.HasteAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.GameEvent;
|
||||
import mage.game.permanent.token.Token;
|
||||
|
|
@ -55,7 +56,7 @@ public class ChancellorOfTheForge extends CardImpl<ChancellorOfTheForge> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures you control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public ChancellorOfTheForge(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.effects.common.UntapTargetEffect;
|
|||
import mage.abilities.keyword.FlashAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPermanent;
|
||||
import mage.target.common.TargetControlledPermanent;
|
||||
|
||||
|
|
@ -52,7 +53,7 @@ public class DeceiverExarch extends CardImpl<DeceiverExarch> {
|
|||
private static final FilterPermanent filter = new FilterPermanent("permanent an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public DeceiverExarch(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ import mage.abilities.keyword.LivingWeaponAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -53,7 +54,7 @@ public class Lashwrithe extends CardImpl<Lashwrithe> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Swamp"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public Lashwrithe(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ import mage.cards.CardImpl;
|
|||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.permanent.token.GolemToken;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
|
|
@ -57,7 +58,7 @@ public class VitalSplicer extends CardImpl<VitalSplicer> {
|
|||
static {
|
||||
filter.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filter.add(new SubtypePredicate("Golem"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public VitalSplicer(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.effects.common.continious.GainAbilityAllEffect;
|
|||
import mage.abilities.keyword.HasteAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
/**
|
||||
|
|
@ -52,7 +53,7 @@ public class FiresOfYavimaya extends CardImpl<FiresOfYavimaya> {
|
|||
private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Creatures you control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public FiresOfYavimaya(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ import mage.abilities.keyword.ReboundAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -90,7 +91,7 @@ class ConsumingVaporsEffect extends OneShotEffect<ConsumingVaporsEffect> {
|
|||
|
||||
FilterControlledPermanent filter = new FilterControlledPermanent("creature");
|
||||
filter.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
TargetControlledPermanent target = new TargetControlledPermanent(1, 1, filter, false);
|
||||
|
||||
//A spell or ability could have removed the only legal target this player
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
|
|||
import mage.abilities.keyword.IndestructibleAbility;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterArtifactPermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -50,7 +51,7 @@ public class DarksteelJuggernaut extends CardImpl<DarksteelJuggernaut> {
|
|||
private static final FilterArtifactPermanent filter = new FilterArtifactPermanent("artifacts you control");
|
||||
|
||||
static {
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public DarksteelJuggernaut (UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ import mage.cards.CardImpl;
|
|||
import mage.counters.CounterType;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.game.permanent.token.Token;
|
||||
|
|
@ -69,9 +70,9 @@ public class KothOfTheHammer extends CardImpl<KothOfTheHammer> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Mountain"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
filterCount.add(new SubtypePredicate("Mountain"));
|
||||
filterCount.setTargetController(Constants.TargetController.YOU);
|
||||
filterCount.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public KothOfTheHammer (UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.abilities.effects.OneShotEffect;
|
|||
import mage.abilities.effects.common.continious.GainControlTargetEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterEquipment;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.events.GameEvent;
|
||||
import mage.game.permanent.Permanent;
|
||||
|
|
@ -52,10 +53,10 @@ import mage.target.TargetPermanent;
|
|||
*/
|
||||
public class OgreGeargrabber extends CardImpl<OgreGeargrabber> {
|
||||
|
||||
private static FilterEquipment filter = new FilterEquipment("Equipment an opponent controls");
|
||||
private static final FilterEquipment filter = new FilterEquipment("Equipment an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public OgreGeargrabber(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.cards.CardImpl;
|
|||
import mage.filter.FilterPermanent;
|
||||
import mage.filter.predicate.Predicates;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.filter.predicate.permanent.TappedPredicate;
|
||||
|
||||
/**
|
||||
|
|
@ -53,7 +54,7 @@ public class ToilToRenown extends CardImpl<ToilToRenown> {
|
|||
new CardTypePredicate(CardType.ARTIFACT),
|
||||
new CardTypePredicate(CardType.CREATURE),
|
||||
new CardTypePredicate(CardType.LAND)));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public ToilToRenown(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ import mage.cards.CardImpl;
|
|||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -54,7 +55,7 @@ public class MasterOfEtherium extends CardImpl<MasterOfEtherium> {
|
|||
static {
|
||||
filterCounted.add(new CardTypePredicate(CardType.ARTIFACT));
|
||||
filterBoosted.add(new CardTypePredicate(CardType.ARTIFACT));
|
||||
filterBoosted.setTargetController(Constants.TargetController.YOU);
|
||||
filterBoosted.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public MasterOfEtherium(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ import mage.abilities.effects.common.continious.BoostControlledEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -49,7 +50,7 @@ public class AkoumBattlesinger extends CardImpl<AkoumBattlesinger> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public AkoumBattlesinger(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.keyword.FlyingAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledPermanent;
|
||||
import mage.filter.predicate.mageobject.CardTypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.game.Game;
|
||||
import mage.game.permanent.Permanent;
|
||||
import mage.players.Player;
|
||||
|
|
@ -99,7 +100,7 @@ class ButcherOfMalakirEffect extends OneShotEffect<ButcherOfMalakirEffect> {
|
|||
public boolean apply(Game game, Ability source) {
|
||||
FilterControlledPermanent filter = new FilterControlledPermanent("creature you control");
|
||||
filter.add(new CardTypePredicate(CardType.CREATURE));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
|
||||
Set<UUID> opponents = game.getOpponents(source.getControllerId());
|
||||
for (UUID opponentId : opponents) {
|
||||
|
|
|
|||
|
|
@ -45,6 +45,7 @@ import mage.abilities.keyword.FirstStrikeAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPermanent;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
|
|
@ -58,7 +59,7 @@ public class ClawsOfValakut extends CardImpl<ClawsOfValakut> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Mountain"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public ClawsOfValakut (UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPlayer;
|
||||
|
||||
/**
|
||||
|
|
@ -52,7 +53,7 @@ public class HalimarExcavator extends CardImpl<HalimarExcavator> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public HalimarExcavator(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.effects.common.LoseLifeTargetEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPlayer;
|
||||
|
||||
/**
|
||||
|
|
@ -52,7 +53,7 @@ public class HagraDiabolist extends CardImpl<HagraDiabolist> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public HagraDiabolist(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.keyword.FirstStrikeAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -51,7 +52,7 @@ public class HighlandBerserker extends CardImpl<HighlandBerserker> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public HighlandBerserker(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.keyword.VigilanceAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -51,7 +52,7 @@ public class JoragaBard extends CardImpl<JoragaBard> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public JoragaBard(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import mage.cards.CardImpl;
|
|||
import mage.counters.CounterType;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -50,7 +51,7 @@ public class KazuulWarlord extends CardImpl<KazuulWarlord> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public KazuulWarlord(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.effects.common.SkipNextUntapTargetEffect;
|
|||
import mage.abilities.effects.common.TapTargetEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
/**
|
||||
|
|
@ -48,7 +49,7 @@ public class KorHookmaster extends CardImpl<KorHookmaster> {
|
|||
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls");
|
||||
|
||||
static {
|
||||
filter.setTargetController(TargetController.OPPONENT);
|
||||
filter.add(new ControllerPredicate(TargetController.OPPONENT));
|
||||
}
|
||||
|
||||
public KorHookmaster(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import mage.abilities.effects.common.GainLifeEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -47,7 +48,7 @@ public class LandbindRitual extends CardImpl<LandbindRitual> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Plains"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public LandbindRitual(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ import mage.abilities.effects.common.DiscardTargetEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.TargetPlayer;
|
||||
|
||||
/**
|
||||
|
|
@ -48,7 +49,7 @@ public class MindSludge extends CardImpl<MindSludge> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Swamp"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public MindSludge(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.effects.common.DamageTargetEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
/**
|
||||
|
|
@ -52,7 +53,7 @@ public class MurasaPyromancer extends CardImpl<MurasaPyromancer> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public MurasaPyromancer(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import mage.abilities.effects.common.GainLifeEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterControlledCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -50,7 +51,7 @@ public class OnduCleric extends CardImpl<OnduCleric> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public OnduCleric(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import mage.abilities.effects.common.continious.BoostTargetEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
/**
|
||||
|
|
@ -49,7 +50,7 @@ public class PrimalBellow extends CardImpl<PrimalBellow> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Forest"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ import mage.abilities.keyword.FlyingAbility;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -51,7 +52,7 @@ public class SeascapeAerialist extends CardImpl<SeascapeAerialist> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
}
|
||||
|
||||
public SeascapeAerialist(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import mage.abilities.effects.common.DamageTargetEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetCreatureOrPlayer;
|
||||
|
||||
import java.util.UUID;
|
||||
|
|
@ -49,7 +50,7 @@ public class SpireBarrage extends CardImpl<SpireBarrage> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Mountain"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
}
|
||||
|
||||
public SpireBarrage(UUID ownerId) {
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ import mage.cards.CardImpl;
|
|||
import mage.filter.common.FilterCreaturePermanent;
|
||||
import mage.filter.predicate.mageobject.AbilityPredicate;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
/**
|
||||
|
|
@ -55,7 +56,7 @@ public class TajuruArcher extends CardImpl<TajuruArcher> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Ally"));
|
||||
filter.setTargetController(Constants.TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(Constants.TargetController.YOU));
|
||||
filterTarget.add(new AbilityPredicate(FlyingAbility.class));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ import mage.abilities.effects.common.continious.BoostSourceEffect;
|
|||
import mage.cards.CardImpl;
|
||||
import mage.filter.common.FilterLandPermanent;
|
||||
import mage.filter.predicate.mageobject.SubtypePredicate;
|
||||
import mage.filter.predicate.permanent.ControllerPredicate;
|
||||
|
||||
/**
|
||||
*
|
||||
|
|
@ -50,7 +51,7 @@ public class TimbermawLarva extends CardImpl<TimbermawLarva> {
|
|||
|
||||
static {
|
||||
filter.add(new SubtypePredicate("Forest"));
|
||||
filter.setTargetController(TargetController.YOU);
|
||||
filter.add(new ControllerPredicate(TargetController.YOU));
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue