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

refactored SupertypePredicate to be part of SuperType

Browse source
This commit is contained in:
Evan Kranzler 2020-01-06 19:21:27 -05:00
parent d919818daa
commit ecf26585b5
190 changed files with 341 additions and 529 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetOpponentsCreaturePermanent;
import java.util.UUID;
@ -28,7 +27,7 @@ public final class AbominableTreefolk extends CardImpl {
private static final FilterPermanent filter = new FilterControlledPermanent("snow permanents you control");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter);

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

@ -17,7 +17,6 @@ import mage.filter.FilterCard;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import java.util.UUID;
@ -38,7 +37,7 @@ public final class AcclaimedContender extends CardImpl {
SubType.AURA.getPredicate(),
SubType.EQUIPMENT.getPredicate(),
Predicates.and(
new SupertypePredicate(SuperType.LEGENDARY),
SuperType.LEGENDARY.getPredicate(),
CardType.ARTIFACT.getPredicate()
)
));

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

@ -14,7 +14,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -26,7 +25,7 @@ public final class AdventurersGuildhouse extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.GREEN));
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public AdventurersGuildhouse(UUID ownerId, CardSetInfo setInfo) {

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

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

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

@ -17,7 +17,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game;
import mage.target.TargetPlayer;
@ -63,7 +62,7 @@ class AnathemancerCount implements DynamicValue {
}
FilterLandPermanent filter = new FilterLandPermanent();
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
filter.add(new ControllerIdPredicate(sourceAbility.getFirstTarget()));
return game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game);

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

