github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

rename counttype to comparisontype

Browse source
This commit is contained in:
ingmargoudt 2017-04-11 17:01:59 +02:00
parent 60a325c43f
commit 03643d53a3
489 changed files with 1062 additions and 1062 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CantBeCounteredSourceEffect;
@ -52,7 +52,7 @@ public class AbruptDecay extends CardImpl {
private static final FilterNonlandPermanent filter = new FilterNonlandPermanent("nonland permanent with converted mana cost 3 or less");
static {
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public AbruptDecay(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.a;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.Mode;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.ExileTargetEffect;
@ -53,7 +53,7 @@ public class AbzanCharm extends CardImpl {
private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creature with power 3 or greater");
static {
FILTER.add(new PowerPredicate(CountType.MORE_THAN, 2));
FILTER.add(new PowerPredicate(ComparisonType.MORE_THAN, 2));
}
public AbzanCharm(UUID ownerId, CardSetInfo setInfo) {

6
Mage.Sets/src/mage/cards/a/AegisOfTheMeek.java
View file

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -54,8 +54,8 @@ public class AegisOfTheMeek extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("1/1 creature");
static {
filter.add(new PowerPredicate(CountType.EQUAL_TO, 1));
filter.add(new ToughnessPredicate(CountType.EQUAL_TO, 1));
filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, 1));
filter.add(new ToughnessPredicate(ComparisonType.EQUAL_TO, 1));
}
public AegisOfTheMeek(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
@ -104,7 +104,7 @@ class AetherVialEffect extends OneShotEffect {
int count = permanent.getCounters(game).getCount(CounterType.CHARGE);
FilterCreatureCard filter = new FilterCreatureCard("creature card with converted mana cost equal to " + count);
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, count));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, count));
String choiceText = "Put a " + filter.getMessage() + " from your hand onto the battlefield?";
Player controller = game.getPlayer(source.getControllerId());

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

@ -29,7 +29,7 @@ package mage.cards.a;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.CardsInHandCondition;
@ -60,7 +60,7 @@ public class AkkiUnderling extends CardImpl {
this.toughness = new MageInt(1);
// As long as you have seven or more cards in hand, Akki Underling gets +2/+1 and has first strike.
Condition condition = new CardsInHandCondition(CountType.MORE_THAN,6);
Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,6);
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1"));
ability.addEffect(new ConditionalContinuousEffect(

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

@ -29,7 +29,7 @@ package mage.cards.a;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.AttacksTriggeredAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect;
@ -59,7 +59,7 @@ public class AleshaWhoSmilesAtDeath extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("creature card with power 2 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
}
public AleshaWhoSmilesAtDeath(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.common.delayed.OnLeaveReturnExiledToBattlefieldAbility;
import mage.abilities.effects.OneShotEffect;
@ -77,7 +77,7 @@ class AlignedHedronNetworkExileEffect extends OneShotEffect {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 5 or greater");
static {
filter.add(new PowerPredicate(CountType.MORE_THAN, 4));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 4));
}
public AlignedHedronNetworkExileEffect() {

6
Mage.Sets/src/mage/cards/a/Aluren.java
View file

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.SourceIsSpellCondition;
import mage.abilities.costs.AlternativeCostSourceAbility;
@ -63,7 +63,7 @@ public class Aluren extends CardImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with converted mana cost 3 or less");
static {
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public Aluren(UUID ownerId, CardSetInfo setInfo) {
@ -95,7 +95,7 @@ class AlurenRuleEffect extends ContinuousEffectImpl {
private static final FilterCreatureCard filter = new FilterCreatureCard("creature cards with converted mana cost 3 or less");
static {
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
private static AlternativeCostSourceAbility alternativeCastingCostAbility = new AlternativeCostSourceAbility(null, SourceIsSpellCondition.instance, null, filter, true);

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleEvasionAbility;
import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect;
import mage.cards.CardImpl;
@ -49,7 +49,7 @@ public class AmrouKithkin extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 3 or greater");
static {
filter.add(new PowerPredicate(CountType.MORE_THAN, 2));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 2));
}
public AmrouKithkin(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -53,7 +53,7 @@ public class AmrouScout extends CardImpl {
private static final FilterPermanentCard filter = new FilterPermanentCard("Rebel permanent card with converted mana cost 3 or less");
static {
filter.add(new SubtypePredicate("Rebel"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public AmrouScout(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.a;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.condition.common.YouGainedLifeCondition;
import mage.abilities.effects.common.CreateTokenEffect;
@ -52,7 +52,7 @@ public class AngelicAccord extends CardImpl {
// At the beginning of each end step, if you gained 4 or more life this turn, create a 4/4 white Angel creature token with flying.
this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new AngelToken()), TargetController.ANY,
new YouGainedLifeCondition(CountType.MORE_THAN, 3), false), new PlayerGainedLifeWatcher());
new YouGainedLifeCondition(ComparisonType.MORE_THAN, 3), false), new PlayerGainedLifeWatcher());
}
public AngelicAccord(final AngelicAccord card) {

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.TriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@ -70,7 +70,7 @@ public class ApothecaryGeist extends CardImpl {
TriggeredAbility triggeredAbility = new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3));
this.addAbility(new ConditionalTriggeredAbility(
triggeredAbility,
new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0),
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0),
"When {this} enters the battlefield, if you control another Spirit, you gain 3 life."));
}

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

@ -27,7 +27,7 @@
*/
package mage.cards.a;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.common.ExileCardYouChooseTargetOpponentEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -47,7 +47,7 @@ public class AppetiteForBrains extends CardImpl {
private static final FilterCard filter = new FilterCard("a card from it with converted mana cost 4 or greater");
static {
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 3));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3));
}
public AppetiteForBrains(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.AttachedToMatchesFilterCondition;
@ -70,7 +70,7 @@ public class ArachnusWeb extends CardImpl {
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAttackActivateAttachedEffect()));
// At the beginning of the end step, if enchanted creature's power is 4 or greater, destroy Arachnus Web.
FilterPermanent filter = new FilterPermanent("if enchanted creature's power is 4 or greater");
filter.add(new PowerPredicate(CountType.MORE_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3));
this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD,
new DestroySourceEffect(), TargetController.ANY,
new AttachedToMatchesFilterCondition(filter), false));

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

