diff --git a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java index 065fac42c23..1672151b256 100644 --- a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java +++ b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java @@ -11,7 +11,6 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; @@ -40,7 +39,7 @@ public final class BogbrewWitch extends CardImpl { // {2}, {T}: Search your library for a card named Festering Newt or Bubbling Cauldron, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, new FilterCard(filter)); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutCardInPlay), + new SearchLibraryPutInPlayEffect(target, true, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java b/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java index 9213e78c170..29315a76fc6 100644 --- a/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java +++ b/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java @@ -7,7 +7,6 @@ import mage.abilities.TriggeredAbilityImpl; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; @@ -57,7 +56,7 @@ class DeepGnomeTerramancerTriggeredAbility extends TriggeredAbilityImpl { FilterCard filter = new FilterCard("Plains card"); filter.add(SubType.PLAINS.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); + addEffect(new SearchLibraryPutInPlayEffect(target, true, true)); } DeepGnomeTerramancerTriggeredAbility(DeepGnomeTerramancerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/d/DroidFactory.java b/Mage.Sets/src/mage/cards/d/DroidFactory.java index 30fc6c52800..79f291ee17f 100644 --- a/Mage.Sets/src/mage/cards/d/DroidFactory.java +++ b/Mage.Sets/src/mage/cards/d/DroidFactory.java @@ -64,7 +64,7 @@ public final class DroidFactory extends CardImpl { filter.add(Predicates.or(subtypePredicates)); filter.add(SuperType.BASIC.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); + addEffect(new SearchLibraryPutInPlayEffect(target, true, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/f/FontOfFertility.java b/Mage.Sets/src/mage/cards/f/FontOfFertility.java index 8ad2d008d8c..25b46ba65db 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFertility.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFertility.java @@ -9,7 +9,6 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetCardInLibrary; @@ -28,7 +27,7 @@ public final class FontOfFertility extends CardImpl { // {1}{G}, Sacrifice Font of Fertility: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/j/JediEnclave.java b/Mage.Sets/src/mage/cards/j/JediEnclave.java index 0c804a970f6..8251e9acd7b 100644 --- a/Mage.Sets/src/mage/cards/j/JediEnclave.java +++ b/Mage.Sets/src/mage/cards/j/JediEnclave.java @@ -64,7 +64,7 @@ public final class JediEnclave extends CardImpl { filter.add(Predicates.or(subtypePredicates)); filter.add(SuperType.BASIC.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); + addEffect(new SearchLibraryPutInPlayEffect(target, true, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/j/JungleVillage.java b/Mage.Sets/src/mage/cards/j/JungleVillage.java index 71faddefb63..ab87e1ee0cb 100644 --- a/Mage.Sets/src/mage/cards/j/JungleVillage.java +++ b/Mage.Sets/src/mage/cards/j/JungleVillage.java @@ -64,7 +64,7 @@ public final class JungleVillage extends CardImpl { filter.add(Predicates.or(subtypePredicates)); filter.add(SuperType.BASIC.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); + addEffect(new SearchLibraryPutInPlayEffect(target, true, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/k/KyscuDrake.java b/Mage.Sets/src/mage/cards/k/KyscuDrake.java index a236890d684..b610fab9140 100644 --- a/Mage.Sets/src/mage/cards/k/KyscuDrake.java +++ b/Mage.Sets/src/mage/cards/k/KyscuDrake.java @@ -49,7 +49,7 @@ public final class KyscuDrake extends CardImpl { this.addAbility(new LimitedTimesPerTurnActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(0, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}"))); // Sacrifice Kyscu Drake and a creature named Spitting Drake: Search your library for a card named Viashivan Dragon and put that card onto the battlefield. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(1, 1, filter), false, true, Outcome.PutCardInPlay), new CompositeCost(new SacrificeSourceCost(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filterSpitting, false)), "sacrifice {this} and a creature named Spitting Drake"))); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(1, 1, filter), false, true), new CompositeCost(new SacrificeSourceCost(), new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filterSpitting, false)), "sacrifice {this} and a creature named Spitting Drake"))); } private KyscuDrake(final KyscuDrake card) { diff --git a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java index 497605895f1..17ba7dbb3f2 100644 --- a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java +++ b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java @@ -8,7 +8,6 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Outcome; import mage.constants.SubType; import mage.filter.FilterCard; import mage.target.common.TargetCardInLibrary; @@ -33,7 +32,7 @@ public final class SeedguideAsh extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); // When Seedguide Ash dies, you may search your library for up to three Forest cards and put them onto the battlefield tapped. If you do, shuffle your library. - this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, filter), true, true, Outcome.PutLandInPlay), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, filter), true, true), true)); } private SeedguideAsh(final SeedguideAsh card) { diff --git a/Mage.Sets/src/mage/cards/s/SithRuins.java b/Mage.Sets/src/mage/cards/s/SithRuins.java index 14b85b0869e..ffaa8a431d3 100644 --- a/Mage.Sets/src/mage/cards/s/SithRuins.java +++ b/Mage.Sets/src/mage/cards/s/SithRuins.java @@ -64,7 +64,7 @@ public final class SithRuins extends CardImpl { filter.add(Predicates.or(subtypePredicates)); filter.add(SuperType.BASIC.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); + addEffect(new SearchLibraryPutInPlayEffect(target, true, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java b/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java index 661b5eaca9b..b601eab24e6 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java @@ -14,7 +14,6 @@ import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; import mage.constants.SubType; -import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.common.FilterControlledLandPermanent; import mage.filter.common.FilterControlledPermanent; @@ -45,7 +44,7 @@ public final class UlvenwaldHydra extends CardImpl { // When Ulvenwald Hydra enters the battlefield, you may search your library for a land card, put it onto the battlefield tapped, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(new FilterLandCard()); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(target, true, true), true)); } private UlvenwaldHydra(final UlvenwaldHydra card) { diff --git a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java index 55cba34f07d..1eff5d1d9ef 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldSlums.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldSlums.java @@ -64,7 +64,7 @@ public final class UnderworldSlums extends CardImpl { filter.add(Predicates.or(subtypePredicates)); filter.add(SuperType.BASIC.getPredicate()); TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, true, true, Outcome.PutLandInPlay)); + addEffect(new SearchLibraryPutInPlayEffect(target, true, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java index 3def3622f12..4cc05760573 100644 --- a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java +++ b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java @@ -10,7 +10,6 @@ import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.target.common.TargetCardInLibrary; @@ -28,7 +27,7 @@ public final class WayfarersBauble extends CardImpl { // {2}, {tap}, Sacrifice Wayfarer's Bauble: Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND),true, true, Outcome.PutLandInPlay), new GenericManaCost(2)); + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND),true, true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java index 157a18dc376..fd12039b687 100644 --- a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java @@ -7,7 +7,6 @@ import mage.abilities.costs.common.PayLifeCost; import mage.abilities.costs.common.SacrificeSourceCost; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; -import mage.constants.Outcome; import mage.constants.SubType; import mage.constants.Zone; import mage.filter.FilterCard; @@ -33,7 +32,7 @@ public class FetchLandActivatedAbility extends ActivatedAbilityImpl { FilterCard filter = new FilterCard(subType1.getDescription() + " or " + subType2.getDescription() + " card"); filter.add(Predicates.or(subType1.getPredicate(), subType2.getPredicate())); TargetCardInLibrary target = new TargetCardInLibrary(filter); - addEffect(new SearchLibraryPutInPlayEffect(target, false, true, Outcome.PutLandInPlay)); + addEffect(new SearchLibraryPutInPlayEffect(target, false, true)); } private FetchLandActivatedAbility(FetchLandActivatedAbility ability) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java index e238a10d8b8..8a4e222fdd1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInPlayEffect.java @@ -22,22 +22,18 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect { protected boolean optional; public SearchLibraryPutInPlayEffect(TargetCardInLibrary target) { - this(target, false, true, Outcome.PutCardInPlay); + this(target, false, true); } public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped) { - this(target, tapped, true, Outcome.PutCardInPlay); - } - - public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle) { - this(target, tapped, forceShuffle, Outcome.PutCardInPlay); + this(target, tapped, true); } public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, Outcome outcome) { - this(target, tapped, true, outcome); + this(target, tapped, true); } - public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle, Outcome outcome) { + public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle) { this(target, tapped, forceShuffle, false); } diff --git a/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java index 59f7b8f0980..ed114e237ed 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java @@ -4,7 +4,6 @@ import mage.abilities.Ability; import mage.abilities.common.SpellCastControllerTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; -import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.filter.common.FilterCreatureCard; @@ -23,7 +22,7 @@ public final class GarrukCallerOfBeastsEmblem extends Emblem { */ public GarrukCallerOfBeastsEmblem() { super("Emblem Garruk"); - Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterCreatureCard("creature card")), false, true, Outcome.PutCreatureInPlay); + Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterCreatureCard("creature card")), false, true); Ability ability = new SpellCastControllerTriggeredAbility(Zone.COMMAND, effect, StaticFilters.FILTER_SPELL_A_CREATURE, true, false); this.getAbilities().add(ability); } diff --git a/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java b/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java index 9bedbedc650..3ba9993644e 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java @@ -3,7 +3,6 @@ package mage.game.command.emblems; import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility; import mage.abilities.effects.Effect; import mage.abilities.effects.common.search.SearchLibraryPutInPlayEffect; -import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.command.Emblem; @@ -14,7 +13,7 @@ public class GarrukUnleashedEmblem extends Emblem { // At the beginning of your end step, you may search your library for a creature card, put it onto the battlefield, then shuffle your library. public GarrukUnleashedEmblem() { super("Emblem Garruk"); - Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), false, true, Outcome.PutCreatureInPlay) + Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), false, true) .setText("search your library for a creature card, put it onto the battlefield, then shuffle"); this.getAbilities().add(new BeginningOfYourEndStepTriggeredAbility(Zone.COMMAND, effect, true)); }