github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

move CounterPredicate to be within CounterType class

Browse source
This commit is contained in:
Evan Kranzler 2020-09-12 20:48:13 -04:00
parent b5370ecf32
commit 8876d39491
109 changed files with 162 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -77,7 +76,7 @@ class AetherbornMarauderEffect extends OneShotEffect {
if (controller != null && sourceObject != null) {
FilterControlledPermanent filter = new FilterControlledPermanent("permanent you control to remove +1/+1 counters from");
filter.add(AnotherPredicate.instance);
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
boolean firstRun = true;
while (game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) > 0) {
if (controller.chooseUse(outcome, "Move " + (firstRun ? "any" : "more") + " +1/+1 counters from other permanents you control to " + sourceObject.getLogName() + '?', source, game)) {

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

@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -26,7 +25,7 @@ public final class AinokBondKin extends CardImpl {
static {
filter.add(CardType.CREATURE.getPredicate());
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
static final String rule = "Each creature you control with a +1/+1 counter on it has first strike";

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

@ -17,7 +17,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -30,7 +29,7 @@ public final class AquastrandSpider extends CardImpl {
= new FilterCreaturePermanent("creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public AquastrandSpider(UUID ownerId, CardSetInfo setInfo) {

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

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -23,7 +22,7 @@ public final class ArmorcraftJudge extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public ArmorcraftJudge(UUID ownerId, CardSetInfo setInfo) {

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

@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
@ -33,7 +32,7 @@ public final class Aurification extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature with a gold counter on it");
static {
filter.add(new CounterPredicate(CounterType.GOLD));
filter.add(CounterType.GOLD.getPredicate());
}
static final String rule = "Each creature with a gold counter on it is a Wall in addition to its other creature types and has defender.";

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

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -27,7 +26,7 @@ public final class AvatarOfTheResolute extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
filter.add(AnotherPredicate.instance);
}

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

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
@ -25,7 +24,7 @@ public final class BanewhipPunisher extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a -1/-1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.M1M1));
filter.add(CounterType.M1M1.getPredicate());
}
public BanewhipPunisher(UUID ownerId, CardSetInfo cardSetInfo) {

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

@ -19,7 +19,6 @@ import mage.counters.CounterType;
import mage.filter.FilterObject;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.MulticoloredPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.permanent.token.KnightToken;
import mage.target.common.TargetControlledCreaturePermanent;
@ -35,7 +34,7 @@ public final class BasrisLieutenant extends CardImpl {
static {
multicoloredFilter.add(MulticoloredPredicate.instance);
controlledCreatureWithP1P1CounterFilter.add(TargetController.YOU.getControllerPredicate());
controlledCreatureWithP1P1CounterFilter.add(new CounterPredicate(CounterType.P1P1));
controlledCreatureWithP1P1CounterFilter.add(CounterType.P1P1.getPredicate());
}
public BasrisLieutenant(UUID ownerId, CardSetInfo setInfo) {

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

@ -12,7 +12,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import java.util.UUID;
@ -25,7 +24,7 @@ public final class BattlefrontKrushok extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public BattlefrontKrushok(UUID ownerId, CardSetInfo setInfo) {

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

@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -152,7 +151,7 @@ class BombSquadBeginningEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a fuse counter on it");
static {
filter.add(new CounterPredicate(CounterType.FUSE));
filter.add(CounterType.FUSE.getPredicate());
}
public BombSquadBeginningEffect() {

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

@ -17,7 +17,6 @@ import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
@ -33,7 +32,7 @@ public final class BountyHunter extends CardImpl {
static {
filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK)));
filter2.add(new CounterPredicate(CounterType.BOUNTY));
filter2.add(CounterType.BOUNTY.getPredicate());
}
public BountyHunter(UUID ownerId, CardSetInfo setInfo) {

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

@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent;
@ -28,7 +27,7 @@ public final class BramblewoodParagon extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Each creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public BramblewoodParagon(UUID ownerId, CardSetInfo setInfo) {

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

@ -16,7 +16,6 @@ import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -29,7 +28,7 @@ public final class CennsTactician extends CardImpl {
private static final FilterControlledCreaturePermanent filterCounter = new FilterControlledCreaturePermanent("Each creature you control with a +1/+1 counter on it");
static {
filterSoldier.add(SubType.SOLDIER.getPredicate());
filterCounter.add(new CounterPredicate(CounterType.P1P1));
filterCounter.add(CounterType.P1P1.getPredicate());
}
public CennsTactician(UUID ownerId, CardSetInfo setInfo) {

7
Mage.Sets/src/mage/cards/c/ChevillBaneOfMonsters.java
View file

@ -17,8 +17,6 @@ import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.TargetPermanent;
import java.util.UUID;
@ -34,16 +32,15 @@ public final class ChevillBaneOfMonsters extends CardImpl {
= new FilterCreatureOrPlaneswalkerPermanent("creature or planeswalker an opponent controls");
private static final FilterPermanent filter3
= new FilterPermanent("a permanent an opponent controls with a bounty counter on it");
private static final Predicate predicate = new CounterPredicate(CounterType.BOUNTY);
static {
filter.add(TargetController.OPPONENT.getControllerPredicate());
filter.add(predicate);
filter.add(CounterType.BOUNTY.getPredicate());
filter2.add(TargetController.OPPONENT.getControllerPredicate());
filter3.add(TargetController.OPPONENT.getControllerPredicate());
filter3.add(predicate);
filter3.add(CounterType.BOUNTY.getPredicate());
}
private static final Condition condition

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

@ -14,7 +14,6 @@ import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.players.Player;
@ -53,7 +52,7 @@ class ChroniclerOfHeroesEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public ChroniclerOfHeroesEffect() {

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

@ -10,7 +10,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -23,7 +22,7 @@ public final class CodeSlice extends CardImpl {
static {
filter.add(CardType.ARTIFACT.getPredicate());
filter.add(new CounterPredicate(CounterType.BOUNTY));
filter.add(CounterType.BOUNTY.getPredicate());
}
public CodeSlice(UUID ownerId, CardSetInfo setInfo) {

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

@ -15,7 +15,6 @@ import mage.constants.TargetController;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -25,7 +24,7 @@ public final class CrownedCeratok extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
filter.add(TargetController.YOU.getControllerPredicate());
}

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

@ -12,7 +12,6 @@ import mage.constants.TargetController;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.Target;
import mage.target.common.TargetCreaturePermanent;
@ -25,7 +24,7 @@ public final class CrumblingAshes extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a -1/-1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.M1M1));
filter.add(CounterType.M1M1.getPredicate());
}
public CrumblingAshes(UUID ownerId, CardSetInfo setInfo) {

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

@ -19,7 +19,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -30,7 +29,7 @@ public final class CytoplastManipulator extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public CytoplastManipulator(UUID ownerId, CardSetInfo setInfo) {

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

@ -19,7 +19,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetControlledCreaturePermanent;
@ -33,7 +32,7 @@ public final class CytoplastRootKin extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control that has a +1/+1 counter on it");
static {
filter.add(AnotherPredicate.instance);
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public CytoplastRootKin(UUID ownerId, CardSetInfo setInfo) {

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

@ -17,7 +17,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -28,7 +27,7 @@ public final class CytospawnShambler extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public CytospawnShambler(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/d/DustOfMoments.java
View file

@ -20,7 +20,6 @@ import mage.filter.Filter;
import mage.filter.FilterCard;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CardCounterPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -67,7 +66,7 @@ public final class DustOfMoments extends CardImpl {
super(Outcome.Benefit);
this.counter = new Counter(CounterType.TIME.getName(), 2);
this.permFilter = new FilterPermanent("permanent and each suspended card");
permFilter.add(new CounterPredicate(CounterType.TIME));
permFilter.add(CounterType.TIME.getPredicate());
this.exiledFilter = new FilterCard("permanent and each suspended card");
exiledFilter.add(new CardCounterPredicate(CounterType.TIME));

3
Mage.Sets/src/mage/cards/e/EliteScaleguard.java
View file

@ -16,7 +16,6 @@ import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.target.common.TargetCreaturePermanent;
import mage.target.targetadjustment.TargetAdjuster;
@ -30,7 +29,7 @@ public final class EliteScaleguard extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public EliteScaleguard(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/e/EtrataTheSilencer.java
View file

@ -19,7 +19,6 @@ import mage.counters.CounterType;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.DamagedPlayerEvent;
import mage.game.events.GameEvent;
@ -111,7 +110,7 @@ class EtrataTheSilencerEffect extends OneShotEffect {
private static final FilterCard filter = new FilterCard();
static {
filter.add(new CounterPredicate(CounterType.HIT));
filter.add(CounterType.HIT.getPredicate());
}
public EtrataTheSilencerEffect() {

3
Mage.Sets/src/mage/cards/e/ExavaRakdosBloodWitch.java
View file

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

3
Mage.Sets/src/mage/cards/e/ExperimentKraj.java
View file

@ -16,7 +16,6 @@ import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
@ -59,7 +58,7 @@ class ExperimentKrajEffect extends ContinuousEffectImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
filter.add(AnotherPredicate.instance);
}

3
Mage.Sets/src/mage/cards/e/EyeOfDoom.java
View file

@ -15,7 +15,6 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -35,7 +34,7 @@ public final class EyeOfDoom extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("permanent with a doom counter on it");
static {
filter.add(new CounterPredicate(CounterType.DOOM));
filter.add(CounterType.DOOM.getPredicate());
}
public EyeOfDoom(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/f/FoundryHornet.java
View file

@ -18,7 +18,6 @@ import mage.constants.TargetController;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -30,7 +29,7 @@ public final class FoundryHornet extends CardImpl {
private static final FilterCreaturePermanent filterOpponent = new FilterCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
filterOpponent.add(TargetController.OPPONENT.getControllerPredicate());
}

3
Mage.Sets/src/mage/cards/f/FulfillContract.java
View file

@ -13,7 +13,6 @@ import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -30,7 +29,7 @@ public final class FulfillContract extends CardImpl {
private static final FilterControlledCreaturePermanent filterRogueOrHunter = new FilterControlledCreaturePermanent("Rogue or Hunter you control");
static {
filterBountyCreature.add(new CounterPredicate(CounterType.BOUNTY));
filterBountyCreature.add(CounterType.BOUNTY.getPredicate());
filterRogueOrHunter.add(Predicates.or(SubType.ROGUE.getPredicate(), SubType.HUNTER.getPredicate()));
}

3
Mage.Sets/src/mage/cards/g/GnarlidColony.java
View file

@ -17,7 +17,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import java.util.UUID;
@ -29,7 +28,7 @@ public final class GnarlidColony extends CardImpl {
private static final FilterPermanent filter = new FilterControlledCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public GnarlidColony(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/g/GrakmawSkyclaveRavager.java
View file

@ -17,7 +17,6 @@ import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.GrakmawSkyclaveRavagerToken;
@ -34,7 +33,7 @@ public final class GrakmawSkyclaveRavager extends CardImpl {
static {
filter.add(AnotherPredicate.instance);
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public GrakmawSkyclaveRavager(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/g/GrindDust.java
View file

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.SpellAbilityType;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -37,7 +36,7 @@ public final class GrindDust extends SplitCard {
// Exile any number of target creatures that have -1/-1 counters on them.
getRightHalfCard().getSpellAbility().addEffect(new ExileTargetEffect());
FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures that have -1/-1 counters on them");
filter.add(new CounterPredicate(CounterType.M1M1));
filter.add(CounterType.M1M1.getPredicate());
getRightHalfCard().getSpellAbility().addTarget(new TargetCreaturePermanent(0, Integer.MAX_VALUE, filter, false));
}

3
Mage.Sets/src/mage/cards/h/HagraConstrictor.java
View file

@ -14,7 +14,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import java.util.UUID;
@ -26,7 +25,7 @@ public final class HagraConstrictor extends CardImpl {
private static final FilterPermanent filter = new FilterControlledCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public HagraConstrictor(UUID ownerId, CardSetInfo setInfo) {

5
Mage.Sets/src/mage/cards/h/HaphazardBombardment.java
View file

@ -19,7 +19,6 @@ import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -41,7 +40,7 @@ public final class HaphazardBombardment extends CardImpl {
// At the beginning of your end step, if two or more permanents you don't control have an aim counter on them, destroy one of those permanents at random.
FilterPermanent filter = new FilterPermanent("if two or more permanents you don't control have an aim counter on them");
filter.add(TargetController.NOT_YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.AIM));
filter.add(CounterType.AIM.getPredicate());
this.addAbility(new ConditionalInterveningIfTriggeredAbility(new BeginningOfYourEndStepTriggeredAbility(new HaphazardBombardmentEndOfTurnEffect(), false),
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1, false),
"At the beginning of your end step, if two or more permanents you don't control have an aim counter on them, destroy one of those permanents at random"));
@ -126,7 +125,7 @@ class HaphazardBombardmentEndOfTurnEffect extends OneShotEffect {
// that don't have indestructible.
FilterPermanent filter = new FilterPermanent("if two or more permanents you don't control have an aim counter on them");
filter.add(TargetController.NOT_YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.AIM));
filter.add(CounterType.AIM.getPredicate());
filter.add(Predicates.not(new AbilityPredicate(IndestructibleAbility.class)));
List<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
if (!permanents.isEmpty()) {

10
Mage.Sets/src/mage/cards/h/HazardousConditions.java
View file

@ -1,7 +1,6 @@
package mage.cards.h;
import java.util.UUID;
import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -9,10 +8,11 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.filter.predicate.permanent.CounterAnyPredicate;
import java.util.UUID;
/**
*
* @author spjspj
*/
public final class HazardousConditions extends CardImpl {
@ -20,11 +20,11 @@ public final class HazardousConditions extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with no counter");
static {
filter.add(Predicates.not(new CounterPredicate(null)));
filter.add(Predicates.not(CounterAnyPredicate.instance));
}
public HazardousConditions(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{G}");
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{B}{G}");
// Creatures with no counters on them get -2/-2 until end of turn
this.getSpellAbility().addEffect(new BoostAllEffect(-2, -2, Duration.EndOfTurn, filter, false));

3
Mage.Sets/src/mage/cards/h/HeliumSquirter.java
View file

@ -17,7 +17,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -28,7 +27,7 @@ public final class HeliumSquirter extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public HeliumSquirter(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/h/HeraldOfSecretStreams.java
View file

@ -13,7 +13,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -24,7 +23,7 @@ public final class HeraldOfSecretStreams extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control with +1/+1 counters on them");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public HeraldOfSecretStreams(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/h/HighSentinelsOfArashin.java
View file

@ -21,7 +21,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -33,7 +32,7 @@ public final class HighSentinelsOfArashin extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control with a +1/+1 counter on it");
static {
filter.add(AnotherPredicate.instance);
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public HighSentinelsOfArashin(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/h/Hindervines.java
View file

@ -10,7 +10,6 @@ import mage.constants.Duration;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -21,7 +20,7 @@ public final class Hindervines extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with no +1/+1 counters on them");
static {
filter.add(Predicates.not(new CounterPredicate(CounterType.P1P1)));
filter.add(Predicates.not(CounterType.P1P1).getPredicate());
}
public Hindervines(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/h/HotPursuit.java
View file

@ -14,7 +14,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetOpponentsCreaturePermanent;
/**
@ -26,7 +25,7 @@ public final class HotPursuit extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature with a bounty counter on it");
static {
filter.add(new CounterPredicate(CounterType.BOUNTY));
filter.add(CounterType.BOUNTY.getPredicate());
}
public HotPursuit(UUID ownerId, CardSetInfo setInfo) {

14
Mage.Sets/src/mage/cards/h/HungryHungryHeifer.java
View file

@ -1,7 +1,6 @@
package mage.cards.h;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
@ -9,20 +8,17 @@ import mage.abilities.costs.common.RemoveCounterCost;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.constants.*;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.filter.predicate.permanent.CounterAnyPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetControlledPermanent;
import java.util.UUID;
/**
*
* @author spjspj
*/
public final class HungryHungryHeifer extends CardImpl {
@ -53,7 +49,7 @@ class HungryHungryHeiferEffect extends OneShotEffect {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("a permanent you control with a counter on it");
static {
filter.add(new CounterPredicate(null));
filter.add(CounterAnyPredicate.instance);
}
public HungryHungryHeiferEffect() {

3
Mage.Sets/src/mage/cards/h/HuntToExtinction.java
View file

@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetOpponentsCreaturePermanent;
/**
@ -23,7 +22,7 @@ public final class HuntToExtinction extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a bounty counter on it");
static {
filter.add(new CounterPredicate(CounterType.BOUNTY));
filter.add(CounterType.BOUNTY.getPredicate());
}
public HuntToExtinction(UUID ownerId, CardSetInfo setInfo) {

10
Mage.Sets/src/mage/cards/h/Hydradoodle.java
View file

@ -1,7 +1,6 @@
package mage.cards.h;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.SpellAbility;
@ -17,13 +16,14 @@ import mage.constants.Outcome;
import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.filter.predicate.permanent.CounterAnyPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.UUID;
/**
*
* @author spjspj
*/
public final class Hydradoodle extends CardImpl {
@ -63,7 +63,7 @@ class HydradoodleEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent("permanent with a counter");
static {
filter.add(new CounterPredicate(null));
filter.add(CounterAnyPredicate.instance);
}
HydradoodleEffect() {
@ -71,7 +71,7 @@ class HydradoodleEffect extends OneShotEffect {
this.staticText = "roll X six-sided dice. {this} enters the battlefield with a number of +1/+1 counters on it equal to the total of those results";
}
HydradoodleEffect(final HydradoodleEffect effect) {
private HydradoodleEffect(final HydradoodleEffect effect) {
super(effect);
}

3
Mage.Sets/src/mage/cards/i/InspiringCall.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -24,7 +23,7 @@ public final class InspiringCall extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public InspiringCall(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/i/IvorytuskFortress.java
View file

@ -12,7 +12,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -23,7 +22,7 @@ public final class IvorytuskFortress extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public IvorytuskFortress(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/j/JabbaTheHutt.java
View file

@ -22,7 +22,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterOpponentsCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.token.HunterToken;
@ -39,7 +38,7 @@ public final class JabbaTheHutt extends CardImpl {
private static final FilterOpponentsCreaturePermanent filter = new FilterOpponentsCreaturePermanent("creature an opponent control with a bounty counter on it");
static {
filter.add(new CounterPredicate(CounterType.BOUNTY));
filter.add(CounterType.BOUNTY.getPredicate());
}
public JabbaTheHutt(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/j/JangoFett.java
View file

@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -138,7 +137,7 @@ class JangoFettEffect extends OneShotEffect {
int count = 0;
if (defenderId != null) {
FilterCreaturePermanent bountyFilter = new FilterCreaturePermanent("creatures defending player controls with a bounty counter");
bountyFilter.add(new CounterPredicate(CounterType.BOUNTY));
bountyFilter.add(CounterType.BOUNTY.getPredicate());
count = game.getBattlefield().countAll(bountyFilter, defenderId, game);
}

3
Mage.Sets/src/mage/cards/j/JiangYangguWildcrafter.java
View file

@ -16,7 +16,6 @@ import mage.constants.SuperType;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
@ -30,7 +29,7 @@ public final class JiangYangguWildcrafter extends CardImpl {
= new FilterControlledCreaturePermanent("Each creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public JiangYangguWildcrafter(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/k/KalonianHydra.java
View file

@ -18,7 +18,6 @@ import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -60,7 +59,7 @@ class KalonianHydraEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public KalonianHydraEffect() {

3
Mage.Sets/src/mage/cards/k/KindredBoon.java
View file

@ -21,7 +21,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.ChosenSubtypePredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.TargetPermanent;
/**
*
@ -31,7 +30,7 @@ public final class KindredBoon extends CardImpl {
private static final FilterControlledCreaturePermanent filterDivinity = new FilterControlledCreaturePermanent("Each creature you control with a divinity counter on it");
static {
filterDivinity.add(new CounterPredicate(CounterType.DIVINITY));
filterDivinity.add(CounterType.DIVINITY.getPredicate());
}
public KindredBoon(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/l/LifecraftersGift.java
View file

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -48,7 +47,7 @@ class LifecraftersGiftEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public LifecraftersGiftEffect() {

3
Mage.Sets/src/mage/cards/l/LilianaDeathWielder.java
View file

@ -18,7 +18,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.StaticFilters;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCreaturePermanent;
@ -32,7 +31,7 @@ public final class LilianaDeathWielder extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a -1/-1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.M1M1));
filter.add(CounterType.M1M1.getPredicate());
}
public LilianaDeathWielder(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/l/LockjawSnapper.java
View file

@ -14,7 +14,6 @@ import mage.constants.SubType;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -68,7 +67,7 @@ class LockjawSnapperEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
boolean applied = false;
FilterCreaturePermanent filter = new FilterCreaturePermanent();
filter.add(new CounterPredicate(CounterType.M1M1));
filter.add(CounterType.M1M1.getPredicate());
if (game.getBattlefield().getActivePermanents(filter, source.getControllerId(), game).isEmpty()) {
return true;
}

3
Mage.Sets/src/mage/cards/l/LongshotSquad.java
View file

@ -17,7 +17,6 @@ import mage.constants.TargetController;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -30,7 +29,7 @@ public final class LongshotSquad extends CardImpl {
static {
filter.add(CardType.CREATURE.getPredicate());
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public LongshotSquad(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/m/MerEkNightblade.java
View file

@ -17,7 +17,6 @@ import mage.constants.TargetController;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -29,7 +28,7 @@ public final class MerEkNightblade extends CardImpl {
static {
filter.add(CardType.CREATURE.getPredicate());
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public MerEkNightblade(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/m/MineLayer.java
View file

@ -18,7 +18,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetLandPermanent;
@ -33,7 +32,7 @@ public final class MineLayer extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("land with a mine counter on it");
static {
filter.add(new CounterPredicate(CounterType.MINE));
filter.add(CounterType.MINE.getPredicate());
}
public MineLayer(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/m/MutantsPrey.java
View file

@ -10,7 +10,6 @@ import mage.constants.CardType;
import mage.constants.TargetController;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -25,7 +24,7 @@ public final class MutantsPrey extends CardImpl {
private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature an opponent controls");
static {
filter1.add(TargetController.YOU.getControllerPredicate());
filter1.add(new CounterPredicate(CounterType.P1P1));
filter1.add(CounterType.P1P1.getPredicate());
filter2.add(TargetController.OPPONENT.getControllerPredicate());
}

3
Mage.Sets/src/mage/cards/n/NerfHerder.java
View file

@ -16,7 +16,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -27,7 +26,7 @@ public final class NerfHerder extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public NerfHerder(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/n/NissasJudgment.java
View file

@ -13,7 +13,6 @@ import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -63,7 +62,7 @@ class NissasJudgmentEffect extends OneShotEffect {
static {
filter.add(TargetController.OPPONENT.getControllerPredicate());
filterWithCounter.add(new CounterPredicate(CounterType.P1P1));
filterWithCounter.add(CounterType.P1P1.getPredicate());
}
public NissasJudgmentEffect() {

3
Mage.Sets/src/mage/cards/n/NovijenSages.java
View file

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.TargetPermanent;
/**
@ -28,7 +27,7 @@ public final class NovijenSages extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public NovijenSages(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/o/ObsidianFireheart.java
View file

@ -23,7 +23,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetLandPermanent;
@ -40,7 +39,7 @@ public final class ObsidianFireheart extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("land without a blaze counter on it");
static {
filter.add(Predicates.not(new CounterPredicate(CounterType.BLAZE)));
filter.add(Predicates.not(CounterType.BLAZE).getPredicate());
}
public ObsidianFireheart(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/o/OranRiefOoze.java
View file

@ -13,7 +13,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterAttackingCreature;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
@ -27,7 +26,7 @@ public final class OranRiefOoze extends CardImpl {
= new FilterAttackingCreature("attacking creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public OranRiefOoze(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/o/OuterRimGang.java
View file

@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -22,7 +21,7 @@ public final class OuterRimGang extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each creature with a bounty counter on it");
static {
filter.add(new CounterPredicate(CounterType.BOUNTY));
filter.add(CounterType.BOUNTY.getPredicate());
}
public OuterRimGang(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/p/PatronOfTheValiant.java
View file

@ -15,7 +15,6 @@ import mage.constants.SubType;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -54,7 +53,7 @@ class PatronOfTheValiantEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public PatronOfTheValiantEffect() {

3
Mage.Sets/src/mage/cards/p/PlaxcasterFrogling.java
View file

@ -17,7 +17,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -28,7 +27,7 @@ public final class PlaxcasterFrogling extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public PlaxcasterFrogling(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/p/Pridemalkin.java
View file

@ -15,7 +15,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetControlledCreaturePermanent;
import java.util.UUID;
@ -29,7 +28,7 @@ public final class Pridemalkin extends CardImpl {
= new FilterControlledCreaturePermanent("each creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public Pridemalkin(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/r/RageForger.java
View file

@ -18,7 +18,6 @@ import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -37,7 +36,7 @@ public final class RageForger extends CardImpl {
filter.add(SubType.SHAMAN.getPredicate());
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(AnotherPredicate.instance);
filterAttack.add(new CounterPredicate(CounterType.P1P1));
filterAttack.add(CounterType.P1P1.getPredicate());
}
public RageForger(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/r/RenegadeKrasis.java
View file

@ -14,7 +14,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -53,7 +52,7 @@ class RenegadeKrasisTriggeredAbility extends TriggeredAbilityImpl {
static {
filter.add(AnotherPredicate.instance);
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public RenegadeKrasisTriggeredAbility() {

3
Mage.Sets/src/mage/cards/r/RetributionOfTheAncients.java
View file

@ -17,7 +17,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -29,7 +28,7 @@ public final class RetributionOfTheAncients extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creatures you control");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public RetributionOfTheAncients(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/r/RiftElemental.java
View file

@ -20,7 +20,6 @@ import mage.constants.TargetController;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterPermanentOrSuspendedCard;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -61,7 +60,7 @@ class RiftElementalCost extends CostImpl {
private static final FilterPermanentOrSuspendedCard filter = new FilterPermanentOrSuspendedCard("permanent you control with a time counter or suspended card you own");
static {
filter.getPermanentFilter().add(TargetController.YOU.getControllerPredicate());
filter.getPermanentFilter().add(new CounterPredicate(CounterType.TIME));
filter.getPermanentFilter().add(CounterType.TIME.getPredicate());
filter.getCardFilter().add(TargetController.YOU.getOwnerPredicate());
}

3
Mage.Sets/src/mage/cards/r/RimefeatherOwl.java
View file

@ -25,7 +25,6 @@ import mage.constants.SubLayer;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.TargetPermanent;
@ -40,7 +39,7 @@ public final class RimefeatherOwl extends CardImpl {
private static final FilterPermanent filter2 = new FilterPermanent("snow permanents on the battlefield");
static {
filter.add(new CounterPredicate(CounterType.ICE));
filter.add(CounterType.ICE.getPredicate());
filter2.add(SuperType.SNOW.getPredicate());
}

3
Mage.Sets/src/mage/cards/r/RimescaleDragon.java
View file

@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
@ -30,7 +29,7 @@ public final class RimescaleDragon extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with ice counters");
static {
filter.add(new CounterPredicate(CounterType.ICE));
filter.add(CounterType.ICE.getPredicate());
}
public RimescaleDragon(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SapphireDrake.java
View file

@ -11,7 +11,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -24,7 +23,7 @@ public final class SapphireDrake extends CardImpl {
static {
filter.add(CardType.CREATURE.getPredicate());
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
static final String rule = "Each creature you control with a +1/+1 counter on it has flying";

3
Mage.Sets/src/mage/cards/s/ScaleBlessing.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -50,7 +49,7 @@ class ScaleBlessingEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public ScaleBlessingEffect() {

3
Mage.Sets/src/mage/cards/s/SimicBasilisk.java
View file

@ -21,7 +21,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -32,7 +31,7 @@ public final class SimicBasilisk extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public SimicBasilisk(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SkatewingSpy.java
View file

@ -14,7 +14,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import java.util.UUID;
@ -26,7 +25,7 @@ public final class SkatewingSpy extends CardImpl {
private static final FilterPermanent filter = new FilterControlledCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public SkatewingSpy(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SkyclaveShadowcat.java
View file

@ -16,7 +16,6 @@ import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetControlledPermanent;
import java.util.UUID;
@ -30,7 +29,7 @@ public final class SkyclaveShadowcat extends CardImpl {
= new FilterControlledCreaturePermanent("a creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public SkyclaveShadowcat(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SnowMercy.java
View file

@ -17,7 +17,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
@ -33,7 +32,7 @@ public final class SnowMercy extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with globe counters on them");
static {
filter.add(new CounterPredicate(CounterType.GLOBE));
filter.add(CounterType.GLOBE.getPredicate());
}
public SnowMercy(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SoulbladeCorrupter.java
View file

@ -15,7 +15,6 @@ import mage.constants.SetTargetPointer;
import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
@ -61,7 +60,7 @@ class SoulbladeCorrupterTriggeredAbility extends AttacksAllTriggeredAbility {
private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creature with a +1/+1 counter on it");
static {
filter2.add(new CounterPredicate(CounterType.P1P1));
filter2.add(CounterType.P1P1.getPredicate());
}
SoulbladeCorrupterTriggeredAbility() {

3
Mage.Sets/src/mage/cards/s/SpikeCannibal.java
View file

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -54,7 +53,7 @@ class SpikeCannibalEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures with +1/+1 counter");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
SpikeCannibalEffect() {

3
Mage.Sets/src/mage/cards/s/SporebackTroll.java
View file

@ -15,7 +15,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -26,7 +25,7 @@ public final class SporebackTroll extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public SporebackTroll(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SteppeGlider.java
View file

@ -18,7 +18,6 @@ import mage.constants.Duration;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -30,7 +29,7 @@ public final class SteppeGlider extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public SteppeGlider(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SunbringersTouch.java
View file

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.counters.CounterType;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -23,7 +22,7 @@ public final class SunbringersTouch extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Each creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public SunbringersTouch(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/s/SwarmShambler.java
View file

@ -18,7 +18,6 @@ import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.permanent.Permanent;
@ -72,7 +71,7 @@ class SwarmShamblerTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterPermanent filter = new FilterControlledCreaturePermanent();
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
SwarmShamblerTriggeredAbility() {

5
Mage.Sets/src/mage/cards/t/TayamLuminousEnigma.java
View file

@ -21,7 +21,7 @@ import mage.filter.FilterCard;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterPermanentCard;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.filter.predicate.permanent.CounterAnyPredicate;
import mage.game.Game;
import mage.game.events.EntersTheBattlefieldEvent;
import mage.game.events.GameEvent;
@ -38,7 +38,6 @@ import java.util.UUID;
import static com.google.common.collect.Iterables.getOnlyElement;
/**
*
* @author htrajan
*/
public final class TayamLuminousEnigma extends CardImpl {
@ -80,7 +79,7 @@ class TayamLuminousEnigmaCost extends RemoveCounterCost {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a creature with a counter among creatures you control");
static {
filter.add(new CounterPredicate(null));
filter.add(CounterAnyPredicate.instance);
}
public TayamLuminousEnigmaCost() {

3
Mage.Sets/src/mage/cards/t/TemperedVeteran.java
View file

@ -13,7 +13,6 @@ import mage.constants.SubType;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.TargetPermanent;
import mage.target.common.TargetCreaturePermanent;
@ -28,7 +27,7 @@ public final class TemperedVeteran extends CardImpl {
= new FilterCreaturePermanent("creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public TemperedVeteran(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/TemporalDistortion.java
View file

@ -20,7 +20,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -35,7 +34,7 @@ public final class TemporalDistortion extends CardImpl {
static {
filter.add(Predicates.or(CardType.LAND.getPredicate(), CardType.CREATURE.getPredicate()));
filter2.add(new CounterPredicate(CounterType.HOURGLASS));
filter2.add(CounterType.HOURGLASS.getPredicate());
}
public TemporalDistortion(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/TenaciousHunter.java
View file

@ -18,7 +18,6 @@ import mage.constants.ComparisonType;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -29,7 +28,7 @@ public final class TenaciousHunter extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature has a -1/-1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.M1M1));
filter.add(CounterType.M1M1.getPredicate());
}
public TenaciousHunter(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/TetzimocPrimalDeath.java
View file

@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
@ -30,7 +29,7 @@ public final class TetzimocPrimalDeath extends CardImpl {
static {
filter.add(TargetController.OPPONENT.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.PREY));
filter.add(CounterType.PREY.getPredicate());
}
public TetzimocPrimalDeath(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/ThatWhichWasTaken.java
View file

@ -20,7 +20,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.TargetPermanent;
@ -36,7 +35,7 @@ public final class ThatWhichWasTaken extends CardImpl {
static {
filter.add(AnotherPredicate.instance);
filterIndestructible.add(new CounterPredicate(CounterType.DIVINITY));
filterIndestructible.add(CounterType.DIVINITY.getPredicate());
}
public ThatWhichWasTaken(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/TheCrowdGoesWild.java
View file

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.Duration;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.target.common.TargetCreaturePermanent;
import mage.target.targetadjustment.TargetAdjuster;
@ -27,7 +26,7 @@ public final class TheCrowdGoesWild extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each creature with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public TheCrowdGoesWild(UUID ownerId, CardSetInfo setInfo) {

17
Mage.Sets/src/mage/cards/t/ThiefOfBlood.java
View file

@ -1,7 +1,5 @@
package mage.cards.t;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldAbility;
@ -10,24 +8,25 @@ import mage.abilities.keyword.FlyingAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.Outcome;
import mage.constants.SubType;
import mage.counters.Counter;
import mage.counters.CounterType;
import mage.counters.Counters;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.filter.predicate.permanent.CounterAnyPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import java.util.UUID;
/**
*
* @author emerald000
*/
public final class ThiefOfBlood extends CardImpl {
public ThiefOfBlood(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{B}");
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.subtype.add(SubType.VAMPIRE);
@ -39,7 +38,7 @@ public final class ThiefOfBlood extends CardImpl {
this.addAbility(new EntersBattlefieldAbility(new ThiefOfBloodEffect(), null, "As {this} enters the battlefield, remove all counters from all permanents. {this} enters the battlefield with a +1/+1 counter on it for each counter removed this way", null));
}
public ThiefOfBlood(final ThiefOfBlood card) {
private ThiefOfBlood(final ThiefOfBlood card) {
super(card);
}
@ -54,7 +53,7 @@ class ThiefOfBloodEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent("permanent with a counter");
static {
filter.add(new CounterPredicate(null));
filter.add(CounterAnyPredicate.instance);
}
ThiefOfBloodEffect() {
@ -62,7 +61,7 @@ class ThiefOfBloodEffect extends OneShotEffect {
this.staticText = "remove all counters from all permanents. {this} enters the battlefield with a +1/+1 counter on it for each counter removed this way";
}
ThiefOfBloodEffect(final ThiefOfBloodEffect effect) {
private ThiefOfBloodEffect(final ThiefOfBloodEffect effect) {
super(effect);
}

3
Mage.Sets/src/mage/cards/t/TimeOfHeroes.java
View file

@ -10,7 +10,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
/**
*
@ -22,7 +21,7 @@ public final class TimeOfHeroes extends CardImpl {
static {
filter.add(TargetController.YOU.getControllerPredicate());
filter.add(new CounterPredicate(CounterType.LEVEL));
filter.add(CounterType.LEVEL.getPredicate());
}
public TimeOfHeroes(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/Timecrafting.java
View file

@ -12,7 +12,6 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.counters.CounterType;
import mage.filter.common.FilterPermanentOrSuspendedCard;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -26,7 +25,7 @@ public final class Timecrafting extends CardImpl {
private static final FilterPermanentOrSuspendedCard filter = new FilterPermanentOrSuspendedCard("permanent with a time counter on it or suspended card");
static {
filter.getPermanentFilter().add(new CounterPredicate(CounterType.TIME));
filter.getPermanentFilter().add(CounterType.TIME.getPredicate());
}
public Timecrafting(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/TitanicBrawl.java
View file

@ -13,7 +13,6 @@ import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent;
@ -28,7 +27,7 @@ public final class TitanicBrawl extends CardImpl {
= new FilterControlledCreaturePermanent("a creature you control with a +1/+1 counter on it");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
private static final Condition condition = new SourceTargetsPermanentCondition(filter);

3
Mage.Sets/src/mage/cards/t/TogetherForever.java
View file

@ -17,7 +17,6 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
@ -34,7 +33,7 @@ public final class TogetherForever extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("");
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(CounterType.P1P1.getPredicate());
}
public TogetherForever(UUID ownerId, CardSetInfo setInfo) {

3
Mage.Sets/src/mage/cards/t/TrapDigger.java
View file

@ -21,7 +21,6 @@ import mage.filter.common.FilterAttackingCreature;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.target.common.TargetAttackingCreature;
import mage.target.common.TargetControlledPermanent;
@ -35,7 +34,7 @@ public final class TrapDigger extends CardImpl {
private static final FilterAttackingCreature filter2 = new FilterAttackingCreature("attacking creature without flying");
static {
filter1.add(new CounterPredicate(CounterType.TRAP));
filter1.add(CounterType.TRAP.getPredicate());
filter2.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
}

3
Mage.Sets/src/mage/cards/t/TriadOfFates.java
View file

@ -16,7 +16,6 @@ import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.CounterPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -35,7 +34,7 @@ public final class TriadOfFates extends CardImpl {
static {
filter.add(AnotherPredicate.instance);
filterCounter.add(new CounterPredicate(CounterType.FATE));
filterCounter.add(CounterType.FATE.getPredicate());
}
public TriadOfFates(UUID ownerId, CardSetInfo setInfo) {

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