@ -27,7 +27,7 @@
*/
package mage.cards.a;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.decorator.ConditionalOneShotEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
@ -59,7 +59,7 @@ public class ArtificersEpiphany extends CardImpl {
this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2));
this.getSpellAbility().addEffect(new ConditionalOneShotEffect(
new DiscardControllerEffect(1),
new PermanentsOnTheBattlefieldCondition(filter, CountType.EQUAL_TO, 0)));
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.EQUAL_TO, 0)));
}
public ArtificersEpiphany(final ArtificersEpiphany card) {

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

@ -28,7 +28,7 @@
package mage.cards.a;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.DiscardCardCost;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -51,7 +51,7 @@ public class ArtificersIntuition extends CardImpl {
private static final FilterArtifactCard filter = new FilterArtifactCard("artifact card with converted mana cost 1 or less");
static {
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 2));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2));
}
public ArtificersIntuition(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}");

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

@ -29,7 +29,7 @@ package mage.cards.a;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@ -69,7 +69,7 @@ public class AshenmoorCohort extends CardImpl {
this.toughness = new MageInt(3);
// Ashenmoor Cohort gets +1/+1 as long as you control another black creature.
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0);
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0);
ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));

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

@ -29,7 +29,7 @@ package mage.cards.a;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.LoyaltyAbility;
import mage.abilities.common.PlanswalkerEntersWithLoyalityCountersAbility;
import mage.abilities.costs.Cost;
@ -151,7 +151,7 @@ class AshiokNightmareWeaverPutIntoPlayEffect extends OneShotEffect {
}
FilterCard filter = new FilterCreatureCard("creature card with converted mana cost {" + cmc + "} exiled with " + sourceObject.getIdName());
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, cmc));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc));
Target target = new TargetCardInExile(filter, CardUtil.getExileZoneId(game, source.getSourceId(), source.getSourceObjectZoneChangeCounter()));

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

@ -29,7 +29,7 @@ package mage.cards.a;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.condition.common.CardsInHandCondition;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -60,7 +60,7 @@ public class AsylumVisitor extends CardImpl {
// At the beginning of each player's upkeep, if that player has no cards in hand, you draw a card and you lose 1 life.
Ability ability = new ConditionalTriggeredAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardSourceControllerEffect(1), TargetController.ANY, false),
new CardsInHandCondition(CountType.EQUAL_TO, 0, null, TargetController.ACTIVE),
new CardsInHandCondition(ComparisonType.EQUAL_TO, 0, null, TargetController.ACTIVE),
"At the beginning of each player's upkeep, if that player has no cards in hand, you draw a card and you lose 1 life.");
Effect effect = new LoseLifeSourceControllerEffect(1);
effect.setText("and you lose 1 life");

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

@ -29,7 +29,7 @@ package mage.cards.a;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.ReturnToHandTargetEffect;
@ -51,7 +51,7 @@ public class AuriokSalvagers extends CardImpl {
private static final FilterArtifactCard filter = new FilterArtifactCard("artifact card with converted mana cost 1 or less from your graveyard");
static {
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 2));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2));
}
public AuriokSalvagers(UUID ownerId, CardSetInfo setInfo) {

6
Mage.Sets/src/mage/cards/a/AustereCommand.java
View file

@ -27,7 +27,7 @@
*/
package mage.cards.a;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.Mode;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl;
@ -49,8 +49,8 @@ public class AustereCommand extends CardImpl {
private static final FilterCreaturePermanent filter3orLess = new FilterCreaturePermanent("creatures with converted mana cost 3 or less");
private static final FilterCreaturePermanent filter4orMore = new FilterCreaturePermanent("creatures with converted mana cost 4 or greater");
static {
filter3orLess.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter4orMore.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 3));
filter3orLess.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
filter4orMore.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3));
}
public AustereCommand(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ package mage.cards.a;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.TapTargetEffect;
@ -52,7 +52,7 @@ public class AysenBureaucrats extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
}
public AysenBureaucrats(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
@ -49,7 +49,7 @@ public class BalaGedScorpion extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 1 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 2));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 2));
}
public BalaGedScorpion(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ package mage.cards.b;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@ -76,7 +76,7 @@ public class BallynockCohort extends CardImpl {
this.addAbility(FirstStrikeAbility.getInstance());
// Ballynock Cohort gets +1/+1 as long as you control another white creature.
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0);
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0);
Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility;
import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.cards.CardImpl;
@ -62,7 +62,7 @@ public class BarbarianOutcast extends CardImpl {
// When you control no Swamps, sacrifice Barbarian Outcast.
this.addAbility(new ControlsPermanentsControllerTriggeredAbility(
new FilterLandPermanent("Swamp", "no Swamps"), CountType.EQUAL_TO, 0,
new FilterLandPermanent("Swamp", "no Swamps"), ComparisonType.EQUAL_TO, 0,
new SacrificeSourceEffect()));
}

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