@ -13,7 +13,6 @@ import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.PowerPredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import java.util.UUID;
@ -60,7 +59,7 @@ enum ArcticFoxesCondition implements Condition {
private static final FilterPermanent filter = new FilterLandPermanent();
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
@Override

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

@ -15,7 +15,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -25,7 +24,7 @@ public final class ArenaOfTheAncients extends CardImpl {
private static final FilterCreaturePermanent legendaryFilter = new FilterCreaturePermanent("legendary creatures");
static {
legendaryFilter.add(new SupertypePredicate(SuperType.LEGENDARY));
legendaryFilter.add(SuperType.LEGENDARY.getPredicate());
}
public ArenaOfTheAncients(UUID ownerId, CardSetInfo setInfo) {

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

@ -15,7 +15,6 @@ import mage.constants.SuperType;
import mage.constants.SubType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
@ -27,7 +26,7 @@ public final class ArvadTheCursed extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creatures");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public ArvadTheCursed(UUID ownerId, CardSetInfo setInfo) {

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

@ -9,7 +9,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.target.TargetPermanent;
import mage.target.targetadjustment.TargetAdjuster;
@ -44,7 +43,7 @@ enum AvalancheAdjuster implements TargetAdjuster {
private static final FilterPermanent filter = new FilterLandPermanent("snow lands");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
@Override

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

@ -10,7 +10,6 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -20,7 +19,7 @@ public final class AyumiTheLastVisitor extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("Legendary land");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public AyumiTheLastVisitor(UUID ownerId, CardSetInfo setInfo) {

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

@ -10,7 +10,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.permanent.token.custom.CreatureToken;
import mage.target.TargetPermanent;
@ -25,7 +24,7 @@ public final class BalduvianConjurer extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("snow land");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public BalduvianConjurer(UUID ownerId, CardSetInfo setInfo) {

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

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.permanent.token.TokenImpl;
import mage.target.TargetPermanent;
@ -26,7 +25,7 @@ public final class BalduvianFrostwaker extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("snow land");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public BalduvianFrostwaker(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -26,7 +25,7 @@ public final class BantPanorama extends CardImpl {
static {
filter.add(CardType.LAND.getPredicate());
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
filter.add(Predicates.or(
SubType.FOREST.getPredicate(),
SubType.PLAINS.getPredicate(),

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

@ -16,7 +16,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -26,7 +25,7 @@ public final class BenalishHonorGuard extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("legendary creature you control");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public BenalishHonorGuard(UUID ownerId, CardSetInfo setInfo) {

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

@ -17,7 +17,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import java.util.UUID;
@ -32,7 +31,7 @@ public final class BlackbladeReforged extends CardImpl {
= new FilterControlledCreaturePermanent("legendary creature");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public BlackbladeReforged(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -25,7 +24,7 @@ public final class BlindWithAnger extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public BlindWithAnger(UUID ownerId, CardSetInfo setInfo) {

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

@ -20,7 +20,6 @@ import mage.constants.Zone;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.AbilityPredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -32,7 +31,7 @@ public final class Blizzard extends CardImpl {
private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("creatures with flying");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
filter2.add(new AbilityPredicate(FlyingAbility.class));
}

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

@ -16,7 +16,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -37,7 +36,7 @@ public final class BlizzardStrix extends CardImpl {
static {
filter.add(AnotherPredicate.instance);
filter2.add(AnotherPredicate.instance);
filter2.add(new SupertypePredicate(SuperType.SNOW));
filter2.add(SuperType.SNOW.getPredicate());
}
private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter2);

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

@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -46,7 +45,7 @@ class BloodMoonEffect extends ContinuousEffectImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
}
BloodMoonEffect() {

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

@ -16,7 +16,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetPermanent;
/**
@ -28,7 +27,7 @@ public final class BountyAgent extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("legendary permanent that's an artifact, creature, or enchantment");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
filter.add(Predicates.or(
CardType.ARTIFACT.getPredicate(),
CardType.CREATURE.getPredicate(),

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

@ -11,7 +11,6 @@ import mage.constants.SetTargetPointer;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -22,7 +21,7 @@ public final class BurningEarth extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("a player taps a nonbasic land");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
}
public BurningEarth(UUID ownerId, CardSetInfo setInfo) {

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

@ -16,7 +16,6 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
* @author JRHerlehy
@ -27,7 +26,7 @@ public final class CabalStronghold extends CardImpl {
private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("basic Swamp you control");
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
filter.add(SubType.SWAMP.getPredicate());
}

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

@ -17,7 +17,6 @@ import mage.constants.SubType;
import mage.constants.ComparisonType;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
* @author fireshoes
@ -27,7 +26,7 @@ public final class CanopyVista extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public CanopyVista(UUID ownerId, CardSetInfo setInfo) {

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

@ -13,7 +13,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -25,7 +24,7 @@ public final class CaptainSisay extends CardImpl {
private static final FilterCard filter = new FilterCard("legendary card");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public CaptainSisay(UUID ownerId, CardSetInfo setInfo) {

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

@ -7,7 +7,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
@ -16,7 +15,7 @@ public final class CastDown extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public CastDown(UUID ownerId, CardSetInfo cardSetInfo){

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

@ -14,7 +14,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ColorPredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -26,7 +25,7 @@ public final class CathedralOfSerra extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public CathedralOfSerra(UUID ownerId, CardSetInfo setInfo) {

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

@ -9,7 +9,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -21,7 +20,7 @@ public final class ChillToTheBone extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonsnow creature");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.SNOW)));
filter.add(Predicates.not(SuperType.SNOW.getPredicate()));
}
public ChillToTheBone(UUID ownerId, CardSetInfo setInfo) {

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

@ -17,7 +17,6 @@ import mage.constants.SubType;
import mage.constants.ComparisonType;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -28,7 +27,7 @@ public final class CinderGlade extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public CinderGlade(UUID ownerId, CardSetInfo setInfo) {

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

@ -9,7 +9,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -25,7 +24,7 @@ public final class CircuitousRoute extends CardImpl {
filter.add(Predicates.or(
Predicates.and(
CardType.LAND.getPredicate(),
new SupertypePredicate(SuperType.BASIC)
SuperType.BASIC.getPredicate()
), SubType.GATE.getPredicate()
));
}

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

@ -12,7 +12,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
@ -47,7 +46,7 @@ class ColdSnapDamageTargetEffect extends OneShotEffect{
private static final FilterLandPermanent filter = new FilterLandPermanent("snow lands");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public ColdSnapDamageTargetEffect()

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

@ -15,7 +15,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import java.util.UUID;
@ -28,7 +27,7 @@ public final class ConiferWurm extends CardImpl {
= new FilterControlledPermanent("the number of snow permanents you control");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter);

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

@ -12,7 +12,6 @@ import mage.constants.Outcome;
import mage.constants.SuperType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
@ -28,7 +27,7 @@ public final class Cytoshape extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public Cytoshape(UUID ownerId, CardSetInfo setInfo) {

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

@ -11,7 +11,6 @@ import mage.constants.Duration;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -22,7 +21,7 @@ public final class DayOfDestiny extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Legendary creatures");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public DayOfDestiny(UUID ownerId, CardSetInfo setInfo) {

5
Mage.Sets/src/mage/cards/d/DeadOfWinter.java
View file

@ -12,7 +12,6 @@ import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import java.util.UUID;
@ -25,8 +24,8 @@ public final class DeadOfWinter extends CardImpl {
private static final FilterPermanent filter2 = new FilterControlledPermanent();
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.SNOW)));
filter2.add(new SupertypePredicate(SuperType.SNOW));
filter.add(Predicates.not(SuperType.SNOW.getPredicate()));
filter2.add(SuperType.SNOW.getPredicate());
}
private static final DynamicValue xValue = new PermanentsOnBattlefieldCount(filter2, -1);

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

@ -22,7 +22,6 @@ import mage.constants.Zone;
import mage.counters.CounterType;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -102,7 +101,7 @@ class NonBasicLandsInOpponentsGraveyards implements DynamicValue {
static {
filter.add(CardType.LAND.getPredicate());
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
}
@Override

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

@ -15,7 +15,6 @@ import mage.constants.Duration;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -26,7 +25,7 @@ public final class DiamondFaerie extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Snow creatures");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public DiamondFaerie(UUID ownerId, CardSetInfo setInfo) {

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

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.permanent.token.TrooperToken2;
import mage.target.TargetPermanent;
@ -27,7 +26,7 @@ public final class DirectorKrennic extends CardImpl {
static {
filterLand.add(CardType.LAND.getPredicate());
filterLand.add(new SupertypePredicate(SuperType.BASIC));
filterLand.add(SuperType.BASIC.getPredicate());
}
public DirectorKrennic(UUID ownerId, CardSetInfo setInfo) {

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

@ -11,7 +11,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -27,7 +26,7 @@ public final class DistrictGuide extends CardImpl {
filter.add(Predicates.or(
Predicates.and(
CardType.LAND.getPredicate(),
new SupertypePredicate(SuperType.BASIC)
SuperType.BASIC.getPredicate()
), SubType.GATE.getPredicate()
));
}

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

@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -27,7 +26,7 @@ public final class DjinnOfInfiniteDeceits extends CardImpl {
private static final String rule = "Exchange control of two target nonlegendary creatures";
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonlegendary creature");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public DjinnOfInfiniteDeceits(UUID ownerId, CardSetInfo setInfo) {

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

@ -16,7 +16,6 @@ import mage.constants.SuperType;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/**
@ -28,7 +27,7 @@ public final class DriftOfTheDead extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("snow lands you control");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
filter.add(CardType.LAND.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -13,7 +13,6 @@ import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
import java.util.ArrayList;
@ -63,7 +62,7 @@ public final class DroidFactory extends CardImpl {
subtypePredicates.add(SubType.PLAINS.getPredicate());
subtypePredicates.add(SubType.ISLAND.getPredicate());
filter.add(Predicates.or(subtypePredicates));
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
TargetCardInLibrary target = new TargetCardInLibrary(filter);
addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay));
}

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

@ -10,7 +10,6 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -44,7 +43,7 @@ class UntapAllLandsTargetEffect extends OneShotEffect {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public UntapAllLandsTargetEffect() {

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

@ -14,7 +14,6 @@ import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.TappedPredicate;
import mage.target.TargetPermanent;
import mage.target.common.TargetControlledCreaturePermanent;
@ -30,7 +29,7 @@ public final class Earthcraft extends CardImpl {
static {
filterCreature.add(Predicates.not(TappedPredicate.instance));
filterLand.add(CardType.LAND.getPredicate());
filterLand.add(new SupertypePredicate(SuperType.BASIC));
filterLand.add(SuperType.BASIC.getPredicate());
}
public Earthcraft(UUID ownerId, CardSetInfo setInfo) {

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

@ -13,7 +13,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetPermanent;
/**
@ -24,7 +23,7 @@ public final class EiganjoCastle extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public EiganjoCastle(UUID ownerId, CardSetInfo setInfo) {

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

@ -10,7 +10,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetPermanent;
import java.util.UUID;
@ -23,7 +22,7 @@ public final class EmpressGalina extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("legendary permanent");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public EmpressGalina(UUID ownerId, CardSetInfo setInfo) {

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

@ -9,7 +9,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetOpponent;
/**
@ -21,7 +20,7 @@ public final class Encroach extends CardImpl {
private static final FilterCard filter = new FilterCard("a nonbasic land card");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
filter.add(CardType.LAND.getPredicate());
}

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

@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -27,7 +26,7 @@ public final class EsperPanorama extends CardImpl {
static {
filter.add(CardType.LAND.getPredicate());
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
filter.add(Predicates.or(
SubType.PLAINS.getPredicate(),
SubType.ISLAND.getPredicate(),

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

@ -21,7 +21,6 @@ import mage.constants.Zone;
import mage.filter.common.FilterPermanentCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.other.ExpansionSetPredicate;
/**
@ -34,7 +33,7 @@ public final class EverythingamajigB extends CardImpl {
static {
filter.add(Predicates.and(
Predicates.not(new SupertypePredicate(SuperType.BASIC)), // all Un-set basic lands are black bordered cards, and thus illegal choices
Predicates.not(SuperType.BASIC.getPredicate()), // all Un-set basic lands are black bordered cards, and thus illegal choices
Predicates.not(new NamePredicate("Steamflogger Boss")), // printed in Unstable with a black border
Predicates.or(new ExpansionSetPredicate("UGL"), new ExpansionSetPredicate("UNH"), new ExpansionSetPredicate("UST"))
));

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

@ -16,7 +16,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetControlledPermanent;
@ -31,7 +30,7 @@ public final class Excavator extends CardImpl {
private static final FilterControlledLandPermanent filter = new FilterControlledLandPermanent("basic land");
static
{
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public Excavator(UUID ownerId, CardSetInfo setInfo) {

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

@ -18,7 +18,6 @@ import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCardInGraveyard;
@ -34,7 +33,7 @@ public final class Extirpate extends CardImpl {
private static final FilterCard filter = new FilterCard("card in a graveyard other than a basic land card");
static {
filter.add(Predicates.not(Predicates.and(CardType.LAND.getPredicate(), new SupertypePredicate(SuperType.BASIC))));
filter.add(Predicates.not(Predicates.and(CardType.LAND.getPredicate(), SuperType.BASIC.getPredicate())));
}
public Extirpate(UUID ownerId, CardSetInfo setInfo) {

5
Mage.Sets/src/mage/cards/e/EyeOfSingularity.java
View file

@ -13,7 +13,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -58,7 +57,7 @@ class EyeOfSingularityETBEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent();
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
}
EyeOfSingularityETBEffect() {
@ -146,7 +145,7 @@ class EyeOfSingularityTriggeredEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent();
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
}
EyeOfSingularityTriggeredEffect() {

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

@ -21,7 +21,6 @@ import mage.constants.Zone;
import mage.filter.StaticFilters;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.players.Player;
@ -38,7 +37,7 @@ public final class FieldOfRuin extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.OPPONENT));
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
}
public FieldOfRuin(UUID ownerId, CardSetInfo setInfo) {

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

@ -16,7 +16,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetControlledPermanent;
/**
@ -28,7 +27,7 @@ public final class FieldmistBorderpost extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a basic land");
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public FieldmistBorderpost (UUID ownerId, CardSetInfo setInfo) {

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

@ -16,7 +16,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetControlledPermanent;
/**
@ -28,7 +27,7 @@ public final class FirewildBorderpost extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("a basic land");
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public FirewildBorderpost (UUID ownerId, CardSetInfo setInfo) {

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

@ -12,7 +12,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -25,7 +24,7 @@ public final class FlowerFlourish extends SplitCard {
= new FilterCard("basic Forest or Plains card");
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
filter.add(Predicates.or(
SubType.FOREST.getPredicate(),
SubType.PLAINS.getPredicate()

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

@ -14,7 +14,6 @@ import mage.constants.SuperType;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -25,7 +24,7 @@ public final class FreyalisesRadiance extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("snow permanents");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public FreyalisesRadiance(UUID ownerId, CardSetInfo setInfo) {

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

@ -12,7 +12,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -25,7 +24,7 @@ public final class GaeasTouch extends CardImpl {
// You may put a basic Forest card from your hand onto the battlefield. Activate this ability only any time you could cast a sorcery and only once each turn.
FilterCard filter = new FilterCard("basic Forest card");
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
filter.add(SubType.FOREST.getPredicate());
LimitedTimesPerTurnActivatedAbility ability = new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD,
new PutCardFromHandOntoBattlefieldEffect(filter), new GenericManaCost(0), 1);

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

@ -16,7 +16,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import java.util.UUID;
@ -29,7 +28,7 @@ public final class GangrenousZombies extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
filter.add(SubType.SWAMP.getPredicate());
}

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

@ -16,7 +16,6 @@ import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -65,7 +64,7 @@ class GargantuanGorillaSacrificeEffect extends OneShotEffect {
static {
filter.add(SubType.FOREST.getPredicate());
filterSnow.add(new SupertypePredicate(SuperType.SNOW));
filterSnow.add(SuperType.SNOW.getPredicate());
}
public GargantuanGorillaSacrificeEffect() {

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

@ -13,7 +13,6 @@ import mage.constants.SuperType;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
import java.util.UUID;
@ -30,7 +29,7 @@ public final class GatecreeperVine extends CardImpl {
Predicates.or(
Predicates.and(
CardType.LAND.getPredicate(),
new SupertypePredicate(SuperType.BASIC)),
SuperType.BASIC.getPredicate()),
SubType.GATE.getPredicate()));
}

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

@ -17,7 +17,6 @@ import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType;
@ -35,7 +34,7 @@ public final class GauntletOfPower extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("a basic land");
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public GauntletOfPower(UUID ownerId, CardSetInfo setInfo) {

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

@ -11,7 +11,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetControlledPermanent;
/**
@ -24,7 +23,7 @@ public final class GlacialCrevasses extends CardImpl {
static {
filter.add(SubType.MOUNTAIN.getPredicate());
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public GlacialCrevasses(UUID ownerId, CardSetInfo setInfo) {

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

@ -12,7 +12,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.common.FilterPermanentCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetCard;
@ -46,7 +45,7 @@ class GlacialRevelationEffect extends OneShotEffect {
private static final FilterCard filter = new FilterPermanentCard("snow permanent cards");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
GlacialRevelationEffect() {

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

@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -33,7 +32,7 @@ public final class GoryosVengeance extends CardImpl {
private static final FilterCard filter = new FilterCreatureCard("legendary creature card");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public GoryosVengeance(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -27,7 +26,7 @@ public final class GrixisPanorama extends CardImpl {
static {
filter.add(CardType.LAND.getPredicate());
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
filter.add(Predicates.or(
SubType.ISLAND.getPredicate(),
SubType.SWAMP.getPredicate(),

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

@ -14,7 +14,6 @@ import mage.constants.Zone;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetControlledPermanent;
/**
@ -26,7 +25,7 @@ public final class HallowedGround extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledLandPermanent("nonsnow land you control");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.SNOW)));
filter.add(Predicates.not(SuperType.SNOW.getPredicate()));
}
public HallowedGround(UUID ownerId, CardSetInfo setInfo) {

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

@ -17,7 +17,6 @@ import mage.constants.ComparisonType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetPermanent;
/**
@ -29,7 +28,7 @@ public final class HeidarRimewindMaster extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("you control four or more snow permanents");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public HeidarRimewindMaster(UUID ownerId, CardSetInfo setInfo) {

7
Mage.Sets/src/mage/cards/h/HeroesPodium.java
View file

@ -17,7 +17,6 @@ import mage.constants.*;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreatureCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetCard;
@ -31,7 +30,7 @@ public final class HeroesPodium extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each legendary creature you control");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public HeroesPodium(UUID ownerId, CardSetInfo setInfo) {
@ -65,7 +64,7 @@ class HeroesPodiumLegendaryCount implements DynamicValue {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other legendary creature you control");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
@Override
@ -98,7 +97,7 @@ class HeroesPodiumEffect extends OneShotEffect {
private static final FilterCreatureCard filter = new FilterCreatureCard("a legendary creature card");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public HeroesPodiumEffect() {

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

@ -13,7 +13,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
/**
@ -25,7 +24,7 @@ public final class HerosBlade extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("a legendary creature");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -8,7 +8,6 @@ import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SuperType;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -20,7 +19,7 @@ public final class HerosDemise extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public HerosDemise(UUID ownerId, CardSetInfo setInfo) {

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

@ -15,7 +15,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.TappedPredicate;
import mage.target.common.TargetControlledPermanent;
@ -28,7 +27,7 @@ public final class HonorWornShaku extends CardImpl {
static {
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public HonorWornShaku(UUID ownerId, CardSetInfo setInfo) {

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

@ -16,7 +16,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import java.util.UUID;
@ -29,7 +28,7 @@ public final class IceFangCoatl extends CardImpl {
private static final FilterPermanent filter = new FilterControlledPermanent();
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
filter.add(AnotherPredicate.instance);
}

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

@ -11,7 +11,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.target.TargetPlayer;
@ -26,7 +25,7 @@ public final class IcebergCancrix extends CardImpl {
static {
filter.add(AnotherPredicate.instance);
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public IcebergCancrix(UUID ownerId, CardSetInfo setInfo) {

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

@ -11,7 +11,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -22,7 +21,7 @@ public final class Imperiosaur extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
}
public Imperiosaur(UUID ownerId, CardSetInfo setInfo) {

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

@ -9,7 +9,6 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SuperType;
import mage.filter.common.FilterLandCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -21,7 +20,7 @@ public final class IntoTheNorth extends CardImpl {
private static final FilterLandCard filter = new FilterLandCard("snow land card");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public IntoTheNorth(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,6 @@ import mage.constants.Outcome;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.Target;
@ -56,7 +55,7 @@ class IwamoriOfTheOpenFistEffect extends OneShotEffect {
private static final FilterCard filter = new FilterCard("legendary creature card");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
filter.add(CardType.CREATURE.getPredicate());
}

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

@ -18,7 +18,6 @@ import mage.constants.Zone;
import mage.filter.StaticFilters;
import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetControlledCreaturePermanent;
/**
@ -30,7 +29,7 @@ public final class JaliraMasterPolymorphist extends CardImpl {
private static final FilterCreatureCard filterCard = new FilterCreatureCard("nonlegendary creature card");
static {
filterCard.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filterCard.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public JaliraMasterPolymorphist(UUID ownerId, CardSetInfo setInfo) {

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

@ -13,7 +13,6 @@ import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
import java.util.ArrayList;
@ -63,7 +62,7 @@ public final class JediEnclave extends CardImpl {
subtypePredicates.add(SubType.PLAINS.getPredicate());
subtypePredicates.add(SubType.ISLAND.getPredicate());
filter.add(Predicates.or(subtypePredicates));
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
TargetCardInLibrary target = new TargetCardInLibrary(filter);
addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay));
}

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

@ -15,7 +15,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
/**
@ -28,7 +27,7 @@ public final class JundPanorama extends CardImpl {
static {
filter.add(CardType.LAND.getPredicate());
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
filter.add(Predicates.or(
SubType.SWAMP.getPredicate(),
SubType.MOUNTAIN.getPredicate(),

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

@ -13,7 +13,6 @@ import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
import java.util.ArrayList;
@ -63,7 +62,7 @@ public final class JungleVillage extends CardImpl {
subtypePredicates.add(SubType.MOUNTAIN.getPredicate());
subtypePredicates.add(SubType.FAERIE.getPredicate());
filter.add(Predicates.or(subtypePredicates));
filter.add(new SupertypePredicate(SuperType.BASIC));
filter.add(SuperType.BASIC.getPredicate());
TargetCardInLibrary target = new TargetCardInLibrary(filter);
addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay));
}

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

@ -17,7 +17,6 @@ import mage.filter.FilterCard;
import mage.filter.common.FilterPermanentCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetCard;
@ -77,7 +76,7 @@ class KamahlsDruidicVowEffect extends OneShotEffect {
filter.add(
Predicates.or(
CardType.LAND.getPredicate(),
new SupertypePredicate(SuperType.LEGENDARY)
SuperType.LEGENDARY.getPredicate()
));
TargetCard target1 = new TargetCard(0, Integer.MAX_VALUE, Zone.LIBRARY, filter);
target1.setNotTarget(true);

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

@ -13,7 +13,6 @@ import mage.constants.CardType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCreaturePermanent;
/**
@ -24,7 +23,7 @@ public final class Karakas extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public Karakas(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,6 @@ import mage.constants.Duration;
import mage.constants.SuperType;
import mage.filter.common.FilterControlledLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.filter.predicate.permanent.TappedPredicate;
import mage.target.common.TargetControlledPermanent;
@ -28,7 +27,7 @@ public final class KarplusanGiant extends CardImpl {
static {
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
public KarplusanGiant(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -25,7 +24,7 @@ public final class KashiTribeElite extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("Legendary Snakes");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
filter.add(SubType.SNAKE.getPredicate());
}

5
Mage.Sets/src/mage/cards/k/KethisTheHiddenHand.java
View file

@ -14,7 +14,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.common.TargetCardInYourGraveyard;
@ -30,8 +29,8 @@ public final class KethisTheHiddenHand extends CardImpl {
private static final FilterCard filter2 = new FilterCard("legendary cards from your graveyard");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter2.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
filter2.add(SuperType.LEGENDARY.getPredicate());
}
public KethisTheHiddenHand(UUID ownerId, CardSetInfo setInfo) {

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

@ -20,7 +20,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetControlledCreaturePermanent;
@ -35,7 +34,7 @@ public final class KikiJikiMirrorBreaker extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("nonlegendary creature you control");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public KikiJikiMirrorBreaker(UUID ownerId, CardSetInfo setInfo) {

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

@ -16,7 +16,6 @@ import mage.constants.Duration;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetAnyTarget;
import mage.target.common.TargetCreaturePermanent;
@ -28,7 +27,7 @@ public final class KitsuneHealer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("legendary creature");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public KitsuneHealer(UUID ownerId, CardSetInfo setInfo) {

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

@ -41,7 +41,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.StaticFilters;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.Target;
@ -56,7 +55,7 @@ public final class KondasBanner extends CardImpl {
private static final FilterControlledCreaturePermanent legendaryFilter = new FilterControlledCreaturePermanent("legendary creatures");
static {
legendaryFilter.add(new SupertypePredicate(SuperType.LEGENDARY));
legendaryFilter.add(SuperType.LEGENDARY.getPredicate());
}
public KondasBanner(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,6 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -27,7 +26,7 @@ public final class KondasHatamoto extends CardImpl {
private static final String rule2 = "As long as you control a legendary Samurai, {this} has vigilance";
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
filter.add(SubType.SAMURAI.getPredicate());
}

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

@ -10,7 +10,6 @@ import mage.constants.SuperType;
import mage.constants.TargetController;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetPlayer;
/**
@ -23,7 +22,7 @@ public final class LayBareTheHeart extends CardImpl {
static {
filter.add(Predicates.not(CardType.LAND.getPredicate()));
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public LayBareTheHeart(UUID ownerId, CardSetInfo setInfo) {

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

@ -10,7 +10,6 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -21,7 +20,7 @@ public final class LegionsOfLimDul extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("snow swamp");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
filter.add(SubType.SWAMP .getPredicate());
}

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

@ -15,7 +15,6 @@ import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterPermanentCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInLibrary;
import mage.target.common.TargetControlledPermanent;
@ -28,7 +27,7 @@ public final class Lifespinner extends CardImpl {
private static final FilterPermanentCard filter = new FilterPermanentCard("legendary Spirit permanent card");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
filter.add(SubType.SPIRIT.getPredicate());
}

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

@ -16,7 +16,6 @@ import mage.filter.FilterCard;
import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.command.emblems.LilianaDefiantNecromancerEmblem;
import mage.target.common.TargetCardInYourGraveyard;
@ -31,7 +30,7 @@ public final class LilianaDefiantNecromancer extends CardImpl {
protected static final FilterCreatureCard filter = new FilterCreatureCard("nonlegendary creature with converted mana cost X from your graveyard");
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(SuperType.LEGENDARY.getPredicate()));
}
public LilianaDefiantNecromancer(UUID ownerId, CardSetInfo setInfo) {

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

@ -11,7 +11,6 @@ import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.SuperType;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
/**
*
@ -22,7 +21,7 @@ public final class LivonyaSilone extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("Legendary land");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public LivonyaSilone(UUID ownerId, CardSetInfo setInfo) {

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

@ -13,7 +13,6 @@ import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetCard;
@ -49,7 +48,7 @@ class LobotomyEffect extends OneShotEffect {
private static final FilterCard filter = new FilterCard("card other than a basic land card");
static {
filter.add(Predicates.not(Predicates.and(CardType.LAND.getPredicate(), new SupertypePredicate(SuperType.BASIC))));
filter.add(Predicates.not(Predicates.and(CardType.LAND.getPredicate(), SuperType.BASIC.getPredicate())));
}
public LobotomyEffect() {

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

@ -15,7 +15,6 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.common.FilterCreatureCard;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.common.TargetCardInYourGraveyard;
/**
@ -27,7 +26,7 @@ public final class LoyalRetainers extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("legendary creature card from your graveyard");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}
public LoyalRetainers(UUID ownerId, CardSetInfo setInfo) {

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

@ -10,7 +10,6 @@ import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -24,7 +23,7 @@ public final class MagusOfTheMoon extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
}
public MagusOfTheMoon(UUID ownerId, CardSetInfo setInfo) {

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

@ -17,7 +17,6 @@ import mage.constants.SuperType;
import mage.constants.TargetController;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.permanent.token.MaritLageToken;
import java.util.UUID;
@ -31,7 +30,7 @@ public final class MaritLagesSlumber extends CardImpl {
= new FilterControlledPermanent("{this} or another snow permanent");
static {
filter.add(new SupertypePredicate(SuperType.SNOW));
filter.add(SuperType.SNOW.getPredicate());
}
private static final Condition condition

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

@ -15,7 +15,6 @@ import mage.constants.SuperType;
import mage.filter.common.FilterAttackingCreature;
import mage.filter.common.FilterLandPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.game.Game;
import mage.game.combat.CombatGroup;
import mage.game.permanent.Permanent;
@ -60,7 +59,7 @@ public final class MercadiasDownfall extends CardImpl {
}
}
FilterLandPermanent filter = new FilterLandPermanent("nonbasic land");
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
filter.add(Predicates.not(SuperType.BASIC.getPredicate()));
System.out.println("The number of nonbasic lands is " + game.getBattlefield().countAll(filter, defenderId, game));
return game.getBattlefield().countAll(filter, defenderId, game);
}

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

@ -16,7 +16,6 @@ import mage.constants.ColoredManaSymbol;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.mageobject.SupertypePredicate;
import mage.target.TargetPermanent;
/**
@ -28,7 +27,7 @@ public final class MinamoSchoolAtWatersEdge extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("legendary permanent");
static {
filter.add(new SupertypePredicate(SuperType.LEGENDARY));
filter.add(SuperType.LEGENDARY.getPredicate());
}

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