diff --git a/Mage.Sets/src/mage/cards/a/ALittleChat.java b/Mage.Sets/src/mage/cards/a/ALittleChat.java index fd65e1b953..f7a30ce598 100644 --- a/Mage.Sets/src/mage/cards/a/ALittleChat.java +++ b/Mage.Sets/src/mage/cards/a/ALittleChat.java @@ -1,11 +1,11 @@ package mage.cards.a; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.CasualtyAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java index 51003c288d..5ce894f204 100644 --- a/Mage.Sets/src/mage/cards/a/AcclaimedContender.java +++ b/Mage.Sets/src/mage/cards/a/AcclaimedContender.java @@ -6,10 +6,10 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/a/AdventureAwaits.java b/Mage.Sets/src/mage/cards/a/AdventureAwaits.java index 52d331b822..5c5d027b53 100644 --- a/Mage.Sets/src/mage/cards/a/AdventureAwaits.java +++ b/Mage.Sets/src/mage/cards/a/AdventureAwaits.java @@ -3,9 +3,11 @@ package mage.cards.a; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; -import mage.cards.*; +import mage.cards.Cards; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java b/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java index 4b447bd211..fc309d5443 100644 --- a/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java +++ b/Mage.Sets/src/mage/cards/a/AdventurousImpulse.java @@ -2,10 +2,10 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java b/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java index a4cd6e707c..e27dc30fed 100644 --- a/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java +++ b/Mage.Sets/src/mage/cards/a/AdviceFromTheFae.java @@ -5,10 +5,10 @@ import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java index f3c9a18acd..6e02710c12 100644 --- a/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java +++ b/Mage.Sets/src/mage/cards/a/AjaniMentorOfHeroes.java @@ -6,14 +6,10 @@ import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.DistributeCountersEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.TargetController; +import mage.constants.*; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.common.FilterCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/a/AjanisInfluence.java b/Mage.Sets/src/mage/cards/a/AjanisInfluence.java index fd10941fba..6702a76676 100644 --- a/Mage.Sets/src/mage/cards/a/AjanisInfluence.java +++ b/Mage.Sets/src/mage/cards/a/AjanisInfluence.java @@ -3,11 +3,11 @@ package mage.cards.a; import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.counters.CounterType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; diff --git a/Mage.Sets/src/mage/cards/a/AncestralMemories.java b/Mage.Sets/src/mage/cards/a/AncestralMemories.java index 74f1b83ba3..1a0c675ad4 100644 --- a/Mage.Sets/src/mage/cards/a/AncestralMemories.java +++ b/Mage.Sets/src/mage/cards/a/AncestralMemories.java @@ -1,10 +1,10 @@ package mage.cards.a; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/AncientStirrings.java b/Mage.Sets/src/mage/cards/a/AncientStirrings.java index 137ad672c1..f9db9656d0 100644 --- a/Mage.Sets/src/mage/cards/a/AncientStirrings.java +++ b/Mage.Sets/src/mage/cards/a/AncientStirrings.java @@ -2,10 +2,10 @@ package mage.cards.a; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorlessPredicate; diff --git a/Mage.Sets/src/mage/cards/a/Anticipate.java b/Mage.Sets/src/mage/cards/a/Anticipate.java index 3e3bc99c5d..45e332212d 100644 --- a/Mage.Sets/src/mage/cards/a/Anticipate.java +++ b/Mage.Sets/src/mage/cards/a/Anticipate.java @@ -1,10 +1,10 @@ package mage.cards.a; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java b/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java index e8ab05a63a..90862c920e 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneInfusion.java @@ -2,11 +2,11 @@ package mage.cards.a; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java b/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java index 4c499ef157..dceb053330 100644 --- a/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java +++ b/Mage.Sets/src/mage/cards/a/ArcaneInvestigator.java @@ -5,11 +5,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RollDieWithResultTableEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java b/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java index 66b1f2b7c1..dfb756bc97 100644 --- a/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java +++ b/Mage.Sets/src/mage/cards/a/ArcanistsOwl.java @@ -3,11 +3,11 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterArtifactOrEnchantmentCard; diff --git a/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java b/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java index e8a542a4cb..4de9d34253 100644 --- a/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java +++ b/Mage.Sets/src/mage/cards/a/AstorBearerOfBlades.java @@ -4,16 +4,12 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledEffect; import mage.abilities.keyword.CrewAbility; import mage.abilities.keyword.EquipAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.StaticFilters; @@ -40,18 +36,15 @@ public final class AstorBearerOfBlades extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.WARRIOR); + this.subtype.add(SubType.HUMAN, SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(4); - // When Astor, Bearer of Blades enters the battlefield, look at the top seven cards of your library. You may reveal an Equipment or Vehicle card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. + // When Astor, Bearer of Blades enters the battlefield, look at the top seven cards of your library. + // You may reveal an Equipment or Vehicle card from among them and put it into your hand. + // Put the rest on the bottom of your library in a random order. this.addAbility(new EntersBattlefieldTriggeredAbility( - new LookLibraryAndPickControllerEffect( - 7, 1, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM - ) + new LookLibraryAndPickControllerEffect(7, 1, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM) )); // Equipment you control have equip {1}. diff --git a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java index 61f0f9e82b..784d63150d 100644 --- a/Mage.Sets/src/mage/cards/a/AugurOfBolas.java +++ b/Mage.Sets/src/mage/cards/a/AugurOfBolas.java @@ -3,10 +3,10 @@ package mage.cards.a; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java b/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java index a5a841256b..5968c80f39 100644 --- a/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java +++ b/Mage.Sets/src/mage/cards/a/AyeshaTanakaArmorer.java @@ -8,15 +8,11 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalRestrictionEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.combat.CantBeBlockedSourceEffect; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.common.FilterArtifactCard; @@ -53,16 +49,15 @@ public final class AyeshaTanakaArmorer extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{U}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.ARTIFICER); + this.subtype.add(SubType.HUMAN, SubType.ARTIFICER); this.power = new MageInt(2); this.toughness = new MageInt(4); - // Whenever Ayesha Tanaka, Armorer attacks, look at the top four cards of your library. You may put any number of artifact cards with mana value less than or equal to Ayesha's power from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order. + // Whenever Ayesha Tanaka, Armorer attacks, look at the top four cards of your library. + // You may put any number of artifact cards with mana value less than or equal to Ayesha's power + // from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order. this.addAbility(new AttacksTriggeredAbility(new LookLibraryAndPickControllerEffect( - 4, Integer.MAX_VALUE, filter, - LookLibraryControllerEffect.PutCards.BATTLEFIELD_TAPPED, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 4, Integer.MAX_VALUE, filter, PutCards.BATTLEFIELD_TAPPED, PutCards.BOTTOM_RANDOM ))); // Ayesha can't be blocked as long as defending player controls three or more artifacts. @@ -95,4 +90,4 @@ enum AyeshaTanakaArmorerPredicate implements ObjectSourcePlayerPredicate { .map(p -> input.getObject().getManaValue() <= p) .orElse(false); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java b/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java index fce92d1a56..7492616f32 100644 --- a/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java +++ b/Mage.Sets/src/mage/cards/a/AzcantaTheSunkenRuin.java @@ -6,11 +6,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/b/BasicConjuration.java b/Mage.Sets/src/mage/cards/b/BasicConjuration.java index 4c8e38d7fa..04976e9d66 100644 --- a/Mage.Sets/src/mage/cards/b/BasicConjuration.java +++ b/Mage.Sets/src/mage/cards/b/BasicConjuration.java @@ -2,10 +2,10 @@ package mage.cards.b; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/b/BitterRevelation.java b/Mage.Sets/src/mage/cards/b/BitterRevelation.java index 0e37f7fbaa..2083d5df96 100644 --- a/Mage.Sets/src/mage/cards/b/BitterRevelation.java +++ b/Mage.Sets/src/mage/cards/b/BitterRevelation.java @@ -2,11 +2,11 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/b/BlexVexingPest.java b/Mage.Sets/src/mage/cards/b/BlexVexingPest.java index c67811db94..e2edd272bd 100644 --- a/Mage.Sets/src/mage/cards/b/BlexVexingPest.java +++ b/Mage.Sets/src/mage/cards/b/BlexVexingPest.java @@ -8,12 +8,11 @@ import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.Cards; +import mage.cards.CardSetInfo; import mage.cards.ModalDoubleFacesCard; import mage.constants.*; -import mage.cards.CardSetInfo; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/b/BloodPrice.java b/Mage.Sets/src/mage/cards/b/BloodPrice.java index 93305849f4..94e983ef66 100644 --- a/Mage.Sets/src/mage/cards/b/BloodPrice.java +++ b/Mage.Sets/src/mage/cards/b/BloodPrice.java @@ -1,11 +1,11 @@ package mage.cards.b; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/b/BlossomPrancer.java b/Mage.Sets/src/mage/cards/b/BlossomPrancer.java index 4cd309b21d..37bc85c8de 100644 --- a/Mage.Sets/src/mage/cards/b/BlossomPrancer.java +++ b/Mage.Sets/src/mage/cards/b/BlossomPrancer.java @@ -5,10 +5,12 @@ import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ReachAbility; -import mage.cards.*; +import mage.cards.Cards; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java b/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java index f8539a32c2..3651f37774 100644 --- a/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java +++ b/Mage.Sets/src/mage/cards/b/BoardTheWeatherlight.java @@ -2,10 +2,10 @@ package mage.cards.b; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.HistoricPredicate; diff --git a/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java b/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java index de08f840a8..73e40dc425 100644 --- a/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java +++ b/Mage.Sets/src/mage/cards/b/BondOfFlourishing.java @@ -2,10 +2,10 @@ package mage.cards.b; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; diff --git a/Mage.Sets/src/mage/cards/b/BrazenUpstart.java b/Mage.Sets/src/mage/cards/b/BrazenUpstart.java index 2d6b63d5b1..3f9274c5a6 100644 --- a/Mage.Sets/src/mage/cards/b/BrazenUpstart.java +++ b/Mage.Sets/src/mage/cards/b/BrazenUpstart.java @@ -3,11 +3,11 @@ package mage.cards.b; import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java b/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java index 1b27828d57..d0a7290e6b 100644 --- a/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java +++ b/Mage.Sets/src/mage/cards/b/BrightwoodTracker.java @@ -6,10 +6,10 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java b/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java index 15c7c64dc2..8c32b42688 100644 --- a/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java +++ b/Mage.Sets/src/mage/cards/c/CalixDestinysHand.java @@ -7,7 +7,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnToBattlefieldUnderOwnerControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/c/CarthTheLion.java b/Mage.Sets/src/mage/cards/c/CarthTheLion.java index b9d9b458ba..c9294f550c 100644 --- a/Mage.Sets/src/mage/cards/c/CarthTheLion.java +++ b/Mage.Sets/src/mage/cards/c/CarthTheLion.java @@ -7,7 +7,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.constants.*; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/c/CartographersSurvey.java b/Mage.Sets/src/mage/cards/c/CartographersSurvey.java index 47b0cfb460..536db468a8 100644 --- a/Mage.Sets/src/mage/cards/c/CartographersSurvey.java +++ b/Mage.Sets/src/mage/cards/c/CartographersSurvey.java @@ -3,10 +3,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java index 7277d9269f..1237ca76d6 100644 --- a/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java +++ b/Mage.Sets/src/mage/cards/c/CavalierOfThorns.java @@ -6,13 +6,13 @@ import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.costs.common.ExileSourceFromGraveCost; import mage.abilities.effects.common.DoIfCostPaid; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java b/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java index 141461a4b0..39590ae195 100644 --- a/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java +++ b/Mage.Sets/src/mage/cards/c/CelestusSanctifier.java @@ -4,10 +4,10 @@ import mage.MageInt; import mage.abilities.common.BecomeDayAsEntersAbility; import mage.abilities.common.BecomesDayOrNightTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/c/CollectedCompany.java b/Mage.Sets/src/mage/cards/c/CollectedCompany.java index a41f1b164e..60ec265ce2 100644 --- a/Mage.Sets/src/mage/cards/c/CollectedCompany.java +++ b/Mage.Sets/src/mage/cards/c/CollectedCompany.java @@ -2,11 +2,11 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.ManaValuePredicate; diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java b/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java index e9ec1c7786..6ffe037ff3 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithDinosaurs.java @@ -2,10 +2,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithNature.java b/Mage.Sets/src/mage/cards/c/CommuneWithNature.java index 9b216d3873..c7085ab45b 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithNature.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithNature.java @@ -2,10 +2,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java b/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java index f51fc750c5..4e1ee57f27 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithSpirits.java @@ -1,10 +1,10 @@ package mage.cards.c; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java b/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java index eb688a01ec..bf3e517e4c 100644 --- a/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java +++ b/Mage.Sets/src/mage/cards/c/CommuneWithTheGods.java @@ -1,11 +1,11 @@ package mage.cards.c; import java.util.UUID; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/c/ContingencyPlan.java b/Mage.Sets/src/mage/cards/c/ContingencyPlan.java index e3aefc29b9..4fede4c93e 100644 --- a/Mage.Sets/src/mage/cards/c/ContingencyPlan.java +++ b/Mage.Sets/src/mage/cards/c/ContingencyPlan.java @@ -2,10 +2,10 @@ package mage.cards.c; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java b/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java index 13a9d9baaf..d15e5d32c2 100644 --- a/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java +++ b/Mage.Sets/src/mage/cards/c/CoralhelmChronicler.java @@ -5,11 +5,11 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DrawDiscardControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java index 5ef2464947..95987b1aa7 100644 --- a/Mage.Sets/src/mage/cards/c/CourageousOutrider.java +++ b/Mage.Sets/src/mage/cards/c/CourageousOutrider.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/c/CourtHussar.java b/Mage.Sets/src/mage/cards/c/CourtHussar.java index af4d720f61..0e39a447f3 100644 --- a/Mage.Sets/src/mage/cards/c/CourtHussar.java +++ b/Mage.Sets/src/mage/cards/c/CourtHussar.java @@ -5,12 +5,12 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.ManaWasSpentCondition; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.SacrificeSourceUnlessConditionEffect; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.ColoredManaSymbol; diff --git a/Mage.Sets/src/mage/cards/c/CreativeOutburst.java b/Mage.Sets/src/mage/cards/c/CreativeOutburst.java index eeb5fe7a5c..1981e17b95 100644 --- a/Mage.Sets/src/mage/cards/c/CreativeOutburst.java +++ b/Mage.Sets/src/mage/cards/c/CreativeOutburst.java @@ -7,10 +7,10 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.game.permanent.token.TreasureToken; import mage.target.common.TargetAnyTarget; diff --git a/Mage.Sets/src/mage/cards/c/Curate.java b/Mage.Sets/src/mage/cards/c/Curate.java index cb246a89ec..18279d40fa 100644 --- a/Mage.Sets/src/mage/cards/c/Curate.java +++ b/Mage.Sets/src/mage/cards/c/Curate.java @@ -2,10 +2,10 @@ package mage.cards.c; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DarkBargain.java b/Mage.Sets/src/mage/cards/d/DarkBargain.java index 6474609486..deb6ab6a87 100644 --- a/Mage.Sets/src/mage/cards/d/DarkBargain.java +++ b/Mage.Sets/src/mage/cards/d/DarkBargain.java @@ -3,10 +3,10 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.effects.common.DamageControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java index 9bd9d851b9..7cf6af18c0 100644 --- a/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java +++ b/Mage.Sets/src/mage/cards/d/DeployTheGatewatch.java @@ -3,10 +3,10 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPlaneswalkerCard; diff --git a/Mage.Sets/src/mage/cards/d/DiabolicVision.java b/Mage.Sets/src/mage/cards/d/DiabolicVision.java index 8a422cfc06..882697491d 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicVision.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicVision.java @@ -2,10 +2,10 @@ package mage.cards.d; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/d/DigThroughTime.java b/Mage.Sets/src/mage/cards/d/DigThroughTime.java index b9a8c554ca..0e2b3f8849 100644 --- a/Mage.Sets/src/mage/cards/d/DigThroughTime.java +++ b/Mage.Sets/src/mage/cards/d/DigThroughTime.java @@ -1,11 +1,11 @@ package mage.cards.d; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.DelveAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java b/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java index a6fd73628f..5dfbd83bc4 100644 --- a/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java +++ b/Mage.Sets/src/mage/cards/d/DihadaBinderOfWills.java @@ -4,7 +4,6 @@ import java.util.UUID; import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.common.CanBeYourCommanderAbility; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.effects.common.UntapAllEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; diff --git a/Mage.Sets/src/mage/cards/d/DiscerningTaste.java b/Mage.Sets/src/mage/cards/d/DiscerningTaste.java index 79afbce533..6d004a64b8 100644 --- a/Mage.Sets/src/mage/cards/d/DiscerningTaste.java +++ b/Mage.Sets/src/mage/cards/d/DiscerningTaste.java @@ -5,12 +5,11 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.Mode; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; -import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java b/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java index 7d4814aa1e..45d8472d93 100644 --- a/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java +++ b/Mage.Sets/src/mage/cards/d/DomriChaosBringer.java @@ -8,7 +8,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.mana.ManaEffect; import mage.abilities.effects.common.continuous.GainAbilityControlledSpellsEffect; import mage.abilities.effects.mana.BasicManaEffect; diff --git a/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java b/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java index 55c899a46b..24c6d3d166 100644 --- a/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java +++ b/Mage.Sets/src/mage/cards/d/DovinGrandArbiter.java @@ -7,7 +7,6 @@ import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java b/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java index d2faf5617b..aa574e76db 100644 --- a/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java +++ b/Mage.Sets/src/mage/cards/d/DragonlordOjutai.java @@ -7,16 +7,12 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.SourceTappedCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; /** * diff --git a/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java b/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java index c55cc5520d..1d1c024957 100644 --- a/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java +++ b/Mage.Sets/src/mage/cards/d/DrawnFromDreams.java @@ -1,10 +1,10 @@ package mage.cards.d; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java index 4fe12c18a9..695fb926a4 100644 --- a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java +++ b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java @@ -7,11 +7,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.WerewolfFrontTriggeredAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/e/EarlyFrost.java b/Mage.Sets/src/mage/cards/e/EarlyFrost.java index ce71258c2d..b4bab28ecd 100644 --- a/Mage.Sets/src/mage/cards/e/EarlyFrost.java +++ b/Mage.Sets/src/mage/cards/e/EarlyFrost.java @@ -1,4 +1,3 @@ - package mage.cards.e; import java.util.UUID; @@ -6,7 +5,6 @@ import mage.abilities.effects.common.TapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; /** @@ -21,7 +19,7 @@ public final class EarlyFrost extends CardImpl { // Tap up to three target lands. this.getSpellAbility().addEffect(new TapTargetEffect()); - this.getSpellAbility().addTarget(new TargetLandPermanent(0, 3, new FilterLandPermanent(), false)); + this.getSpellAbility().addTarget(new TargetLandPermanent(0, 3)); } private EarlyFrost(final EarlyFrost card) { diff --git a/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java b/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java index 405d284179..d0797660f0 100644 --- a/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java +++ b/Mage.Sets/src/mage/cards/e/EllynHarbreezeBusybody.java @@ -6,10 +6,10 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.dynamicvalue.common.TokensCreatedThisTurnCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.watchers.common.CreatedTokenWatcher; @@ -25,16 +25,13 @@ public final class EllynHarbreezeBusybody extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.PEASANT); + this.subtype.add(SubType.HUMAN, SubType.PEASANT); this.power = new MageInt(2); this.toughness = new MageInt(4); // {T}: Look at the top X cards of your library, where X is the number of tokens you created this turn. Put one of those cards into your hand and the rest on the bottom of your library in a random order. this.addAbility(new SimpleActivatedAbility(new LookLibraryAndPickControllerEffect( - TokensCreatedThisTurnCount.instance, 1, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + TokensCreatedThisTurnCount.instance, 1, PutCards.HAND, PutCards.BOTTOM_RANDOM ), new TapSourceCost()).addHint(TokensCreatedThisTurnCount.getHint()), new CreatedTokenWatcher()); // Choose a Background diff --git a/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java b/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java index 328ec0bfcc..893573ccdc 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java +++ b/Mage.Sets/src/mage/cards/e/ElvishRejuvenator.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/f/FaerieMechanist.java b/Mage.Sets/src/mage/cards/f/FaerieMechanist.java index a5c6633141..e9b2bff7ee 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieMechanist.java +++ b/Mage.Sets/src/mage/cards/f/FaerieMechanist.java @@ -4,11 +4,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; @@ -21,10 +21,9 @@ public final class FaerieMechanist extends CardImpl { public FaerieMechanist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}{U}"); - this.subtype.add(SubType.FAERIE); - this.subtype.add(SubType.ARTIFICER); - this.power = new MageInt(2); - this.toughness = new MageInt(2); + this.subtype.add(SubType.FAERIE, SubType.ARTIFICER); + this.power = new MageInt(2); + this.toughness = new MageInt(2); // Flying this.addAbility(FlyingAbility.getInstance()); // When Faerie Mechanist enters the battlefield, look at the top three cards of your library. diff --git a/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java b/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java index 92d267fadc..ff10f61fe3 100644 --- a/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java +++ b/Mage.Sets/src/mage/cards/f/FirjaJudgeOfValor.java @@ -3,12 +3,12 @@ package mage.cards.f; import mage.MageInt; import mage.abilities.common.CastSecondSpellTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.abilities.keyword.LifelinkAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; diff --git a/Mage.Sets/src/mage/cards/f/FlashOfInsight.java b/Mage.Sets/src/mage/cards/f/FlashOfInsight.java index 8d03d4fff0..2ff903d45a 100644 --- a/Mage.Sets/src/mage/cards/f/FlashOfInsight.java +++ b/Mage.Sets/src/mage/cards/f/FlashOfInsight.java @@ -8,11 +8,11 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java b/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java index f42db3fb41..dedca826c2 100644 --- a/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java +++ b/Mage.Sets/src/mage/cards/f/FloriferousVinewall.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; -import mage.constants.SubType; import mage.abilities.keyword.DefenderAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; +import mage.constants.SubType; import mage.filter.StaticFilters; /** @@ -21,8 +21,7 @@ public final class FloriferousVinewall extends CardImpl { public FloriferousVinewall(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.subtype.add(SubType.PLANT); - this.subtype.add(SubType.WALL); + this.subtype.add(SubType.PLANT, SubType.WALL); this.power = new MageInt(0); this.toughness = new MageInt(2); @@ -30,10 +29,9 @@ public final class FloriferousVinewall extends CardImpl { this.addAbility(DefenderAbility.getInstance()); // When Floriferous Vinewall enters the battlefield, look at the top six cards of your library. You may reveal a land card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. - this.addAbility(new EntersBattlefieldTriggeredAbility( - new LookLibraryAndPickControllerEffect(6, 1, StaticFilters.FILTER_CARD_LAND, - LookLibraryControllerEffect.PutCards.HAND, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM) - )); + this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect( + 6, 1, StaticFilters.FILTER_CARD_LAND, PutCards.HAND, PutCards.BOTTOM_RANDOM + ))); } private FloriferousVinewall(final FloriferousVinewall card) { diff --git a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java index 1e518ad9ef..e7afc783ae 100644 --- a/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java +++ b/Mage.Sets/src/mage/cards/f/ForbiddenAlchemy.java @@ -3,11 +3,11 @@ package mage.cards.f; import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/f/FoulEmissary.java b/Mage.Sets/src/mage/cards/f/FoulEmissary.java index 16b296551e..9ea96a447c 100644 --- a/Mage.Sets/src/mage/cards/f/FoulEmissary.java +++ b/Mage.Sets/src/mage/cards/f/FoulEmissary.java @@ -4,14 +4,13 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.common.SacrificeSourceTriggeredAbility; -import mage.abilities.effects.Effect; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.EmergeAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.game.Game; @@ -27,8 +26,7 @@ public final class FoulEmissary extends CardImpl { public FoulEmissary(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.HORROR); + this.subtype.add(SubType.HUMAN, SubType.HORROR); this.power = new MageInt(1); this.toughness = new MageInt(1); @@ -37,7 +35,7 @@ public final class FoulEmissary extends CardImpl { 4, 1, StaticFilters.FILTER_CARD_CREATURE_A, PutCards.HAND, PutCards.BOTTOM_ANY))); // When you sacrifice Foul Emissary while casting a spell with emerge, create a 3/2 colorless Eldrazi Horror creature token. - this.addAbility(new FoulEmissaryTriggeredAbility(new CreateTokenEffect(new EldraziHorrorToken()), false)); + this.addAbility(new FoulEmissaryTriggeredAbility()); } private FoulEmissary(final FoulEmissary card) { @@ -52,8 +50,9 @@ public final class FoulEmissary extends CardImpl { class FoulEmissaryTriggeredAbility extends SacrificeSourceTriggeredAbility { - public FoulEmissaryTriggeredAbility(Effect effect, boolean optional) { - super(effect, optional); + public FoulEmissaryTriggeredAbility() { + super(new CreateTokenEffect(new EldraziHorrorToken()), false); + setTriggerPhrase("When you sacrifice {this} while casting a spell with emerge, "); } public FoulEmissaryTriggeredAbility(final FoulEmissaryTriggeredAbility ability) { @@ -73,9 +72,4 @@ class FoulEmissaryTriggeredAbility extends SacrificeSourceTriggeredAbility { public FoulEmissaryTriggeredAbility copy() { return new FoulEmissaryTriggeredAbility(this); } - - @Override - public String getRule() { - return "When you sacrifice {this} while casting a spell with emerge, create a 3/2 colorless Eldrazi Horror creature token."; - } } diff --git a/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java b/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java index 76aa2ff778..cee359f79f 100644 --- a/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java +++ b/Mage.Sets/src/mage/cards/g/GarruksHarbinger.java @@ -4,11 +4,11 @@ import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.common.SavedDamageValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HexproofFromBlackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/g/GatherThePack.java b/Mage.Sets/src/mage/cards/g/GatherThePack.java index f5a462cbe3..330de3d974 100644 --- a/Mage.Sets/src/mage/cards/g/GatherThePack.java +++ b/Mage.Sets/src/mage/cards/g/GatherThePack.java @@ -3,12 +3,12 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.condition.common.SpellMasteryCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java b/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java index a28ac55929..698a197dd2 100644 --- a/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java +++ b/Mage.Sets/src/mage/cards/g/GavonyDawnguard.java @@ -5,12 +5,12 @@ import mage.abilities.common.BecomeDayAsEntersAbility; import mage.abilities.common.BecomesDayOrNightTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.WardAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java b/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java index bc52296d2c..9471e08a80 100644 --- a/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java +++ b/Mage.Sets/src/mage/cards/g/GenesisUltimatum.java @@ -1,11 +1,11 @@ package mage.cards.g; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ExileSpellEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; diff --git a/Mage.Sets/src/mage/cards/g/GlacialRevelation.java b/Mage.Sets/src/mage/cards/g/GlacialRevelation.java index 18da214a7c..60b39b1ca3 100644 --- a/Mage.Sets/src/mage/cards/g/GlacialRevelation.java +++ b/Mage.Sets/src/mage/cards/g/GlacialRevelation.java @@ -1,10 +1,10 @@ package mage.cards.g; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java b/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java index 67ef251b58..423b071e20 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheCosmos.java @@ -6,7 +6,6 @@ import mage.abilities.Ability; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java index 3cbac75e0c..c32c485d4e 100644 --- a/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java +++ b/Mage.Sets/src/mage/cards/g/GlimpseTheFuture.java @@ -2,10 +2,10 @@ package mage.cards.g; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/g/GlintNestCrane.java b/Mage.Sets/src/mage/cards/g/GlintNestCrane.java index 0edbeddcb2..66499a047c 100644 --- a/Mage.Sets/src/mage/cards/g/GlintNestCrane.java +++ b/Mage.Sets/src/mage/cards/g/GlintNestCrane.java @@ -4,11 +4,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/g/GrimFlayer.java b/Mage.Sets/src/mage/cards/g/GrimFlayer.java index e145da19f8..9a3f670553 100644 --- a/Mage.Sets/src/mage/cards/g/GrimFlayer.java +++ b/Mage.Sets/src/mage/cards/g/GrimFlayer.java @@ -8,16 +8,12 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.hint.common.CardTypesInGraveyardHint; import mage.abilities.keyword.TrampleAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.AbilityWord; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; +import mage.constants.*; /** * @author fireshoes diff --git a/Mage.Sets/src/mage/cards/g/GrislySalvage.java b/Mage.Sets/src/mage/cards/g/GrislySalvage.java index 2ab1d716f6..297660f66c 100644 --- a/Mage.Sets/src/mage/cards/g/GrislySalvage.java +++ b/Mage.Sets/src/mage/cards/g/GrislySalvage.java @@ -2,11 +2,11 @@ package mage.cards.g; import java.util.UUID; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java b/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java index c39a404795..c21270ebce 100644 --- a/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java +++ b/Mage.Sets/src/mage/cards/g/GrowingRitesOfItlimoc.java @@ -7,15 +7,11 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SuperType; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java index 93cb5bef3a..2e07cf1e85 100644 --- a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java +++ b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java @@ -4,11 +4,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.ExploitCreatureTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ExploitAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java b/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java index 65586694fc..fa4b67d759 100644 --- a/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java +++ b/Mage.Sets/src/mage/cards/h/HaraldKingOfSkemfar.java @@ -3,11 +3,11 @@ package mage.cards.h; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.MenaceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/h/HatcherySpider.java b/Mage.Sets/src/mage/cards/h/HatcherySpider.java index 93e9e7591f..9637e0d919 100644 --- a/Mage.Sets/src/mage/cards/h/HatcherySpider.java +++ b/Mage.Sets/src/mage/cards/h/HatcherySpider.java @@ -5,7 +5,6 @@ import mage.ObjectColor; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.CastSourceTriggeredAbility; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.ReachAbility; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/h/HeroesPodium.java b/Mage.Sets/src/mage/cards/h/HeroesPodium.java index ae30add9fc..55b0fbc248 100644 --- a/Mage.Sets/src/mage/cards/h/HeroesPodium.java +++ b/Mage.Sets/src/mage/cards/h/HeroesPodium.java @@ -10,12 +10,12 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.common.FilterControlledCreaturePermanent; import mage.filter.common.FilterCreatureCard; diff --git a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java index 57ff868cd1..6f3db00803 100644 --- a/Mage.Sets/src/mage/cards/i/IconOfAncestry.java +++ b/Mage.Sets/src/mage/cards/i/IconOfAncestry.java @@ -9,7 +9,6 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/i/Impulse.java b/Mage.Sets/src/mage/cards/i/Impulse.java index 23a5e01589..1897876f92 100644 --- a/Mage.Sets/src/mage/cards/i/Impulse.java +++ b/Mage.Sets/src/mage/cards/i/Impulse.java @@ -2,10 +2,10 @@ package mage.cards.i; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java b/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java index 5ef822d075..6b4e623e15 100644 --- a/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java +++ b/Mage.Sets/src/mage/cards/i/IncubationIncongruity.java @@ -4,11 +4,11 @@ import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.ExileTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardSetInfo; import mage.cards.SplitCard; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.constants.SpellAbilityType; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/i/IngeniousSmith.java b/Mage.Sets/src/mage/cards/i/IngeniousSmith.java index a2cb43b3d2..9a701b3780 100644 --- a/Mage.Sets/src/mage/cards/i/IngeniousSmith.java +++ b/Mage.Sets/src/mage/cards/i/IngeniousSmith.java @@ -5,11 +5,11 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldControlledTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.counters.CounterType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java index f79268e9ec..62113b31fc 100644 --- a/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java +++ b/Mage.Sets/src/mage/cards/j/JaceTheLivingGuildpact.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.abilities.effects.common.ShuffleHandGraveyardAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java b/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java index 9bceed2e19..2d7a8242d2 100644 --- a/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java +++ b/Mage.Sets/src/mage/cards/j/JarOfEyeballs.java @@ -10,11 +10,11 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.counters.CounterType; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java b/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java index 862b79d820..0b9518f566 100644 --- a/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java +++ b/Mage.Sets/src/mage/cards/k/KeskitTheFleshSculptor.java @@ -6,11 +6,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeTargetCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.PartnerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java b/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java index 66fd0b0792..361afc7a6a 100644 --- a/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java +++ b/Mage.Sets/src/mage/cards/k/KinnanBonderProdigy.java @@ -5,7 +5,6 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.TapForManaAllTriggeredManaAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.mana.AddManaOfAnyTypeProducedEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java b/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java index 2a1cc5831b..d75947328f 100644 --- a/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java +++ b/Mage.Sets/src/mage/cards/k/KolvoriGodOfKinship.java @@ -17,7 +17,6 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalContinuousEffect; import mage.abilities.effects.common.ChooseCreatureTypeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.VigilanceAbility; diff --git a/Mage.Sets/src/mage/cards/k/KrosanRestorer.java b/Mage.Sets/src/mage/cards/k/KrosanRestorer.java index 1056f5bbcc..a6f2c4e028 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanRestorer.java +++ b/Mage.Sets/src/mage/cards/k/KrosanRestorer.java @@ -1,4 +1,3 @@ - package mage.cards.k; import java.util.UUID; @@ -15,7 +14,6 @@ import mage.constants.AbilityWord; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.Zone; -import mage.filter.common.FilterLandPermanent; import mage.target.common.TargetLandPermanent; /** @@ -41,7 +39,7 @@ public final class KrosanRestorer extends CardImpl { new UntapTargetEffect(), new TapSourceCost(), new CardsInControllerGraveyardCondition(7)); - ability.addTarget(new TargetLandPermanent(0, 3, new FilterLandPermanent(), false)); + ability.addTarget(new TargetLandPermanent(0, 3)); ability.setAbilityWord(AbilityWord.THRESHOLD); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/k/KruphixsInsight.java b/Mage.Sets/src/mage/cards/k/KruphixsInsight.java index 7d9103fa6f..a8339e6a36 100644 --- a/Mage.Sets/src/mage/cards/k/KruphixsInsight.java +++ b/Mage.Sets/src/mage/cards/k/KruphixsInsight.java @@ -2,11 +2,11 @@ package mage.cards.k; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; /** diff --git a/Mage.Sets/src/mage/cards/l/LavaballTrap.java b/Mage.Sets/src/mage/cards/l/LavaballTrap.java index 39fc399138..2b92d71972 100644 --- a/Mage.Sets/src/mage/cards/l/LavaballTrap.java +++ b/Mage.Sets/src/mage/cards/l/LavaballTrap.java @@ -1,4 +1,3 @@ - package mage.cards.l; import mage.abilities.Ability; @@ -12,7 +11,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.filter.StaticFilters; -import mage.filter.common.FilterCreaturePermanent; import mage.game.Game; import mage.game.permanent.Permanent; import mage.players.Player; @@ -37,9 +35,8 @@ public final class LavaballTrap extends CardImpl { // Destroy two target lands. Lavaball Trap deals 4 damage to each creature. this.getSpellAbility().addEffect(new DestroyTargetEffect()); - this.getSpellAbility().addEffect(new DamageAllEffect(4, new FilterCreaturePermanent())); - this.getSpellAbility().addTarget(new TargetLandPermanent(2, 2, StaticFilters.FILTER_LANDS, false)); - + this.getSpellAbility().addEffect(new DamageAllEffect(4, StaticFilters.FILTER_PERMANENT_CREATURE)); + this.getSpellAbility().addTarget(new TargetLandPermanent(2)); } private LavaballTrap(final LavaballTrap card) { diff --git a/Mage.Sets/src/mage/cards/l/LeadTheStampede.java b/Mage.Sets/src/mage/cards/l/LeadTheStampede.java index 23840ef293..947374e448 100644 --- a/Mage.Sets/src/mage/cards/l/LeadTheStampede.java +++ b/Mage.Sets/src/mage/cards/l/LeadTheStampede.java @@ -2,10 +2,10 @@ package mage.cards.l; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/l/LilianasSpoils.java b/Mage.Sets/src/mage/cards/l/LilianasSpoils.java index 53ce187838..273561540d 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasSpoils.java +++ b/Mage.Sets/src/mage/cards/l/LilianasSpoils.java @@ -3,11 +3,11 @@ package mage.cards.l; import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.discard.DiscardTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetOpponent; diff --git a/Mage.Sets/src/mage/cards/l/LoneRevenant.java b/Mage.Sets/src/mage/cards/l/LoneRevenant.java index 0e5bf3f7e8..3250bcab75 100644 --- a/Mage.Sets/src/mage/cards/l/LoneRevenant.java +++ b/Mage.Sets/src/mage/cards/l/LoneRevenant.java @@ -7,12 +7,12 @@ import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HexproofAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/m/Machinate.java b/Mage.Sets/src/mage/cards/m/Machinate.java index d552380610..d875903e49 100644 --- a/Mage.Sets/src/mage/cards/m/Machinate.java +++ b/Mage.Sets/src/mage/cards/m/Machinate.java @@ -3,12 +3,12 @@ package mage.cards.m; import java.util.UUID; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/m/MaestrosCharm.java b/Mage.Sets/src/mage/cards/m/MaestrosCharm.java index 4539577dd4..ced13b3df8 100644 --- a/Mage.Sets/src/mage/cards/m/MaestrosCharm.java +++ b/Mage.Sets/src/mage/cards/m/MaestrosCharm.java @@ -4,11 +4,11 @@ import mage.abilities.Mode; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.common.TargetCreatureOrPlaneswalker; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java b/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java index 048e4533e7..1ab7c03f60 100644 --- a/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java +++ b/Mage.Sets/src/mage/cards/m/MayaelTheAnima.java @@ -1,4 +1,3 @@ - package mage.cards.m; import java.util.UUID; @@ -7,13 +6,9 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.ComparisonType; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.PowerPredicate; diff --git a/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java b/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java index 74c2d17d17..e14e00e939 100644 --- a/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java +++ b/Mage.Sets/src/mage/cards/m/MeletisAstronomer.java @@ -3,11 +3,11 @@ package mage.cards.m; import java.util.UUID; import mage.MageInt; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HeroicAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterEnchantmentCard; diff --git a/Mage.Sets/src/mage/cards/m/MemorialToUnity.java b/Mage.Sets/src/mage/cards/m/MemorialToUnity.java index 3303eb95e1..18faa122dd 100644 --- a/Mage.Sets/src/mage/cards/m/MemorialToUnity.java +++ b/Mage.Sets/src/mage/cards/m/MemorialToUnity.java @@ -7,11 +7,11 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.GreenManaAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MemoryDeluge.java b/Mage.Sets/src/mage/cards/m/MemoryDeluge.java index c713c1bb13..5704a18e2e 100644 --- a/Mage.Sets/src/mage/cards/m/MemoryDeluge.java +++ b/Mage.Sets/src/mage/cards/m/MemoryDeluge.java @@ -3,11 +3,11 @@ package mage.cards.m; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManaSpentToCastCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/m/MilitiaBugler.java b/Mage.Sets/src/mage/cards/m/MilitiaBugler.java index 6cdf4d5ecb..2a71758ee8 100644 --- a/Mage.Sets/src/mage/cards/m/MilitiaBugler.java +++ b/Mage.Sets/src/mage/cards/m/MilitiaBugler.java @@ -3,12 +3,12 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.VigilanceAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.PowerPredicate; diff --git a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java index 644b8144d5..6229535831 100644 --- a/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java +++ b/Mage.Sets/src/mage/cards/m/MundaAmbushLeader.java @@ -5,11 +5,11 @@ import mage.MageInt; import mage.abilities.common.AllyEntersBattlefieldTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.HasteAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java b/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java index c71a54bda5..aa2ccd9d55 100644 --- a/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java +++ b/Mage.Sets/src/mage/cards/n/NaelAvizoaAeronaut.java @@ -7,10 +7,9 @@ import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.hint.common.DomainHint; -import mage.constants.*; import mage.abilities.keyword.FlyingAbility; +import mage.constants.*; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.game.Game; @@ -26,8 +25,7 @@ public final class NaelAvizoaAeronaut extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{U}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.ELF); - this.subtype.add(SubType.SCOUT); + this.subtype.add(SubType.ELF, SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(4); @@ -37,11 +35,7 @@ public final class NaelAvizoaAeronaut extends CardImpl { // Domain -- Whenever Nael, Avizoa Aeronaut deals combat damage to a player, look at the top X cards of your library, where X is the number of basic land types among lands you control. // Put up to one of them on top of your library and the rest on the bottom in a random order. Then if there are five basic land types among lands you control, draw a card. Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( - new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 1, - LookLibraryControllerEffect.PutCards.TOP_ANY, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, - true - ), + new LookLibraryAndPickControllerEffect(DomainValue.REGULAR, 1, PutCards.TOP_ANY, PutCards.BOTTOM_RANDOM, true), false ); ability.addEffect(new NaelAvizoaAeronautEffect()); diff --git a/Mage.Sets/src/mage/cards/n/NagaOracle.java b/Mage.Sets/src/mage/cards/n/NagaOracle.java index 1f57bd3d92..3360b819f7 100644 --- a/Mage.Sets/src/mage/cards/n/NagaOracle.java +++ b/Mage.Sets/src/mage/cards/n/NagaOracle.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/n/NaggingThoughts.java b/Mage.Sets/src/mage/cards/n/NaggingThoughts.java index 1d8fa65620..d736a3045b 100644 --- a/Mage.Sets/src/mage/cards/n/NaggingThoughts.java +++ b/Mage.Sets/src/mage/cards/n/NaggingThoughts.java @@ -3,11 +3,11 @@ package mage.cards.n; import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.MadnessAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java b/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java index 969bc16a96..78be9a3655 100644 --- a/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java +++ b/Mage.Sets/src/mage/cards/n/NahiriHeirOfTheAncients.java @@ -8,7 +8,6 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java b/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java index 19fde5784e..12d10c22c3 100644 --- a/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java +++ b/Mage.Sets/src/mage/cards/n/NarsetParterOfVeils.java @@ -5,7 +5,6 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousRuleModifyingEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/n/Necrosynthesis.java b/Mage.Sets/src/mage/cards/n/Necrosynthesis.java index f9549e8025..0cf3488651 100644 --- a/Mage.Sets/src/mage/cards/n/Necrosynthesis.java +++ b/Mage.Sets/src/mage/cards/n/Necrosynthesis.java @@ -8,7 +8,6 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.GainAbilityAttachedEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.keyword.EnchantAbility; diff --git a/Mage.Sets/src/mage/cards/n/NessianGameWarden.java b/Mage.Sets/src/mage/cards/n/NessianGameWarden.java index 63a4aca5c4..5811f657a8 100644 --- a/Mage.Sets/src/mage/cards/n/NessianGameWarden.java +++ b/Mage.Sets/src/mage/cards/n/NessianGameWarden.java @@ -6,10 +6,10 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/n/NessianWanderer.java b/Mage.Sets/src/mage/cards/n/NessianWanderer.java index 9cd28428e9..c9c664ef2d 100644 --- a/Mage.Sets/src/mage/cards/n/NessianWanderer.java +++ b/Mage.Sets/src/mage/cards/n/NessianWanderer.java @@ -3,10 +3,10 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.abilityword.ConstellationAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java b/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java index d3d255eff1..9c4cf60a36 100644 --- a/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java +++ b/Mage.Sets/src/mage/cards/n/NissaGenesisMage.java @@ -5,17 +5,12 @@ import mage.abilities.Ability; import mage.abilities.LoyaltyAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.FilterCard; -import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetLandPermanent; @@ -47,8 +42,8 @@ public final class NissaGenesisMage extends CardImpl { Effect effect = new UntapTargetEffect("untap up to two target creatures and up to two target lands"); effect.setTargetPointer(new EachTargetPointer()); Ability ability = new LoyaltyAbility(effect, +2); - ability.addTarget(new TargetCreaturePermanent(0, 2, StaticFilters.FILTER_PERMANENT_CREATURES, false)); - ability.addTarget(new TargetLandPermanent(0, 2, StaticFilters.FILTER_LANDS, false)); + ability.addTarget(new TargetCreaturePermanent(0, 2)); + ability.addTarget(new TargetLandPermanent(0, 2)); this.addAbility(ability); //-3: Target creature gets +5/+5 until end of turn. diff --git a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java index 6c2afa68a1..d57530b12e 100644 --- a/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java +++ b/Mage.Sets/src/mage/cards/n/NissaSageAnimist.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; import mage.constants.*; -import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; import mage.game.permanent.token.NissaSageAnimistToken; @@ -47,7 +46,7 @@ public final class NissaSageAnimist extends CardImpl { // -7: Untap up to six target lands. They become 6/6 Elemental creatures. They're still lands. Ability ability = new LoyaltyAbility(new UntapTargetEffect(), -7); - ability.addTarget(new TargetLandPermanent(0, 6, StaticFilters.FILTER_LAND, false)); + ability.addTarget(new TargetLandPermanent(0, 6)); ability.addEffect(new NissaSageAnimistMinusAnimateEffect()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java b/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java index 38a1e9fd8a..108c0651cb 100644 --- a/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java +++ b/Mage.Sets/src/mage/cards/n/NumotTheDevastator.java @@ -1,4 +1,3 @@ - package mage.cards.n; import java.util.UUID; @@ -15,7 +14,6 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; import mage.constants.SuperType; -import mage.filter.StaticFilters; import mage.target.common.TargetLandPermanent; /** @@ -39,7 +37,7 @@ public final class NumotTheDevastator extends CardImpl { effect.setText("destroy up to two target lands"); Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility( new DoIfCostPaid(effect, new ManaCostsImpl<>("{2}{R}")), false); - ability.addTarget(new TargetLandPermanent(0, 2, StaticFilters.FILTER_LANDS, false)); + ability.addTarget(new TargetLandPermanent(0, 2)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java b/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java index 06b8ee0f06..fa85c346e2 100644 --- a/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java +++ b/Mage.Sets/src/mage/cards/n/NymrisOonasTrickster.java @@ -3,12 +3,12 @@ package mage.cards.n; import mage.MageInt; import mage.abilities.common.FirstSpellOpponentsTurnTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; diff --git a/Mage.Sets/src/mage/cards/o/OathOfNissa.java b/Mage.Sets/src/mage/cards/o/OathOfNissa.java index 7a2efc7075..22a047f844 100644 --- a/Mage.Sets/src/mage/cards/o/OathOfNissa.java +++ b/Mage.Sets/src/mage/cards/o/OathOfNissa.java @@ -7,7 +7,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.AsThoughEffectImpl; import mage.abilities.effects.AsThoughManaEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/o/OnceUponATime.java b/Mage.Sets/src/mage/cards/o/OnceUponATime.java index 041e220c25..2144319726 100644 --- a/Mage.Sets/src/mage/cards/o/OnceUponATime.java +++ b/Mage.Sets/src/mage/cards/o/OnceUponATime.java @@ -4,10 +4,10 @@ import mage.abilities.Ability; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.WatcherScope; import mage.filter.StaticFilters; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java b/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java index 089f8a0ae6..368099f4a8 100644 --- a/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java +++ b/Mage.Sets/src/mage/cards/o/OrbOfDragonkind.java @@ -11,13 +11,13 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.costs.mana.ColoredManaCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.ConditionalAnyColorManaAbility; import mage.abilities.mana.builder.ConditionalManaBuilder; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ColoredManaSymbol; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/o/OrganHoarder.java b/Mage.Sets/src/mage/cards/o/OrganHoarder.java index 02f6c9468b..98c7372742 100644 --- a/Mage.Sets/src/mage/cards/o/OrganHoarder.java +++ b/Mage.Sets/src/mage/cards/o/OrganHoarder.java @@ -3,10 +3,10 @@ package mage.cards.o; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java b/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java index 7cbb019311..00b18319f7 100644 --- a/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java +++ b/Mage.Sets/src/mage/cards/o/OtherworldlyGaze.java @@ -2,11 +2,11 @@ package mage.cards.o; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java b/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java index 3213b29761..549a2cfdd2 100644 --- a/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java +++ b/Mage.Sets/src/mage/cards/p/PeerThroughDepths.java @@ -1,10 +1,10 @@ package mage.cards.p; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/p/Petradon.java b/Mage.Sets/src/mage/cards/p/Petradon.java index 0da5daa8fd..bcd74d8c87 100644 --- a/Mage.Sets/src/mage/cards/p/Petradon.java +++ b/Mage.Sets/src/mage/cards/p/Petradon.java @@ -34,7 +34,7 @@ public final class Petradon extends CardImpl { // When Petradon enters the battlefield, exile two target lands. Ability ability = new EntersBattlefieldTriggeredAbility(new ExileTargetForSourceEffect(), false); - ability.addTarget(new TargetLandPermanent(2, 2, StaticFilters.FILTER_LANDS, false)); + ability.addTarget(new TargetLandPermanent(2)); this.addAbility(ability); // When Petradon leaves the battlefield, return the exiled cards to the battlefield under their owners' control. diff --git a/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java b/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java index af1bc7a5c5..e8a11826f2 100644 --- a/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java +++ b/Mage.Sets/src/mage/cards/p/PiecesOfThePuzzle.java @@ -2,11 +2,11 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.effects.Effect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/p/PlowUnder.java b/Mage.Sets/src/mage/cards/p/PlowUnder.java index 31412ff234..6f57791dc2 100644 --- a/Mage.Sets/src/mage/cards/p/PlowUnder.java +++ b/Mage.Sets/src/mage/cards/p/PlowUnder.java @@ -1,4 +1,3 @@ - package mage.cards.p; import java.util.UUID; @@ -6,7 +5,6 @@ import mage.abilities.effects.common.PutOnLibraryTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.filter.StaticFilters; import mage.target.common.TargetLandPermanent; /** @@ -21,7 +19,7 @@ public final class PlowUnder extends CardImpl { // Put two target lands on top of their owners' libraries. this.getSpellAbility().addEffect(new PutOnLibraryTargetEffect(true)); - this.getSpellAbility().addTarget(new TargetLandPermanent(2,2, StaticFilters.FILTER_LANDS, false)); + this.getSpellAbility().addTarget(new TargetLandPermanent(2)); } private PlowUnder(final PlowUnder card) { diff --git a/Mage.Sets/src/mage/cards/p/PreferredSelection.java b/Mage.Sets/src/mage/cards/p/PreferredSelection.java index f020d5f41e..e3802b446a 100644 --- a/Mage.Sets/src/mage/cards/p/PreferredSelection.java +++ b/Mage.Sets/src/mage/cards/p/PreferredSelection.java @@ -9,13 +9,13 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.CardType; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.constants.TargetController; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java b/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java index b5f4a36bd5..d9688f2fd6 100644 --- a/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java +++ b/Mage.Sets/src/mage/cards/p/ProfessorOnyx.java @@ -8,7 +8,6 @@ import mage.abilities.common.MagecraftAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.effects.common.SacrificeOpponentsEffect; diff --git a/Mage.Sets/src/mage/cards/p/PropheticBolt.java b/Mage.Sets/src/mage/cards/p/PropheticBolt.java index d52add9501..7350ca11da 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticBolt.java +++ b/Mage.Sets/src/mage/cards/p/PropheticBolt.java @@ -3,10 +3,10 @@ package mage.cards.p; import java.util.UUID; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.common.TargetAnyTarget; /** diff --git a/Mage.Sets/src/mage/cards/p/PropheticTitan.java b/Mage.Sets/src/mage/cards/p/PropheticTitan.java index eda7d02bfb..8edc084f09 100644 --- a/Mage.Sets/src/mage/cards/p/PropheticTitan.java +++ b/Mage.Sets/src/mage/cards/p/PropheticTitan.java @@ -6,12 +6,12 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.DeliriumCondition; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.hint.common.CardTypesInGraveyardHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java b/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java index 93d6e53ad5..5b4da1e8c9 100644 --- a/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java +++ b/Mage.Sets/src/mage/cards/q/QuandrixApprentice.java @@ -3,10 +3,10 @@ package mage.cards.q; import mage.MageInt; import mage.abilities.common.MagecraftAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java b/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java index ce751defc3..9b3e5c41d4 100644 --- a/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java +++ b/Mage.Sets/src/mage/cards/r/RalIzzetViceroy.java @@ -6,12 +6,12 @@ import mage.abilities.dynamicvalue.common.InstantSorceryExileGraveyardCount; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.hint.Hint; import mage.abilities.hint.ValueHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.game.command.emblems.RalIzzetViceroyEmblem; diff --git a/Mage.Sets/src/mage/cards/r/RalsOutburst.java b/Mage.Sets/src/mage/cards/r/RalsOutburst.java index af16157c2b..ce3751323b 100644 --- a/Mage.Sets/src/mage/cards/r/RalsOutburst.java +++ b/Mage.Sets/src/mage/cards/r/RalsOutburst.java @@ -2,10 +2,10 @@ package mage.cards.r; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.common.TargetAnyTarget; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RansackTheLab.java b/Mage.Sets/src/mage/cards/r/RansackTheLab.java index 047fe23ddb..198bd02dfc 100644 --- a/Mage.Sets/src/mage/cards/r/RansackTheLab.java +++ b/Mage.Sets/src/mage/cards/r/RansackTheLab.java @@ -1,10 +1,10 @@ package mage.cards.r; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/r/RavenFamiliar.java b/Mage.Sets/src/mage/cards/r/RavenFamiliar.java index 87b38a3bd4..1e09fc1028 100644 --- a/Mage.Sets/src/mage/cards/r/RavenFamiliar.java +++ b/Mage.Sets/src/mage/cards/r/RavenFamiliar.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.EchoAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/r/RealityHeist.java b/Mage.Sets/src/mage/cards/r/RealityHeist.java index 395f1864f6..2c149e98b8 100644 --- a/Mage.Sets/src/mage/cards/r/RealityHeist.java +++ b/Mage.Sets/src/mage/cards/r/RealityHeist.java @@ -3,12 +3,12 @@ package mage.cards.r; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.dynamicvalue.common.ArtifactYouControlCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.cost.SpellCostReductionForEachSourceEffect; import mage.abilities.hint.common.ArtifactYouControlHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java b/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java index 0d5df69e50..25ca0bc7aa 100644 --- a/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java +++ b/Mage.Sets/src/mage/cards/r/RecruitmentOfficer.java @@ -4,11 +4,11 @@ import mage.MageInt; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterCreatureCard; @@ -30,16 +30,13 @@ public final class RecruitmentOfficer extends CardImpl { public RecruitmentOfficer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.power = new MageInt(2); this.toughness = new MageInt(1); // {3}{W}: Look at the top four cards of your library. You may reveal a creature card with mana value 3 or less from among them and put it into your hand. Put the rest on the bottom of your library in a random order. this.addAbility(new SimpleActivatedAbility(new LookLibraryAndPickControllerEffect( - 4, 1, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 4, 1, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM ), new ManaCostsImpl<>("{3}{W}"))); } diff --git a/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java b/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java index 68d78728e6..1f55bb039b 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java +++ b/Mage.Sets/src/mage/cards/s/SarkhansDragonfire.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.ObjectColor; import mage.abilities.effects.common.DamageTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; import mage.target.common.TargetAnyTarget; diff --git a/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java b/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java index 8e9d715db4..f3be969d81 100644 --- a/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java +++ b/Mage.Sets/src/mage/cards/s/SatoruUmezawa.java @@ -6,7 +6,6 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.Card; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java b/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java index bff86473e6..08b54dabff 100644 --- a/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java +++ b/Mage.Sets/src/mage/cards/s/SatyrWayfinder.java @@ -4,11 +4,11 @@ package mage.cards.s; import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java b/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java index 494804c354..bbceced928 100644 --- a/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java +++ b/Mage.Sets/src/mage/cards/s/ScatteredThoughts.java @@ -1,10 +1,10 @@ package mage.cards.s; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java b/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java index 9357d53e38..1f3b011b1e 100644 --- a/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java +++ b/Mage.Sets/src/mage/cards/s/ScionOfHalaster.java @@ -4,7 +4,6 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.continuous.GainAbilityAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; @@ -68,7 +67,7 @@ class ScionOfHalasterReplacementEffect extends ReplacementEffectImpl { @Override public boolean replaceEvent(GameEvent event, Ability source, Game game) { - new LookLibraryAndPickControllerEffect(2, 1, LookLibraryControllerEffect.PutCards.GRAVEYARD, LookLibraryControllerEffect.PutCards.TOP_ANY).apply(game, source); + new LookLibraryAndPickControllerEffect(2, 1, PutCards.GRAVEYARD, PutCards.TOP_ANY).apply(game, source); Player you = game.getPlayer(event.getPlayerId()); if (you != null) { you.drawCards(1, source, game, event); @@ -89,4 +88,4 @@ class ScionOfHalasterReplacementEffect extends ReplacementEffectImpl { CardsDrawnThisTurnWatcher watcher = game.getState().getWatcher(CardsDrawnThisTurnWatcher.class); return watcher != null && watcher.getCardsDrawnThisTurn(event.getPlayerId()) == 0; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java b/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java index fbf0a09282..52db9f2369 100644 --- a/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java +++ b/Mage.Sets/src/mage/cards/s/ScoutTheBorders.java @@ -1,11 +1,11 @@ package mage.cards.s; import java.util.UUID; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/s/SeaGateOracle.java b/Mage.Sets/src/mage/cards/s/SeaGateOracle.java index 9f4ad41b7d..ef4d47989d 100644 --- a/Mage.Sets/src/mage/cards/s/SeaGateOracle.java +++ b/Mage.Sets/src/mage/cards/s/SeaGateOracle.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java b/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java index b491278f6e..a364be2e8d 100644 --- a/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java +++ b/Mage.Sets/src/mage/cards/s/SeeTheUnwritten.java @@ -2,13 +2,13 @@ package mage.cards.s; import mage.abilities.condition.common.FerociousCondition; import mage.abilities.decorator.ConditionalOneShotEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.hint.common.FerociousHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SeekTheWilds.java b/Mage.Sets/src/mage/cards/s/SeekTheWilds.java index e7ed6ed28f..81313d5488 100644 --- a/Mage.Sets/src/mage/cards/s/SeekTheWilds.java +++ b/Mage.Sets/src/mage/cards/s/SeekTheWilds.java @@ -2,10 +2,10 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/s/ShadowProphecy.java b/Mage.Sets/src/mage/cards/s/ShadowProphecy.java index 0be344f2f6..ae21a5e73c 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowProphecy.java +++ b/Mage.Sets/src/mage/cards/s/ShadowProphecy.java @@ -2,13 +2,13 @@ package mage.cards.s; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.LoseLifeSourceControllerEffect; import mage.abilities.hint.common.DomainHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; @@ -22,9 +22,7 @@ public final class ShadowProphecy extends CardImpl { // Domain - Look at the top X cards of your library, where X is the number of basic land types among lands you control. Put up to two of them into your hand and the rest into your graveyard. You lose 2 life. this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 2, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.GRAVEYARD + DomainValue.REGULAR, 2, PutCards.HAND, PutCards.GRAVEYARD )); this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(2)); this.getSpellAbility().setAbilityWord(AbilityWord.DOMAIN); diff --git a/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java b/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java index 7a2cab8192..6a7a203f08 100644 --- a/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java +++ b/Mage.Sets/src/mage/cards/s/ShigekiJukaiVisionary.java @@ -6,7 +6,6 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.ReturnToHandFromBattlefieldSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.ChannelAbility; diff --git a/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java b/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java index 9cd5ddfc37..a04798600e 100644 --- a/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java +++ b/Mage.Sets/src/mage/cards/s/ShimmerOfPossibility.java @@ -1,10 +1,10 @@ package mage.cards.s; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java b/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java index b56554d104..8fcce8965a 100644 --- a/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java +++ b/Mage.Sets/src/mage/cards/s/SigardaChampionOfLight.java @@ -6,7 +6,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.condition.common.CovenCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.abilities.hint.common.CovenHint; import mage.abilities.keyword.FlyingAbility; diff --git a/Mage.Sets/src/mage/cards/s/SightBeyondSight.java b/Mage.Sets/src/mage/cards/s/SightBeyondSight.java index 3fe8b4a48e..d83d487654 100644 --- a/Mage.Sets/src/mage/cards/s/SightBeyondSight.java +++ b/Mage.Sets/src/mage/cards/s/SightBeyondSight.java @@ -2,11 +2,11 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ReboundAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java b/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java index 9b8114685b..7bf1c57776 100644 --- a/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java +++ b/Mage.Sets/src/mage/cards/s/SilhanaWayfinder.java @@ -3,10 +3,10 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/SilundiVision.java b/Mage.Sets/src/mage/cards/s/SilundiVision.java index 463c050652..3e6eae3287 100644 --- a/Mage.Sets/src/mage/cards/s/SilundiVision.java +++ b/Mage.Sets/src/mage/cards/s/SilundiVision.java @@ -2,11 +2,11 @@ package mage.cards.s; import mage.abilities.common.EntersBattlefieldTappedAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.mana.BlueManaAbility; import mage.cards.CardSetInfo; import mage.cards.ModalDoubleFacesCard; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/SilverbackElder.java b/Mage.Sets/src/mage/cards/s/SilverbackElder.java index d3fc8e35bf..044b443473 100644 --- a/Mage.Sets/src/mage/cards/s/SilverbackElder.java +++ b/Mage.Sets/src/mage/cards/s/SilverbackElder.java @@ -8,11 +8,11 @@ import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; +import mage.constants.SubType; import mage.filter.StaticFilters; import mage.target.TargetPermanent; @@ -25,8 +25,7 @@ public final class SilverbackElder extends CardImpl { public SilverbackElder(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}{G}"); - this.subtype.add(SubType.APE); - this.subtype.add(SubType.SHAMAN); + this.subtype.add(SubType.APE, SubType.SHAMAN); this.power = new MageInt(5); this.toughness = new MageInt(7); @@ -37,8 +36,7 @@ public final class SilverbackElder extends CardImpl { // * Look at the top five cards of your library. You may put a land card from among them onto the battlefield tapped. Put the rest on the bottom of your library in a random order. ability.addMode(new Mode(new LookLibraryAndPickControllerEffect( - 5, 1, StaticFilters.FILTER_CARD_LAND, - LookLibraryControllerEffect.PutCards.BATTLEFIELD_TAPPED, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 5, 1, StaticFilters.FILTER_CARD_LAND, PutCards.BATTLEFIELD_TAPPED, PutCards.BOTTOM_RANDOM ))); // * You gain 4 life. diff --git a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java index b1c6047c7e..17a9d2520d 100644 --- a/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java +++ b/Mage.Sets/src/mage/cards/s/SionaCaptainOfThePyleas.java @@ -5,13 +5,9 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Zone; +import mage.constants.*; import mage.filter.FilterCard; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/s/SkallaWolf.java b/Mage.Sets/src/mage/cards/s/SkallaWolf.java index c2ac49b936..60b65114ff 100644 --- a/Mage.Sets/src/mage/cards/s/SkallaWolf.java +++ b/Mage.Sets/src/mage/cards/s/SkallaWolf.java @@ -5,11 +5,11 @@ import mage.MageInt; import mage.ObjectColor; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; -import mage.constants.SubType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; +import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.mageobject.ColorPredicate; diff --git a/Mage.Sets/src/mage/cards/s/SleightOfHand.java b/Mage.Sets/src/mage/cards/s/SleightOfHand.java index bc85f30e58..89ade43e52 100644 --- a/Mage.Sets/src/mage/cards/s/SleightOfHand.java +++ b/Mage.Sets/src/mage/cards/s/SleightOfHand.java @@ -1,10 +1,10 @@ package mage.cards.s; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java b/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java index 2bfdd744c6..7debb87c95 100644 --- a/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java +++ b/Mage.Sets/src/mage/cards/s/SlimefootsSurvey.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.common.FilterLandCard; import mage.filter.predicate.Predicates; @@ -41,7 +41,7 @@ public final class SlimefootsSurvey extends CardImpl { this.getSpellAbility().setAbilityWord(AbilityWord.DOMAIN); this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), true)); this.getSpellAbility().addEffect(new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 1, LookLibraryControllerEffect.PutCards.TOP_ANY, LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, true + DomainValue.REGULAR, 1, PutCards.TOP_ANY, PutCards.BOTTOM_RANDOM, true )); } diff --git a/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java b/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java index 3566861d1b..66aafa4875 100644 --- a/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java +++ b/Mage.Sets/src/mage/cards/s/SoulcipherBoard.java @@ -10,7 +10,6 @@ import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalOneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.RemoveCounterSourceEffect; @@ -18,6 +17,7 @@ import mage.abilities.keyword.TransformAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.TargetController; import mage.counters.CounterType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java b/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java index 01aa39b17c..4077566f2b 100644 --- a/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java +++ b/Mage.Sets/src/mage/cards/s/StoneforgeAcolyte.java @@ -8,11 +8,11 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.common.TapTargetCost; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterControlledPermanent; diff --git a/Mage.Sets/src/mage/cards/s/StormTheFestival.java b/Mage.Sets/src/mage/cards/s/StormTheFestival.java index 921184cec8..10c33fcfd8 100644 --- a/Mage.Sets/src/mage/cards/s/StormTheFestival.java +++ b/Mage.Sets/src/mage/cards/s/StormTheFestival.java @@ -2,12 +2,12 @@ package mage.cards.s; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.ComparisonType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterPermanentCard; import mage.filter.predicate.mageobject.ManaValuePredicate; diff --git a/Mage.Sets/src/mage/cards/s/StrategicPlanning.java b/Mage.Sets/src/mage/cards/s/StrategicPlanning.java index 1a20bb62d7..4fdaba4639 100644 --- a/Mage.Sets/src/mage/cards/s/StrategicPlanning.java +++ b/Mage.Sets/src/mage/cards/s/StrategicPlanning.java @@ -2,10 +2,10 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java b/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java index abacba8a0e..393db3acd2 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java +++ b/Mage.Sets/src/mage/cards/s/SultaiAscendancy.java @@ -3,10 +3,10 @@ package mage.cards.s; import java.util.UUID; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.TargetController; /** diff --git a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java index 1bf2e15014..8b5d7af0ed 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java +++ b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java @@ -4,10 +4,10 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java b/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java index aac25d74ec..ee2d8b466c 100644 --- a/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java +++ b/Mage.Sets/src/mage/cards/s/SumalaWoodshaper.java @@ -3,10 +3,10 @@ package mage.cards.s; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/s/SummoningTrap.java b/Mage.Sets/src/mage/cards/s/SummoningTrap.java index 0b6ac70ec7..e9307e9c36 100644 --- a/Mage.Sets/src/mage/cards/s/SummoningTrap.java +++ b/Mage.Sets/src/mage/cards/s/SummoningTrap.java @@ -6,7 +6,6 @@ import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/s/SupremeWill.java b/Mage.Sets/src/mage/cards/s/SupremeWill.java index d7c70baa91..78f66d0356 100644 --- a/Mage.Sets/src/mage/cards/s/SupremeWill.java +++ b/Mage.Sets/src/mage/cards/s/SupremeWill.java @@ -5,10 +5,10 @@ import mage.abilities.Mode; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.TargetSpell; /** diff --git a/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java b/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java index b7a40e1328..3ef1cf100e 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java +++ b/Mage.Sets/src/mage/cards/t/TaigamSidisisHand.java @@ -13,7 +13,6 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.GetXValue; import mage.abilities.dynamicvalue.common.SignInversionDynamicValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.SkipDrawStepEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.cards.CardImpl; diff --git a/Mage.Sets/src/mage/cards/t/TaigamsScheming.java b/Mage.Sets/src/mage/cards/t/TaigamsScheming.java index 746d8cf2e0..f65c44bd49 100644 --- a/Mage.Sets/src/mage/cards/t/TaigamsScheming.java +++ b/Mage.Sets/src/mage/cards/t/TaigamsScheming.java @@ -2,10 +2,10 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; /** * diff --git a/Mage.Sets/src/mage/cards/t/TalasLookout.java b/Mage.Sets/src/mage/cards/t/TalasLookout.java index bb2e5e5b7e..32e3c65b3c 100644 --- a/Mage.Sets/src/mage/cards/t/TalasLookout.java +++ b/Mage.Sets/src/mage/cards/t/TalasLookout.java @@ -3,11 +3,11 @@ package mage.cards.t; import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; @@ -20,8 +20,7 @@ public final class TalasLookout extends CardImpl { public TalasLookout(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{U}"); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.PIRATE); + this.subtype.add(SubType.HUMAN, SubType.PIRATE); this.power = new MageInt(3); this.toughness = new MageInt(2); @@ -30,9 +29,7 @@ public final class TalasLookout extends CardImpl { // When Talas Lookout dies, look at the top two cards of your library. Put one of them into your hand and the other into your graveyard. this.addAbility(new DiesSourceTriggeredAbility(new LookLibraryAndPickControllerEffect( - 2, 1, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.GRAVEYARD + 2, 1, PutCards.HAND, PutCards.GRAVEYARD ))); } diff --git a/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java b/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java index 6e0604fc50..3ecdc4a9e9 100644 --- a/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java +++ b/Mage.Sets/src/mage/cards/t/TappingAtTheWindow.java @@ -2,11 +2,11 @@ package mage.cards.t; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java b/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java index f38d11082a..5509d07f4a 100644 --- a/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java +++ b/Mage.Sets/src/mage/cards/t/TazriBeaconOfUnity.java @@ -8,7 +8,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.PartyCount; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.cost.SpellCostReductionForEachSourceEffect; import mage.abilities.hint.common.PartyCountHint; import mage.constants.SubType; @@ -16,6 +15,7 @@ import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java b/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java index cf3a8b8610..9432e7c8ea 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java +++ b/Mage.Sets/src/mage/cards/t/TeferiTemporalArchmage.java @@ -5,11 +5,11 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.common.CanBeYourCommanderAbility; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.UntapTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterPermanent; diff --git a/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java b/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java index 58a0e3f060..35b79ac36b 100644 --- a/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java +++ b/Mage.Sets/src/mage/cards/t/TeferiWhoSlowsTheSunset.java @@ -6,13 +6,9 @@ import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GainLifeEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.game.Game; import mage.game.command.emblems.TeferiWhoSlowsTheSunsetEmblem; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java b/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java index f1e9fa9c91..1e6edebc8d 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretAgentOfBolas.java @@ -8,16 +8,11 @@ import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.AddCardTypeTargetEffect; import mage.abilities.effects.common.continuous.SetBasePowerToughnessTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Outcome; -import mage.constants.SubType; -import mage.constants.SuperType; +import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; import mage.players.Player; diff --git a/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java b/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java index bb256ce107..4a3282abed 100644 --- a/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java +++ b/Mage.Sets/src/mage/cards/t/TezzeretsGatebreaker.java @@ -9,12 +9,12 @@ import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.combat.CantBeBlockedAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.StaticFilters; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/t/ThassasIntervention.java b/Mage.Sets/src/mage/cards/t/ThassasIntervention.java index 55a5ba1b9f..25f59fe979 100644 --- a/Mage.Sets/src/mage/cards/t/ThassasIntervention.java +++ b/Mage.Sets/src/mage/cards/t/ThassasIntervention.java @@ -6,10 +6,10 @@ import mage.abilities.dynamicvalue.MultipliedValue; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CounterUnlessPaysEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.TargetSpell; import java.util.UUID; diff --git a/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java b/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java index 1c6cab3ae0..31eda156c7 100644 --- a/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java +++ b/Mage.Sets/src/mage/cards/t/TheAntiquitiesWar.java @@ -6,16 +6,9 @@ import mage.abilities.Ability; import mage.abilities.common.SagaAbility; import mage.abilities.effects.ContinuousEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.Duration; -import mage.constants.Layer; -import mage.constants.Outcome; -import mage.constants.SagaChapter; -import mage.constants.SubLayer; -import mage.constants.SubType; +import mage.constants.*; import mage.filter.StaticFilters; import mage.game.Game; import mage.game.permanent.Permanent; diff --git a/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java b/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java index bcf7ed50a0..8c20252f58 100644 --- a/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java +++ b/Mage.Sets/src/mage/cards/t/TheLadyOfOtaria.java @@ -6,7 +6,6 @@ import mage.abilities.common.BeginningOfEndStepTriggeredAbility; import mage.abilities.condition.Condition; import mage.abilities.costs.AlternativeCostSourceAbility; import mage.abilities.costs.common.TapTargetCost; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.hint.ConditionHint; import mage.abilities.hint.Hint; @@ -56,9 +55,7 @@ public final class TheLadyOfOtaria extends CardImpl { // At the beginning of each end step, if a land you controlled was put into your graveyard from the battlefield this turn, reveal the top four cards of your library. Put any number of Dwarf cards from among them into your hand and the rest on the bottom of your library in a random order. this.addAbility(new BeginningOfEndStepTriggeredAbility( new RevealLibraryPickControllerEffect( - 4, Integer.MAX_VALUE, filter2, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, false + 4, Integer.MAX_VALUE, filter2, PutCards.HAND, PutCards.BOTTOM_RANDOM, false ), TargetController.ANY, TheLadyOfOtariaCondition.instance, false ).addHint(TheLadyOfOtariaCondition.getHint()), new TheLadyOfOtariaWatcher()); } diff --git a/Mage.Sets/src/mage/cards/t/TheManaRig.java b/Mage.Sets/src/mage/cards/t/TheManaRig.java index 13a43be6bf..d23874edc8 100644 --- a/Mage.Sets/src/mage/cards/t/TheManaRig.java +++ b/Mage.Sets/src/mage/cards/t/TheManaRig.java @@ -8,10 +8,10 @@ import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.ManacostVariableValue; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SuperType; import mage.filter.StaticFilters; import mage.game.permanent.token.PowerstoneToken; diff --git a/Mage.Sets/src/mage/cards/t/TheWorldSpell.java b/Mage.Sets/src/mage/cards/t/TheWorldSpell.java index 1a80a6965f..7323cf7679 100644 --- a/Mage.Sets/src/mage/cards/t/TheWorldSpell.java +++ b/Mage.Sets/src/mage/cards/t/TheWorldSpell.java @@ -4,7 +4,6 @@ import mage.abilities.Ability; import mage.abilities.common.SagaAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.cards.CardsImpl; @@ -41,9 +40,7 @@ public final class TheWorldSpell extends CardImpl { sagaAbility.addChapterEffect( this, SagaChapter.CHAPTER_I, SagaChapter.CHAPTER_II, new LookLibraryAndPickControllerEffect( - 7, 1, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM + 7, 1, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM ) ); diff --git a/Mage.Sets/src/mage/cards/t/ThievesFortune.java b/Mage.Sets/src/mage/cards/t/ThievesFortune.java index 27e9fdf577..7c1a96d588 100644 --- a/Mage.Sets/src/mage/cards/t/ThievesFortune.java +++ b/Mage.Sets/src/mage/cards/t/ThievesFortune.java @@ -2,11 +2,11 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.ProwlAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java b/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java index a054f43c03..60effa21f5 100644 --- a/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java +++ b/Mage.Sets/src/mage/cards/t/TomorrowAzamisFamiliar.java @@ -6,7 +6,6 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.*; diff --git a/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java b/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java index ddf558ab82..b5968a71f8 100644 --- a/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java +++ b/Mage.Sets/src/mage/cards/t/TorstenFounderOfBenalia.java @@ -4,11 +4,11 @@ import mage.MageInt; import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; @@ -35,16 +35,13 @@ public final class TorstenFounderOfBenalia extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{G}{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HUMAN); - this.subtype.add(SubType.SOLDIER); + this.subtype.add(SubType.HUMAN, SubType.SOLDIER); this.power = new MageInt(7); this.toughness = new MageInt(7); // When Torsten, Founder of Benalia enters the battlefield, reveal the top seven cards of your library. Put any number of creature and/or land cards from among them into your hand and the rest on the bottom of your library in a random order. this.addAbility(new EntersBattlefieldTriggeredAbility(new RevealLibraryPickControllerEffect( - 7, Integer.MAX_VALUE, filter, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, false + 7, Integer.MAX_VALUE, filter, PutCards.HAND, PutCards.BOTTOM_RANDOM, false ))); // When Torsten dies, create seven 1/1 white Soldier creature tokens. diff --git a/Mage.Sets/src/mage/cards/t/TowerGeist.java b/Mage.Sets/src/mage/cards/t/TowerGeist.java index 1e6b89582e..8181684d4a 100644 --- a/Mage.Sets/src/mage/cards/t/TowerGeist.java +++ b/Mage.Sets/src/mage/cards/t/TowerGeist.java @@ -33,11 +33,11 @@ import java.util.UUID; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; /** diff --git a/Mage.Sets/src/mage/cards/t/TrackersInstincts.java b/Mage.Sets/src/mage/cards/t/TrackersInstincts.java index 2bc1425fee..4292b415ad 100644 --- a/Mage.Sets/src/mage/cards/t/TrackersInstincts.java +++ b/Mage.Sets/src/mage/cards/t/TrackersInstincts.java @@ -2,12 +2,12 @@ package mage.cards.t; import java.util.UUID; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; /** diff --git a/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java b/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java index 1542e0cc21..7f6ba0f9ea 100644 --- a/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java +++ b/Mage.Sets/src/mage/cards/t/TrailOfCrumbs.java @@ -6,10 +6,10 @@ import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/u/UncoveredClues.java b/Mage.Sets/src/mage/cards/u/UncoveredClues.java index 976afa743f..37127b7ba2 100644 --- a/Mage.Sets/src/mage/cards/u/UncoveredClues.java +++ b/Mage.Sets/src/mage/cards/u/UncoveredClues.java @@ -2,10 +2,10 @@ package mage.cards.u; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.common.FilterInstantOrSorceryCard; diff --git a/Mage.Sets/src/mage/cards/u/UnderrealmLich.java b/Mage.Sets/src/mage/cards/u/UnderrealmLich.java index 1ca93be83f..4ef262a38d 100644 --- a/Mage.Sets/src/mage/cards/u/UnderrealmLich.java +++ b/Mage.Sets/src/mage/cards/u/UnderrealmLich.java @@ -8,7 +8,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.PayLifeCost; import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TapSourceEffect; import mage.abilities.effects.common.continuous.GainAbilitySourceEffect; import mage.abilities.keyword.IndestructibleAbility; @@ -18,6 +17,7 @@ import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.game.Game; import mage.game.events.GameEvent; diff --git a/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java b/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java index 381930217f..75da54f62b 100644 --- a/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java +++ b/Mage.Sets/src/mage/cards/u/UnityOfTheDroids.java @@ -4,12 +4,12 @@ import java.util.UUID; import mage.abilities.Mode; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.PreventDamageToTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.PutCards; import mage.filter.common.FilterCreaturePermanent; import mage.filter.predicate.Predicates; import mage.target.common.TargetCreaturePermanent; diff --git a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java index 5e24861e04..b90f59fcae 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java +++ b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java @@ -10,7 +10,6 @@ import mage.abilities.effects.ContinuousEffect; import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.*; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.*; import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.DistributeCountersEffect; diff --git a/Mage.Sets/src/mage/cards/v/VesselOfNascency.java b/Mage.Sets/src/mage/cards/v/VesselOfNascency.java index e1ac0ee88d..4d4e9b1f01 100644 --- a/Mage.Sets/src/mage/cards/v/VesselOfNascency.java +++ b/Mage.Sets/src/mage/cards/v/VesselOfNascency.java @@ -5,11 +5,11 @@ import mage.abilities.Ability; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.RevealLibraryPickControllerEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.FilterCard; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java b/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java index fb3ce6f2ee..a63902054c 100644 --- a/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java +++ b/Mage.Sets/src/mage/cards/v/VineshaperProdigy.java @@ -5,11 +5,11 @@ import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.condition.common.KickedCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.keyword.KickerAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; @@ -22,8 +22,7 @@ public final class VineshaperProdigy extends CardImpl { public VineshaperProdigy(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.subtype.add(SubType.ELF); - this.subtype.add(SubType.DRUID); + this.subtype.add(SubType.ELF, SubType.DRUID); this.power = new MageInt(2); this.toughness = new MageInt(2); @@ -34,9 +33,7 @@ public final class VineshaperProdigy extends CardImpl { this.addAbility(new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility( new LookLibraryAndPickControllerEffect( - 3, 1, - LookLibraryControllerEffect.PutCards.HAND, - LookLibraryControllerEffect.PutCards.BOTTOM_ANY + 3, 1, PutCards.HAND, PutCards.BOTTOM_ANY )), KickedCondition.ONCE, "When {this} enters the battlefield, " + "if it was kicked, look at the top three cards of your library. " + "Put one of them into your hand and the rest on the bottom of your library in any order." diff --git a/Mage.Sets/src/mage/cards/v/VivienReid.java b/Mage.Sets/src/mage/cards/v/VivienReid.java index afc38b1b9c..960d5c343a 100644 --- a/Mage.Sets/src/mage/cards/v/VivienReid.java +++ b/Mage.Sets/src/mage/cards/v/VivienReid.java @@ -6,13 +6,13 @@ import mage.abilities.LoyaltyAbility; import mage.abilities.effects.common.DestroyTargetEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.constants.SubType; import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; diff --git a/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java b/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java index b706aea96a..6b45400398 100644 --- a/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java +++ b/Mage.Sets/src/mage/cards/v/VodaSeaScavenger.java @@ -4,12 +4,12 @@ import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.dynamicvalue.common.DomainValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect; import mage.abilities.hint.common.DomainHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.AbilityWord; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import java.util.UUID; @@ -22,15 +22,13 @@ public final class VodaSeaScavenger extends CardImpl { public VodaSeaScavenger(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.MERFOLK); - this.subtype.add(SubType.ROGUE); + this.subtype.add(SubType.MERFOLK, SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(2); // Domain — When Voda Sea Scavenger enters the battlefield, look at the top card X cards of your library, where X is the number of basic land types among lands you control. You may put one of those cards on top of your library. Put the rest on the bottom of your library in a random order. this.addAbility(new EntersBattlefieldTriggeredAbility(new LookLibraryAndPickControllerEffect( - DomainValue.REGULAR, 1, LookLibraryControllerEffect.PutCards.TOP_ANY, - LookLibraryControllerEffect.PutCards.BOTTOM_RANDOM, true + DomainValue.REGULAR, 1, PutCards.TOP_ANY, PutCards.BOTTOM_RANDOM, true )).setAbilityWord(AbilityWord.DOMAIN).addHint(DomainHint.instance)); } diff --git a/Mage.Sets/src/mage/cards/w/WakerOfWaves.java b/Mage.Sets/src/mage/cards/w/WakerOfWaves.java index 69f2dcc76d..a070f21937 100644 --- a/Mage.Sets/src/mage/cards/w/WakerOfWaves.java +++ b/Mage.Sets/src/mage/cards/w/WakerOfWaves.java @@ -7,7 +7,6 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.common.DiscardSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostAllEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; diff --git a/Mage.Sets/src/mage/cards/w/WanderingMind.java b/Mage.Sets/src/mage/cards/w/WanderingMind.java index bea533fcea..b2d457d626 100644 --- a/Mage.Sets/src/mage/cards/w/WanderingMind.java +++ b/Mage.Sets/src/mage/cards/w/WanderingMind.java @@ -3,11 +3,11 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.common.EntersBattlefieldTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.FilterCard; import mage.filter.common.FilterNonlandCard; diff --git a/Mage.Sets/src/mage/cards/w/WarlockClass.java b/Mage.Sets/src/mage/cards/w/WarlockClass.java index a4e89a1e33..7ed4220adb 100644 --- a/Mage.Sets/src/mage/cards/w/WarlockClass.java +++ b/Mage.Sets/src/mage/cards/w/WarlockClass.java @@ -8,7 +8,6 @@ import mage.abilities.condition.common.MorbidCondition; import mage.abilities.decorator.ConditionalInterveningIfTriggeredAbility; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.LoseLifeOpponentsEffect; import mage.abilities.effects.common.continuous.GainClassAbilitySourceEffect; import mage.abilities.hint.common.MorbidHint; diff --git a/Mage.Sets/src/mage/cards/w/WarmWelcome.java b/Mage.Sets/src/mage/cards/w/WarmWelcome.java index 7627fdd79f..04d8a1c77a 100644 --- a/Mage.Sets/src/mage/cards/w/WarmWelcome.java +++ b/Mage.Sets/src/mage/cards/w/WarmWelcome.java @@ -2,10 +2,10 @@ package mage.cards.w; import mage.abilities.effects.common.CreateTokenEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.filter.StaticFilters; import mage.game.permanent.token.CitizenGreenWhiteToken; diff --git a/Mage.Sets/src/mage/cards/w/Weatherlight.java b/Mage.Sets/src/mage/cards/w/Weatherlight.java index a88e76e3a2..07a5dc0217 100644 --- a/Mage.Sets/src/mage/cards/w/Weatherlight.java +++ b/Mage.Sets/src/mage/cards/w/Weatherlight.java @@ -3,12 +3,12 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.CrewAbility; import mage.abilities.keyword.FlyingAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.constants.SuperType; import mage.filter.FilterCard; diff --git a/Mage.Sets/src/mage/cards/w/WildsongHowler.java b/Mage.Sets/src/mage/cards/w/WildsongHowler.java index 263b258493..dad0a4f2a9 100644 --- a/Mage.Sets/src/mage/cards/w/WildsongHowler.java +++ b/Mage.Sets/src/mage/cards/w/WildsongHowler.java @@ -3,11 +3,11 @@ package mage.cards.w; import mage.MageInt; import mage.abilities.common.TransformsOrEntersTriggeredAbility; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.keyword.NightboundAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.constants.SubType; import mage.filter.StaticFilters; diff --git a/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java b/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java index 8f994100c7..e744bc7ed0 100644 --- a/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java +++ b/Mage.Sets/src/mage/cards/w/WitnessTheFuture.java @@ -3,11 +3,11 @@ package mage.cards.w; import java.util.UUID; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.TargetPlayerShufflesTargetCardsEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.PutCards; import mage.target.TargetPlayer; import mage.target.common.TargetCardInTargetPlayersGraveyard; diff --git a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java index b8e80a1815..fb319fb2ab 100644 --- a/Mage.Sets/src/mage/cards/y/YodaJediMaster.java +++ b/Mage.Sets/src/mage/cards/y/YodaJediMaster.java @@ -1,4 +1,3 @@ - package mage.cards.y; import java.util.UUID; @@ -9,15 +8,10 @@ import mage.abilities.effects.Effect; import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.common.GetEmblemEffect; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.ReturnToBattlefieldUnderYourControlTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; -import mage.constants.CardType; -import mage.constants.SubType; -import mage.constants.SuperType; -import mage.constants.Outcome; -import mage.constants.TargetController; +import mage.constants.*; import mage.filter.FilterPermanent; import mage.filter.predicate.mageobject.AnotherPredicate; import mage.game.Game; diff --git a/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java b/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java index 60ccfa10da..898d97196a 100644 --- a/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java +++ b/Mage.Sets/src/mage/cards/y/YouMeetInATavern.java @@ -2,12 +2,12 @@ package mage.cards.y; import mage.abilities.Mode; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; -import mage.abilities.effects.common.LookLibraryControllerEffect.PutCards; import mage.abilities.effects.common.continuous.BoostControlledEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.Duration; +import mage.constants.PutCards; import mage.filter.StaticFilters; import java.util.UUID; diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index c2fbfd2508..c9027aa18b 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -35,6 +35,7 @@ import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.dynamicvalue.common.StaticValue; import mage.cards.Cards; import mage.cards.CardsImpl; +import mage.constants.PutCards; import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.StaticFilters; @@ -157,12 +158,12 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff sb.append(plural ? "them" : "it"); } sb.append(" "); - sb.append(putPickedCards.getMessage(plural)); + sb.append(putPickedCards.getMessage(false, plural)); return sb.append("?").toString(); } protected String getChooseHint() { - return "to put " + putPickedCards.getMessage(numberToPick > 1); + return "to put " + putPickedCards.getMessage(false, numberToPick > 1); } @Override @@ -201,7 +202,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff sb.append("and put "); sb.append(plural ? "them " : "it "); } - sb.append(putPickedCards.getMessage(plural)); + sb.append(putPickedCards.getMessage(false, plural)); plural = optional || upTo @@ -218,7 +219,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff if (putPickedCards == PutCards.GRAVEYARD && putLookedCards == PutCards.TOP_ANY) { sb.append("back "); } - sb.append(putLookedCards.getMessage(plural)); + sb.append(putLookedCards.getMessage(false, plural)); // get text frame from super class and inject action text return setText(mode, sb.toString()); diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java index 45361da307..e4c3e95357 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryControllerEffect.java @@ -9,6 +9,7 @@ import mage.abilities.effects.OneShotEffect; import mage.cards.Cards; import mage.cards.CardsImpl; import mage.constants.Outcome; +import mage.constants.PutCards; import mage.constants.Zone; import mage.game.Game; import mage.players.Player; @@ -20,44 +21,6 @@ import mage.util.CardUtil; */ public class LookLibraryControllerEffect extends OneShotEffect { - public enum PutCards { - HAND(Outcome.DrawCard, Zone.HAND, "into your hand"), - GRAVEYARD(Outcome.Discard, Zone.GRAVEYARD, "into your graveyard"), - BATTLEFIELD(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield"), - BATTLEFIELD_TAPPED(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield tapped"), - TOP_ANY(Outcome.Benefit, Zone.LIBRARY, "on top of your library", " in any order"), - BOTTOM_ANY(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in any order"), - BOTTOM_RANDOM(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in a random order"); - - private final Outcome outcome; - private final Zone zone; - private final String message; - private final String order; - - PutCards(Outcome outcome, Zone zone, String message) { - this(outcome, zone, message, ""); - } - - PutCards(Outcome outcome, Zone zone, String message, String order) { - this.outcome = outcome; - this.zone = zone; - this.message = message; - this.order = order; - } - - public Outcome getOutcome() { - return outcome; - } - - public Zone getZone() { - return zone; - } - - public String getMessage(boolean withOrder) { - return withOrder ? message + order : message; - } - } - protected DynamicValue numberOfCards; protected PutCards putLookedCards; protected boolean revealCards; @@ -167,7 +130,7 @@ public class LookLibraryControllerEffect extends OneShotEffect { sb.append(middleText); } else if (!oneCard) { sb.append(", then put them "); - sb.append(putLookedCards == PutCards.TOP_ANY ? "back in any order" : putLookedCards.getMessage(true)); + sb.append(putLookedCards == PutCards.TOP_ANY ? "back in any order" : putLookedCards.getMessage(false, true)); } return sb.toString(); } diff --git a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java index e6df716914..8170f8dfa4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPickControllerEffect.java @@ -1,5 +1,6 @@ package mage.abilities.effects.common; +import mage.constants.PutCards; import mage.filter.FilterCard; /** diff --git a/Mage/src/main/java/mage/constants/PutCards.java b/Mage/src/main/java/mage/constants/PutCards.java new file mode 100644 index 0000000000..e5c1edabaf --- /dev/null +++ b/Mage/src/main/java/mage/constants/PutCards.java @@ -0,0 +1,49 @@ +package mage.constants; + +/** + * + * @author awjackson + */ + +public enum PutCards { + HAND(Outcome.DrawCard, Zone.HAND, "into your hand"), + GRAVEYARD(Outcome.Discard, Zone.GRAVEYARD, "into your graveyard"), + BATTLEFIELD(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield"), + BATTLEFIELD_TAPPED(Outcome.PutCardInPlay, Zone.BATTLEFIELD, "onto the battlefield tapped"), + EXILED(Outcome.Exile, Zone.EXILED, "into exile"), // may need special case code to generate correct text + TOP_OR_BOTTOM(Outcome.Benefit, Zone.LIBRARY, "on the top or bottom of your library"), + TOP_ANY(Outcome.Benefit, Zone.LIBRARY, "on top of your library", " in any order"), + BOTTOM_ANY(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in any order"), + BOTTOM_RANDOM(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in a random order"); + + private final Outcome outcome; + private final Zone zone; + private final String messageYour; + private final String messageOwner; + private final String order; + + PutCards(Outcome outcome, Zone zone, String message) { + this(outcome, zone, message, ""); + } + + PutCards(Outcome outcome, Zone zone, String message, String order) { + this.outcome = outcome; + this.zone = zone; + this.messageYour = message; + this.messageOwner = message.replace("your", "its owner's"); + this.order = order; + } + + public Outcome getOutcome() { + return outcome; + } + + public Zone getZone() { + return zone; + } + + public String getMessage(boolean owner, boolean withOrder) { + String message = owner ? messageOwner : messageYour; + return withOrder ? message + order : message; + } +} diff --git a/Mage/src/main/java/mage/target/common/TargetLandPermanent.java b/Mage/src/main/java/mage/target/common/TargetLandPermanent.java index a0c69ef1ab..98bb12c090 100644 --- a/Mage/src/main/java/mage/target/common/TargetLandPermanent.java +++ b/Mage/src/main/java/mage/target/common/TargetLandPermanent.java @@ -12,7 +12,7 @@ import mage.target.TargetPermanent; public class TargetLandPermanent extends TargetPermanent { public TargetLandPermanent() { - this(1, 1, StaticFilters.FILTER_LAND, false); + this(1); } public TargetLandPermanent(FilterLandPermanent filter) { @@ -20,11 +20,11 @@ public class TargetLandPermanent extends TargetPermanent { } public TargetLandPermanent(int numTargets) { - this(numTargets, numTargets, StaticFilters.FILTER_LAND, false); + this(numTargets, numTargets); } public TargetLandPermanent(int numTargets, int maxNumTargets) { - this(numTargets, maxNumTargets, StaticFilters.FILTER_LAND, false); + this(numTargets, maxNumTargets, maxNumTargets > 1 ? StaticFilters.FILTER_LANDS : StaticFilters.FILTER_LAND, false); } public TargetLandPermanent(int minNumTargets, int maxNumTargets, FilterLandPermanent filter, boolean notTarget) {