@ -27,7 +27,7 @@
*/
package mage.cards.b;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.TriggeredAbility;
import mage.abilities.TriggeredAbilityImpl;
import mage.abilities.condition.Condition;
@ -55,7 +55,7 @@ public class BarrenGlory extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{4}{W}{W}");
// At the beginning of your upkeep, if you control no permanents other than Barren Glory and have no cards in hand, you win the game.
Condition condition = new CardsInHandCondition(CountType.EQUAL_TO, 0);
Condition condition = new CardsInHandCondition(ComparisonType.EQUAL_TO, 0);
TriggeredAbility ability = new BarrenGloryTriggeredAbility();
this.addAbility(new ConditionalTriggeredAbility(ability,
condition,

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

@ -30,7 +30,7 @@ package mage.cards.b;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
@ -55,7 +55,7 @@ public class BeaconBehemoth extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater");
static {
filter.add(new PowerPredicate(CountType.MORE_THAN, 4));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 4));
}
public BeaconBehemoth (UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ package mage.cards.b;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DestroyTargetEffect;
@ -52,7 +52,7 @@ public class BigGameHunter extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 4 or greater");
static {
filter.add(new PowerPredicate(CountType.MORE_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 3));
}
public BigGameHunter(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.effects.common.WinGameSourceControllerEffect;
@ -64,7 +64,7 @@ public class Biovisionary extends CardImpl {
this.addAbility(new BeginningOfEndStepTriggeredAbility(
Zone.BATTLEFIELD, new WinGameSourceControllerEffect(),
TargetController.ANY,
new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 3),
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 3),
false));
}

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ActivateAsSorceryActivatedAbility;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.SacrificeTargetCost;
@ -106,7 +106,7 @@ class BirthingPodEffect extends OneShotEffect {
if (sacrificedPermanent != null && controller != null) {
int newConvertedCost = sacrificedPermanent.getConvertedManaCost() + 1;
FilterCard filter = new FilterCard("creature card with converted mana cost " + newConvertedCost);
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, newConvertedCost));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, newConvertedCost));
filter.add(new CardTypePredicate(CardType.CREATURE));
TargetCardInLibrary target = new TargetCardInLibrary(filter);
if (controller.searchLibrary(target, game)) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.b;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -54,7 +54,7 @@ public class BlackcleaveCliffs extends CardImpl {
public BlackcleaveCliffs(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.LAND},null);
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, CountType.FEWER_THAN, 3));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 3));
String abilityText = "tapped unless you control fewer than 3 lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));
this.addAbility(new BlackManaAbility());

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

@ -29,7 +29,7 @@ package mage.cards.b;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -57,7 +57,7 @@ public class Blightspeaker extends CardImpl {
static {
filter.add(new SubtypePredicate("Rebel"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public Blightspeaker(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.condition.Condition;
import mage.abilities.decorator.ConditionalContinuousEffect;
import mage.abilities.dynamicvalue.DynamicValue;
@ -58,7 +58,7 @@ public class BloodLust extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
static {
filter.add(new ToughnessPredicate(CountType.MORE_THAN, 4));
filter.add(new ToughnessPredicate(ComparisonType.MORE_THAN, 4));
}
public BloodLust(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.common.PutCardIntoGraveFromAnywhereAllTriggeredAbility;
import mage.abilities.condition.common.OpponentLostLifeCondition;
@ -61,7 +61,7 @@ public class BloodchiefAscension extends CardImpl {
this.addAbility(new BeginningOfEndStepTriggeredAbility(Zone.BATTLEFIELD,
new AddCountersSourceEffect(CounterType.QUEST.createInstance(1), false),
TargetController.ANY,
new OpponentLostLifeCondition(CountType.MORE_THAN, 1),
new OpponentLostLifeCondition(ComparisonType.MORE_THAN, 1),
true));
// Whenever a card is put into an opponent's graveyard from anywhere, if Bloodchief Ascension has three or more quest counters on it, you may have that player lose 2 life. If you do, you gain 2 life.

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

@ -29,7 +29,7 @@ package mage.cards.b;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ActivateIfConditionActivatedAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@ -80,7 +80,7 @@ public class BloodlineKeeper extends CardImpl {
Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD,
new TransformSourceEffect(true),
new ManaCostsImpl("{B}"),
new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 4));
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 4));
this.addAbility(ability);
}

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
@ -53,7 +53,7 @@ public class BloodthornTaunter extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 5 or greater");
static {
filter.add(new PowerPredicate(CountType.MORE_THAN, 4));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 4));
}
public BloodthornTaunter(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.b;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -53,7 +53,7 @@ public class BloomingMarsh extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
// Blooming Marsh enters the battlefield tapped unless you control two or fewer other lands.
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), CountType.FEWER_THAN, 3));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), ComparisonType.FEWER_THAN, 3));
String abilityText = "tapped unless you control fewer than 3 lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));

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

