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

refactored AnotherPredicate to singleton enum

Browse source
This commit is contained in:
Evan Kranzler 2019-01-12 16:12:51 -05:00
parent 92b5535a0e
commit e6b99215e1
417 changed files with 427 additions and 427 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ public final class AcidSpewerDragon extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new SubtypePredicate(SubType.DRAGON));
}

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

@ -34,7 +34,7 @@ public final class AdarkarValkyrie extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AdarkarValkyrie(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ public final class AdmonitionAngel extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("nonland permanent other than Admonition Angel");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
}

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

@ -27,7 +27,7 @@ public final class AegisAngel extends CardImpl {
private static final FilterPermanent filter = new FilterPermanent("another target permanent");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AegisAngel(UUID ownerId, CardSetInfo setInfo) {

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

@ -25,7 +25,7 @@ public final class AegisAutomaton extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AegisAutomaton(UUID ownerId, CardSetInfo setInfo) {

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

@ -25,7 +25,7 @@ public final class AerialGuide extends CardImpl {
static final FilterAttackingCreature filter = new FilterAttackingCreature("another target attacking creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AerialGuide(UUID ownerId, CardSetInfo setInfo) {

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

@ -76,7 +76,7 @@ class AetherbornMarauderEffect extends OneShotEffect {
Permanent sourceObject = game.getPermanent(source.getSourceId());
if (controller != null && sourceObject != null) {
FilterControlledPermanent filter = new FilterControlledPermanent("permanent you control to remove +1/+1 counters from");
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new CounterPredicate(CounterType.P1P1));
boolean firstRun = true;
while (game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) > 0) {

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

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

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

@ -36,7 +36,7 @@ public final class AjaniSteadfast extends CardImpl {
private static final FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("other planeswalker you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -35,7 +35,7 @@ public final class AjaniUnyielding extends CardImpl {
static {
nonlandPermanentFilter.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
planeswalkerFilter.add(new ControllerPredicate(TargetController.YOU));
planeswalkerFilter.add(new AnotherPredicate());
planeswalkerFilter.add(AnotherPredicate.instance);
}
public AjaniUnyielding(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@ public final class AkroanConscriptor extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AkroanConscriptor(UUID ownerId, CardSetInfo setInfo) {

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

@ -21,7 +21,7 @@ public final class AltarOfTheBrood extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another permanent");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AltarOfTheBrood(UUID ownerId, CardSetInfo setInfo) {

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

@ -22,7 +22,7 @@ public final class AmbushKrotiq extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AmbushKrotiq(UUID ownerId, CardSetInfo setInfo) {

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

@ -40,7 +40,7 @@ public class AminatouTheFateShifter extends CardImpl {
static {
filter.add(new OwnerPredicate(TargetController.YOU));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AminatouTheFateShifter(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@ public final class AnabaAncestor extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.MINOTAUR));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AnabaAncestor(UUID ownerId, CardSetInfo setInfo) {

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

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

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

@ -32,7 +32,7 @@ public final class AnafenzaTheForemost extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target tapped creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new TappedPredicate());
}

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

@ -24,7 +24,7 @@ public final class AncestralMask extends CardImpl {
private static final FilterEnchantmentPermanent filter = new FilterEnchantmentPermanent("each other enchantment on the battlefield");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AncestralMask(UUID ownerId, CardSetInfo setInfo) {

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

@ -39,7 +39,7 @@ public final class AngelOfCondemnation extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AngelOfCondemnation(UUID ownerId, CardSetInfo setInfo) {

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

@ -26,7 +26,7 @@ public final class AngelicCaptain extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.ALLY));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AngelicCaptain(UUID ownerId, CardSetInfo setInfo) {

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

@ -25,7 +25,7 @@ public final class ApocalypseDemon extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ApocalypseDemon(UUID ownerId, CardSetInfo cardSetInfo) {

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

@ -27,7 +27,7 @@ public final class ApothecaryGeist extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Elf");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new SubtypePredicate(SubType.SPIRIT));
}

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

@ -41,10 +41,10 @@ public final class ArahboRoarOfTheWorld extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.CAT));
filter.add(new ControllerPredicate(TargetController.YOU));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter2.add(new SubtypePredicate(SubType.CAT));
filter2.add(new ControllerPredicate(TargetController.YOU));
filter2.add(new AnotherPredicate());
filter2.add(AnotherPredicate.instance);
}
public ArahboRoarOfTheWorld(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@ public final class ArashinForemost extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.WARRIOR));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ArashinForemost(UUID ownerId, CardSetInfo setInfo) {

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

@ -25,7 +25,7 @@ public final class ArcboundCrusher extends CardImpl {
private static final FilterPermanent filter = new FilterArtifactPermanent("another artifact");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ArcboundCrusher(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ public final class AshenmoorCohort extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.BLACK));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
private static final String rule = "Ashenmoor Cohort gets +1/+1 as long as you control another black creature";

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

@ -36,7 +36,7 @@ public final class AthreosGodOfPassage extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you own");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new OwnerPredicate(TargetController.YOU));
}

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

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

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

@ -120,7 +120,7 @@ class MoveTargetAuraEffect extends OneShotEffect {
}
FilterPermanent filter = new FilterPermanent("another permanent " + enchantment.getLogName() + " can enchant");
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new PermanentCanBeAttachedToPredicate(enchantment));
Target target = new TargetPermanent(filter);
target.setNotTarget(true);

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

@ -24,7 +24,7 @@ public final class AuriokChampion extends CardImpl {
private static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AuriokChampion(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@ public final class Aurochs extends CardImpl {
static {
filter1.add(new SubtypePredicate(SubType.AUROCHS));
filter1.add(new AnotherPredicate());
filter1.add(AnotherPredicate.instance);
}
public Aurochs(UUID ownerId, CardSetInfo setInfo) {

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

@ -33,7 +33,7 @@ public final class AurochsHerd extends CardImpl {
static {
filter1.add(new SubtypePredicate(SubType.AUROCHS));
filter2.add(new SubtypePredicate(SubType.AUROCHS));
filter2.add(new AnotherPredicate());
filter2.add(AnotherPredicate.instance);
}
public AurochsHerd(UUID ownerId, CardSetInfo setInfo) {

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

@ -25,7 +25,7 @@ public final class AuroraChampion extends CardImpl {
private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AuroraChampion(UUID ownerId, CardSetInfo setInfo) {

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

@ -33,7 +33,7 @@ public final class AvacynGuardianAngel extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AvacynGuardianAngel(UUID ownerId, CardSetInfo setInfo) {

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

@ -107,7 +107,7 @@ class AvacynThePurifierEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature");
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
List<Permanent> permanents = game.getBattlefield().getActivePermanents(filter, source.getControllerId(), source.getSourceId(), game);
for (Permanent permanent : permanents) {
permanent.damage(3, source.getSourceId(), game, false, true);

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

@ -28,7 +28,7 @@ public final class AvatarOfTheResolute extends CardImpl {
static {
filter.add(new CounterPredicate(CounterType.P1P1));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AvatarOfTheResolute(UUID ownerId, CardSetInfo setInfo) {

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

@ -21,7 +21,7 @@ public final class AviaryMechanic extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another permanent you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public AviaryMechanic(UUID ownerId, CardSetInfo setInfo) {

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

@ -32,7 +32,7 @@ public final class BallynockCohort extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.WHITE));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
private String rule = "{this} gets +1/+1 as long as you control another white creature";

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

@ -28,7 +28,7 @@ public final class BalthorTheStout extends CardImpl {
static {
filter1.add(new SubtypePredicate(SubType.BARBARIAN));
filter2.add(new AnotherPredicate());
filter2.add(AnotherPredicate.instance);
filter2.add(new SubtypePredicate(SubType.BARBARIAN));
}

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

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

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

@ -32,7 +32,7 @@ public final class BaronSengir extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.VAMPIRE));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BaronSengir(UUID ownerId, CardSetInfo setInfo) {

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

@ -31,7 +31,7 @@ public final class BarrageTyrant extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another colorless creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ColorlessPredicate());
}

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

@ -24,7 +24,7 @@ public final class BarrenGlory extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent();
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BarrenGlory(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@ public final class BazaarKrovod extends CardImpl {
static final FilterAttackingCreature filter = new FilterAttackingCreature("another target attacking creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BazaarKrovod(UUID ownerId, CardSetInfo setInfo) {

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

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

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

@ -27,7 +27,7 @@ public final class BelltollDragon extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other Dragon creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new SubtypePredicate(SubType.DRAGON));
}

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

@ -26,7 +26,7 @@ public final class BindingMummy extends CardImpl {
private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new SubtypePredicate(SubType.ZOMBIE));
}

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

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

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

@ -25,7 +25,7 @@ public final class BlindSpotGiant extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.GIANT));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BlindSpotGiant(UUID ownerId, CardSetInfo setInfo) {

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

@ -31,7 +31,7 @@ public final class BloodChinFanatic extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Warrior creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new SubtypePredicate(SubType.WARRIOR));
}

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

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

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

@ -26,7 +26,7 @@ public final class BloodmistInfiltrator extends CardImpl {
= new FilterControlledCreaturePermanent("another creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BloodmistInfiltrator(UUID ownerId, CardSetInfo setInfo) {

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

@ -26,7 +26,7 @@ public final class BoltwingMarauder extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature under your control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BoltwingMarauder(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ public final class BoundByMoonsilver extends CardImpl {
private final static FilterControlledPermanent filter = new FilterControlledPermanent("another permanent");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BoundByMoonsilver(UUID ownerId, CardSetInfo setInfo) {

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

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

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

@ -23,7 +23,7 @@ public final class BreachingHippocamp extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BreachingHippocamp(UUID ownerId, CardSetInfo setInfo) {

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

@ -32,7 +32,7 @@ public final class BriarberryCohort extends CardImpl {
static {
filter.add(new ColorPredicate(ObjectColor.BLUE));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
private String rule = "{this} gets +1/+1 as long as you control another blue creature";

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

@ -30,7 +30,7 @@ public final class BrionStoutarm extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature other than Brion Stoutarm");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BrionStoutarm(UUID ownerId, CardSetInfo setInfo) {

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

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

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

@ -25,7 +25,7 @@ public final class BronzebeakMoa extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature under your control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BronzebeakMoa (UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{W}");

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

@ -31,7 +31,7 @@ public final class BrothersYamazaki extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new NamePredicate("Brothers Yamazaki"));
}

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

@ -27,7 +27,7 @@ public final class BullAurochs extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.AUROCHS));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BullAurochs(UUID ownerId, CardSetInfo setInfo) {

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

@ -24,7 +24,7 @@ public final class BullRushBruiser extends CardImpl {
private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public BullRushBruiser(UUID ownerId, CardSetInfo setInfo) {

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

@ -31,7 +31,7 @@ public final class CaptainOfTheMists extends CardImpl {
private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another Human");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new SubtypePredicate(SubType.HUMAN));
}

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

@ -28,7 +28,7 @@ public final class CarnifexDemon extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public CarnifexDemon(UUID ownerId, CardSetInfo setInfo) {

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

@ -26,7 +26,7 @@ public final class CatacombSifter extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -25,7 +25,7 @@ public final class CennsHeir extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.KITHKIN));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public CennsHeir(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ public final class ChampionOfLambholt extends CardImpl {
private final static FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -33,7 +33,7 @@ public final class ChampionOfStraySouls extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creatures");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ChampionOfStraySouls(UUID ownerId, CardSetInfo setInfo) {

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

@ -24,7 +24,7 @@ public final class ChampionOfTheParish extends CardImpl {
private static final FilterPermanent filter = new FilterControlledCreaturePermanent("another Human");
static {
filter.add(new SubtypePredicate(SubType.HUMAN));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ChampionOfTheParish(UUID ownerId, CardSetInfo setInfo) {

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

@ -14,7 +14,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
public final class ChaosMaw extends CardImpl {
private static FilterCreaturePermanent filter = new FilterCreaturePermanent("other creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ChaosMaw(UUID ownerId, CardSetInfo cardSetInfo){
super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{5}{R}{R}");

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

@ -66,7 +66,7 @@ class CherishedHatchlingTriggeredAbility extends DelayedTriggeredAbility {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public CherishedHatchlingTriggeredAbility() {

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

@ -26,7 +26,7 @@ public final class Chewbacca extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another target creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public Chewbacca(UUID ownerId, CardSetInfo setInfo) {

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

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

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

@ -40,7 +40,7 @@ public final class ChiefChirpa extends CardImpl {
diedFilter.add(new ControllerPredicate(TargetController.YOU));
ewokFilter.add(new SubtypePredicate(SubType.EWOK));
ewokFilter.add(new AnotherPredicate());
ewokFilter.add(AnotherPredicate.instance);
}
public ChiefChirpa(UUID ownerId, CardSetInfo setInfo) {

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

@ -21,7 +21,7 @@ public final class CinderGiant extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("each other creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public CinderGiant(UUID ownerId, CardSetInfo setInfo) {

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

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

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

@ -32,7 +32,7 @@ public final class ConsecratedByBlood extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("two other creatures");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ConsecratedByBlood(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ public final class ConsulsShieldguard extends CardImpl {
private final static FilterAttackingCreature filter = new FilterAttackingCreature();
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public ConsulsShieldguard(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ public final class CourtStreetDenizen extends CardImpl {
private static final FilterPermanent filter = new FilterCreaturePermanent("another white creature");
private static final FilterCreaturePermanent filterOpponentCreature = new FilterCreaturePermanent("creature an opponent controls");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ColorPredicate(ObjectColor.WHITE));
filter.add(new ControllerPredicate(TargetController.YOU));
filterOpponentCreature.add(new ControllerPredicate(TargetController.OPPONENT));

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

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

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

@ -28,7 +28,7 @@ public final class Cryptoplasm extends CardImpl {
final static FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public Cryptoplasm(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ public final class CustodiSoulbinders extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public CustodiSoulbinders(UUID ownerId, CardSetInfo setInfo) {

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

@ -32,7 +32,7 @@ public final class CytoplastRootKin extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("other creature you control that has a +1/+1 counter on it");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new CounterPredicate(CounterType.P1P1));
}

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

@ -26,7 +26,7 @@ public final class DarkslickShores extends CardImpl {
private final static FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DarkslickShores(UUID ownerId, CardSetInfo setInfo) {

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

@ -65,7 +65,7 @@ class DauntlessBodyguardChooseCreatureEffect extends OneShotEffect {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DauntlessBodyguardChooseCreatureEffect() {

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

@ -36,7 +36,7 @@ public final class DauntlessDourbark extends CardImpl {
filter.add(Predicates.or(new SubtypePredicate(SubType.FOREST),
new SubtypePredicate(SubType.TREEFOLK)));
filter2.add(new SubtypePredicate(SubType.TREEFOLK));
filter2.add(new AnotherPredicate());
filter2.add(AnotherPredicate.instance);
}
final static private String rule = "{this} has trample as long as you control another Treefolk";

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

@ -29,7 +29,7 @@ public final class DeathbringerRegent extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("other creatures");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DeathbringerRegent(UUID ownerId, CardSetInfo setInfo) {

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

@ -22,7 +22,7 @@ public final class DecoratedChampion extends CardImpl {
private static final FilterTeamPermanent filter = new FilterTeamPermanent(SubType.WARRIOR, "another Warrior");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DecoratedChampion(UUID ownerId, CardSetInfo setInfo) {

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

@ -26,7 +26,7 @@ public final class DeeprootElite extends CardImpl {
private static final FilterPermanent filterYourAnotherMerfolk = new FilterPermanent(SubType.MERFOLK, "another " + SubType.MERFOLK.toString());
static {
filterYourAnotherMerfolk.add(new AnotherPredicate());
filterYourAnotherMerfolk.add(AnotherPredicate.instance);
filterYourAnotherMerfolk.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -60,7 +60,7 @@ class DefiantGreatmawTriggeredAbility extends TriggeredAbilityImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -24,7 +24,7 @@ public final class DemonicTaskmaster extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a creature other than Demonic Taskmaster");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DemonicTaskmaster(UUID ownerId, CardSetInfo setInfo) {

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

@ -24,7 +24,7 @@ public final class DemonlordOfAshmouth extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent(" another creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DemonlordOfAshmouth(UUID ownerId, CardSetInfo setInfo) {

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

@ -22,7 +22,7 @@ public final class DenizenOfTheDeep extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
static{
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DenizenOfTheDeep(UUID ownerId, CardSetInfo setInfo) {

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

@ -26,7 +26,7 @@ public final class DeputyOfAcquittals extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("another target creature you control");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -27,8 +27,8 @@ public final class DesolationGiant extends CardImpl {
private static final FilterCreaturePermanent filter2 = new FilterCreaturePermanent("other creatures you control");
static {
filter.add(new AnotherPredicate());
filter2.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter2.add(AnotherPredicate.instance);
filter2.add(new ControllerPredicate(TargetController.YOU));
}

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

@ -25,7 +25,7 @@ public final class DireFleetCaptain extends CardImpl {
static {
filter.add(new SubtypePredicate(SubType.PIRATE));
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DireFleetCaptain(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@ public final class DominatorDrone extends CardImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another colorless creature");
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
filter.add(new ColorlessPredicate());
}

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

@ -63,7 +63,7 @@ class DracoplasmEffect extends ReplacementEffectImpl {
private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent();
static {
filter.add(new AnotherPredicate());
filter.add(AnotherPredicate.instance);
}
public DracoplasmEffect() {

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

@ -32,7 +32,7 @@ public final class DreadCacodemon extends CardImpl {
private static final FilterCreaturePermanent otherCreaturesYouControl = new FilterCreaturePermanent("other creatures you control");
static {
otherCreaturesYouControl.add(new ControllerPredicate(TargetController.YOU));
otherCreaturesYouControl.add(new AnotherPredicate());
otherCreaturesYouControl.add(AnotherPredicate.instance);
}
public DreadCacodemon(UUID ownerId, CardSetInfo setInfo) {

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