github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 03:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactored many other predicates to singleton enums

Browse source
This commit is contained in:
Evan Kranzler 2019-01-12 16:30:49 -05:00
parent dc409c9a9e
commit 8629977f14
595 changed files with 657 additions and 660 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ public final class AbzanAscendancy extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public AbzanAscendancy(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AkoumFlameseeker.java
View file

@ -30,7 +30,7 @@ public final class AkoumFlameseeker extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.ALLY));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AkoumFlameseeker(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@ public final class AkroanHoplite extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public AkroanHoplite(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/Alarum.java
View file

@ -23,7 +23,7 @@ public final class Alarum extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonattacking creature");
static {
filter.add(Predicates.not(new AttackingPredicate()));
filter.add(Predicates.not(AttackingPredicate.instance));
}
public Alarum(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AltarGolem.java
View file

@ -34,7 +34,7 @@ public final class AltarGolem extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AltarGolem(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AlwaysWatching.java
View file

@ -26,7 +26,7 @@ public final class AlwaysWatching extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public AlwaysWatching(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AnaBattlemage.java
View file

@ -34,7 +34,7 @@ public final class AnaBattlemage extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AnaBattlemage(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AnafenzaKinTreeSpirit.java
View file

@ -25,7 +25,7 @@ public final class AnafenzaKinTreeSpirit extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another nontoken creature");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
filter.add(AnotherPredicate.instance);
}

2
Mage.Sets/src/mage/cards/a/AnafenzaTheForemost.java
View file

@ -33,7 +33,7 @@ public final class AnafenzaTheForemost extends CardImpl {
static {
filter.add(AnotherPredicate.instance);
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
}
public AnafenzaTheForemost(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncestorsProphet.java
View file

@ -27,7 +27,7 @@ public final class AncestorsProphet extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.CLERIC));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public AncestorsProphet(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncientHellkite.java
View file

@ -29,7 +29,7 @@ public final class AncientHellkite extends CardImpl {
static {
filter.add(new CardTypePredicate(CardType.CREATURE));
filter.add(new DefendingPlayerControlsPredicate());
filter.add(DefendingPlayerControlsPredicate.instance);
}
public AncientHellkite(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncientHolocron.java
View file

@ -23,7 +23,7 @@ public final class AncientHolocron extends CardImpl {
private static final FilterSpell filter = new FilterSpell("multicolored spells");
static {
filter.add(new MulticoloredPredicate());
filter.add(MulticoloredPredicate.instance);
}
public AncientHolocron(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AncientStoneIdol.java
View file

@ -65,7 +65,7 @@ class AncientStoneIdolCostReductionEffect extends CostModificationEffectImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public AncientStoneIdolCostReductionEffect() {

2
Mage.Sets/src/mage/cards/a/AngelicFavor.java
View file

@ -38,7 +38,7 @@ public final class AngelicFavor extends CardImpl {
private static final FilterControlledCreaturePermanent untappedCreatureYouControl = new FilterControlledCreaturePermanent("untapped creature you control");
static {
untappedCreatureYouControl.add(Predicates.not(new TappedPredicate()));
untappedCreatureYouControl.add(Predicates.not(TappedPredicate.instance));
}
public AngelicFavor(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AnointerPriest.java
View file

@ -24,7 +24,7 @@ public final class AnointerPriest extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("a creature token");
static {
filter.add(new TokenPredicate());
filter.add(TokenPredicate.instance);
}
public AnointerPriest(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AphettoGrifter.java
View file

@ -28,7 +28,7 @@ public final class AphettoGrifter extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Wizards you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.WIZARD));
}

2
Mage.Sets/src/mage/cards/a/ApocalypseChime.java
View file

@ -27,7 +27,7 @@ public final class ApocalypseChime extends CardImpl {
static {
filter.add(Predicates.and(
Predicates.not(new TokenPredicate()),
Predicates.not(TokenPredicate.instance),
new ExpansionSetPredicate("HML")
));
}

2
Mage.Sets/src/mage/cards/a/ArachnusSpinner.java
View file

@ -39,7 +39,7 @@ public final class ArachnusSpinner extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.SPIDER));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public ArachnusSpinner(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/ArashinWarBeast.java
View file

@ -51,7 +51,7 @@ class ArashinWarBeastTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("one or more blockers");
static {
filter.add(new BlockingPredicate());
filter.add(BlockingPredicate.instance);
}
boolean usedForCombatDamageStep;

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

@ -29,8 +29,8 @@ public final class ArcadesSabboth extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(new AttackingPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(Predicates.not(AttackingPredicate.instance));
}
public ArcadesSabboth(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/ArtificersAssistant.java
View file

@ -22,7 +22,7 @@ public final class ArtificersAssistant extends CardImpl {
private static final FilterSpell filter = new FilterSpell("a historic spell");
static {
filter.add(new HistoricPredicate());
filter.add(HistoricPredicate.instance);
}
public ArtificersAssistant(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AryelKnightOfWindgrace.java
View file

@ -80,7 +80,7 @@ class AryelTapXTargetCost extends VariableCostImpl {
static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Knights you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.KNIGHT));
}

2
Mage.Sets/src/mage/cards/a/Asphyxiate.java
View file

@ -20,7 +20,7 @@ public final class Asphyxiate extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public Asphyxiate(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/Assassinate.java
View file

@ -20,7 +20,7 @@ public final class Assassinate extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
static {
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
}
public Assassinate(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AssassinsBlade.java
View file

@ -29,7 +29,7 @@ public final class AssassinsBlade extends CardImpl {
static {
filter.add(Predicates.not(new ColorPredicate(ObjectColor.BLACK)));
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public AssassinsBlade(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AuraOfDominion.java
View file

@ -31,7 +31,7 @@ public final class AuraOfDominion extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}

2
Mage.Sets/src/mage/cards/a/AvenSoulgazer.java
View file

@ -33,7 +33,7 @@ public final class AvenSoulgazer extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("face down creature");
static {
filter.add(new FaceDownPredicate());
filter.add(FaceDownPredicate.instance);
}
public AvenSoulgazer(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AweForTheGuilds.java
View file

@ -22,7 +22,7 @@ public final class AweForTheGuilds extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Monocolored creatures");
static {
filter.add(Predicates.not(new MulticoloredPredicate()));
filter.add(Predicates.not(MulticoloredPredicate.instance));
}
public AweForTheGuilds(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/a/AzamiLadyOfScrolls.java
View file

@ -27,7 +27,7 @@ public final class AzamiLadyOfScrolls extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Wizard you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.WIZARD));
}

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

@ -24,7 +24,7 @@ public final class Backlash extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public Backlash(UUID ownerId, CardSetInfo setInfo) {

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

@ -34,7 +34,7 @@ public final class BalduvianTradingPost extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.MOUNTAIN));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BalduvianTradingPost(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ public final class BantSureblade extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another multicolor permanent");
static {
filter.add(new MulticoloredPredicate());
filter.add(MulticoloredPredicate.instance);
filter.add(AnotherPredicate.instance);
}

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

@ -27,7 +27,7 @@ public final class BastionProtector extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures");
static {
filter.add(new CommanderPredicate());
filter.add(CommanderPredicate.instance);
}
public BastionProtector(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@ public final class BattleScreech extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BattleScreech(UUID ownerId, CardSetInfo setInfo) {

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

@ -76,7 +76,7 @@ class BazaarOfWondersEffect extends OneShotEffect {
String spellName = spell.getName();
FilterPermanent filter1 = new FilterPermanent();
filter1.add(new NamePredicate(spellName));
filter1.add(Predicates.not(new TokenPredicate()));
filter1.add(Predicates.not(TokenPredicate.instance));
if (!game.getBattlefield().getActivePermanents(filter1, source.getControllerId(), game).isEmpty()) {
spell.counter(source.getControllerId(), game);
return true;

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

@ -29,7 +29,7 @@ public final class BeastmastersMagemark extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures you control that are enchanted");
static {
filter.add(new EnchantedPredicate());
filter.add(EnchantedPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -30,7 +30,7 @@ public final class BeastsOfBogardan extends CardImpl {
static {
controlFilter.add(new ColorPredicate(ObjectColor.WHITE));
controlFilter.add(Predicates.not(new TokenPredicate()));
controlFilter.add(Predicates.not(TokenPredicate.instance));
}
public BeastsOfBogardan(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ public final class BenBenAkkiHermit extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent("untapped Mountain you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.MOUNTAIN));
}

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

@ -27,7 +27,7 @@ public final class BenalishMissionary extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("blocked creature");
static {
filter.add(new BlockedPredicate());
filter.add(BlockedPredicate.instance);
}
public BenalishMissionary(UUID ownerId, CardSetInfo setInfo) {

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

@ -33,7 +33,7 @@ public final class Benthicore extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.MERFOLK));
}

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

@ -32,7 +32,7 @@ public final class BetrothedOfFire extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledCreaturePermanent("an untapped creature");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BetrothedOfFire(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ public final class Bifurcate extends CardImpl {
private static FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creatures");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public Bifurcate(UUID ownerId, CardSetInfo setInfo) {

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

@ -26,7 +26,7 @@ public final class BirchloreRangers extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Elves you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.ELF));
}

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

@ -31,7 +31,7 @@ public final class BlackOakOfOdunos extends CardImpl {
static {
filter.add(AnotherPredicate.instance);
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BlackOakOfOdunos(UUID ownerId, CardSetInfo setInfo) {

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

@ -23,7 +23,7 @@ public final class BlaringCaptain extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "attacking Warriors");
static {
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public BlaringCaptain(UUID ownerId, CardSetInfo setInfo) {

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

@ -23,7 +23,7 @@ public final class Blockbuster extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
static {
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
}
public Blockbuster(UUID ownerId, CardSetInfo setInfo) {

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

@ -37,7 +37,7 @@ public final class BloodTribute extends CardImpl {
TextPartSubType textPartVampire = (TextPartSubType) addTextPart(new TextPartSubType(SubType.VAMPIRE));
FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("an untapped Vampire you control");
filter.add(new TextPartSubtypePredicate(textPartVampire));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
this.addAbility(new KickerAbility(new TapTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true))));
// Target opponent loses half their life, rounded up.

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

@ -27,7 +27,7 @@ public final class BloodswornSteward extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("Commander creatures");
static {
filter.add(new CommanderPredicate());
filter.add(CommanderPredicate.instance);
}
public BloodswornSteward(UUID ownerId, CardSetInfo setInfo) {

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

@ -19,7 +19,7 @@ public final class BoardTheWeatherlight extends CardImpl {
private static final FilterCard filter = new FilterCard("a historic card");
static {
filter.add(new HistoricPredicate());
filter.add(HistoricPredicate.instance);
}
public BoardTheWeatherlight(UUID ownerId, CardSetInfo setInfo) {

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

@ -62,7 +62,7 @@ class Borrowing100000ArrowsEffect extends OneShotEffect {
Player opponent = game.getPlayer(this.getTargetPointer().getFirst(game, source));
if (opponent != null) {
FilterCreaturePermanent filter = new FilterCreaturePermanent();
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
filter.add(new ControllerIdPredicate(opponent.getId()));
return new DrawCardSourceControllerEffect(game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game)).apply(game, source);
}

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

@ -25,7 +25,7 @@ public final class BraceForImpact extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("multicolored creature");
static {
filter.add(new MulticoloredPredicate());
filter.add(MulticoloredPredicate.instance);
}
public BraceForImpact(UUID ownerId, CardSetInfo setInfo) {

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

@ -21,7 +21,7 @@ public final class Brainspoil extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that isn't enchanted");
static {
filter.add(Predicates.not(new EnchantedPredicate()));
filter.add(Predicates.not(EnchantedPredicate.instance));
}
public Brainspoil(UUID ownerId, CardSetInfo setInfo) {

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

@ -32,7 +32,7 @@ public final class BrambleSovereign extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
filter.add(AnotherPredicate.instance);
}

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

@ -28,7 +28,7 @@ public final class BrandedBrawlers extends CardImpl {
static final private FilterLandPermanent filter = new FilterLandPermanent("an untapped land");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
final static private String rule = "{this} can't block if you control an untapped land";

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

@ -21,7 +21,7 @@ public final class BreakOpen extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Face-down creature an opponent controls");
static {
filter.add(new FaceDownPredicate());
filter.add(FaceDownPredicate.instance);
filter.add(new ControllerPredicate(TargetController.OPPONENT));
}

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

@ -34,7 +34,7 @@ public final class BridgeFromBelow extends CardImpl {
static{
filter1.add(new ControllerPredicate(TargetController.YOU));
filter1.add(Predicates.not(new TokenPredicate()));
filter1.add(Predicates.not(TokenPredicate.instance));
filter2.add(new ControllerPredicate(TargetController.OPPONENT));
}

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

@ -31,7 +31,7 @@ public final class BrokenVisage extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nonartifact attacking creature");
static {
filter.add(Predicates.not(new CardTypePredicate(CardType.ARTIFACT)));
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public BrokenVisage(UUID ownerId, CardSetInfo setInfo) {

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

@ -50,7 +50,7 @@ class BroodingSaurianControlEffect extends ContinuousEffectImpl {
private static final FilterPermanent filter = new FilterPermanent();
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public BroodingSaurianControlEffect() {

4
Mage.Sets/src/mage/cards/b/BrudicladTelchorEngineer.java
View file

@ -31,7 +31,7 @@ public final class BrudicladTelchorEngineer extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature tokens you control");
static {
filter.add(new TokenPredicate());
filter.add(TokenPredicate.instance);
}
public BrudicladTelchorEngineer(UUID ownerId, CardSetInfo setInfo) {
@ -64,7 +64,7 @@ class BrudicladTelchorEngineerEffect extends OneShotEffect {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("token you control");
static {
filter.add(new TokenPredicate());
filter.add(TokenPredicate.instance);
}
public BrudicladTelchorEngineerEffect() {

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

@ -58,7 +58,7 @@ class BrutalSuppressionAdditionalCostEffect extends CostModificationEffectImpl {
private static final FilterPermanent filter2 = new FilterPermanent("nontoken Rebels");
static{
filter2.add(new SubtypePredicate(SubType.REBEL));
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
BrutalSuppressionAdditionalCostEffect() {

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

@ -48,7 +48,7 @@ class BurdenOfGreedCount implements DynamicValue {
return 0;
}
FilterArtifactPermanent filter = new FilterArtifactPermanent();
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
filter.add(new ControllerIdPredicate(sourceAbility.getFirstTarget()));
return game.getBattlefield().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game);
}

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

@ -27,7 +27,7 @@ public final class BurnAtTheStake extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public BurnAtTheStake(UUID ownerId, CardSetInfo setInfo) {

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

@ -50,7 +50,7 @@ class CalmingVerseEffect extends OneShotEffect {
static {
untappedLandFilter.add(new CardTypePredicate(CardType.LAND));
untappedLandFilter.add(Predicates.not(new TappedPredicate()));
untappedLandFilter.add(Predicates.not(TappedPredicate.instance));
}
private static final FilterEnchantmentPermanent opponentEnchantmentsFilter = new FilterEnchantmentPermanent("enchantments you don't control");

2
Mage.Sets/src/mage/cards/c/CaptainPhasma.java
View file

@ -32,7 +32,7 @@ public final class CaptainPhasma extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.TROOPER));
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
filterCard.add(new SubtypePredicate(SubType.TROOPER));
}

2
Mage.Sets/src/mage/cards/c/CaptivatingVampire.java
View file

@ -34,7 +34,7 @@ public final class CaptivatingVampire extends CardImpl {
static {
filter1.add(new SubtypePredicate(SubType.VAMPIRE));
filter2.add(new SubtypePredicate(SubType.VAMPIRE));
filter2.add(Predicates.not(new TappedPredicate()));
filter2.add(Predicates.not(TappedPredicate.instance));
}
public CaptivatingVampire(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CaribouRange.java
View file

@ -34,7 +34,7 @@ public final class CaribouRange extends CardImpl {
static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Caribou token");
static {
filter.add(new TokenPredicate());
filter.add(TokenPredicate.instance);
filter.add(new SubtypePredicate(SubType.CARIBOU));
}

2
Mage.Sets/src/mage/cards/c/CatapultMaster.java
View file

@ -28,7 +28,7 @@ public final class CatapultMaster extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.SOLDIER));
}
public CatapultMaster(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CatapultSquad.java
View file

@ -29,7 +29,7 @@ public final class CatapultSquad extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Soldiers you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.SOLDIER));
}

2
Mage.Sets/src/mage/cards/c/CavalryPegasus.java
View file

@ -25,7 +25,7 @@ public final class CavalryPegasus extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("each attacking Human");
static {
filter.add(new SubtypePredicate(SubType.HUMAN));
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public CavalryPegasus(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/ChewbaccaTheBeast.java
View file

@ -28,7 +28,7 @@ public final class ChewbaccaTheBeast extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(AnotherPredicate.instance);
filter.add(new AttackingPredicate());
filter.add(AttackingPredicate.instance);
}
public ChewbaccaTheBeast(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/ChickenALaKing.java
View file

@ -33,7 +33,7 @@ public final class ChickenALaKing extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Chicken you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.CHICKEN));
}

2
Mage.Sets/src/mage/cards/c/ChiseiHeartOfOceans.java
View file

@ -29,7 +29,7 @@ public final class ChiseiHeartOfOceans extends CardImpl {
static {
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(new CounterAnyPredicate());
filter.add(CounterAnyPredicate.instance);
}
public ChiseiHeartOfOceans(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/ChosenOfMarkov.java
View file

@ -28,7 +28,7 @@ public final class ChosenOfMarkov extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Vampire you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.VAMPIRE));
}

2
Mage.Sets/src/mage/cards/c/CitadelOfPain.java
View file

@ -56,7 +56,7 @@ class CitadelOfPainEffect extends OneShotEffect {
}
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public CitadelOfPainEffect() {

4
Mage.Sets/src/mage/cards/c/CityInABottle.java
View file

@ -139,7 +139,7 @@ class CityInABottleStateTriggeredAbility extends StateTriggeredAbility {
private static final FilterPermanent filter = new FilterPermanent("a nontoken permanent originally printed in the Arabian Nights expansion other than City in a Bottle");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
filter.add(Predicates.or(getArabianNightsNamePredicates()));
}
@ -173,7 +173,7 @@ class CityInABottleSacrificeEffect extends OneShotEffect {
private static final FilterPermanent filter = new FilterPermanent("a nontoken permanent originally printed in the Arabian Nights expansion other than City in a Bottle");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
filter.add(Predicates.or(getArabianNightsNamePredicates()));
}

2
Mage.Sets/src/mage/cards/c/ClockOfOmens.java
View file

@ -26,7 +26,7 @@ public final class ClockOfOmens extends CardImpl {
static {
filter.add(new CardTypePredicate(CardType.ARTIFACT));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public ClockOfOmens(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CloudgoatRanger.java
View file

@ -34,7 +34,7 @@ public final class CloudgoatRanger extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Kithkin you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.KITHKIN));
}

2
Mage.Sets/src/mage/cards/c/ClovenCasting.java
View file

@ -27,7 +27,7 @@ public final class ClovenCasting extends CardImpl {
filter.add(Predicates.or(
new CardTypePredicate(CardType.INSTANT),
new CardTypePredicate(CardType.SORCERY)));
filter.add(new MulticoloredPredicate());
filter.add(MulticoloredPredicate.instance);
}
public ClovenCasting(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CollectiveEffort.java
View file

@ -44,7 +44,7 @@ public final class CollectiveEffort extends CardImpl {
private static final FilterPlayer filterPlayer = new FilterPlayer("player whose creatures get +1/+1 counters");
static {
filterUntapped.add(Predicates.not(new TappedPredicate()));
filterUntapped.add(Predicates.not(TappedPredicate.instance));
filterDestroyCreature.add(new PowerPredicate(ComparisonType.MORE_THAN, 3));
}

2
Mage.Sets/src/mage/cards/c/CommanderCody.java
View file

@ -25,7 +25,7 @@ public final class CommanderCody extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-token Trooper creatures");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
filter.add(new SubtypePredicate(SubType.TROOPER));
}

2
Mage.Sets/src/mage/cards/c/CopperhoofVorrac.java
View file

@ -28,7 +28,7 @@ public final class CopperhoofVorrac extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("untapped permanent your opponents control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new ControllerPredicate(TargetController.OPPONENT));
}

2
Mage.Sets/src/mage/cards/c/CoralAtoll.java
View file

@ -30,7 +30,7 @@ public final class CoralAtoll extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.ISLAND));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public CoralAtoll(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CoralReef.java
View file

@ -40,7 +40,7 @@ public final class CoralReef extends CardImpl {
static {
islandFilter.add(new SubtypePredicate(SubType.ISLAND));
untappedBlueCreatureFilter.add(Predicates.not(new TappedPredicate()));
untappedBlueCreatureFilter.add(Predicates.not(TappedPredicate.instance));
untappedBlueCreatureFilter.add(new ColorPredicate(ObjectColor.BLUE));
}

2
Mage.Sets/src/mage/cards/c/CorrosiveOoze.java
View file

@ -31,7 +31,7 @@ public final class CorrosiveOoze extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("equipped creature");
static {
filter.add(new EquippedPredicate());
filter.add(EquippedPredicate.instance);
}
public CorrosiveOoze(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CovetedPeacock.java
View file

@ -25,7 +25,7 @@ public final class CovetedPeacock extends CardImpl {
public static final FilterPermanent filter = new FilterCreaturePermanent("creature defending player controls");
static {
filter.add(new DefendingPlayerControlsPredicate());
filter.add(DefendingPlayerControlsPredicate.instance);
}
public CovetedPeacock(UUID ownerId, CardSetInfo setInfo) {

4
Mage.Sets/src/mage/cards/c/Crackleburr.java
View file

@ -38,10 +38,10 @@ public final class Crackleburr extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.RED));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter2.add(new ColorPredicate(ObjectColor.BLUE));
filter2.add(new TappedPredicate());
filter2.add(TappedPredicate.instance);
}
public Crackleburr(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CracklingPerimeter.java
View file

@ -27,7 +27,7 @@ public final class CracklingPerimeter extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.GATE));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public CracklingPerimeter(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CrashingBoars.java
View file

@ -53,7 +53,7 @@ class CrashingBoarsEffect extends OneShotEffect {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creature you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
CrashingBoarsEffect() {

2
Mage.Sets/src/mage/cards/c/CrimsonHonorGuard.java
View file

@ -56,7 +56,7 @@ class CrimsonHonorGuardEffect extends OneShotEffect {
private final static FilterPermanent filter = new FilterPermanent("Commander");
static {
filter.add(new CommanderPredicate());
filter.add(CommanderPredicate.instance);
}
public CrimsonHonorGuardEffect() {

4
Mage.Sets/src/mage/cards/c/CrookclawElder.java
View file

@ -33,9 +33,9 @@ public final class CrookclawElder extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.BIRD));
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter2.add(new SubtypePredicate(SubType.WIZARD));
filter2.add(Predicates.not(new TappedPredicate()));
filter2.add(Predicates.not(TappedPredicate.instance));
}
public CrookclawElder(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/Cryptbreaker.java
View file

@ -33,7 +33,7 @@ public final class Cryptbreaker extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped Zombies you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
filter.add(new SubtypePredicate(SubType.ZOMBIE));
}

4
Mage.Sets/src/mage/cards/c/CrypticGateway.java
View file

@ -39,7 +39,7 @@ public final class CrypticGateway extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("untapped creatures you control");
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
TargetControlledPermanent target;
@ -70,7 +70,7 @@ class CrypticGatewayCost extends CostImpl {
TargetControlledPermanent target;
static {
filter.add(Predicates.not(new TappedPredicate()));
filter.add(Predicates.not(TappedPredicate.instance));
}
public CrypticGatewayCost(TargetControlledPermanent target) {

4
Mage.Sets/src/mage/cards/c/CurtainOfLight.java
View file

@ -31,8 +31,8 @@ public final class CurtainOfLight extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("unblocked attacking creature");
static {
filter.add(new AttackingPredicate());
filter.add(Predicates.not(new BlockedPredicate()));
filter.add(AttackingPredicate.instance);
filter.add(Predicates.not(BlockedPredicate.instance));
}
public CurtainOfLight(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CutTheEarthlyBond.java
View file

@ -21,7 +21,7 @@ public final class CutTheEarthlyBond extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("enchanted permanent");
static {
filter.add(new EnchantedPredicate());
filter.add(EnchantedPredicate.instance);
}
public CutTheEarthlyBond(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/d/DAvenantTrapper.java
View file

@ -23,7 +23,7 @@ public final class DAvenantTrapper extends CardImpl {
private static final FilterSpell filter = new FilterSpell("a historic spell");
static {
filter.add(new HistoricPredicate());
filter.add(HistoricPredicate.instance);
}
public DAvenantTrapper(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/d/DanceOfMany.java
View file

@ -39,7 +39,7 @@ public final class DanceOfMany extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("nontoken creature");
static {
filter.add(Predicates.not(new TokenPredicate()));
filter.add(Predicates.not(TokenPredicate.instance));
}
public DanceOfMany(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/d/DaringArchaeologist.java
View file

@ -27,7 +27,7 @@ public final class DaringArchaeologist extends CardImpl {
private static final FilterSpell filter = new FilterSpell("a historic spell");
static {
filter.add(new HistoricPredicate());
filter.add(HistoricPredicate.instance);
}
public DaringArchaeologist(UUID ownerId, CardSetInfo setInfo) {

4
Mage.Sets/src/mage/cards/d/DazzlingBeauty.java
View file

@ -32,8 +32,8 @@ public final class DazzlingBeauty extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("unblocked attacking creature");
static {
filter.add(new AttackingPredicate());
filter.add(Predicates.not(new BlockedPredicate()));
filter.add(AttackingPredicate.instance);
filter.add(Predicates.not(BlockedPredicate.instance));
}
public DazzlingBeauty(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/d/DeadeyeHarpooner.java
View file

@ -27,7 +27,7 @@ public final class DeadeyeHarpooner extends CardImpl {
private final static FilterOpponentsCreaturePermanent filter = new FilterOpponentsCreaturePermanent("tapped creature an opponent controls");
static {
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
}
public DeadeyeHarpooner(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/d/DeathStroke.java
View file

@ -19,7 +19,7 @@ public final class DeathStroke extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("tapped creature");
static {
filter.add(new TappedPredicate());
filter.add(TappedPredicate.instance);
}
public DeathStroke(UUID ownerId, CardSetInfo setInfo) {

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