@ -29,7 +29,7 @@ package mage.cards.b;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.costs.common.TapSourceCost;
@ -60,7 +60,7 @@ public class BogGlider extends CardImpl {
static {
filter.add(new SubtypePredicate("Mercenary"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 3));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3));
}
public BogGlider(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.SacrificeSourceEffect;
@ -58,7 +58,7 @@ public class BogSerpent extends CardImpl {
// When you control no Swamps, sacrifice Bog Serpent.
this.addAbility(new ControlsPermanentsControllerTriggeredAbility(
new FilterLandPermanent("Swamp", "no Swamps"), CountType.EQUAL_TO, 0,
new FilterLandPermanent("Swamp", "no Swamps"), ComparisonType.EQUAL_TO, 0,
new SacrificeSourceEffect()));
}

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

@ -27,7 +27,7 @@
*/
package mage.cards.b;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -53,7 +53,7 @@ public class BotanicalSanctum extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
// Botanical Sanctum enters the battlefield tapped unless you control two or fewer other lands.
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), CountType.FEWER_THAN, 3));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), ComparisonType.FEWER_THAN, 3));
String abilityText = "tapped unless you control fewer than 3 lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.RemoveVariableCountersSourceCost;
import mage.abilities.costs.common.TapSourceCost;
@ -108,7 +108,7 @@ class BrainInAJarCastEffect extends OneShotEffect {
if (controller != null && sourceObject != null) {
int counters = sourceObject.getCounters(game).getCount(CounterType.CHARGE);
FilterCard filter = new FilterInstantOrSorceryCard();
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, counters));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, counters));
int cardsToCast = controller.getHand().count(filter, source.getControllerId(), source.getSourceId(), game);
if (cardsToCast > 0 && controller.chooseUse(outcome, "Cast an instant or sorcery card with converted mana costs of " + counters + " from your hand without paying its mana cost?", source, game)) {
TargetCardInHand target = new TargetCardInHand(filter);

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.combat.CantBlockCreaturesSourceEffect;
import mage.cards.CardImpl;
@ -48,7 +48,7 @@ public class BrassclawOrcs extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 2 or greater");
static {
filter.add(new PowerPredicate(CountType.MORE_THAN, 1));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 1));
}
public BrassclawOrcs(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.Effect;
@ -55,7 +55,7 @@ public class BreakThroughTheLine extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
}
public BreakThroughTheLine(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ package mage.cards.b;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@ -76,7 +76,7 @@ public class BriarberryCohort extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Briarberry Cohort gets +1/+1 as long as you control another blue creature.
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0);
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0);
Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.dynamicvalue.common.ColorsOfManaSpentToCastCount;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
@ -98,7 +98,7 @@ class BringToLightEffect extends OneShotEffect {
int numberColors = ColorsOfManaSpentToCastCount.getInstance().calculate(game, source, this);
FilterCard filter = new FilterCard();
filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.INSTANT), new CardTypePredicate(CardType.SORCERY)));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, numberColors + 1));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, numberColors + 1));
TargetCardInLibrary target = new TargetCardInLibrary(filter);
controller.searchLibrary(target, game);
Card card = controller.getLibrary().getCard(target.getFirstTarget(), game);

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.TriggeredAbility;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.condition.common.CardsInHandCondition;
@ -63,7 +63,7 @@ public class BrinkOfMadness extends CardImpl {
TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SacrificeSourceEffect(), TargetController.YOU, false);
ability.addEffect(new BrinkOfMadnessEffect());
ability.addTarget(new TargetOpponent());
CardsInHandCondition contition = new CardsInHandCondition(CountType.EQUAL_TO, 0);
CardsInHandCondition contition = new CardsInHandCondition(ComparisonType.EQUAL_TO, 0);
this.addAbility(new ConditionalTriggeredAbility(ability, contition, "At the beginning of your upkeep, if you have no cards in hand, sacrifice {this} and target opponent discards his or her hand."));
}

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

@ -28,7 +28,7 @@
package mage.cards.b;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.effects.keyword.InvestigateEffect;
import mage.abilities.keyword.FlyingAbility;
@ -51,7 +51,7 @@ public class BygoneBishop extends CardImpl {
static {
filterSpell.add(new CardTypePredicate(CardType.CREATURE));
filterSpell.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filterSpell.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public BygoneBishop(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -62,7 +62,7 @@ public class CanopyVista extends CardImpl {
this.subtype.add("Plains");
// Canopy Vista enters the battlefield tapped unless you control two or more basic lands.
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 1));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1));
String abilityText = "tapped unless you control two or more basic lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));
this.addAbility(new GreenManaAbility());

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

