diff --git a/Mage.Sets/src/mage/cards/a/AboshansDesire.java b/Mage.Sets/src/mage/cards/a/AboshansDesire.java index 3684967ee7e..11ba91b0ae5 100644 --- a/Mage.Sets/src/mage/cards/a/AboshansDesire.java +++ b/Mage.Sets/src/mage/cards/a/AboshansDesire.java @@ -4,7 +4,7 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; @@ -39,7 +39,7 @@ public final class AboshansDesire extends CardImpl { // Threshold - Enchanted creature has shroud as long as seven or more cards are in your graveyard. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilityAttachedEffect(ShroudAbility.getInstance(), AttachmentType.AURA, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), "enchanted creature has shroud as long as seven or more cards are in your graveyard")); + new CardsInControllerGraveyardCondition(7), "enchanted creature has shroud as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/a/Anticognition.java b/Mage.Sets/src/mage/cards/a/Anticognition.java index 8b5c0127d9f..37c560cac45 100644 --- a/Mage.Sets/src/mage/cards/a/Anticognition.java +++ b/Mage.Sets/src/mage/cards/a/Anticognition.java @@ -2,7 +2,7 @@ package mage.cards.a; import java.util.UUID; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.CounterTargetEffect; @@ -35,15 +35,15 @@ public final class Anticognition extends CardImpl { // Counter target creature or planeswalker spell unless its controller pays {2}. If an opponent has eight or more cards in their graveyard, instead counter that spell, then scry 2. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new CounterTargetEffect(), new CounterUnlessPaysEffect(new GenericManaCost(2)), - CardsInOpponentGraveCondition.EIGHT, "Counter target creature or planeswalker spell " + + CardsInOpponentGraveyardCondition.EIGHT, "Counter target creature or planeswalker spell " + "unless its controller pays {2}. If an opponent has eight or more cards in their graveyard, " + "instead counter that spell" )); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( - new ScryEffect(2), CardsInOpponentGraveCondition.EIGHT, ", then scry 2" + new ScryEffect(2), CardsInOpponentGraveyardCondition.EIGHT, ", then scry 2" )); this.getSpellAbility().addTarget(new TargetSpell(filter)); - this.getSpellAbility().addHint(CardsInOpponentGraveCondition.EIGHT.getHint()); + this.getSpellAbility().addHint(CardsInOpponentGraveyardCondition.EIGHT.getHint()); } private Anticognition(final Anticognition card) { diff --git a/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java b/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java index 0702277adf4..3100b3f4b99 100644 --- a/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java +++ b/Mage.Sets/src/mage/cards/a/AnuridBarkripper.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -27,7 +27,7 @@ public final class AnuridBarkripper extends CardImpl { // Threshold - Anurid Barkripper gets +2/+2 as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/a/AvenWarcraft.java b/Mage.Sets/src/mage/cards/a/AvenWarcraft.java index 33a95b37004..604ba33b994 100644 --- a/Mage.Sets/src/mage/cards/a/AvenWarcraft.java +++ b/Mage.Sets/src/mage/cards/a/AvenWarcraft.java @@ -3,7 +3,7 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.effects.common.continuous.GainProtectionFromColorAllEffect; @@ -60,7 +60,7 @@ class AvenWarcraftEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - if (new CardsInControllerGraveCondition(7).apply(game, source)) { + if (new CardsInControllerGraveyardCondition(7).apply(game, source)) { game.addEffect(new GainProtectionFromColorAllEffect( Duration.EndOfTurn, StaticFilters.FILTER_CONTROLLED_CREATURES diff --git a/Mage.Sets/src/mage/cards/b/BarbarianRing.java b/Mage.Sets/src/mage/cards/b/BarbarianRing.java index cfbdb4ddde5..5d71eb58f3f 100644 --- a/Mage.Sets/src/mage/cards/b/BarbarianRing.java +++ b/Mage.Sets/src/mage/cards/b/BarbarianRing.java @@ -3,7 +3,7 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,7 +36,7 @@ public final class BarbarianRing extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{R}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); thresholdAbility.addTarget(new TargetAnyTarget()); diff --git a/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java b/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java index f2e7ccd6c32..caea711bbc7 100644 --- a/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java +++ b/Mage.Sets/src/mage/cards/b/BattlefieldScrounger.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.LimitedTimesPerTurnActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.Cost; import mage.abilities.costs.CostImpl; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -37,7 +37,7 @@ public final class BattlefieldScrounger extends CardImpl { new BoostSourceEffect(3, 3, Duration.EndOfTurn), new BattlefieldScroungerCost(), 1, - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BattlewiseAven.java b/Mage.Sets/src/mage/cards/b/BattlewiseAven.java index b5db356b13c..6169471ad5a 100644 --- a/Mage.Sets/src/mage/cards/b/BattlewiseAven.java +++ b/Mage.Sets/src/mage/cards/b/BattlewiseAven.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -31,10 +31,10 @@ public final class BattlewiseAven extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Battlewise Aven gets +1/+1 and has first strike. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FirstStrikeAbility.getInstance()), - new CardsInControllerGraveCondition(7), "and has first strike")); + new CardsInControllerGraveyardCondition(7), "and has first strike")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java b/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java index 407f733f7d0..21f277ffeb8 100644 --- a/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java +++ b/Mage.Sets/src/mage/cards/b/BlackbloomRogue.java @@ -2,7 +2,7 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.MenaceAbility; @@ -36,9 +36,9 @@ public final class BlackbloomRogue extends CardImpl { // Blackbloom Rogue gets +3/+0 as long as an opponent has eight or more cards in their graveyard. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield), - CardsInOpponentGraveCondition.EIGHT, "{this} gets +3/+0 as long as " + + CardsInOpponentGraveyardCondition.EIGHT, "{this} gets +3/+0 as long as " + "an opponent has eight or more cards in their graveyard" - )).addHint(CardsInOpponentGraveCondition.EIGHT.getHint())); + )).addHint(CardsInOpponentGraveyardCondition.EIGHT.getHint())); } private BlackbloomRogue(final BlackbloomRogue card) { diff --git a/Mage.Sets/src/mage/cards/b/Bloodcurdler.java b/Mage.Sets/src/mage/cards/b/Bloodcurdler.java index 3e8b8943819..d07c45ed7aa 100644 --- a/Mage.Sets/src/mage/cards/b/Bloodcurdler.java +++ b/Mage.Sets/src/mage/cards/b/Bloodcurdler.java @@ -8,7 +8,7 @@ import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.common.ExileCardFromOwnGraveyardControllerEffect; @@ -39,7 +39,7 @@ public final class Bloodcurdler extends CardImpl { // At the beginning of your upkeep, put the top card of your library into your graveyard. this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new PutTopCardOfLibraryIntoGraveControllerEffect(1), TargetController.YOU, false)); - Condition thresholdCondition = new CardsInControllerGraveCondition(7); + Condition thresholdCondition = new CardsInControllerGraveyardCondition(7); // Threshold - As long as seven or more cards are in your graveyard, Bloodcurdler gets +1/+1 and has "At the beginning of your end step, exile two cards from your graveyard." Ability thresholdAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), thresholdCondition, diff --git a/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java b/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java index 47cbe2e9ef8..5bc059b2913 100644 --- a/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java +++ b/Mage.Sets/src/mage/cards/b/BoneshardSlasher.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BecomesTargetTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.SacrificeSourceEffect; @@ -33,10 +33,10 @@ public final class BoneshardSlasher extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Boneshard Slasher gets +2/+2 and has "When Boneshard Slasher becomes the target of a spell or ability, sacrifice it." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); Effect effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(new BecomesTargetTriggeredAbility(new SacrificeSourceEffect())), - new CardsInControllerGraveCondition(7), "and has \"When {this} becomes the target of a spell or ability, sacrifice it.\""); + new CardsInControllerGraveyardCondition(7), "and has \"When {this} becomes the target of a spell or ability, sacrifice it.\""); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CabalInquisitor.java b/Mage.Sets/src/mage/cards/c/CabalInquisitor.java index cc8f8889d84..1166e6cb0c5 100644 --- a/Mage.Sets/src/mage/cards/c/CabalInquisitor.java +++ b/Mage.Sets/src/mage/cards/c/CabalInquisitor.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.ActivatedAbilityImpl; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCosts; @@ -37,7 +37,7 @@ public final class CabalInquisitor extends CardImpl { this.toughness = new MageInt(1); // Threshold - {1}{B}, {T}, Exile two cards from your graveyard: Target player discards a card. Activate this ability only any time you could cast a sorcery, and only if seven or more cards are in your graveyard. - Ability ability = new ActivateAsSorceryConditionalActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}"), new CardsInControllerGraveCondition(7)); + Ability ability = new ActivateAsSorceryConditionalActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1), new ManaCostsImpl("{1}{B}"), new CardsInControllerGraveyardCondition(7)); ability.addTarget(new TargetPlayer()); ability.addCost(new TapSourceCost()); ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(2, new FilterCard("cards from your graveyard")))); diff --git a/Mage.Sets/src/mage/cards/c/CabalPit.java b/Mage.Sets/src/mage/cards/c/CabalPit.java index 5ab82254f9a..18b5e66e9ad 100644 --- a/Mage.Sets/src/mage/cards/c/CabalPit.java +++ b/Mage.Sets/src/mage/cards/c/CabalPit.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,7 +37,7 @@ public final class CabalPit extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2,-2, Duration.EndOfTurn), new ManaCostsImpl("{B}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); thresholdAbility.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CabalRitual.java b/Mage.Sets/src/mage/cards/c/CabalRitual.java index 55b08fadf77..cd7f6d0f210 100644 --- a/Mage.Sets/src/mage/cards/c/CabalRitual.java +++ b/Mage.Sets/src/mage/cards/c/CabalRitual.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.Mana; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalManaEffect; import mage.abilities.effects.mana.BasicManaEffect; import mage.cards.CardImpl; @@ -25,7 +25,7 @@ public final class CabalRitual extends CardImpl { this.getSpellAbility().addEffect(new ConditionalManaEffect( new BasicManaEffect(Mana.BlackMana(5)), new BasicManaEffect(Mana.BlackMana(3)), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Add {B}{B}{B}.

Threshold — Add {B}{B}{B}{B}{B} instead if seven or more cards are in your graveyard")); } diff --git a/Mage.Sets/src/mage/cards/c/CabalTorturer.java b/Mage.Sets/src/mage/cards/c/CabalTorturer.java index bc9201ebe48..8b5c3e3fa69 100644 --- a/Mage.Sets/src/mage/cards/c/CabalTorturer.java +++ b/Mage.Sets/src/mage/cards/c/CabalTorturer.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; @@ -39,7 +39,7 @@ public final class CabalTorturer extends CardImpl { this.addAbility(ability); // Threshold - {3}{B}{B}, {tap}: Target creature gets -2/-2 until end of turn. Activate this ability only if seven or more cards are in your graveyard. ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), - new ManaCostsImpl("{3}{B}{B}"), new CardsInControllerGraveCondition(7)); + new ManaCostsImpl("{3}{B}{B}"), new CardsInControllerGraveyardCondition(7)); ability.addCost(new TapSourceCost()); ability.addTarget(new TargetCreaturePermanent()); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/c/CentaurChieftain.java b/Mage.Sets/src/mage/cards/c/CentaurChieftain.java index a6ac7f00f19..0ac4a238354 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurChieftain.java +++ b/Mage.Sets/src/mage/cards/c/CentaurChieftain.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.BoostControlledEffect; @@ -47,7 +47,7 @@ public final class CentaurChieftain extends CardImpl { gainedAbility.addEffect(effect); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveCondition(7), + new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"When {this} enters the battlefield, creatures you control get +1/+1 and gain trample until end of turn.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CentaurGarden.java b/Mage.Sets/src/mage/cards/c/CentaurGarden.java index add788e3fb6..5d81dcbb9a2 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurGarden.java +++ b/Mage.Sets/src/mage/cards/c/CentaurGarden.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -37,7 +37,7 @@ public final class CentaurGarden extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(+3,+3, Duration.EndOfTurn), new ManaCostsImpl("{G}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); thresholdAbility.addTarget(new TargetCreaturePermanent()); diff --git a/Mage.Sets/src/mage/cards/c/CephalidColiseum.java b/Mage.Sets/src/mage/cards/c/CephalidColiseum.java index 50b8a5799c0..856658513aa 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidColiseum.java +++ b/Mage.Sets/src/mage/cards/c/CephalidColiseum.java @@ -3,7 +3,7 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -36,7 +36,7 @@ public final class CephalidColiseum extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardTargetEffect(3, 3), new ManaCostsImpl("{U}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); thresholdAbility.addTarget(new TargetPlayer()); diff --git a/Mage.Sets/src/mage/cards/c/CephalidSage.java b/Mage.Sets/src/mage/cards/c/CephalidSage.java index b870aac7967..eb89c4c26d8 100644 --- a/Mage.Sets/src/mage/cards/c/CephalidSage.java +++ b/Mage.Sets/src/mage/cards/c/CephalidSage.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -32,7 +32,7 @@ public final class CephalidSage extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Cephalid Sage has "When Cephalid Sage enters the battlefield, draw three cards, then discard two cards." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(new EntersBattlefieldTriggeredAbility(new DrawDiscardControllerEffect(3, 2))), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"When {this} enters the battlefield, draw three cards, then discard two cards.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/Chainflinger.java b/Mage.Sets/src/mage/cards/c/Chainflinger.java index a9892f2530b..fddebec3276 100644 --- a/Mage.Sets/src/mage/cards/c/Chainflinger.java +++ b/Mage.Sets/src/mage/cards/c/Chainflinger.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; @@ -40,7 +40,7 @@ public final class Chainflinger extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{2}{R}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addTarget(new TargetAnyTarget()); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java b/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java index 22b8b7d5ec4..4b76d28883f 100644 --- a/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java +++ b/Mage.Sets/src/mage/cards/c/ChildhoodHorror.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; @@ -40,13 +40,13 @@ public final class ChildhoodHorror extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "If seven or more cards are in your graveyard, Childhood Horror gets +2/+2" )); Effect effect = new ConditionalRestrictionEffect( new CantBlockSourceEffect(Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); effect.setText("and can't block"); thresholdAbility.addEffect(effect); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/c/Chlorophant.java b/Mage.Sets/src/mage/cards/c/Chlorophant.java index 1afe14e3e20..6b6b94b91a5 100644 --- a/Mage.Sets/src/mage/cards/c/Chlorophant.java +++ b/Mage.Sets/src/mage/cards/c/Chlorophant.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -36,7 +36,7 @@ public final class Chlorophant extends CardImpl { effect.setText("At the beginning of your upkeep, you may put another +1/+1 counter on {this}."); Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(effect, TargetController.YOU, true); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"At the beginning of your upkeep, you may put another +1/+1 counter on {this}.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CrashingCentaur.java b/Mage.Sets/src/mage/cards/c/CrashingCentaur.java index 27ece75adfc..5cfd163ee77 100644 --- a/Mage.Sets/src/mage/cards/c/CrashingCentaur.java +++ b/Mage.Sets/src/mage/cards/c/CrashingCentaur.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -46,11 +46,11 @@ public final class CrashingCentaur extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "If seven or more cards are in your graveyard, {this} gets +2/+2")); Effect effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(ShroudAbility.getInstance()), - new CardsInControllerGraveCondition(7), "and has shroud"); + new CardsInControllerGraveyardCondition(7), "and has shroud"); thresholdAbility.addEffect(effect); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); diff --git a/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java b/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java index 8770e67a6be..1c7ab657780 100644 --- a/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java +++ b/Mage.Sets/src/mage/cards/c/CuriousHomunculus.java @@ -43,7 +43,7 @@ public final class CuriousHomunculus extends CardImpl { this.addAbility(new TransformAbility()); this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(new TransformSourceEffect(true), TargetController.YOU, false), - new InstantOrSorceryCardsInControllerGraveCondition(3), + new InstantOrSorceryCardsInControllerGraveyardCondition(3), "At the beginning of your upkeep, if there are three or more instant and/or sorcery cards in your graveyard, transform {this}")); } @@ -57,11 +57,11 @@ public final class CuriousHomunculus extends CardImpl { } } -class InstantOrSorceryCardsInControllerGraveCondition implements Condition { +class InstantOrSorceryCardsInControllerGraveyardCondition implements Condition { private int value; - public InstantOrSorceryCardsInControllerGraveCondition(int value) { + public InstantOrSorceryCardsInControllerGraveyardCondition(int value) { this.value = value; } diff --git a/Mage.Sets/src/mage/cards/d/DecayingSoil.java b/Mage.Sets/src/mage/cards/d/DecayingSoil.java index 42318087da2..506ff1df531 100644 --- a/Mage.Sets/src/mage/cards/d/DecayingSoil.java +++ b/Mage.Sets/src/mage/cards/d/DecayingSoil.java @@ -4,7 +4,7 @@ import mage.abilities.Ability; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.Cost; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; @@ -55,7 +55,7 @@ public final class DecayingSoil extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Decaying Soil has "Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand." ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new GainAbilitySourceEffect(new DecayingSoilTriggeredAbility(new DecayingSoilEffect(), filter)), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"Whenever a nontoken creature is put into your graveyard from the battlefield, you may pay {1}. If you do, return that card to your hand.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java b/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java index 2428b64b11e..e1fd584e611 100644 --- a/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java +++ b/Mage.Sets/src/mage/cards/d/DeepSeaTerror.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.InvertCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.combat.CantAttackAnyPlayerSourceEffect; @@ -31,7 +31,7 @@ public final class DeepSeaTerror extends CardImpl { // Deep-Sea Terror can't attack unless there are seven or more cards in your graveyard. Effect effect = new ConditionalRestrictionEffect( new CantAttackAnyPlayerSourceEffect(Duration.WhileOnBattlefield), - new InvertCondition(new CardsInControllerGraveCondition(7))); + new InvertCondition(new CardsInControllerGraveyardCondition(7))); effect.setText("{this} can't attack unless there are seven or more cards in your graveyard"); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, effect)); diff --git a/Mage.Sets/src/mage/cards/d/Demoralize.java b/Mage.Sets/src/mage/cards/d/Demoralize.java index 6bf4b336d7e..ec060ff7afc 100644 --- a/Mage.Sets/src/mage/cards/d/Demoralize.java +++ b/Mage.Sets/src/mage/cards/d/Demoralize.java @@ -2,7 +2,7 @@ package mage.cards.d; import java.util.UUID; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.AddContinuousEffectToGame; import mage.abilities.effects.common.combat.CantBlockAllEffect; @@ -32,7 +32,7 @@ public final class Demoralize extends CardImpl { this.getSpellAbility().addEffect( new ConditionalOneShotEffect( new AddContinuousEffectToGame(new CantBlockAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, Duration.EndOfTurn)), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "

Threshold — If seven or more cards are in your graveyard, creatures can't block this turn" )); } diff --git a/Mage.Sets/src/mage/cards/d/DesertsHold.java b/Mage.Sets/src/mage/cards/d/DesertsHold.java index 37eca1b6db3..276e609e94e 100644 --- a/Mage.Sets/src/mage/cards/d/DesertsHold.java +++ b/Mage.Sets/src/mage/cards/d/DesertsHold.java @@ -6,7 +6,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.OrCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -54,7 +54,7 @@ public final class DesertsHold extends CardImpl { new EntersBattlefieldTriggeredAbility(new GainLifeEffect(3)), new OrCondition( new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(filterDesertPermanent)), - new CardsInControllerGraveCondition(1, filterDesertCard)), + new CardsInControllerGraveyardCondition(1, filterDesertCard)), "When {this} enters the battlefield, if you control a Desert or there is a Desert card in your graveyard, you gain 3 life.")); // Enchanted creature can't attack or block, and its activated abilities can't be activated. diff --git a/Mage.Sets/src/mage/cards/d/DirtyWererat.java b/Mage.Sets/src/mage/cards/d/DirtyWererat.java index 97a6595bb0c..9d4115f5667 100644 --- a/Mage.Sets/src/mage/cards/d/DirtyWererat.java +++ b/Mage.Sets/src/mage/cards/d/DirtyWererat.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -47,12 +47,12 @@ public final class DirtyWererat extends CardImpl { Ability thresholdAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "If seven or more cards are in your graveyard, {this} gets +2/+2" )); Effect effect = new ConditionalRestrictionEffect( new CantBlockSourceEffect(Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); effect.setText("and can't block"); thresholdAbility.addEffect(effect); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/d/DivineSacrament.java b/Mage.Sets/src/mage/cards/d/DivineSacrament.java index 4e7c130453f..c164c33ebfd 100644 --- a/Mage.Sets/src/mage/cards/d/DivineSacrament.java +++ b/Mage.Sets/src/mage/cards/d/DivineSacrament.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; @@ -38,7 +38,7 @@ public final class DivineSacrament extends CardImpl { // Threshold - White creatures get an additional +1/+1 as long as seven or more cards are in your graveyard. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "If seven or more cards are in your graveyard, white creatures get an additional +1/+1." )); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/e/ElvishReclaimer.java b/Mage.Sets/src/mage/cards/e/ElvishReclaimer.java index 79fddbe5972..9e00d777925 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishReclaimer.java +++ b/Mage.Sets/src/mage/cards/e/ElvishReclaimer.java @@ -5,7 +5,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -29,7 +29,7 @@ import java.util.UUID; public final class ElvishReclaimer extends CardImpl { private static final Condition condition - = new CardsInControllerGraveCondition(3, StaticFilters.FILTER_CARD_LAND); + = new CardsInControllerGraveyardCondition(3, StaticFilters.FILTER_CARD_LAND); public ElvishReclaimer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}"); diff --git a/Mage.Sets/src/mage/cards/e/Epicenter.java b/Mage.Sets/src/mage/cards/e/Epicenter.java index 2ad129e43ec..72b49d644ae 100644 --- a/Mage.Sets/src/mage/cards/e/Epicenter.java +++ b/Mage.Sets/src/mage/cards/e/Epicenter.java @@ -3,7 +3,7 @@ package mage.cards.e; import mage.abilities.Ability; import mage.abilities.condition.InvertCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.SacrificeEffect; @@ -30,13 +30,13 @@ public final class Epicenter extends CardImpl { // Target player sacrifices a land. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new SacrificeEffect(StaticFilters.FILTER_LAND, 1, "Target player"), - new InvertCondition(new CardsInControllerGraveCondition(7)), + new InvertCondition(new CardsInControllerGraveyardCondition(7)), "Target player sacrifices a land" )); // Threshold - Each player sacrifices all lands they control instead if seven or more cards are in your graveyard. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new EpicenterEffect(), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "

Threshold — Each player sacrifices all lands they control instead " + "if seven or more cards are in your graveyard." )); diff --git a/Mage.Sets/src/mage/cards/e/ExcavatingAnurid.java b/Mage.Sets/src/mage/cards/e/ExcavatingAnurid.java index aeb5e0bc14b..7795e33cf82 100644 --- a/Mage.Sets/src/mage/cards/e/ExcavatingAnurid.java +++ b/Mage.Sets/src/mage/cards/e/ExcavatingAnurid.java @@ -5,7 +5,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -29,7 +29,7 @@ import java.util.UUID; */ public final class ExcavatingAnurid extends CardImpl { - private static final Condition condition = new CardsInControllerGraveCondition(7); + private static final Condition condition = new CardsInControllerGraveyardCondition(7); public ExcavatingAnurid(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}"); diff --git a/Mage.Sets/src/mage/cards/f/FarWanderings.java b/Mage.Sets/src/mage/cards/f/FarWanderings.java index 06ec46f67f9..3610c25ed6c 100644 --- a/Mage.Sets/src/mage/cards/f/FarWanderings.java +++ b/Mage.Sets/src/mage/cards/f/FarWanderings.java @@ -1,7 +1,7 @@ package mage.cards.f; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; @@ -28,7 +28,7 @@ public final class FarWanderings extends CardImpl { Effect effect = new ConditionalOneShotEffect( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LAND), true, true), new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library.

Threshold — If seven or more cards are in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle your library."); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/f/FledglingDragon.java b/Mage.Sets/src/mage/cards/f/FledglingDragon.java index 7f9137052c5..d5e21e58a67 100644 --- a/Mage.Sets/src/mage/cards/f/FledglingDragon.java +++ b/Mage.Sets/src/mage/cards/f/FledglingDragon.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,11 +36,11 @@ public final class FledglingDragon extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Fledgling Dragon gets +3/+3 and has "{R}: Fledgling Dragon gets +1/+0 until end of turn." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +3/+3")); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), - new CardsInControllerGraveCondition(7), "and has \"{R}: {this} gets +1/+0 until end of turn.\"")); + new CardsInControllerGraveyardCondition(7), "and has \"{R}: {this} gets +1/+0 until end of turn.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/f/Frightcrawler.java b/Mage.Sets/src/mage/cards/f/Frightcrawler.java index dcca2568ac3..4b77b58b2d9 100644 --- a/Mage.Sets/src/mage/cards/f/Frightcrawler.java +++ b/Mage.Sets/src/mage/cards/f/Frightcrawler.java @@ -3,7 +3,7 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.common.combat.CantBlockSourceEffect; @@ -34,12 +34,12 @@ public final class Frightcrawler extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "If seven or more cards are in your graveyard, {this} gets +2/+2 " )); thresholdAbility.addEffect(new ConditionalRestrictionEffect( new CantBlockSourceEffect(Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "and can't block.")); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); diff --git a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java index 926d87adc6f..166d9122efd 100644 --- a/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java +++ b/Mage.Sets/src/mage/cards/g/GateToTheAfterlife.java @@ -3,7 +3,7 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; @@ -56,7 +56,7 @@ public final class GateToTheAfterlife extends CardImpl { // {2}, {T}, Sacrifice Gate to the Afterlife: Search your graveyard, hand, and/or library for a card named God-Pharaoh's Gift and put it onto the battlefield. If you seearch your library this way, shuffle it. Activate this ability only if there are six or more creature cards in your graveyard. ability = new ConditionalActivatedAbility( Zone.BATTLEFIELD, new GateToTheAfterlifeEffect(), new GenericManaCost(2), - new CardsInControllerGraveCondition(6, StaticFilters.FILTER_CARD_CREATURE) + new CardsInControllerGraveyardCondition(6, StaticFilters.FILTER_CARD_CREATURE) ); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/g/GhituLavarunner.java b/Mage.Sets/src/mage/cards/g/GhituLavarunner.java index 0dba45ac83c..a343abf2766 100644 --- a/Mage.Sets/src/mage/cards/g/GhituLavarunner.java +++ b/Mage.Sets/src/mage/cards/g/GhituLavarunner.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -36,12 +36,12 @@ public final class GhituLavarunner extends CardImpl{ Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(2, StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY), + new CardsInControllerGraveyardCondition(2, StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY), "As long as there are two or more instant and/or sorcery cards in your graveyard, {this} gets +1/+0")); ability.addEffect( new ConditionalContinuousEffect( new GainAbilitySourceEffect(HasteAbility.getInstance()), - new CardsInControllerGraveCondition(2, StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY), + new CardsInControllerGraveyardCondition(2, StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY), "and has haste.")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/Gloomdrifter.java b/Mage.Sets/src/mage/cards/g/Gloomdrifter.java index 9e09d7d1f12..a59f01ad702 100644 --- a/Mage.Sets/src/mage/cards/g/Gloomdrifter.java +++ b/Mage.Sets/src/mage/cards/g/Gloomdrifter.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -48,7 +48,7 @@ public final class Gloomdrifter extends CardImpl { Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(new EntersBattlefieldTriggeredAbility( new BoostAllEffect(-2, -2, Duration.EndOfTurn, filter, false))), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"When {this} enters the battlefield, nonblack creatures get -2/-2 until end of turn.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/g/GrizzlyFate.java b/Mage.Sets/src/mage/cards/g/GrizzlyFate.java index 7ed92e5eb38..e96c3ecfbe3 100644 --- a/Mage.Sets/src/mage/cards/g/GrizzlyFate.java +++ b/Mage.Sets/src/mage/cards/g/GrizzlyFate.java @@ -2,7 +2,7 @@ package mage.cards.g; import java.util.UUID; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -28,7 +28,7 @@ public final class GrizzlyFate extends CardImpl { // Threshold - Create four 2/2 green Bear creature tokens instead if seven or more cards are in your graveyard. Effect effect = new ConditionalOneShotEffect(new CreateTokenEffect(new BearToken(), 4), new CreateTokenEffect(new BearToken(), 2), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Create two 2/2 green Bear creature tokens.

Threshold — Create four 2/2 green Bear creature tokens instead if seven or more cards are in your graveyard."); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/h/HallowedHealer.java b/Mage.Sets/src/mage/cards/h/HallowedHealer.java index 4b66a5b7d18..45bfc61e376 100644 --- a/Mage.Sets/src/mage/cards/h/HallowedHealer.java +++ b/Mage.Sets/src/mage/cards/h/HallowedHealer.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.PreventDamageToTargetEffect; @@ -41,7 +41,7 @@ public final class HallowedHealer extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToTargetEffect(Duration.EndOfTurn, 4), new TapSourceCost(), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addTarget(new TargetAnyTarget()); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); diff --git a/Mage.Sets/src/mage/cards/h/HuntingGrounds.java b/Mage.Sets/src/mage/cards/h/HuntingGrounds.java index 3ba8a5cde8a..4c540a5808d 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingGrounds.java +++ b/Mage.Sets/src/mage/cards/h/HuntingGrounds.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SpellCastOpponentTriggeredAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -30,7 +30,7 @@ public final class HuntingGrounds extends CardImpl { Ability gainedAbility = new SpellCastOpponentTriggeredAbility(new PutCardFromHandOntoBattlefieldEffect( new FilterCreatureCard("a creature card")), true); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"Whenever an opponent casts a spell, you may put a creature card from your hand onto the battlefield.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/i/IgneousElemental.java b/Mage.Sets/src/mage/cards/i/IgneousElemental.java index 5d750cea5b8..6e2feaf3211 100644 --- a/Mage.Sets/src/mage/cards/i/IgneousElemental.java +++ b/Mage.Sets/src/mage/cards/i/IgneousElemental.java @@ -5,7 +5,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.cost.SpellCostReductionSourceEffect; import mage.abilities.hint.ConditionHint; @@ -32,7 +32,7 @@ public final class IgneousElemental extends CardImpl { this.toughness = new MageInt(3); // This spell costs {2} less to cast if there is a land card in your graveyard. - Condition condition = new CardsInControllerGraveCondition(1, StaticFilters.FILTER_CARD_LAND); + Condition condition = new CardsInControllerGraveyardCondition(1, StaticFilters.FILTER_CARD_LAND); Ability ability = new SimpleStaticAbility(Zone.ALL, new SpellCostReductionSourceEffect(2, condition) .setText("This spell costs {2} less to cast if there is a land card in your graveyard.")); ability.setRuleAtTheTop(true); diff --git a/Mage.Sets/src/mage/cards/i/InfectedVermin.java b/Mage.Sets/src/mage/cards/i/InfectedVermin.java index 5a75f46fb6c..a2602d2fc1b 100644 --- a/Mage.Sets/src/mage/cards/i/InfectedVermin.java +++ b/Mage.Sets/src/mage/cards/i/InfectedVermin.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.DamageEverythingEffect; @@ -35,7 +35,7 @@ public final class InfectedVermin extends CardImpl { Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new DamageEverythingEffect(3), new ManaCostsImpl("{3}{B}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/i/IntoTheStory.java b/Mage.Sets/src/mage/cards/i/IntoTheStory.java index 7110d8be712..8df8f78339a 100644 --- a/Mage.Sets/src/mage/cards/i/IntoTheStory.java +++ b/Mage.Sets/src/mage/cards/i/IntoTheStory.java @@ -1,19 +1,13 @@ package mage.cards.i; -import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.cost.SpellCostReductionSourceEffect; -import mage.abilities.hint.ConditionHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Zone; -import mage.game.Game; -import mage.game.Graveyard; -import mage.players.Player; import java.util.UUID; @@ -27,8 +21,8 @@ public final class IntoTheStory extends CardImpl { // This spell costs {3} less to cast if an opponent has seven or more cards in their graveyard. this.addAbility(new SimpleStaticAbility( - Zone.ALL, new SpellCostReductionSourceEffect(3, CardsInOpponentGraveCondition.SEVEN) - ).setRuleAtTheTop(true).addHint(CardsInOpponentGraveCondition.SEVEN.getHint())); + Zone.ALL, new SpellCostReductionSourceEffect(3, CardsInOpponentGraveyardCondition.SEVEN) + ).setRuleAtTheTop(true).addHint(CardsInOpponentGraveyardCondition.SEVEN.getHint())); // Draw four cards. this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(4)); diff --git a/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java b/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java index 1f7f86bcec5..c99faa4f035 100644 --- a/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java +++ b/Mage.Sets/src/mage/cards/j/JaceVrynsProdigy.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.Gender; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -40,7 +40,7 @@ public final class JaceVrynsProdigy extends CardImpl { // {T}: Draw a card, then discard a card. If there are five or more cards in your graveyard, exile Jace, Vryn's Prodigy, then return him to the battefield transformed under his owner's control. this.addAbility(new TransformAbility()); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1), new TapSourceCost()); - Effect effect = new ConditionalOneShotEffect(new ExileAndReturnTransformedSourceEffect(Gender.MALE), new CardsInControllerGraveCondition(5)); + Effect effect = new ConditionalOneShotEffect(new ExileAndReturnTransformedSourceEffect(Gender.MALE), new CardsInControllerGraveyardCondition(5)); ability.addEffect(effect); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/j/JacesPhantasm.java b/Mage.Sets/src/mage/cards/j/JacesPhantasm.java index 9fef5c65ae7..e66b9cbf028 100644 --- a/Mage.Sets/src/mage/cards/j/JacesPhantasm.java +++ b/Mage.Sets/src/mage/cards/j/JacesPhantasm.java @@ -4,17 +4,15 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; -import mage.abilities.hint.ConditionHint; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Duration; -import mage.constants.Zone; /** * @author Loki @@ -33,9 +31,9 @@ public final class JacesPhantasm extends CardImpl { // Jace's Phantasm gets +4/+4 as long as an opponent has ten or more cards in their graveyard. this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), - CardsInOpponentGraveCondition.TEN, "{this} gets +4/+4 as long as " + + CardsInOpponentGraveyardCondition.TEN, "{this} gets +4/+4 as long as " + "an opponent has ten or more cards in their graveyard" - )).addHint(CardsInOpponentGraveCondition.TEN.getHint())); + )).addHint(CardsInOpponentGraveyardCondition.TEN.getHint())); } public JacesPhantasm(final JacesPhantasm card) { diff --git a/Mage.Sets/src/mage/cards/k/KamahlsDesire.java b/Mage.Sets/src/mage/cards/k/KamahlsDesire.java index 314c9540661..a57500320ec 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlsDesire.java +++ b/Mage.Sets/src/mage/cards/k/KamahlsDesire.java @@ -4,7 +4,7 @@ package mage.cards.k; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; @@ -46,7 +46,7 @@ public final class KamahlsDesire extends CardImpl { // Threshold - Enchanted creature gets +3/+0 as long as seven or more cards are in your graveyard. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostEnchantedEffect(3, 0, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Enchanted creature gets +3/+0 as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KamahlsSledge.java b/Mage.Sets/src/mage/cards/k/KamahlsSledge.java index 06682b45d98..ad187c62904 100644 --- a/Mage.Sets/src/mage/cards/k/KamahlsSledge.java +++ b/Mage.Sets/src/mage/cards/k/KamahlsSledge.java @@ -2,7 +2,7 @@ package mage.cards.k; import java.util.UUID; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetControllerEffect; import mage.abilities.effects.common.DamageTargetEffect; @@ -25,7 +25,7 @@ public final class KamahlsSledge extends CardImpl { this.getSpellAbility().addTarget(new TargetCreaturePermanent()); // Threshold - If seven or more cards are in your graveyard, instead Kamahl's Sledge deals 4 damage to that creature and 4 damage to that creature's controller. this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new DamageTargetControllerEffect(4), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "

Threshold — If seven or more cards are in your graveyard, instead {this} deals 4 damage to that creature and 4 damage to that creature's controller.")); } diff --git a/Mage.Sets/src/mage/cards/k/KirtarsDesire.java b/Mage.Sets/src/mage/cards/k/KirtarsDesire.java index 9f987a41c7d..4d2652c373e 100644 --- a/Mage.Sets/src/mage/cards/k/KirtarsDesire.java +++ b/Mage.Sets/src/mage/cards/k/KirtarsDesire.java @@ -2,7 +2,7 @@ package mage.cards.k; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.combat.CantAttackAttachedEffect; @@ -39,7 +39,7 @@ public final class KirtarsDesire extends CardImpl { // Threshold - Enchanted creature can't block as long as seven or more cards are in your graveyard. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalRestrictionEffect( new CantAttackBlockAttachedEffect(AttachmentType.AURA), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Enchanted creature can't block as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/k/KirtarsWrath.java b/Mage.Sets/src/mage/cards/k/KirtarsWrath.java index 8423e653afb..eec6ce4d347 100644 --- a/Mage.Sets/src/mage/cards/k/KirtarsWrath.java +++ b/Mage.Sets/src/mage/cards/k/KirtarsWrath.java @@ -3,7 +3,7 @@ package mage.cards.k; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CreateTokenEffect; @@ -31,7 +31,7 @@ public final class KirtarsWrath extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new KirtarsWrathEffect(), new DestroyAllEffect(new FilterCreaturePermanent("all creatures"), true), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Destroy all creatures. They can't be regenerated.

Threshold — If seven or more cards are in your graveyard, instead destroy all creatures, then create two 1/1 white Spirit creature tokens with flying. Creatures destroyed this way can't be regenerated")); } diff --git a/Mage.Sets/src/mage/cards/k/KrosanAvenger.java b/Mage.Sets/src/mage/cards/k/KrosanAvenger.java index eaf165ec9c9..3067c2d8e31 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanAvenger.java +++ b/Mage.Sets/src/mage/cards/k/KrosanAvenger.java @@ -4,7 +4,7 @@ package mage.cards.k; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.RegenerateSourceEffect; @@ -36,7 +36,7 @@ public final class KrosanAvenger extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{G}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/cards/k/KrosanBeast.java b/Mage.Sets/src/mage/cards/k/KrosanBeast.java index da30f5ef90b..cbf1da96501 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanBeast.java +++ b/Mage.Sets/src/mage/cards/k/KrosanBeast.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class KrosanBeast extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(7, 7, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "{this} gets +7/+7 as long as seven or more cards are in your graveyard" )); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/k/KrosanRestorer.java b/Mage.Sets/src/mage/cards/k/KrosanRestorer.java index 377505bda60..b63ab9a5d15 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanRestorer.java +++ b/Mage.Sets/src/mage/cards/k/KrosanRestorer.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.UntapTargetEffect; @@ -40,7 +40,7 @@ public final class KrosanRestorer extends CardImpl { ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new TapSourceCost(), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); ability.addTarget(new TargetLandPermanent(0, 3, new FilterLandPermanent(), false)); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/l/LightningSurge.java b/Mage.Sets/src/mage/cards/l/LightningSurge.java index b95db1fa896..7c785876af2 100644 --- a/Mage.Sets/src/mage/cards/l/LightningSurge.java +++ b/Mage.Sets/src/mage/cards/l/LightningSurge.java @@ -2,7 +2,7 @@ package mage.cards.l; import java.util.UUID; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; @@ -27,7 +27,7 @@ public final class LightningSurge extends CardImpl { // Threshold - If seven or more cards are in your graveyard, instead Lightning Surge deals 6 damage to that creature or player and the damage can't be prevented. Effect effect = new ConditionalOneShotEffect(new DamageTargetEffect(6, false), new DamageTargetEffect(4), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "{this} deals 4 damage to any target.

Threshold — {this} deals 6 damage to that permanent or player and the damage can't be prevented instead if seven or more cards are in your graveyard."); this.getSpellAbility().addTarget(new TargetAnyTarget()); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java b/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java index 368e4391561..f7e67500046 100644 --- a/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java +++ b/Mage.Sets/src/mage/cards/m/MagmaticChanneler.java @@ -6,7 +6,7 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -28,7 +28,7 @@ import java.util.UUID; */ public final class MagmaticChanneler extends CardImpl { - private static final Condition condition = new CardsInControllerGraveCondition(4, StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY); + private static final Condition condition = new CardsInControllerGraveyardCondition(4, StaticFilters.FILTER_CARD_INSTANT_AND_SORCERY); public MagmaticChanneler(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); diff --git a/Mage.Sets/src/mage/cards/m/MaskedGorgon.java b/Mage.Sets/src/mage/cards/m/MaskedGorgon.java index 052ed94d0f6..a999140363f 100644 --- a/Mage.Sets/src/mage/cards/m/MaskedGorgon.java +++ b/Mage.Sets/src/mage/cards/m/MaskedGorgon.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -44,7 +44,7 @@ public final class MaskedGorgon extends CardImpl { new ProtectionAbility(filter2), Duration.WhileOnBattlefield, filter1))); // Threshold - Masked Gorgon has protection from green and from white as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.WHITE), Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.GREEN, ObjectColor.WHITE), Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "{this} has protection from green and from white as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MerfolkWindrobber.java b/Mage.Sets/src/mage/cards/m/MerfolkWindrobber.java index eeebde115b7..a54467e218e 100644 --- a/Mage.Sets/src/mage/cards/m/MerfolkWindrobber.java +++ b/Mage.Sets/src/mage/cards/m/MerfolkWindrobber.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.ActivateIfConditionActivatedAbility; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; @@ -43,8 +43,8 @@ public final class MerfolkWindrobber extends CardImpl { // Sacrifice Merfolk Windrobber: Draw a card. Activate this ability only if an opponent has eight or more cards in their graveyard. this.addAbility(new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), - new SacrificeSourceCost(), CardsInOpponentGraveCondition.EIGHT - ).addHint(CardsInOpponentGraveCondition.EIGHT.getHint())); + new SacrificeSourceCost(), CardsInOpponentGraveyardCondition.EIGHT + ).addHint(CardsInOpponentGraveyardCondition.EIGHT.getHint())); } private MerfolkWindrobber(final MerfolkWindrobber card) { diff --git a/Mage.Sets/src/mage/cards/m/MetamorphicWurm.java b/Mage.Sets/src/mage/cards/m/MetamorphicWurm.java index d62d25b5d4b..f987d01a910 100644 --- a/Mage.Sets/src/mage/cards/m/MetamorphicWurm.java +++ b/Mage.Sets/src/mage/cards/m/MetamorphicWurm.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -35,7 +35,7 @@ public final class MetamorphicWurm extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(4, 4, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "{this} gets +4/+4 as long as seven or more cards are in your graveyard" )); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/m/MindCarver.java b/Mage.Sets/src/mage/cards/m/MindCarver.java index 3b349bda49c..3ade92b93e9 100644 --- a/Mage.Sets/src/mage/cards/m/MindCarver.java +++ b/Mage.Sets/src/mage/cards/m/MindCarver.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; @@ -39,9 +39,9 @@ public final class MindCarver extends CardImpl { this.addAbility(new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostEquippedEffect(3, 1), new BoostEquippedEffect(1, 0), - CardsInOpponentGraveCondition.EIGHT, "Equipped creature gets +1/+0. " + + CardsInOpponentGraveyardCondition.EIGHT, "Equipped creature gets +1/+0. " + "It gets +3/+1 instead as long as an opponent has eight or more cards in their graveyard." - )).addHint(CardsInOpponentGraveCondition.EIGHT.getHint())); + )).addHint(CardsInOpponentGraveyardCondition.EIGHT.getHint())); // Equip {2}{B} this.addAbility(new EquipAbility(Outcome.BoostCreature, new ManaCostsImpl<>("{2}{B}"))); diff --git a/Mage.Sets/src/mage/cards/m/MurasaBehemoth.java b/Mage.Sets/src/mage/cards/m/MurasaBehemoth.java index 3b71548ed27..bcac144b857 100644 --- a/Mage.Sets/src/mage/cards/m/MurasaBehemoth.java +++ b/Mage.Sets/src/mage/cards/m/MurasaBehemoth.java @@ -3,7 +3,7 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.TrampleAbility; @@ -21,7 +21,7 @@ import java.util.UUID; */ public final class MurasaBehemoth extends CardImpl { - Condition condition = new CardsInControllerGraveCondition(1, StaticFilters.FILTER_CARD_LAND); + Condition condition = new CardsInControllerGraveyardCondition(1, StaticFilters.FILTER_CARD_LAND); public MurasaBehemoth(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}"); diff --git a/Mage.Sets/src/mage/cards/m/MysticCrusader.java b/Mage.Sets/src/mage/cards/m/MysticCrusader.java index 724cfa5c397..ec9d2bbca33 100644 --- a/Mage.Sets/src/mage/cards/m/MysticCrusader.java +++ b/Mage.Sets/src/mage/cards/m/MysticCrusader.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -39,10 +39,10 @@ public final class MysticCrusader extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK, ObjectColor.RED)); // Threshold - As long as seven or more cards are in your graveyard, Mystic Crusader gets +1/+1 and has flying. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), - new CardsInControllerGraveCondition(7), "and has flying")); + new CardsInControllerGraveyardCondition(7), "and has flying")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MysticEnforcer.java b/Mage.Sets/src/mage/cards/m/MysticEnforcer.java index 5d82874582c..c9dc0e331a1 100644 --- a/Mage.Sets/src/mage/cards/m/MysticEnforcer.java +++ b/Mage.Sets/src/mage/cards/m/MysticEnforcer.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -39,10 +39,10 @@ public final class MysticEnforcer extends CardImpl { this.addAbility(ProtectionAbility.from(ObjectColor.BLACK)); // Threshold - As long as seven or more cards are in your graveyard, Mystic Enforcer gets +3/+3 and has flying. Ability thresholdAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), " as long as seven or more cards are in your graveyard, {this} gets +3/+3")); thresholdAbility.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), - new CardsInControllerGraveCondition(7), "and has flying")); + new CardsInControllerGraveyardCondition(7), "and has flying")); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(thresholdAbility); } diff --git a/Mage.Sets/src/mage/cards/m/MysticFamiliar.java b/Mage.Sets/src/mage/cards/m/MysticFamiliar.java index 0deb288a76f..c54afc0d52f 100644 --- a/Mage.Sets/src/mage/cards/m/MysticFamiliar.java +++ b/Mage.Sets/src/mage/cards/m/MysticFamiliar.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -36,10 +36,10 @@ public final class MysticFamiliar extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Mystic Familiar gets +1/+1 and has protection from black. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(ProtectionAbility.from(ObjectColor.BLACK)), - new CardsInControllerGraveCondition(7), "and has protection from black")); + new CardsInControllerGraveyardCondition(7), "and has protection from black")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MysticPenitent.java b/Mage.Sets/src/mage/cards/m/MysticPenitent.java index 2cf8680bfa9..42ad5f5487e 100644 --- a/Mage.Sets/src/mage/cards/m/MysticPenitent.java +++ b/Mage.Sets/src/mage/cards/m/MysticPenitent.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -38,10 +38,10 @@ public final class MysticPenitent extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Mystic Penitent gets +1/+1 and has flying. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), - new CardsInControllerGraveCondition(7), "and has flying")); + new CardsInControllerGraveyardCondition(7), "and has flying")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/m/MysticVisionary.java b/Mage.Sets/src/mage/cards/m/MysticVisionary.java index 56ab2afa644..d58e2202f39 100644 --- a/Mage.Sets/src/mage/cards/m/MysticVisionary.java +++ b/Mage.Sets/src/mage/cards/m/MysticVisionary.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; @@ -33,7 +33,7 @@ public final class MysticVisionary extends CardImpl { // Threshold - Mystic Visionary has flying as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveCondition(7), + new GainAbilitySourceEffect(FlyingAbility.getInstance()), new CardsInControllerGraveyardCondition(7), "{this} has flying as long as seven or more cards are in your graveyard.")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/m/MysticZealot.java b/Mage.Sets/src/mage/cards/m/MysticZealot.java index 251f7df5bb7..17b5c2c0c99 100644 --- a/Mage.Sets/src/mage/cards/m/MysticZealot.java +++ b/Mage.Sets/src/mage/cards/m/MysticZealot.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -35,10 +35,10 @@ public final class MysticZealot extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Mystic Zealot gets +1/+1 and has flying. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance()), - new CardsInControllerGraveCondition(7), "and has flying")); + new CardsInControllerGraveyardCondition(7), "and has flying")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java b/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java index aacc2ed1a5d..9fb7378dacc 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java +++ b/Mage.Sets/src/mage/cards/n/NantukoBlightcutter.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -47,7 +47,7 @@ public final class NantukoBlightcutter extends CardImpl { // Threshold - Nantuko Blightcutter gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard. PermanentsOnBattlefieldCount count = new PermanentsOnBattlefieldCount(filter); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(count, count, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(count, count, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "{this} gets +1/+1 for each black permanent your opponents control as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NantukoCalmer.java b/Mage.Sets/src/mage/cards/n/NantukoCalmer.java index 5e35893a2c9..3ca7d0fee22 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoCalmer.java +++ b/Mage.Sets/src/mage/cards/n/NantukoCalmer.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -43,7 +43,7 @@ public final class NantukoCalmer extends CardImpl { this.addAbility(ability); // Threshold - Nantuko Calmer gets +1/+1 as long as seven or more cards are in your graveyard. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "{this} gets +1/+1 as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NantukoMonastery.java b/Mage.Sets/src/mage/cards/n/NantukoMonastery.java index 5f8b059a009..8145a9acfda 100644 --- a/Mage.Sets/src/mage/cards/n/NantukoMonastery.java +++ b/Mage.Sets/src/mage/cards/n/NantukoMonastery.java @@ -4,7 +4,7 @@ package mage.cards.n; import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.common.continuous.BecomesCreatureSourceEffect; @@ -33,7 +33,7 @@ public final class NantukoMonastery extends CardImpl { // Threshold - {G}{W}: Nantuko Monastery becomes a 4/4 green and white Insect Monk creature with first strike until end of turn. It's still a land. Activate this ability only if seven or more cards are in your graveyard. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect( new NantukoMonasteryToken(), "land", Duration.EndOfTurn), new ManaCostsImpl<>("{G}{W}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NimanaSkitterSneak.java b/Mage.Sets/src/mage/cards/n/NimanaSkitterSneak.java index 1637dac173d..87769a082af 100644 --- a/Mage.Sets/src/mage/cards/n/NimanaSkitterSneak.java +++ b/Mage.Sets/src/mage/cards/n/NimanaSkitterSneak.java @@ -3,7 +3,7 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -32,14 +32,14 @@ public final class NimanaSkitterSneak extends CardImpl { // As long as an opponent has eight or more cards in their graveyard, Nimana Skitter-Sneak gets +1/+0 and has menace. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(1, 0, Duration.WhileOnBattlefield), - CardsInOpponentGraveCondition.EIGHT, "As long as an opponent has eight" + + CardsInOpponentGraveyardCondition.EIGHT, "As long as an opponent has eight" + " or more cards in their graveyard, {this} gets +1/+0" )); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(new MenaceAbility()), - CardsInOpponentGraveCondition.EIGHT, "and has menace" + CardsInOpponentGraveyardCondition.EIGHT, "and has menace" )); - this.addAbility(ability.addHint(CardsInOpponentGraveCondition.EIGHT.getHint())); + this.addAbility(ability.addHint(CardsInOpponentGraveyardCondition.EIGHT.getHint())); } private NimanaSkitterSneak(final NimanaSkitterSneak card) { diff --git a/Mage.Sets/src/mage/cards/n/NimbleMongoose.java b/Mage.Sets/src/mage/cards/n/NimbleMongoose.java index 94f7f647705..3db146b77e4 100644 --- a/Mage.Sets/src/mage/cards/n/NimbleMongoose.java +++ b/Mage.Sets/src/mage/cards/n/NimbleMongoose.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ShroudAbility; @@ -35,7 +35,7 @@ public final class NimbleMongoose extends CardImpl { // Threshold - Nimble Mongoose gets +2/+2 as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "{this} gets +2/+2 as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/n/NomadDecoy.java b/Mage.Sets/src/mage/cards/n/NomadDecoy.java index e90b227475f..6b520d47a66 100644 --- a/Mage.Sets/src/mage/cards/n/NomadDecoy.java +++ b/Mage.Sets/src/mage/cards/n/NomadDecoy.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; @@ -43,7 +43,7 @@ public final class NomadDecoy extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new TapTargetEffect(), new ManaCostsImpl("{W}{W}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addTarget(new TargetCreaturePermanent(2)); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/n/NomadStadium.java b/Mage.Sets/src/mage/cards/n/NomadStadium.java index e9d9bfa6cf5..a3d7434f23e 100644 --- a/Mage.Sets/src/mage/cards/n/NomadStadium.java +++ b/Mage.Sets/src/mage/cards/n/NomadStadium.java @@ -3,7 +3,7 @@ package mage.cards.n; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -35,7 +35,7 @@ public final class NomadStadium extends CardImpl { Ability thresholdAbility = new ConditionalActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(4), new ManaCostsImpl("{W}"), - new CardsInControllerGraveCondition(7)); + new CardsInControllerGraveyardCondition(7)); thresholdAbility.addCost(new TapSourceCost()); thresholdAbility.addCost(new SacrificeSourceCost()); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/n/NutCollector.java b/Mage.Sets/src/mage/cards/n/NutCollector.java index ac7c3417536..93af23d0406 100644 --- a/Mage.Sets/src/mage/cards/n/NutCollector.java +++ b/Mage.Sets/src/mage/cards/n/NutCollector.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.continuous.BoostAllEffect; @@ -41,7 +41,7 @@ public final class NutCollector extends CardImpl { // Threshold - Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect(new BoostAllEffect(2, 2, Duration.WhileOnBattlefield, filter, false), - new CardsInControllerGraveCondition(7), "Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard")); + new CardsInControllerGraveyardCondition(7), "Squirrel creatures get +2/+2 as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java b/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java index 81c761de2c4..c4fe3f77b63 100644 --- a/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java +++ b/Mage.Sets/src/mage/cards/o/OtarianJuggernaut.java @@ -4,7 +4,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleEvasionAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRequirementEffect; import mage.abilities.effects.common.combat.AttacksIfAbleSourceEffect; @@ -41,11 +41,11 @@ public final class OtarianJuggernaut extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Otarian Juggernaut gets +3/+0 and attacks each combat if able. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(3, 0, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +3/+0")); ability.addEffect(new ConditionalRequirementEffect( new AttacksIfAbleSourceEffect(Duration.WhileOnBattlefield, true), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "and attacks each combat if able" )); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/o/OversoldCemetery.java b/Mage.Sets/src/mage/cards/o/OversoldCemetery.java index d855975ac53..df9da03feaa 100644 --- a/Mage.Sets/src/mage/cards/o/OversoldCemetery.java +++ b/Mage.Sets/src/mage/cards/o/OversoldCemetery.java @@ -3,7 +3,7 @@ package mage.cards.o; import java.util.UUID; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.cards.CardImpl; @@ -26,7 +26,7 @@ public final class OversoldCemetery extends CardImpl { // At the beginning of your upkeep, if you have four or more creature cards in your graveyard, you may return target creature card from your graveyard to your hand. TriggeredAbility ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), TargetController.YOU, true); ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_CREATURE)); - CardsInControllerGraveCondition condition = new CardsInControllerGraveCondition(4, StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); + CardsInControllerGraveyardCondition condition = new CardsInControllerGraveyardCondition(4, StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD); this.addAbility(new ConditionalInterveningIfTriggeredAbility(ability, condition, "At the beginning of your upkeep, if you have four or more creature cards in your graveyard, you may return target creature card from your graveyard to your hand.")); } diff --git a/Mage.Sets/src/mage/cards/p/PardicArsonist.java b/Mage.Sets/src/mage/cards/p/PardicArsonist.java index 2dbc035a9f2..af3f294a68f 100644 --- a/Mage.Sets/src/mage/cards/p/PardicArsonist.java +++ b/Mage.Sets/src/mage/cards/p/PardicArsonist.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -36,7 +36,7 @@ public final class PardicArsonist extends CardImpl { gainedAbility.addTarget(new TargetAnyTarget()); Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveCondition(7), + new GainAbilitySourceEffect(gainedAbility), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"When {this} enters the battlefield, it deals 3 damage to any target.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java b/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java index b146b95830a..b6d2155d346 100644 --- a/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java +++ b/Mage.Sets/src/mage/cards/p/PatriarchsDesire.java @@ -4,7 +4,7 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.continuous.BoostEnchantedEffect; @@ -43,7 +43,7 @@ public final class PatriarchsDesire extends CardImpl { // Threshold - Enchanted creature gets an additional +2/-2 as long as seven or more cards are in your graveyard. ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostEnchantedEffect(2, -2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "Enchanted creature gets an additional +2/-2 as long as seven or more cards are in your graveyard.")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/p/PitKeeper.java b/Mage.Sets/src/mage/cards/p/PitKeeper.java index 00834f6622a..29499ddede7 100644 --- a/Mage.Sets/src/mage/cards/p/PitKeeper.java +++ b/Mage.Sets/src/mage/cards/p/PitKeeper.java @@ -35,7 +35,7 @@ public final class PitKeeper extends CardImpl { triggeredAbility.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); this.addAbility(new ConditionalInterveningIfTriggeredAbility( triggeredAbility, - new CreatureCardsInControllerGraveCondition(4), + new CreatureCardsInControllerGraveyardCondition(4), "When {this} enters the battlefield, if you have four or more creature cards in your graveyard, you may return target creature card from your graveyard to your hand.")); } @@ -49,11 +49,11 @@ public final class PitKeeper extends CardImpl { } } -class CreatureCardsInControllerGraveCondition implements Condition { +class CreatureCardsInControllerGraveyardCondition implements Condition { private int value; - public CreatureCardsInControllerGraveCondition(int value) { + public CreatureCardsInControllerGraveyardCondition(int value) { this.value = value; } diff --git a/Mage.Sets/src/mage/cards/p/PossessedAven.java b/Mage.Sets/src/mage/cards/p/PossessedAven.java index e5e32d08fac..71d0aaae9b5 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedAven.java +++ b/Mage.Sets/src/mage/cards/p/PossessedAven.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -52,18 +52,18 @@ public final class PossessedAven extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Possessed Aven gets +1/+1, is black, and has "{2}{B}, {tap}: Destroy target blue creature." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); Effect effect = new ConditionalContinuousEffect(new BecomesColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), ", is black"); + new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), - new CardsInControllerGraveCondition(7), ", and has \"{2}{B}, {T}: Destroy target blue creature.\""); + new CardsInControllerGraveyardCondition(7), ", and has \"{2}{B}, {T}: Destroy target blue creature.\""); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java b/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java index f98d38e54f9..3f18ac502ab 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java +++ b/Mage.Sets/src/mage/cards/p/PossessedBarbarian.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -52,18 +52,18 @@ public final class PossessedBarbarian extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Possessed Barbarian gets +1/+1, is black, and has "{2}{B}, {tap}: Destroy target red creature." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); Effect effect = new ConditionalContinuousEffect(new BecomesColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), ", is black"); + new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), - new CardsInControllerGraveCondition(7), ", and has \"{2}{B}, {T}: Destroy target red creature.\""); + new CardsInControllerGraveyardCondition(7), ", and has \"{2}{B}, {T}: Destroy target red creature.\""); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/p/PossessedCentaur.java b/Mage.Sets/src/mage/cards/p/PossessedCentaur.java index 28333efb5d6..ba75734a67b 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedCentaur.java +++ b/Mage.Sets/src/mage/cards/p/PossessedCentaur.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -51,18 +51,18 @@ public final class PossessedCentaur extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Possessed Centaur gets +1/+1, is black, and has "{2}{B}, {tap}: Destroy target green creature." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); Effect effect = new ConditionalContinuousEffect(new BecomesColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), ", is black"); + new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), - new CardsInControllerGraveCondition(7), ", and has \"{2}{B}, {T}: Destroy target green creature.\""); + new CardsInControllerGraveyardCondition(7), ", and has \"{2}{B}, {T}: Destroy target green creature.\""); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/p/PossessedNomad.java b/Mage.Sets/src/mage/cards/p/PossessedNomad.java index 81ca6fb2f27..5b599cd4e77 100644 --- a/Mage.Sets/src/mage/cards/p/PossessedNomad.java +++ b/Mage.Sets/src/mage/cards/p/PossessedNomad.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; @@ -52,18 +52,18 @@ public final class PossessedNomad extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Threshold - As long as seven or more cards are in your graveyard, Possessed Nomad gets +1/+1, is black, and has "{2}{B}, {tap}: Destroy target white creature." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); Effect effect = new ConditionalContinuousEffect(new BecomesColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), ", is black"); + new CardsInControllerGraveyardCondition(7), ", is black"); ability.addEffect(effect); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}")); gainedAbility.addCost(new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); effect = new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), - new CardsInControllerGraveCondition(7), ", and has \"{2}{B}, {T}: Destroy target white creature.\""); + new CardsInControllerGraveyardCondition(7), ", and has \"{2}{B}, {T}: Destroy target white creature.\""); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/p/PutridImp.java b/Mage.Sets/src/mage/cards/p/PutridImp.java index 2b7294ca89c..12c2ec7f7c1 100644 --- a/Mage.Sets/src/mage/cards/p/PutridImp.java +++ b/Mage.Sets/src/mage/cards/p/PutridImp.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.DiscardCardCost; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.decorator.ConditionalRestrictionEffect; @@ -42,9 +42,9 @@ public final class PutridImp extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Putrid Imp gets +1/+1 and can't block. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); - Effect effect = new ConditionalRestrictionEffect(new CantBlockSourceEffect(Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7)); + Effect effect = new ConditionalRestrictionEffect(new CantBlockSourceEffect(Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7)); effect.setText("and can't block"); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/r/RamunapHydra.java b/Mage.Sets/src/mage/cards/r/RamunapHydra.java index f6402e7cecb..7fb08136a75 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapHydra.java +++ b/Mage.Sets/src/mage/cards/r/RamunapHydra.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.effects.WhileConditionContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceWhileControlsEffect; import mage.abilities.keyword.ReachAbility; @@ -77,7 +77,7 @@ class RamunapHydraBoostEffect extends WhileConditionContinuousEffect { private final int toughness; public RamunapHydraBoostEffect(int power, int toughness) { - super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, new CardsInControllerGraveCondition(1, filter), Outcome.BoostCreature); + super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, new CardsInControllerGraveyardCondition(1, filter), Outcome.BoostCreature); this.power = power; this.toughness = toughness; staticText = "{this} gets +1/+1 as long as there is a Desert card in your graveyard"; diff --git a/Mage.Sets/src/mage/cards/r/RancidEarth.java b/Mage.Sets/src/mage/cards/r/RancidEarth.java index 5dc35f02a02..82c339ef7df 100644 --- a/Mage.Sets/src/mage/cards/r/RancidEarth.java +++ b/Mage.Sets/src/mage/cards/r/RancidEarth.java @@ -3,7 +3,7 @@ package mage.cards.r; import java.util.UUID; import mage.abilities.Ability; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; @@ -30,7 +30,7 @@ public final class RancidEarth extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new RancidEarthEffect(), new DestroyTargetEffect(), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Destroy target land.

Threshold — If seven or more cards are in your graveyard, instead destroy that land and Rancid Earth deals 1 damage to each creature and each player.")); this.getSpellAbility().addTarget(new TargetLandPermanent()); } diff --git a/Mage.Sets/src/mage/cards/r/RebornHero.java b/Mage.Sets/src/mage/cards/r/RebornHero.java index c0f824c082f..faa7a09068b 100644 --- a/Mage.Sets/src/mage/cards/r/RebornHero.java +++ b/Mage.Sets/src/mage/cards/r/RebornHero.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DoIfCostPaid; @@ -44,7 +44,7 @@ public final class RebornHero extends CardImpl { new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new DoIfCostPaid( new ReturnSourceFromGraveyardToBattlefieldEffect(), new ManaCostsImpl("{W}{W}") ))), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, " + "{this} has \"When {this} dies, you may pay {W}{W}. " + "If you do, return {this} to the battlefield under your control.\"" diff --git a/Mage.Sets/src/mage/cards/r/RepentantVampire.java b/Mage.Sets/src/mage/cards/r/RepentantVampire.java index 8221a9ef085..e2b0a6ae2f6 100644 --- a/Mage.Sets/src/mage/cards/r/RepentantVampire.java +++ b/Mage.Sets/src/mage/cards/r/RepentantVampire.java @@ -8,7 +8,7 @@ import mage.abilities.Ability; import mage.abilities.common.DealtDamageAndDiedTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.DestroyTargetEffect; @@ -53,13 +53,13 @@ public final class RepentantVampire extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Repentant Vampire is white and has "{tap}: Destroy target black creature." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BecomesColorSourceEffect(ObjectColor.WHITE, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} is white")); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DestroyTargetEffect(), new TapSourceCost()); gainedAbility.addTarget(new TargetCreaturePermanent(filter)); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "and has \"{T}: Destroy target black creature.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SandStrangler.java b/Mage.Sets/src/mage/cards/s/SandStrangler.java index 728771c42f7..6ec49639726 100644 --- a/Mage.Sets/src/mage/cards/s/SandStrangler.java +++ b/Mage.Sets/src/mage/cards/s/SandStrangler.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.OrCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.DamageTargetEffect; @@ -44,7 +44,7 @@ public final class SandStrangler extends CardImpl { new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3), true), new OrCondition( new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(filterDesertPermanent)), - new CardsInControllerGraveCondition(1, filterDesertCard)), + new CardsInControllerGraveyardCondition(1, filterDesertCard)), "When {this} enters the battlefield, if you control a Desert or there is a Desert card in your graveyard, you may have {this} deal 3 damage to target creature."); ability.addTarget(new TargetCreaturePermanent()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SetonsDesire.java b/Mage.Sets/src/mage/cards/s/SetonsDesire.java index e03e9051372..5f357faee74 100644 --- a/Mage.Sets/src/mage/cards/s/SetonsDesire.java +++ b/Mage.Sets/src/mage/cards/s/SetonsDesire.java @@ -4,7 +4,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalRequirementEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; @@ -44,7 +44,7 @@ public final class SetonsDesire extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostEnchantedEffect(2, 2, Duration.WhileOnBattlefield))); // Threshold - As long as seven or more cards are in your graveyard, all creatures able to block enchanted creature do so. - Effect effect = new ConditionalRequirementEffect(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA), new CardsInControllerGraveCondition(7)); + Effect effect = new ConditionalRequirementEffect(new MustBeBlockedByAllAttachedEffect(AttachmentType.AURA), new CardsInControllerGraveyardCondition(7)); effect.setText("As long as seven or more cards are in your graveyard, all creatures able to block enchanted creature do so"); ability = new SimpleStaticAbility(Zone.BATTLEFIELD, effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/s/SetonsScout.java b/Mage.Sets/src/mage/cards/s/SetonsScout.java index bca7c190a2b..635b093bfb0 100644 --- a/Mage.Sets/src/mage/cards/s/SetonsScout.java +++ b/Mage.Sets/src/mage/cards/s/SetonsScout.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.keyword.ReachAbility; @@ -36,7 +36,7 @@ public final class SetonsScout extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Threshold - Seton's Scout gets +2/+2 as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java b/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java index c1b51e29546..a2853b1d866 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java +++ b/Mage.Sets/src/mage/cards/s/ShadowbornDemon.java @@ -54,7 +54,7 @@ public final class ShadowbornDemon extends CardImpl { // At the beginning of your upkeep, if there are fewer than six creature cards in your graveyard, sacrifice a creature. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(StaticFilters.FILTER_PERMANENT_CREATURE, 1, ""), TargetController.YOU, false), - new InvertCondition(new CreatureCardsInControllerGraveCondition(6)), + new InvertCondition(new CreatureCardsInControllerGraveyardCondition(6)), "At the beginning of your upkeep, if there are fewer than six creature cards in your graveyard, sacrifice a creature")); } @@ -69,11 +69,11 @@ public final class ShadowbornDemon extends CardImpl { } } -class CreatureCardsInControllerGraveCondition implements Condition { +class CreatureCardsInControllerGraveyardCondition implements Condition { private int value; - public CreatureCardsInControllerGraveCondition(int value) { + public CreatureCardsInControllerGraveyardCondition(int value) { this.value = value; } diff --git a/Mage.Sets/src/mage/cards/s/ShadowsOfThePast.java b/Mage.Sets/src/mage/cards/s/ShadowsOfThePast.java index 7efe75f4e2a..deddcf81725 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowsOfThePast.java +++ b/Mage.Sets/src/mage/cards/s/ShadowsOfThePast.java @@ -3,7 +3,7 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.Ability; import mage.abilities.common.DiesCreatureTriggeredAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalActivatedAbility; import mage.abilities.effects.Effect; @@ -30,7 +30,7 @@ public final class ShadowsOfThePast extends CardImpl { // {4}{B}: Each opponent loses 2 life and you gain 2 life. Activate this ability only if there are four or more creature cards in your graveyard. Ability ability = new ConditionalActivatedAbility(Zone.BATTLEFIELD, - new LoseLifeOpponentsEffect(2), new ManaCostsImpl<>("{4}{B}"), new CardsInControllerGraveCondition(4, StaticFilters.FILTER_CARD_CREATURE)); + new LoseLifeOpponentsEffect(2), new ManaCostsImpl<>("{4}{B}"), new CardsInControllerGraveyardCondition(4, StaticFilters.FILTER_CARD_CREATURE)); Effect effect = new GainLifeEffect(2); effect.setText("and you gain 2 life"); ability.addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java b/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java index 6352e22db71..d10d864fa24 100644 --- a/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java +++ b/Mage.Sets/src/mage/cards/s/ShowerOfCoals.java @@ -2,7 +2,7 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageTargetEffect; @@ -24,7 +24,7 @@ public final class ShowerOfCoals extends CardImpl { // Threshold - Shower of Coals deals 4 damage to each of those creatures and/or players instead if seven or more cards are in your graveyard. Effect effect = new ConditionalOneShotEffect(new DamageTargetEffect(4), new DamageTargetEffect(2), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "{this} deals 2 damage to each of up to three targets.

Threshold — {this} deals 4 damage to each of those permanents and/or players instead if seven or more cards are in your graveyard."); this.getSpellAbility().addTarget(new TargetAnyTarget(0, 3)); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/s/SilverSeraph.java b/Mage.Sets/src/mage/cards/s/SilverSeraph.java index 7c274d9b5b1..caf46f23ae2 100644 --- a/Mage.Sets/src/mage/cards/s/SilverSeraph.java +++ b/Mage.Sets/src/mage/cards/s/SilverSeraph.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.keyword.FlyingAbility; @@ -33,7 +33,7 @@ public final class SilverSeraph extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // Threshold - Other creatures you control get +2/+2 as long as seven or more cards are in your graveyard. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), new CardsInControllerGraveCondition(7), + new BoostControlledEffect(2, 2, Duration.WhileOnBattlefield, true), new CardsInControllerGraveyardCondition(7), "other creatures you control +2/+2 as long as seven or more cards are in your graveyard")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SolitaryCamel.java b/Mage.Sets/src/mage/cards/s/SolitaryCamel.java index b55c1b5a8ba..237e622cf22 100644 --- a/Mage.Sets/src/mage/cards/s/SolitaryCamel.java +++ b/Mage.Sets/src/mage/cards/s/SolitaryCamel.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.OrCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -45,7 +45,7 @@ public final class SolitaryCamel extends CardImpl { new GainAbilitySourceEffect(LifelinkAbility.getInstance()), new OrCondition( new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(filterDesertPermanent)), - new CardsInControllerGraveCondition(1, filterDesertCard)), + new CardsInControllerGraveyardCondition(1, filterDesertCard)), "{this} has lifelink as long as you control a desert or there is a desert card in your graveyard.")); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SpelleaterWolverine.java b/Mage.Sets/src/mage/cards/s/SpelleaterWolverine.java index 452b913676e..10fcd356ffd 100644 --- a/Mage.Sets/src/mage/cards/s/SpelleaterWolverine.java +++ b/Mage.Sets/src/mage/cards/s/SpelleaterWolverine.java @@ -3,7 +3,7 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.DoubleStrikeAbility; @@ -20,7 +20,7 @@ import java.util.UUID; */ public final class SpelleaterWolverine extends CardImpl { - private static final Condition condition = new CardsInControllerGraveCondition( + private static final Condition condition = new CardsInControllerGraveyardCondition( 3, StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY ); diff --git a/Mage.Sets/src/mage/cards/s/SpringingTiger.java b/Mage.Sets/src/mage/cards/s/SpringingTiger.java index 23063003853..806fa6bc0aa 100644 --- a/Mage.Sets/src/mage/cards/s/SpringingTiger.java +++ b/Mage.Sets/src/mage/cards/s/SpringingTiger.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.cards.CardImpl; @@ -34,7 +34,7 @@ public final class SpringingTiger extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "{this} gets +2/+2 as long as seven or more cards are in your graveyard" )); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/s/StitchTogether.java b/Mage.Sets/src/mage/cards/s/StitchTogether.java index c45b9123730..22e2c4e692a 100644 --- a/Mage.Sets/src/mage/cards/s/StitchTogether.java +++ b/Mage.Sets/src/mage/cards/s/StitchTogether.java @@ -2,7 +2,7 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect; @@ -27,7 +27,7 @@ public final class StitchTogether extends CardImpl { Effect effect = new ConditionalOneShotEffect( new ReturnFromGraveyardToBattlefieldTargetEffect(), new ReturnFromGraveyardToHandTargetEffect(), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Return target creature card from your graveyard to your hand.

Threshold — Return that card from your graveyard to the battlefield instead if seven or more cards are in your graveyard."); this.getSpellAbility().addEffect(effect); this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD)); diff --git a/Mage.Sets/src/mage/cards/s/StoneTongueBasilisk.java b/Mage.Sets/src/mage/cards/s/StoneTongueBasilisk.java index a64a30f7459..6100c0fbc6b 100644 --- a/Mage.Sets/src/mage/cards/s/StoneTongueBasilisk.java +++ b/Mage.Sets/src/mage/cards/s/StoneTongueBasilisk.java @@ -5,7 +5,7 @@ import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToACreatureTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.delayed.AtTheEndOfCombatDelayedTriggeredAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalRequirementEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; @@ -40,7 +40,7 @@ public final class StoneTongueBasilisk extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, all creatures able to block Stone-Tongue Basilisk do so. Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalRequirementEffect( new MustBeBlockedByAllSourceEffect(), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, all creatures able to block {this} do so" )); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/s/SwirlingSandstorm.java b/Mage.Sets/src/mage/cards/s/SwirlingSandstorm.java index c0bdfed0a36..09bc60d616c 100644 --- a/Mage.Sets/src/mage/cards/s/SwirlingSandstorm.java +++ b/Mage.Sets/src/mage/cards/s/SwirlingSandstorm.java @@ -2,7 +2,7 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.DamageAllEffect; @@ -32,7 +32,7 @@ public final class SwirlingSandstorm extends CardImpl { // Threshold - Swirling Sandstorm deals 5 damage to each creature without flying if seven or more cards are in your graveyard. Effect effect = new ConditionalOneShotEffect( new DamageAllEffect(5, filter), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "Threshold — {this} deals 5 damage to each creature without flying if seven or more cards are in your graveyard."); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/t/TerohsVanguard.java b/Mage.Sets/src/mage/cards/t/TerohsVanguard.java index 4a3fe21ec7a..99f3408c837 100644 --- a/Mage.Sets/src/mage/cards/t/TerohsVanguard.java +++ b/Mage.Sets/src/mage/cards/t/TerohsVanguard.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; @@ -41,7 +41,7 @@ public final class TerohsVanguard extends CardImpl { Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new GainAbilitySourceEffect(new EntersBattlefieldTriggeredAbility( new GainAbilityControlledEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn, new FilterCreaturePermanent()))), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} has \"When {this} enters the battlefield, creatures you control gain protection from black until end of turn.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThermalBlast.java b/Mage.Sets/src/mage/cards/t/ThermalBlast.java index 6ecf16804a2..fa61fcf573c 100644 --- a/Mage.Sets/src/mage/cards/t/ThermalBlast.java +++ b/Mage.Sets/src/mage/cards/t/ThermalBlast.java @@ -1,7 +1,7 @@ package mage.cards.t; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.cards.CardImpl; @@ -23,7 +23,7 @@ public final class ThermalBlast extends CardImpl { // Threshold - Thermal Blast deals 5 damage to that creature instead if seven or more cards are in your graveyard. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DamageTargetEffect(5), new DamageTargetEffect(3), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "{this} deals 3 damage to target creature.
Threshold — " + "{this} deals 5 damage instead if seven or more cards are in your graveyard." )); diff --git a/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java b/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java index 981d6f1fba8..e26881a680f 100644 --- a/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java +++ b/Mage.Sets/src/mage/cards/t/ThievesGuildEnforcer.java @@ -4,13 +4,11 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldThisOrAnotherTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.Condition; -import mage.abilities.condition.common.CardsInOpponentGraveCondition; +import mage.abilities.condition.common.CardsInOpponentGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.PutTopCardOfLibraryIntoGraveEachPlayerEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; -import mage.abilities.hint.ConditionHint; import mage.abilities.keyword.DeathtouchAbility; import mage.abilities.keyword.FlashAbility; import mage.cards.CardImpl; @@ -20,11 +18,7 @@ import mage.constants.Duration; import mage.constants.SubType; import mage.constants.TargetController; import mage.filter.FilterPermanent; -import mage.game.Game; -import mage.game.Graveyard; -import mage.players.Player; -import java.util.Objects; import java.util.UUID; /** @@ -55,13 +49,13 @@ public final class ThievesGuildEnforcer extends CardImpl { // As long as an opponent has eight or more cards in their graveyard, Thieves' Guild Enforcer gets +2/+1 and has deathtouch. Ability ability = new SimpleStaticAbility(new ConditionalContinuousEffect( new BoostSourceEffect(2, 1, Duration.WhileOnBattlefield), - CardsInOpponentGraveCondition.EIGHT, "as long as an opponent " + + CardsInOpponentGraveyardCondition.EIGHT, "as long as an opponent " + "has eight or more cards in their graveyard, {this} gets +2/+1" )); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect( DeathtouchAbility.getInstance(), Duration.WhileOnBattlefield - ), CardsInOpponentGraveCondition.EIGHT, "and has deathtouch")); - this.addAbility(ability.addHint(CardsInOpponentGraveCondition.EIGHT.getHint())); + ), CardsInOpponentGraveyardCondition.EIGHT, "and has deathtouch")); + this.addAbility(ability.addHint(CardsInOpponentGraveyardCondition.EIGHT.getHint())); } private ThievesGuildEnforcer(final ThievesGuildEnforcer card) { diff --git a/Mage.Sets/src/mage/cards/t/ToxicStench.java b/Mage.Sets/src/mage/cards/t/ToxicStench.java index 060d8a52d3d..f1ad23653ae 100644 --- a/Mage.Sets/src/mage/cards/t/ToxicStench.java +++ b/Mage.Sets/src/mage/cards/t/ToxicStench.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.condition.InvertCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.OneShotEffect; @@ -42,13 +42,13 @@ public final class ToxicStench extends CardImpl { // Target nonblack creature gets -1/-1 until end of turn. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new ToxicStenchEffect(), - new InvertCondition(new CardsInControllerGraveCondition(7)), + new InvertCondition(new CardsInControllerGraveyardCondition(7)), "Target nonblack creature gets -1/-1 until end of turn.")); // Threshold - If seven or more cards are in your graveyard, instead destroy that creature. It can't be regenerated. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new DestroyTargetEffect(true), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "

Threshold — If seven or more cards are in your graveyard, instead destroy that creature. It can't be regenerated.")); this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter)); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousVampire.java b/Mage.Sets/src/mage/cards/t/TreacherousVampire.java index 59d0625cc4f..3b8caa57763 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousVampire.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousVampire.java @@ -7,7 +7,7 @@ import mage.abilities.Ability; import mage.abilities.common.AttacksOrBlocksTriggeredAbility; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.ExileFromGraveCost; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; @@ -52,11 +52,11 @@ public final class TreacherousVampire extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Treacherous Vampire gets +2/+2 and has "When Treacherous Vampire dies, you lose 6 life." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); Effect effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new LoseLifeSourceControllerEffect(6))), - new CardsInControllerGraveCondition(7), "and has \"When {this} dies, you lose 6 life.\"" + new CardsInControllerGraveyardCondition(7), "and has \"When {this} dies, you lose 6 life.\"" ); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java b/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java index 4d980d39d1f..eac9341acad 100644 --- a/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java +++ b/Mage.Sets/src/mage/cards/t/TreacherousWerewolf.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; @@ -36,11 +36,11 @@ public final class TreacherousWerewolf extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Treacherous Werewolf gets +2/+2 and has "When Treacherous Werewolf dies, you lose 4 life." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(2, 2, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +2/+2")); Effect effect = new ConditionalContinuousEffect( new GainAbilitySourceEffect(new DiesSourceTriggeredAbility(new LoseLifeSourceControllerEffect(4))), - new CardsInControllerGraveCondition(7), "and has \"When {this} dies, you lose 4 life.\"" + new CardsInControllerGraveyardCondition(7), "and has \"When {this} dies, you lose 4 life.\"" ); ability.addEffect(effect); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java b/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java index a3848a201e4..9faa526d633 100644 --- a/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java +++ b/Mage.Sets/src/mage/cards/u/UnquenchableThirst.java @@ -6,7 +6,7 @@ import mage.abilities.Ability; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.OrCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.AttachEffect; @@ -55,7 +55,7 @@ public final class UnquenchableThirst extends CardImpl { new EntersBattlefieldTriggeredAbility(new TapEnchantedEffect()), new OrCondition( new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(filterDesertPermanent)), - new CardsInControllerGraveCondition(1, filterDesertCard)), + new CardsInControllerGraveyardCondition(1, filterDesertCard)), "When {this} enters the battlefield, if you control a Desert or there is a Desert card in your graveyard, tap enchanted creature."); this.addAbility(ability2); diff --git a/Mage.Sets/src/mage/cards/v/VigilantSentry.java b/Mage.Sets/src/mage/cards/v/VigilantSentry.java index 3a3d8c045a9..586bcdeeda4 100644 --- a/Mage.Sets/src/mage/cards/v/VigilantSentry.java +++ b/Mage.Sets/src/mage/cards/v/VigilantSentry.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; @@ -36,12 +36,12 @@ public final class VigilantSentry extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Vigilant Sentry gets +1/+1 and has "{tap}: Target attacking or blocking creature gets +3/+3 until end of turn." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( - new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveCondition(7), + new BoostSourceEffect(1, 1, Duration.WhileOnBattlefield), new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +1/+1")); Ability gainedAbility = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(3, 3, Duration.EndOfTurn), new TapSourceCost()); gainedAbility.addTarget(new TargetAttackingOrBlockingCreature()); ability.addEffect(new ConditionalContinuousEffect(new GainAbilitySourceEffect(gainedAbility), - new CardsInControllerGraveCondition(7), "and has \"{T}: Target attacking or blocking creature gets +3/+3 until end of turn.\"")); + new CardsInControllerGraveyardCondition(7), "and has \"{T}: Target attacking or blocking creature gets +3/+3 until end of turn.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/w/WallOfForgottenPharaohs.java b/Mage.Sets/src/mage/cards/w/WallOfForgottenPharaohs.java index 5ccccd87b46..5a6ecebac4f 100644 --- a/Mage.Sets/src/mage/cards/w/WallOfForgottenPharaohs.java +++ b/Mage.Sets/src/mage/cards/w/WallOfForgottenPharaohs.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.ActivateIfConditionActivatedAbility; import mage.abilities.condition.OrCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.DamageTargetEffect; @@ -52,7 +52,7 @@ public final class WallOfForgottenPharaohs extends CardImpl { new OrCondition( "only if you control a Desert or there is a Desert card in your graveyard", new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(filterDesertPermanent)), - new CardsInControllerGraveCondition(1, filterDesertCard) + new CardsInControllerGraveyardCondition(1, filterDesertCard) ) ); ability.addTarget(new TargetPlayerOrPlaneswalker()); diff --git a/Mage.Sets/src/mage/cards/w/WaywardAngel.java b/Mage.Sets/src/mage/cards/w/WaywardAngel.java index c4a9aee453c..13de18eee37 100644 --- a/Mage.Sets/src/mage/cards/w/WaywardAngel.java +++ b/Mage.Sets/src/mage/cards/w/WaywardAngel.java @@ -7,7 +7,7 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.SacrificeControllerEffect; import mage.abilities.effects.common.continuous.BecomesColorSourceEffect; @@ -47,22 +47,22 @@ public final class WaywardAngel extends CardImpl { // Threshold - As long as seven or more cards are in your graveyard, Wayward Angel gets +3/+3, is black, has trample, and has "At the beginning of your upkeep, sacrifice a creature." Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "As long as seven or more cards are in your graveyard, {this} gets +3/+3")); ability.addEffect(new ConditionalContinuousEffect( new BecomesColorSourceEffect(ObjectColor.BLACK, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), ", is black")); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(TrampleAbility.getInstance()), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), ", has trample")); Ability gainedAbility = new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(new FilterControlledCreaturePermanent(), 1, ""), TargetController.YOU, false); ability.addEffect(new ConditionalContinuousEffect( new GainAbilitySourceEffect(gainedAbility), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "and has \"At the beginning of your upkeep, sacrifice a creature.\"")); ability.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/w/WebweaverChangeling.java b/Mage.Sets/src/mage/cards/w/WebweaverChangeling.java index 3dc320e565a..e96b7e72e40 100644 --- a/Mage.Sets/src/mage/cards/w/WebweaverChangeling.java +++ b/Mage.Sets/src/mage/cards/w/WebweaverChangeling.java @@ -2,7 +2,7 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.keyword.ChangelingAbility; @@ -36,7 +36,7 @@ public final class WebweaverChangeling extends CardImpl { // When Webweaver Changeling enters the battlefield, if there are three or more creature cards in your graveyard, you gain 5 life. this.addAbility(new EntersBattlefieldTriggeredAbility(new ConditionalOneShotEffect( new GainLifeEffect(5), - new CardsInControllerGraveCondition( + new CardsInControllerGraveyardCondition( 3, StaticFilters.FILTER_CARD_CREATURE ), "When {this} enters the battlefield, if there are three or more " + "creature cards in your graveyard, you gain 5 life." diff --git a/Mage.Sets/src/mage/cards/w/Werebear.java b/Mage.Sets/src/mage/cards/w/Werebear.java index c526f482d34..b3a2a82900d 100644 --- a/Mage.Sets/src/mage/cards/w/Werebear.java +++ b/Mage.Sets/src/mage/cards/w/Werebear.java @@ -5,7 +5,7 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.mana.GreenManaAbility; @@ -39,7 +39,7 @@ public final class Werebear extends CardImpl { Zone.BATTLEFIELD, new ConditionalContinuousEffect( new BoostSourceEffect(3, 3, Duration.WhileOnBattlefield), - new CardsInControllerGraveCondition(7), + new CardsInControllerGraveyardCondition(7), "{this} gets +3/+3 as long as seven or more cards are in your graveyard" )); thresholdAbility.setAbilityWord(AbilityWord.THRESHOLD); diff --git a/Mage.Sets/src/mage/cards/w/WretchedCamel.java b/Mage.Sets/src/mage/cards/w/WretchedCamel.java index c5d2d7e2c02..ffc78ac4ef4 100644 --- a/Mage.Sets/src/mage/cards/w/WretchedCamel.java +++ b/Mage.Sets/src/mage/cards/w/WretchedCamel.java @@ -6,7 +6,7 @@ import mage.MageInt; import mage.abilities.Ability; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.condition.OrCondition; -import mage.abilities.condition.common.CardsInControllerGraveCondition; +import mage.abilities.condition.common.CardsInControllerGraveyardCondition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.discard.DiscardTargetEffect; @@ -45,7 +45,7 @@ public final class WretchedCamel extends CardImpl { new DiesSourceTriggeredAbility(new DiscardTargetEffect(1)), new OrCondition( new PermanentsOnTheBattlefieldCondition(new FilterControlledPermanent(filterDesertPermanent)), - new CardsInControllerGraveCondition(1, filterDesertCard)), + new CardsInControllerGraveyardCondition(1, filterDesertCard)), "When {this} dies, if you control a Desert or there is a Desert card in your graveyard, target player discards a card."); ability.addTarget(new TargetPlayer()); diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveyardCondition.java similarity index 84% rename from Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveyardCondition.java index 94500ee9183..fa0f86c7913 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveyardCondition.java @@ -12,16 +12,16 @@ import mage.util.CardUtil; * * @author LevelX2 */ -public class CardsInControllerGraveCondition implements Condition { +public class CardsInControllerGraveyardCondition implements Condition { private final int value; private final FilterCard filter; - public CardsInControllerGraveCondition(int value) { + public CardsInControllerGraveyardCondition(int value) { this(value, null); } - public CardsInControllerGraveCondition(int value, FilterCard filter) { + public CardsInControllerGraveyardCondition(int value, FilterCard filter) { this.value = value; this.filter = filter; } diff --git a/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveyardCondition.java similarity index 77% rename from Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java rename to Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveyardCondition.java index 2711105d8de..6a14c7cb909 100644 --- a/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveCondition.java +++ b/Mage/src/main/java/mage/abilities/condition/common/CardsInOpponentGraveyardCondition.java @@ -17,7 +17,7 @@ import java.util.Objects; * * @author TheElk801 */ -public enum CardsInOpponentGraveCondition implements Condition { +public enum CardsInOpponentGraveyardCondition implements Condition { SEVEN(7), EIGHT(8), TEN(10); @@ -25,9 +25,9 @@ public enum CardsInOpponentGraveCondition implements Condition { private final int value; private final Hint hint; - CardsInOpponentGraveCondition(int value) { + CardsInOpponentGraveyardCondition(int value) { this.value = value; - this.hint = new CardsInOpponentGraveConditionHint(value); + this.hint = new CardsInOpponentGraveyardConditionHint(value); } @Override @@ -51,15 +51,15 @@ public enum CardsInOpponentGraveCondition implements Condition { return hint; } - private static final class CardsInOpponentGraveConditionHint implements Hint { + private static final class CardsInOpponentGraveyardConditionHint implements Hint { private final int value; - private CardsInOpponentGraveConditionHint(int value) { + private CardsInOpponentGraveyardConditionHint(int value) { this.value = value; } - private CardsInOpponentGraveConditionHint(final CardsInOpponentGraveConditionHint hint) { + private CardsInOpponentGraveyardConditionHint(final CardsInOpponentGraveyardConditionHint hint) { this.value = hint.value; } @@ -80,8 +80,8 @@ public enum CardsInOpponentGraveCondition implements Condition { } @Override - public CardsInOpponentGraveConditionHint copy() { - return new CardsInOpponentGraveConditionHint(this); + public CardsInOpponentGraveyardConditionHint copy() { + return new CardsInOpponentGraveyardConditionHint(this); } } }