@ -30,7 +30,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.GenericManaCost;
@ -56,7 +56,7 @@ public class CateranBrute extends CardImpl {
static {
filter.add(new SubtypePredicate("Mercenary"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 3));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 3));
}
public CateranBrute(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.GenericManaCost;
@ -57,7 +57,7 @@ public class CateranEnforcer extends CardImpl {
static {
filter.add(new SubtypePredicate("Mercenary"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 5));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 5));
}
public CateranEnforcer(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.GenericManaCost;
@ -55,7 +55,7 @@ public class CateranKidnappers extends CardImpl {
static {
filter.add(new SubtypePredicate("Mercenary"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public CateranKidnappers(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.costs.common.TapSourceCost;
@ -59,7 +59,7 @@ public class CateranOverlord extends CardImpl {
static {
filter.add(new SubtypePredicate("Mercenary"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 7));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 7));
}
public CateranOverlord(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.GenericManaCost;
@ -56,7 +56,7 @@ public class CateranPersuader extends CardImpl {
static {
filter.add(new SubtypePredicate("Mercenary"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 2));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 2));
}
public CateranPersuader(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.GenericManaCost;
@ -57,7 +57,7 @@ public class CateranSlaver extends CardImpl {
static {
filter.add(new SubtypePredicate("Mercenary"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 6));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 6));
}
public CateranSlaver(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DestroyAllEffect;
@ -101,7 +101,7 @@ class CelestialKirinEffect extends OneShotEffect {
if (spell != null) {
int cmc = spell.getConvertedManaCost();
FilterPermanent filter = new FilterPermanent();
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, cmc));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, cmc));
return new DestroyAllEffect(filter).apply(game, source);
}
return false;

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.PermanentHasCounterCondition;
import mage.abilities.decorator.ConditionalContinuousEffect;
@ -64,7 +64,7 @@ public class ChampionsDrake extends CardImpl {
this.addAbility(FlyingAbility.getInstance());
// Champion's Drake gets +3/+3 as long as you control a creature with three or more level counters on it.
ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentHasCounterCondition(CounterType.LEVEL, 2, new FilterControlledCreaturePermanent(), CountType.MORE_THAN), rule);
ConditionalContinuousEffect effect = new ConditionalContinuousEffect(new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new PermanentHasCounterCondition(CounterType.LEVEL, 2, new FilterControlledCreaturePermanent(), ComparisonType.MORE_THAN), rule);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
}

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

@ -29,7 +29,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.effects.OneShotEffect;
@ -101,7 +101,7 @@ class ChroniclerOfHeroesEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
if (new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0).apply(game, source)) {
if (new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0).apply(game, source)) {
controller.drawCards(1, game);
}
return true;

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

@ -27,7 +27,7 @@
*/
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -63,7 +63,7 @@ public class CinderGlade extends CardImpl {
this.subtype.add("Forest");
// Cinder Glade enters the battlefield tapped unless you control two or more basic lands.
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 1));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 1));
String abilityText = "tapped unless you control two or more basic lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));
this.addAbility(new RedManaAbility());

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -98,7 +98,7 @@ class CitanulFluteSearchEffect extends OneShotEffect {
FilterCard filter = new FilterCard("creature card with converted mana cost X or less");
filter.add(new CardTypePredicate(CardType.CREATURE));
//Set the mana cost one higher to 'emulate' a less than or equal to comparison.
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, source.getManaCostsToPay().getX() + 1));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, source.getManaCostsToPay().getX() + 1));
TargetCardInLibrary target = new TargetCardInLibrary(filter);
if (player.searchLibrary(target, game)) {

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -60,7 +60,7 @@ public class ClifftopRetreat extends CardImpl {
public ClifftopRetreat(UUID ownerId, CardSetInfo setInfo) {
super(ownerId,setInfo,new CardType[]{CardType.LAND},null);
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0));
String abilityText = "tap it unless you control a Mountain or a Plains";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));
this.addAbility(new RedManaAbility());

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

@ -29,7 +29,7 @@ package mage.cards.c;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.common.DiesCreatureTriggeredAbility;
import mage.abilities.condition.Condition;
@ -60,7 +60,7 @@ public class ColfenorsUrn extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with toughness 4 or greater");
static {
filter.add(new ToughnessPredicate(CountType.MORE_THAN, 3));
filter.add(new ToughnessPredicate(ComparisonType.MORE_THAN, 3));
}
public ColfenorsUrn(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.common.LookLibraryAndPickControllerEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -49,7 +49,7 @@ public class CollectedCompany extends CardImpl {
static {
filter.add(new CardTypePredicate(CardType.CREATURE));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public CollectedCompany(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.Mode;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.TapTargetCost;
@ -71,7 +71,7 @@ public class CollectiveEffort extends CardImpl {
static {
filterUntapped.add(Predicates.not(new TappedPredicate()));
filterDestroyCreature.add(new PowerPredicate(CountType.MORE_THAN, 3));
filterDestroyCreature.add(new PowerPredicate(ComparisonType.MORE_THAN, 3));
}
public CollectiveEffort(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ package mage.cards.c;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ActivateIfConditionActivatedAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -70,7 +70,7 @@ public class CompanionOfTheTrials extends CardImpl {
Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD,
new UntapTargetEffect(),
new ManaCostsImpl("{1}{W}"),
new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0));
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.common.ExileTargetEffect;
import mage.abilities.keyword.DevoidAbility;
import mage.cards.CardImpl;
@ -49,7 +49,7 @@ public class CompleteDisregard extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 3 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 4));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 4));
}
public CompleteDisregard(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -53,7 +53,7 @@ public class ConcealedCourtyard extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
// Concealed Courtyard enters the battlefield tapped unless you control two or fewer other lands.
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), CountType.FEWER_THAN, 3));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(new FilterLandPermanent(), ComparisonType.FEWER_THAN, 3));
String abilityText = "tapped unless you control fewer than 3 lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.common.CastSourceTriggeredAbility;
@ -66,7 +66,7 @@ public class ConduitOfRuin extends CardImpl {
static {
filter.add(new ColorlessPredicate());
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 6));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 6));
filterCost.add(new FirstCastCreatureSpellPredicate());
}

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

@ -27,7 +27,7 @@
*/
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -46,7 +46,7 @@ public class ConsumeTheMeek extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with converted mana cost 3 or less");
static {
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public ConsumeTheMeek(UUID ownerId, CardSetInfo setInfo) {

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

@ -27,7 +27,7 @@
*/
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -55,7 +55,7 @@ public class CopperlineGorge extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.LAND},null);
// Copperline Gorge enters the battlefield tapped unless you control two or fewer other lands.
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, CountType.FEWER_THAN, 3));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 3));
String abilityText = "tapped unless you control two or fewer other lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));
this.addAbility(new RedManaAbility());

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility;
import mage.abilities.effects.common.SacrificeSourceEffect;
import mage.abilities.keyword.FlyingAbility;
@ -56,7 +56,7 @@ public class CovetousDragon extends CardImpl {
// When you control no artifacts, sacrifice Covetous Dragon.
this.addAbility(new ControlsPermanentsControllerTriggeredAbility(
new FilterArtifactPermanent("no artifacts"), CountType.EQUAL_TO, 0,
new FilterArtifactPermanent("no artifacts"), ComparisonType.EQUAL_TO, 0,
new SacrificeSourceEffect()));
}

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

@ -29,7 +29,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@ -72,7 +72,7 @@ public class CrabappleCohort extends CardImpl {
this.toughness = new MageInt(4);
// Crabapple Cohort gets +1/+1 as long as you control another green creature.
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0);
Condition condition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0);
Effect effect = new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), condition, rule);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect));
}

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.ObjectColor;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.DontUntapInControllersUntapStepAllEffect;
import mage.cards.CardImpl;
@ -54,7 +54,7 @@ public class Crackdown extends CardImpl {
static {
filter.add(Predicates.not(new ColorPredicate(ObjectColor.WHITE)));
filter.add(new PowerPredicate(CountType.MORE_THAN, 2));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 2));
}
public Crackdown(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DamagePlayersEffect;
import mage.cards.CardImpl;
@ -117,7 +117,7 @@ class CracklingDoomEffect extends OneShotEffect {
}
} else if (greatestPower != Integer.MIN_VALUE) {
FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("creature to sacrifice with power equal to " + greatestPower);
filter.add(new PowerPredicate(CountType.EQUAL_TO, greatestPower));
filter.add(new PowerPredicate(ComparisonType.EQUAL_TO, greatestPower));
Target target = new TargetControlledCreaturePermanent(filter);
if (opponent.choose(outcome, target, playerId, game)) {
Permanent permanent = game.getPermanent(target.getFirstTarget());

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

@ -29,7 +29,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect;
@ -52,7 +52,7 @@ public class CraftyPathmage extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
}
public CraftyPathmage(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ package mage.cards.c;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.ManaWasSpentCondition;
import mage.abilities.effects.OneShotEffect;
@ -112,7 +112,7 @@ class CryptChampionEffect extends OneShotEffect {
if (player != null) {
FilterCard filter = new FilterCreatureCard("creature card with converted mana cost 3 or less from your graveyard");
filter.add(new OwnerIdPredicate(playerId));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
Target target = new TargetCardInGraveyard(filter);
if (target.canChoose(playerId, game) && player.chooseTarget(outcome, target, source, game)) {
Card card = game.getCard(target.getFirstTarget());

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
@ -83,7 +83,7 @@ class HasLowestCMCAmongstNonlandPermanentsPredicate implements Predicate<Permane
@Override
public boolean apply(Permanent input, Game game) {
FilterPermanent filter = new FilterNonlandPermanent();
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, input.getConvertedManaCost()));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, input.getConvertedManaCost()));
return !game.getBattlefield().contains(filter, 1, game);
}

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

@ -27,7 +27,7 @@
*/
package mage.cards.c;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -45,7 +45,7 @@ public class CullingSun extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost 3 or less");
static {
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public CullingSun(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.c;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.combat.CantBlockCreaturesSourceEffect;
import mage.abilities.keyword.IntimidateAbility;
@ -49,7 +49,7 @@ public class CyclopsTyrant extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 2 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
}
public CyclopsTyrant(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ControlsPermanentsControllerTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.SacrificeSourceEffect;
@ -58,7 +58,7 @@ public class Dandan extends CardImpl {
// When you control no Islands, sacrifice Dandan.
this.addAbility(new ControlsPermanentsControllerTriggeredAbility(
new FilterLandPermanent("Island", "no Islands"), CountType.EQUAL_TO, 0,
new FilterLandPermanent("Island", "no Islands"), ComparisonType.EQUAL_TO, 0,
new SacrificeSourceEffect()));
}

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.InvertCondition;
@ -61,7 +61,7 @@ public class DarkslickShores extends CardImpl {
super(ownerId,setInfo,new CardType[]{CardType.LAND},null);
// Darkslick Shores enters the battlefield tapped unless you control two or fewer other lands.
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, CountType.FEWER_THAN, 3));
Condition controls = new InvertCondition(new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.FEWER_THAN, 3));
String abilityText = "tapped unless you control two or fewer other lands";
this.addAbility(new EntersBattlefieldAbility(new ConditionalOneShotEffect(new TapSourceEffect(), controls, abilityText), abilityText));

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

@ -30,7 +30,7 @@ package mage.cards.d;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.common.SimpleEvasionAbility;
import mage.abilities.effects.AsThoughEffectImpl;
@ -63,7 +63,7 @@ public class DaxosOfMeletis extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 3 or greater");
static {
filter.add(new PowerPredicate(CountType.MORE_THAN, 2));
filter.add(new PowerPredicate(ComparisonType.MORE_THAN, 2));
}
public DaxosOfMeletis(UUID ownerId, CardSetInfo setInfo) {

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

@ -29,7 +29,7 @@ package mage.cards.d;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.Condition;
import mage.abilities.condition.common.CardsInHandCondition;
@ -60,7 +60,7 @@ public class DeathmaskNezumi extends CardImpl {
this.toughness = new MageInt(2);
// As long as you have seven or more cards in hand, Deathmask Nezumi gets +2/+1 and has fear.
Condition condition = new CardsInHandCondition(CountType.MORE_THAN,6);
Condition condition = new CardsInHandCondition(ComparisonType.MORE_THAN,6);
Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(
new BoostSourceEffect(2,1, Duration.WhileOnBattlefield), condition, "As long as you have seven or more cards in hand, {this} gets +2/+1"));
ability.addEffect(new ConditionalContinuousEffect(

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

@ -29,7 +29,7 @@ package mage.cards.d;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.common.DestroyTargetEffect;
@ -81,7 +81,7 @@ public class DeepfireElemental extends CardImpl {
ability.getTargets().clear();
FilterPermanent newFilter = filter.copy();
newFilter.setMessage(new StringBuilder("artifact or creature with converted mana cost {").append(ability.getManaCostsToPay().getX()).append('}').toString());
newFilter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, ability.getManaCostsToPay().getX()));
newFilter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, ability.getManaCostsToPay().getX()));
Target target = new TargetPermanent(newFilter);
ability.addTarget(target);
}

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

@ -27,7 +27,7 @@
*/
package mage.cards.d;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -47,7 +47,7 @@ public class Defeat extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with power 2 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
}
public Defeat(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -55,7 +55,7 @@ public class DefiantFalcon extends CardImpl {
static {
filter.add(new SubtypePredicate("Rebel"));
filter.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filter.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
}
public DefiantFalcon(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.SimpleEvasionAbility;
import mage.abilities.effects.common.combat.CantBeBlockedByCreaturesSourceEffect;
import mage.abilities.keyword.CrewAbility;
@ -49,7 +49,7 @@ public class DemolitionStomper extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creatures with power 2 or less");
static {
filter.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filter.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
}
public DemolitionStomper(UUID ownerId, CardSetInfo setInfo) {

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

@ -30,7 +30,7 @@ package mage.cards.d;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.ActivateIfConditionActivatedAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -69,7 +69,7 @@ public class DesiccatedNaga extends CardImpl {
Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD,
new LoseLifeTargetEffect(2),
new ManaCostsImpl("{3}{B}"),
new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0));
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0));
ability.addTarget(new TargetOpponent());
Effect effect = new GainLifeEffect(2);
effect.setText("and you gain 2 life");

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.SpellAbility;
import mage.abilities.dynamicvalue.common.ManacostVariableValue;
import mage.abilities.effects.Effect;
@ -67,7 +67,7 @@ public class Detonate extends CardImpl {
ability.getTargets().clear();
int xValue = ability.getManaCostsToPay().getX();
FilterArtifactPermanent filter = new FilterArtifactPermanent("artifact with converted mana cost X");
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, xValue));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue));
ability.addTarget(new TargetArtifactPermanent(filter));
}
}

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.Mode;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CounterTargetEffect;
@ -61,7 +61,7 @@ public class DimirCharm extends CardImpl {
private static final FilterSpell filterSorcery = new FilterSpell("sorcery spell");
static {
filterCreature.add(new PowerPredicate(CountType.FEWER_THAN, 3));
filterCreature.add(new PowerPredicate(ComparisonType.FEWER_THAN, 3));
filterSorcery.add(new CardTypePredicate(CardType.SORCERY));
}

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

@ -30,7 +30,7 @@ package mage.cards.d;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.DiscardTargetCost;
import mage.abilities.effects.OneShotEffect;
@ -112,7 +112,7 @@ class DiscipleOfDeceitEffect extends OneShotEffect {
}
String targetName = new StringBuilder("card with converted mana cost of ").append(card.getConvertedManaCost()).toString();
FilterCard filter = new FilterCard(targetName);
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, card.getConvertedManaCost()));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, card.getConvertedManaCost()));
return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true).apply(game, source);
}
}

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

@ -27,7 +27,7 @@
*/
package mage.cards.d;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.effects.common.CounterTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -46,7 +46,7 @@ public class DisdainfulStroke extends CardImpl {
private static final FilterSpell filter = new FilterSpell("spell with converted mana cost 4 or greater");
static {
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 3));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3));
}
public DisdainfulStroke(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.SpellAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.cards.CardImpl;
@ -61,7 +61,7 @@ public class Disembowel extends CardImpl {
ability.getTargets().clear();
int xValue = ability.getManaCostsToPay().getX();
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost X");
filter.add(new ConvertedManaCostPredicate(CountType.EQUAL_TO, xValue));
filter.add(new ConvertedManaCostPredicate(ComparisonType.EQUAL_TO, xValue));
ability.addTarget(new TargetCreaturePermanent(filter));
}
}

6
Mage.Sets/src/mage/cards/d/DistendedMindbender.java
View file

@ -29,7 +29,7 @@ package mage.cards.d;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CastSourceTriggeredAbility;
@ -91,8 +91,8 @@ class DistendedMindbenderEffect extends OneShotEffect {
private static final FilterCard filterThreeOrLess = new FilterCard("a nonland card from it with converted mana cost 3 or less");
static {
filterFourOrGreater.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 3));
filterThreeOrLess.add(new ConvertedManaCostPredicate(CountType.FEWER_THAN, 4));
filterFourOrGreater.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 3));
filterThreeOrLess.add(new ConvertedManaCostPredicate(ComparisonType.FEWER_THAN, 4));
filterThreeOrLess.add(Predicates.not(new CardTypePredicate(CardType.LAND)));
}

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.SpellAbility;
import mage.abilities.effects.common.continuous.GainControlTargetEffect;
import mage.cards.CardImpl;
@ -67,7 +67,7 @@ public class Dominate extends CardImpl {
ability.getTargets().clear();
int xValue = ability.getManaCostsToPay().getX();
FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with converted mana cost X or less");
filter.add(Predicates.not(new ConvertedManaCostPredicate(CountType.MORE_THAN, xValue)));
filter.add(Predicates.not(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, xValue)));
ability.addTarget(new TargetCreaturePermanent(filter));
}
}

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.MageInt;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.TriggeredAbility;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition;
@ -75,7 +75,7 @@ public class DominatorDrone extends CardImpl {
TriggeredAbility triggeredAbility = new EntersBattlefieldTriggeredAbility(new LoseLifeOpponentsEffect(2));
this.addAbility(new ConditionalTriggeredAbility(
triggeredAbility,
new PermanentsOnTheBattlefieldCondition(filter, CountType.MORE_THAN, 0),
new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 0),
"When {this} enters the battlefield, if you control another colorless creature, each opponent loses 2 life."));
}

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
@ -61,7 +61,7 @@ public class DragonBreath extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater");
static {
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 5));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5));
}
public DragonBreath(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
@ -59,7 +59,7 @@ public class DragonFangs extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater");
static {
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 5));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5));
}
public DragonFangs(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
@ -59,7 +59,7 @@ public class DragonScales extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater");
static {
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 5));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5));
}
public DragonScales(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.OneShotEffect;
@ -59,7 +59,7 @@ public class DragonShadow extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater");
static {
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 5));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5));
}
public DragonShadow(UUID ownerId, CardSetInfo setInfo) {

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

@ -28,7 +28,7 @@
package mage.cards.d;
import mage.abilities.Ability;
import mage.abilities.CountType;
import mage.constants.ComparisonType;
import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.mana.ManaCostsImpl;
@ -60,7 +60,7 @@ public class DragonWings extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("a creature with converted mana cost 6 or greater");
static {
filter.add(new ConvertedManaCostPredicate(CountType.MORE_THAN, 5));
filter.add(new ConvertedManaCostPredicate(ComparisonType.MORE_THAN, 5));
}
public DragonWings(UUID ownerId, CardSetInfo setInfo) {

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