From 698fe34014fcdd0cb797ce1987dbd3616e9d3a55 Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sat, 13 May 2023 23:19:24 -0400 Subject: [PATCH] SearchLibraryPutInPlayEffect: remove forceshuffle parameter, part 2 --- Mage.Sets/src/mage/cards/b/BeginTheInvasion.java | 2 +- Mage.Sets/src/mage/cards/b/BeneathTheSands.java | 2 +- Mage.Sets/src/mage/cards/b/BitterthornNissasAnimus.java | 2 +- Mage.Sets/src/mage/cards/b/BlightedWoodland.java | 2 +- Mage.Sets/src/mage/cards/b/BogbrewWitch.java | 2 +- Mage.Sets/src/mage/cards/b/BrokersHideout.java | 2 +- Mage.Sets/src/mage/cards/b/BurnishedHart.java | 2 +- Mage.Sets/src/mage/cards/c/CabarettiCourtyard.java | 2 +- Mage.Sets/src/mage/cards/c/CentaurRootcaster.java | 2 +- Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java | 2 +- Mage.Sets/src/mage/cards/d/DeepReconnaissance.java | 3 +-- Mage.Sets/src/mage/cards/d/DoricNaturesWarden.java | 2 +- Mage.Sets/src/mage/cards/d/DroidFactory.java | 2 +- Mage.Sets/src/mage/cards/f/FarWanderings.java | 4 ++-- Mage.Sets/src/mage/cards/f/FarhavenElf.java | 2 +- Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java | 2 +- Mage.Sets/src/mage/cards/f/FontOfFertility.java | 2 +- Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java | 2 +- Mage.Sets/src/mage/cards/g/GrowFromTheAshes.java | 4 ++-- Mage.Sets/src/mage/cards/j/JediEnclave.java | 2 +- Mage.Sets/src/mage/cards/j/JungleVillage.java | 2 +- Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java | 4 ++-- Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java | 2 +- Mage.Sets/src/mage/cards/k/KyscuDrake.java | 2 +- Mage.Sets/src/mage/cards/l/LoyalWarhound.java | 2 +- Mage.Sets/src/mage/cards/m/MaestrosTheater.java | 2 +- Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java | 2 +- Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java | 2 +- Mage.Sets/src/mage/cards/n/NaturalOrder.java | 2 +- Mage.Sets/src/mage/cards/n/NaturesLore.java | 2 +- Mage.Sets/src/mage/cards/n/NissasExpedition.java | 2 +- Mage.Sets/src/mage/cards/o/ObscuraStorefront.java | 2 +- Mage.Sets/src/mage/cards/o/OrdealOfNylea.java | 2 +- Mage.Sets/src/mage/cards/p/PrimalGrowth.java | 4 ++-- Mage.Sets/src/mage/cards/q/QuirionTrailblazer.java | 2 +- Mage.Sets/src/mage/cards/r/ReshapeTheEarth.java | 2 +- Mage.Sets/src/mage/cards/r/RiveteersOverlook.java | 2 +- Mage.Sets/src/mage/cards/s/SamutTheTested.java | 2 +- Mage.Sets/src/mage/cards/s/ScoutThePerimeter.java | 2 +- Mage.Sets/src/mage/cards/s/SeedguideAsh.java | 2 +- Mage.Sets/src/mage/cards/s/ShadowbornApostle.java | 2 +- Mage.Sets/src/mage/cards/s/ShefetMonitor.java | 2 +- Mage.Sets/src/mage/cards/s/SiftThroughSands.java | 3 +-- Mage.Sets/src/mage/cards/s/SilkwingScout.java | 2 +- Mage.Sets/src/mage/cards/s/SilvergladeElemental.java | 2 +- Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java | 2 +- Mage.Sets/src/mage/cards/s/SithRuins.java | 2 +- Mage.Sets/src/mage/cards/s/SpaceMarineScout.java | 2 +- Mage.Sets/src/mage/cards/s/Sporocyst.java | 2 +- Mage.Sets/src/mage/cards/s/SylvanPrimordial.java | 3 +-- Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java | 2 +- Mage.Sets/src/mage/cards/t/TerminalMoraine.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderherdMigration.java | 2 +- Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java | 2 +- Mage.Sets/src/mage/cards/u/UnderworldSlums.java | 2 +- Mage.Sets/src/mage/cards/v/VerdantCrescendo.java | 2 +- Mage.Sets/src/mage/cards/w/WarpedLandscape.java | 2 +- Mage.Sets/src/mage/cards/w/WayfarersBauble.java | 2 +- Mage.Sets/src/mage/cards/w/WhisperSquad.java | 2 +- Mage.Sets/src/mage/cards/w/WildWanderer.java | 2 +- Mage.Sets/src/mage/cards/w/WoodElves.java | 2 +- .../mage/abilities/common/FetchLandActivatedAbility.java | 2 +- .../effects/common/search/SearchLibraryPutInPlayEffect.java | 6 +----- .../game/command/emblems/GarrukCallerOfBeastsEmblem.java | 2 +- .../mage/game/command/emblems/GarrukUnleashedEmblem.java | 2 +- 65 files changed, 69 insertions(+), 76 deletions(-) diff --git a/Mage.Sets/src/mage/cards/b/BeginTheInvasion.java b/Mage.Sets/src/mage/cards/b/BeginTheInvasion.java index e396d380413..6b53c9bb3af 100644 --- a/Mage.Sets/src/mage/cards/b/BeginTheInvasion.java +++ b/Mage.Sets/src/mage/cards/b/BeginTheInvasion.java @@ -62,7 +62,7 @@ class BeginTheInvasionEffect extends OneShotEffect { public boolean apply(Game game, Ability source) { int xValue = source.getManaCostsToPay().getX(); return new SearchLibraryPutInPlayEffect( - new TargetCardWithDifferentNameInLibrary(0, xValue, filter), false, true + new TargetCardWithDifferentNameInLibrary(0, xValue, filter), false ).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/b/BeneathTheSands.java b/Mage.Sets/src/mage/cards/b/BeneathTheSands.java index af4d9b12eb6..b289f45d236 100644 --- a/Mage.Sets/src/mage/cards/b/BeneathTheSands.java +++ b/Mage.Sets/src/mage/cards/b/BeneathTheSands.java @@ -22,7 +22,7 @@ public final class BeneathTheSands extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{2}{G}"); // Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true)); // Cycling {2} this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}"))); diff --git a/Mage.Sets/src/mage/cards/b/BitterthornNissasAnimus.java b/Mage.Sets/src/mage/cards/b/BitterthornNissasAnimus.java index 66c282ff890..b825920c39d 100644 --- a/Mage.Sets/src/mage/cards/b/BitterthornNissasAnimus.java +++ b/Mage.Sets/src/mage/cards/b/BitterthornNissasAnimus.java @@ -35,7 +35,7 @@ public final class BitterthornNissasAnimus extends CardImpl { // Whenever equipped creature attacks, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle. this.addAbility(new AttacksAttachedTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND_A), true, true + new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND_A), true ), true)); // Equip {3} diff --git a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java index 7a9523faf2e..2f21abb3582 100644 --- a/Mage.Sets/src/mage/cards/b/BlightedWoodland.java +++ b/Mage.Sets/src/mage/cards/b/BlightedWoodland.java @@ -31,7 +31,7 @@ public final class BlightedWoodland extends CardImpl { // {3}{G}, {T}, Sacrifice Blighted Woodland: Search your library for up to two basic land cards and put them onto the battlefield tapped. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true, true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new ManaCostsImpl<>("{3}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java index 1672151b256..8e23848bfc6 100644 --- a/Mage.Sets/src/mage/cards/b/BogbrewWitch.java +++ b/Mage.Sets/src/mage/cards/b/BogbrewWitch.java @@ -39,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), + new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/b/BrokersHideout.java b/Mage.Sets/src/mage/cards/b/BrokersHideout.java index 021c7b7f5d3..51261045676 100644 --- a/Mage.Sets/src/mage/cards/b/BrokersHideout.java +++ b/Mage.Sets/src/mage/cards/b/BrokersHideout.java @@ -39,7 +39,7 @@ public final class BrokersHideout extends CardImpl { // When Brokers Hideout enters the battlefield, sacrifice it. When you do, search your library for a basic Forest, Plains, or Island card, put it onto the battlefield tapped, then shuffle and you gain 1 life. ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), false); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid( diff --git a/Mage.Sets/src/mage/cards/b/BurnishedHart.java b/Mage.Sets/src/mage/cards/b/BurnishedHart.java index 76ad304ba1e..22a76349cc9 100644 --- a/Mage.Sets/src/mage/cards/b/BurnishedHart.java +++ b/Mage.Sets/src/mage/cards/b/BurnishedHart.java @@ -33,7 +33,7 @@ public final class BurnishedHart extends CardImpl { // {3}, Sacrifice Burnished Hart: Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library. Ability ability = new SimpleActivatedAbility( Zone.BATTLEFIELD, - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS), true, true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(3)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/c/CabarettiCourtyard.java b/Mage.Sets/src/mage/cards/c/CabarettiCourtyard.java index bad2a9c30b3..a331ec65615 100644 --- a/Mage.Sets/src/mage/cards/c/CabarettiCourtyard.java +++ b/Mage.Sets/src/mage/cards/c/CabarettiCourtyard.java @@ -38,7 +38,7 @@ public final class CabarettiCourtyard extends CardImpl { // When Cabaretti Courtyard enters the battlefield, sacrifice it. When you do, search your library for a basic Mountain, Forest, or Plains card, put it onto the battlefield tapped, then shuffle and you gain 1 life. ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), false); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid( diff --git a/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java b/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java index c9730a9a6af..f35124266a9 100644 --- a/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java +++ b/Mage.Sets/src/mage/cards/c/CentaurRootcaster.java @@ -28,7 +28,7 @@ public final class CentaurRootcaster extends CardImpl { // Whenever Centaur Rootcaster deals combat damage to a player, you may search your library for a basic land card and put that card onto the battlefield tapped. If you do, shuffle your library. this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } diff --git a/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java b/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java index 29315a76fc6..851ada4fbed 100644 --- a/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java +++ b/Mage.Sets/src/mage/cards/d/DeepGnomeTerramancer.java @@ -56,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)); + addEffect(new SearchLibraryPutInPlayEffect(target, true)); } DeepGnomeTerramancerTriggeredAbility(DeepGnomeTerramancerTriggeredAbility ability) { diff --git a/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java b/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java index 8a8dda76cd2..f4cdc89d03e 100644 --- a/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java +++ b/Mage.Sets/src/mage/cards/d/DeepReconnaissance.java @@ -7,7 +7,6 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TimingRule; import mage.filter.StaticFilters; import mage.target.common.TargetCardInLibrary; @@ -24,7 +23,7 @@ public final class DeepReconnaissance extends CardImpl { // Search your library for a basic land card and put that card onto the battlefield tapped. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true)); // Flashback {4}{G} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{4}{G}"))); } diff --git a/Mage.Sets/src/mage/cards/d/DoricNaturesWarden.java b/Mage.Sets/src/mage/cards/d/DoricNaturesWarden.java index 7369239e6ab..f165e05f96b 100644 --- a/Mage.Sets/src/mage/cards/d/DoricNaturesWarden.java +++ b/Mage.Sets/src/mage/cards/d/DoricNaturesWarden.java @@ -45,7 +45,7 @@ public final class DoricNaturesWarden extends CardImpl { // When Doric, Nature's Warden enters the battlefield, search your library for a Forest card, put it into the battlefield tapped, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true, true) + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true) )); // Whenever Doric attacks, you may pay {1}{G}. If you do, transform her. diff --git a/Mage.Sets/src/mage/cards/d/DroidFactory.java b/Mage.Sets/src/mage/cards/d/DroidFactory.java index 79f291ee17f..8dcfa7f99b8 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)); + addEffect(new SearchLibraryPutInPlayEffect(target, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/f/FarWanderings.java b/Mage.Sets/src/mage/cards/f/FarWanderings.java index 3b1c709a817..b27c29e632e 100644 --- a/Mage.Sets/src/mage/cards/f/FarWanderings.java +++ b/Mage.Sets/src/mage/cards/f/FarWanderings.java @@ -26,8 +26,8 @@ public final class FarWanderings extends CardImpl { // Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle your library. // Threshold - If seven or more cards are in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle your library. Effect effect = new ConditionalOneShotEffect( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LAND), true, true), - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LAND), true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true), new CardsInControllerGraveyardCondition(7), "Search your library for a basic land card, put that card onto the battlefield tapped, then shuffle.

Threshold — If seven or more cards are in your graveyard, instead search your library for up to three basic land cards, put them onto the battlefield tapped, then shuffle."); this.getSpellAbility().addEffect(effect); diff --git a/Mage.Sets/src/mage/cards/f/FarhavenElf.java b/Mage.Sets/src/mage/cards/f/FarhavenElf.java index 60f0becfe38..3c188d116ee 100644 --- a/Mage.Sets/src/mage/cards/f/FarhavenElf.java +++ b/Mage.Sets/src/mage/cards/f/FarhavenElf.java @@ -28,7 +28,7 @@ public final class FarhavenElf extends CardImpl { this.toughness = new MageInt(1); // When Farhaven Elf enters the battlefield, you may search your library for a basic land card and put it onto the battlefield tapped. If you do, shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } private FarhavenElf(final FarhavenElf card) { diff --git a/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java b/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java index 1853756638f..6ba3e396a32 100644 --- a/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java +++ b/Mage.Sets/src/mage/cards/f/FlagstonesOfTrokair.java @@ -32,7 +32,7 @@ public final class FlagstonesOfTrokair extends CardImpl { this.addAbility(new WhiteManaAbility()); // When Flagstones of Trokair is put into a graveyard from the battlefield, you may search your library for a Plains card and put it onto the battlefield tapped. If you do, shuffle your library. - this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(FILTER), true, true), true, false)); + this.addAbility(new PutIntoGraveFromBattlefieldSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(FILTER), true), true, false)); } private FlagstonesOfTrokair(final FlagstonesOfTrokair card) { diff --git a/Mage.Sets/src/mage/cards/f/FontOfFertility.java b/Mage.Sets/src/mage/cards/f/FontOfFertility.java index 25b46ba65db..1aaf756baa3 100644 --- a/Mage.Sets/src/mage/cards/f/FontOfFertility.java +++ b/Mage.Sets/src/mage/cards/f/FontOfFertility.java @@ -27,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), new ManaCostsImpl<>("{1}{G}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(target, true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java index c9269ce0216..214cb25bb6a 100644 --- a/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java +++ b/Mage.Sets/src/mage/cards/g/GodoBanditWarlord.java @@ -44,7 +44,7 @@ public final class GodoBanditWarlord extends CardImpl { this.toughness = new MageInt(3); // When Godo, Bandit Warlord enters the battlefield, you may search your library for an Equipment card and put it onto the battlefield. If you do, shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), true)); // Whenever Godo attacks for the first time each turn, untap it and all Samurai you control. After this phase, there is an additional combat phase. Ability ability = new AttacksFirstTimeTriggeredAbility(new UntapSourceEffect().setText("untap it"), false); diff --git a/Mage.Sets/src/mage/cards/g/GrowFromTheAshes.java b/Mage.Sets/src/mage/cards/g/GrowFromTheAshes.java index a0609a0ab4a..a1541971042 100644 --- a/Mage.Sets/src/mage/cards/g/GrowFromTheAshes.java +++ b/Mage.Sets/src/mage/cards/g/GrowFromTheAshes.java @@ -26,8 +26,8 @@ public final class GrowFromTheAshes extends CardImpl { // Search you library for a basic land card, put it onto the battlefield, then shuffle your library. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle your library. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), false, true), - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), false, true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), false), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), false), KickedCondition.ONCE, "Search your library for a basic land card, put it onto the battlefield, then shuffle. If this spell was kicked, instead search your library for two basic land cards, put them onto the battlefield, then shuffle.")); } diff --git a/Mage.Sets/src/mage/cards/j/JediEnclave.java b/Mage.Sets/src/mage/cards/j/JediEnclave.java index 8251e9acd7b..d6f2ee45b96 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)); + addEffect(new SearchLibraryPutInPlayEffect(target, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/j/JungleVillage.java b/Mage.Sets/src/mage/cards/j/JungleVillage.java index ab87e1ee0cb..926402d02ff 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)); + addEffect(new SearchLibraryPutInPlayEffect(target, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java b/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java index 526ee1e6ae7..810c329a62e 100644 --- a/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java +++ b/Mage.Sets/src/mage/cards/k/KeeperOfTheAccord.java @@ -53,7 +53,7 @@ public final class KeeperOfTheAccord extends CardImpl { // At the beginning of each opponent's end step, if that player controls more lands than you, you may search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle your library. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new BeginningOfEndStepTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), TargetController.OPPONENT, true), KeeperOfTheAccordCondition.LANDS, "At the beginning of each opponent's end step, " + "if that player controls more lands than you, you may search your library for a basic Plains card, " + @@ -87,4 +87,4 @@ enum KeeperOfTheAccordCondition implements Condition { return game.getBattlefield().countAll(filter, source.getControllerId(), game) < game.getBattlefield().countAll(filter, game.getActivePlayerId(), game); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java index 4c0f7fa334e..15a6396541a 100644 --- a/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java +++ b/Mage.Sets/src/mage/cards/k/KorlashHeirToBlackblade.java @@ -51,7 +51,7 @@ public final class KorlashHeirToBlackblade extends CardImpl { this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}"))); // Grandeur - Discard another card named Korlash, Heir to Blackblade: Search your library for up to two Swamp cards, put them onto the battlefield tapped, then shuffle your library. - effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filterCard), true, true); + effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filterCard), true); effect.setText("Search your library for up to two Swamp cards, put them onto the battlefield tapped, then shuffle."); this.addAbility(new GrandeurAbility(effect, "Korlash, Heir to Blackblade")); } diff --git a/Mage.Sets/src/mage/cards/k/KyscuDrake.java b/Mage.Sets/src/mage/cards/k/KyscuDrake.java index b610fab9140..c5d618562ae 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), 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), 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/l/LoyalWarhound.java b/Mage.Sets/src/mage/cards/l/LoyalWarhound.java index a7b1ea1eeb0..ad6c1e2bc24 100644 --- a/Mage.Sets/src/mage/cards/l/LoyalWarhound.java +++ b/Mage.Sets/src/mage/cards/l/LoyalWarhound.java @@ -42,7 +42,7 @@ public final class LoyalWarhound extends CardImpl { // When Loyal Warhound enters the battlefield, if an opponent controls more lands than you, // search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true, true)), + new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true)), new OpponentControlsMoreCondition(StaticFilters.FILTER_LANDS), "When {this} enters the battlefield, if an opponent controls more lands than you, " + "search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle." diff --git a/Mage.Sets/src/mage/cards/m/MaestrosTheater.java b/Mage.Sets/src/mage/cards/m/MaestrosTheater.java index 9fe34869dac..5db430d0be6 100644 --- a/Mage.Sets/src/mage/cards/m/MaestrosTheater.java +++ b/Mage.Sets/src/mage/cards/m/MaestrosTheater.java @@ -38,7 +38,7 @@ public final class MaestrosTheater extends CardImpl { // When Maestros Theater enters the battlefield, sacrifice it. When you do, search your library for a basic Island, Swamp, or Mountain card, put it onto the battlefield tapped, then shuffle and you gain 1 life. ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), false); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid( diff --git a/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java b/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java index d06cbef5eea..d6491cb1499 100644 --- a/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java +++ b/Mage.Sets/src/mage/cards/m/MagusOfTheOrder.java @@ -50,7 +50,7 @@ public final class MagusOfTheOrder extends CardImpl { // {G}, {T}, Sacrifice Magus of the Order and another green creature: Search your library for a green creature card and put it onto the battlefield. Then shuffle your library. Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(1, filter), false, true + new TargetCardInLibrary(1, filter), false ), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new CompositeCost( diff --git a/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java b/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java index 8bf7875e6f5..dc082398c5d 100644 --- a/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java +++ b/Mage.Sets/src/mage/cards/m/MwonvuliAcidMoss.java @@ -31,7 +31,7 @@ public final class MwonvuliAcidMoss extends CardImpl { // Destroy target land. Search your library for a Forest card and put that card onto the battlefield tapped. Then shuffle your library. this.getSpellAbility().addEffect(new DestroyTargetEffect()); this.getSpellAbility().addTarget(new TargetPermanent(new FilterLandPermanent())); - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterForest), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filterForest), true)); } private MwonvuliAcidMoss(final MwonvuliAcidMoss card) { diff --git a/Mage.Sets/src/mage/cards/n/NaturalOrder.java b/Mage.Sets/src/mage/cards/n/NaturalOrder.java index 40a8835b64b..d5e44201951 100644 --- a/Mage.Sets/src/mage/cards/n/NaturalOrder.java +++ b/Mage.Sets/src/mage/cards/n/NaturalOrder.java @@ -35,7 +35,7 @@ public final class NaturalOrder extends CardImpl { // As an additional cost to cast Natural Order, sacrifice a green creature. this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1,1,filter, true))); // Search your library for a green creature card and put it onto the battlefield. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(1 , filterCard), false, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(1 , filterCard), false)); } private NaturalOrder(final NaturalOrder card) { diff --git a/Mage.Sets/src/mage/cards/n/NaturesLore.java b/Mage.Sets/src/mage/cards/n/NaturesLore.java index d71c0a68e0f..d2fa03f4a7a 100644 --- a/Mage.Sets/src/mage/cards/n/NaturesLore.java +++ b/Mage.Sets/src/mage/cards/n/NaturesLore.java @@ -28,7 +28,7 @@ public final class NaturesLore extends CardImpl { // Search your library for a Forest card and put that card onto the battlefield. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false)); } private NaturesLore(final NaturesLore card) { diff --git a/Mage.Sets/src/mage/cards/n/NissasExpedition.java b/Mage.Sets/src/mage/cards/n/NissasExpedition.java index 7b11c3195f5..00b2d4d59b1 100644 --- a/Mage.Sets/src/mage/cards/n/NissasExpedition.java +++ b/Mage.Sets/src/mage/cards/n/NissasExpedition.java @@ -23,7 +23,7 @@ public final class NissasExpedition extends CardImpl { // Convoke this.addAbility(new ConvokeAbility()); // Search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS), true)); } private NissasExpedition(final NissasExpedition card) { diff --git a/Mage.Sets/src/mage/cards/o/ObscuraStorefront.java b/Mage.Sets/src/mage/cards/o/ObscuraStorefront.java index 0c4175e5a04..9d2ed946c17 100644 --- a/Mage.Sets/src/mage/cards/o/ObscuraStorefront.java +++ b/Mage.Sets/src/mage/cards/o/ObscuraStorefront.java @@ -38,7 +38,7 @@ public final class ObscuraStorefront extends CardImpl { // When Obscura Storefront enters the battlefield, sacrifice it. When you do, search your library for a basic Plains, Island, or Swamp card, put it onto the battlefield tapped, then shuffle and you gain 1 life. ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), false); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid( diff --git a/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java b/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java index aaeb6122b5e..f4e67aa7509 100644 --- a/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java +++ b/Mage.Sets/src/mage/cards/o/OrdealOfNylea.java @@ -49,7 +49,7 @@ public final class OrdealOfNylea extends CardImpl { this.addAbility(ability); // When you sacrifice Ordeal of Nylea, search your library for up to two basic land cards, put them onto the battlefield tapped, then shuffle your library. ability = new SacrificeSourceTriggeredAbility( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS),true, true),false); + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0,2, StaticFilters.FILTER_CARD_BASIC_LANDS),true),false); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalGrowth.java b/Mage.Sets/src/mage/cards/p/PrimalGrowth.java index 8ab7f90a296..4bcee892a62 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalGrowth.java +++ b/Mage.Sets/src/mage/cards/p/PrimalGrowth.java @@ -30,8 +30,8 @@ public final class PrimalGrowth extends CardImpl { // Search your library for a basic land card, put that card onto the battlefield, then shuffle your library. // If Primal Growth was kicked, instead search your library for up to two basic land cards, put them onto the battlefield, then shuffle your library. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), false, true), - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), false, true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LAND), false), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), false), KickedCondition.ONCE, "Search your library for a basic land card, put that card onto the battlefield, then shuffle. If this spell was kicked, instead search your library for up to two basic land cards, put them onto the battlefield, then shuffle")); } diff --git a/Mage.Sets/src/mage/cards/q/QuirionTrailblazer.java b/Mage.Sets/src/mage/cards/q/QuirionTrailblazer.java index 4ff636ef17f..b59b3ef7f10 100644 --- a/Mage.Sets/src/mage/cards/q/QuirionTrailblazer.java +++ b/Mage.Sets/src/mage/cards/q/QuirionTrailblazer.java @@ -26,7 +26,7 @@ public final class QuirionTrailblazer extends CardImpl { this.toughness = new MageInt(2); // When Quirion Trailblazer enters the battlefield, you may search your library for a basic land card and put that card onto the battlefield tapped. If you do, shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } private QuirionTrailblazer(final QuirionTrailblazer card) { diff --git a/Mage.Sets/src/mage/cards/r/ReshapeTheEarth.java b/Mage.Sets/src/mage/cards/r/ReshapeTheEarth.java index 34f187423d7..14c40af1de6 100644 --- a/Mage.Sets/src/mage/cards/r/ReshapeTheEarth.java +++ b/Mage.Sets/src/mage/cards/r/ReshapeTheEarth.java @@ -20,7 +20,7 @@ public final class ReshapeTheEarth extends CardImpl { // Search your library for up to ten land cards, put them onto the battlefield tapped, then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary( 0, 10, StaticFilters.FILTER_CARD_LANDS - ), true, true)); + ), true)); } private ReshapeTheEarth(final ReshapeTheEarth card) { diff --git a/Mage.Sets/src/mage/cards/r/RiveteersOverlook.java b/Mage.Sets/src/mage/cards/r/RiveteersOverlook.java index 0342de20e66..d8e72eb04cb 100644 --- a/Mage.Sets/src/mage/cards/r/RiveteersOverlook.java +++ b/Mage.Sets/src/mage/cards/r/RiveteersOverlook.java @@ -38,7 +38,7 @@ public final class RiveteersOverlook extends CardImpl { // When Riveteers Overlook enters the battlefield, sacrifice it. When you do, search your library for a basic Swamp, Mountain, or Forest card, put it onto the battlefield tapped, then shuffle and you gain 1 life. ReflexiveTriggeredAbility ability = new ReflexiveTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), false); ability.addEffect(new GainLifeEffect(1).concatBy("and")); this.addAbility(new EntersBattlefieldTriggeredAbility(new DoWhenCostPaid( diff --git a/Mage.Sets/src/mage/cards/s/SamutTheTested.java b/Mage.Sets/src/mage/cards/s/SamutTheTested.java index 69b6dbe9681..6d8a013c20d 100644 --- a/Mage.Sets/src/mage/cards/s/SamutTheTested.java +++ b/Mage.Sets/src/mage/cards/s/SamutTheTested.java @@ -51,7 +51,7 @@ public final class SamutTheTested extends CardImpl { this.addAbility(ability); // -7: Search your library for up to two creature and/or planeswalker cards, put them onto the battlefield, then shuffle your library. - effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), false, true); + effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 2, filter), false); ability = new LoyaltyAbility(effect, -7); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/ScoutThePerimeter.java b/Mage.Sets/src/mage/cards/s/ScoutThePerimeter.java index 89dc0827400..3e8deeec894 100644 --- a/Mage.Sets/src/mage/cards/s/ScoutThePerimeter.java +++ b/Mage.Sets/src/mage/cards/s/ScoutThePerimeter.java @@ -23,7 +23,7 @@ public final class ScoutThePerimeter extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{G}"); // Search your library for a land card, put it onto the battlefield tapped, then suffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterLandCard()), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterLandCard()), true)); // Put a bounty counter on up to one target creature an opponent controls. Effect effect = new AddCountersTargetEffect(CounterType.BOUNTY.createInstance()); diff --git a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java index 17ba7dbb3f2..40934e97e52 100644 --- a/Mage.Sets/src/mage/cards/s/SeedguideAsh.java +++ b/Mage.Sets/src/mage/cards/s/SeedguideAsh.java @@ -32,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), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 3, filter), true), true)); } private SeedguideAsh(final SeedguideAsh card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java index c4a8eba84ea..88753702518 100644 --- a/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java +++ b/Mage.Sets/src/mage/cards/s/ShadowbornApostle.java @@ -45,7 +45,7 @@ public final class ShadowbornApostle extends CardImpl { // A deck can have any number of cards named Shadowborn Apostle. this.getSpellAbility().addEffect(new InfoEffect("A deck can have any number of cards named Shadowborn Apostle.")); // {B}, Sacrifice six creatures named Shadowborn Apostle: Search your library for a Demon creature and put it onto the battlefield. Then shuffle your library. - Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true); + Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{B}")); ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(6,6,filterApostle, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/ShefetMonitor.java b/Mage.Sets/src/mage/cards/s/ShefetMonitor.java index 9a822d32fc9..0e0748bb335 100644 --- a/Mage.Sets/src/mage/cards/s/ShefetMonitor.java +++ b/Mage.Sets/src/mage/cards/s/ShefetMonitor.java @@ -44,7 +44,7 @@ public final class ShefetMonitor extends CardImpl { // When you cycle Shefet Monitor, you may search your library for a basic land card or a Desert card, put it onto the battlefield, then shuffle your library. this.addAbility(new CycleTriggeredAbility( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), true)); } diff --git a/Mage.Sets/src/mage/cards/s/SiftThroughSands.java b/Mage.Sets/src/mage/cards/s/SiftThroughSands.java index b26ca9b1f0b..ee2bdd88355 100644 --- a/Mage.Sets/src/mage/cards/s/SiftThroughSands.java +++ b/Mage.Sets/src/mage/cards/s/SiftThroughSands.java @@ -17,7 +17,6 @@ import mage.filter.common.FilterCreatureCard; import mage.filter.predicate.mageobject.NamePredicate; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.events.GameEvent.EventType; import mage.game.stack.Spell; import mage.target.common.TargetCardInLibrary; import mage.watchers.Watcher; @@ -48,7 +47,7 @@ public final class SiftThroughSands extends CardImpl { this.getSpellAbility().addEffect(effect); // If you've cast a spell named Peer Through Depths and a spell named Reach Through Mists this turn, you may search your library for a card named The Unspeakable, put it onto the battlefield, then shuffle your library. - this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true), new SiftThroughSandsCondition(), rule)); + this.getSpellAbility().addEffect(new ConditionalOneShotEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), new SiftThroughSandsCondition(), rule)); this.getSpellAbility().addWatcher(new SiftThroughSandsWatcher()); } diff --git a/Mage.Sets/src/mage/cards/s/SilkwingScout.java b/Mage.Sets/src/mage/cards/s/SilkwingScout.java index 99651042e0a..ae5126cdd7e 100644 --- a/Mage.Sets/src/mage/cards/s/SilkwingScout.java +++ b/Mage.Sets/src/mage/cards/s/SilkwingScout.java @@ -36,7 +36,7 @@ public final class SilkwingScout extends CardImpl { // {G}, Sacrifice Silkwing Scout: 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), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java b/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java index 73ab95b76ea..25f3047ffe5 100644 --- a/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java +++ b/Mage.Sets/src/mage/cards/s/SilvergladeElemental.java @@ -30,7 +30,7 @@ public final class SilvergladeElemental extends CardImpl { this.power = new MageInt(4); this.toughness = new MageInt(4); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, false), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false), true)); } private SilvergladeElemental(final SilvergladeElemental card) { diff --git a/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java b/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java index f776ac2fb5e..60d30409167 100644 --- a/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java +++ b/Mage.Sets/src/mage/cards/s/SilvergladePathfinder.java @@ -33,7 +33,7 @@ public final class SilvergladePathfinder extends CardImpl { // {1}{G}, {tap}, Discard a card: 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), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/s/SithRuins.java b/Mage.Sets/src/mage/cards/s/SithRuins.java index ffaa8a431d3..7de8c8d1743 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)); + addEffect(new SearchLibraryPutInPlayEffect(target, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/s/SpaceMarineScout.java b/Mage.Sets/src/mage/cards/s/SpaceMarineScout.java index 12c1a4beb62..3979b8de1ac 100644 --- a/Mage.Sets/src/mage/cards/s/SpaceMarineScout.java +++ b/Mage.Sets/src/mage/cards/s/SpaceMarineScout.java @@ -50,7 +50,7 @@ public final class SpaceMarineScout extends CardImpl { // Concealed Position -- When Space Marine Scout enters the battlefield, if an opponent controls more lands than you, you may search your library for a Plains card, put it onto the battlefield tapped, then shuffle. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true), condition, "When {this} enters the battlefield, if an opponent controls more lands " + "than you, you may search your library for a basic Plains card, put it onto the battlefield tapped, then shuffle." ).withFlavorWord("Concealed Position")); diff --git a/Mage.Sets/src/mage/cards/s/Sporocyst.java b/Mage.Sets/src/mage/cards/s/Sporocyst.java index a7bf8d9e51d..252839e66ec 100644 --- a/Mage.Sets/src/mage/cards/s/Sporocyst.java +++ b/Mage.Sets/src/mage/cards/s/Sporocyst.java @@ -73,6 +73,6 @@ class SporocystEffect extends OneShotEffect { int xValue = ManacostVariableValue.ETB.calculate(game, source, this); return new SearchLibraryPutInPlayEffect(new TargetCardInLibrary( 0, xValue, StaticFilters.FILTER_CARD_BASIC_LANDS - ), true, true).apply(game, source); + ), true).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java b/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java index 5548badb030..6277702c4c3 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java +++ b/Mage.Sets/src/mage/cards/s/SylvanPrimordial.java @@ -113,9 +113,8 @@ class SylvanPrimordialEffect extends OneShotEffect { } } if (destroyedCreatures > 0) { - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(destroyedCreatures, filterForest), true, true).apply(game, source); + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(destroyedCreatures, filterForest), true).apply(game, source); } return result; } } - diff --git a/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java b/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java index 21ae5491f03..3299721a0ca 100644 --- a/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java +++ b/Mage.Sets/src/mage/cards/t/TajNarSwordsmith.java @@ -71,7 +71,7 @@ class TajNarSwordsmithEffect extends OneShotEffect { FilterCard filter = new FilterCard("Equipment card with mana value {" + payCount + "} or less"); filter.add(SubType.EQUIPMENT.getPredicate()); filter.add(new ManaValuePredicate(ComparisonType.FEWER_THAN, payCount + 1)); - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, filter), false, true).apply(game, source); + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(0, 1, filter), false).apply(game, source); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/t/TerminalMoraine.java b/Mage.Sets/src/mage/cards/t/TerminalMoraine.java index d03b0e8c786..6be297d0027 100644 --- a/Mage.Sets/src/mage/cards/t/TerminalMoraine.java +++ b/Mage.Sets/src/mage/cards/t/TerminalMoraine.java @@ -29,7 +29,7 @@ public final class TerminalMoraine extends CardImpl { // {tap}: Add {C}. this.addAbility(new ColorlessManaAbility()); // {2}, {tap}, Sacrifice Terminal Moraine: 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), new ManaCostsImpl<>("{2}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/t/ThunderherdMigration.java b/Mage.Sets/src/mage/cards/t/ThunderherdMigration.java index e4ab1f076fb..a6dfb6d4aa2 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderherdMigration.java +++ b/Mage.Sets/src/mage/cards/t/ThunderherdMigration.java @@ -37,7 +37,7 @@ public final class ThunderherdMigration extends CardImpl { )); // Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true)); } private ThunderherdMigration(final ThunderherdMigration card) { diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java b/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java index b601eab24e6..14098e947a2 100644 --- a/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java +++ b/Mage.Sets/src/mage/cards/u/UlvenwaldHydra.java @@ -44,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), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(target, 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 1eff5d1d9ef..1bc8eb97812 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)); + addEffect(new SearchLibraryPutInPlayEffect(target, true)); } @Override diff --git a/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java b/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java index bcb2f56ddb1..7efbe4f33c1 100644 --- a/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java +++ b/Mage.Sets/src/mage/cards/v/VerdantCrescendo.java @@ -29,7 +29,7 @@ public final class VerdantCrescendo extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{3}{G}"); // Search your library for a basic land card and put it onto the battlefield tapped. - this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, false)); + this.getSpellAbility().addEffect(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true)); // Search your library and graveyard for a card named Nissa, Nature's Artisan, reveal it, and put it into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryGraveyardPutInHandEffect(filter, true)); diff --git a/Mage.Sets/src/mage/cards/w/WarpedLandscape.java b/Mage.Sets/src/mage/cards/w/WarpedLandscape.java index 806b22c726e..9d3dbc7f19a 100644 --- a/Mage.Sets/src/mage/cards/w/WarpedLandscape.java +++ b/Mage.Sets/src/mage/cards/w/WarpedLandscape.java @@ -31,7 +31,7 @@ public final class WarpedLandscape extends CardImpl { // {2}, {T}, Sacrifice Warped Landscape: Search your library for a basic land card and put it 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), + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java index 4cc05760573..1b16cd2067f 100644 --- a/Mage.Sets/src/mage/cards/w/WayfarersBauble.java +++ b/Mage.Sets/src/mage/cards/w/WayfarersBauble.java @@ -27,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), new GenericManaCost(2)); + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND),true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WhisperSquad.java b/Mage.Sets/src/mage/cards/w/WhisperSquad.java index 131911a62cf..dea375ccbcf 100644 --- a/Mage.Sets/src/mage/cards/w/WhisperSquad.java +++ b/Mage.Sets/src/mage/cards/w/WhisperSquad.java @@ -35,7 +35,7 @@ public final class WhisperSquad extends CardImpl { // {1}{B}: Search your library for a card named Whisper Squad, put it onto the battlefield tapped, then shuffle your library. this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInPlayEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), new ManaCostsImpl<>("{1}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/w/WildWanderer.java b/Mage.Sets/src/mage/cards/w/WildWanderer.java index a63db7564ea..9079040c0f9 100644 --- a/Mage.Sets/src/mage/cards/w/WildWanderer.java +++ b/Mage.Sets/src/mage/cards/w/WildWanderer.java @@ -27,7 +27,7 @@ public final class WildWanderer extends CardImpl { this.toughness = new MageInt(2); // When Wild Wanderer enters the battlefield, you may search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } private WildWanderer(final WildWanderer card) { diff --git a/Mage.Sets/src/mage/cards/w/WoodElves.java b/Mage.Sets/src/mage/cards/w/WoodElves.java index 4a78fda52bc..1eccef731d1 100644 --- a/Mage.Sets/src/mage/cards/w/WoodElves.java +++ b/Mage.Sets/src/mage/cards/w/WoodElves.java @@ -33,7 +33,7 @@ public final class WoodElves extends CardImpl { this.toughness = new MageInt(1); // When Wood Elves enters the battlefield, search your library for a Forest card and put that card onto the battlefield. Then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false, true))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), false))); } private WoodElves(final WoodElves card) { diff --git a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java index fd12039b687..dea28b8af54 100644 --- a/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java +++ b/Mage/src/main/java/mage/abilities/common/FetchLandActivatedAbility.java @@ -32,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)); + addEffect(new SearchLibraryPutInPlayEffect(target, false)); } 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 2f12bb78e9e..ddb9a083ac7 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 @@ -21,14 +21,10 @@ public class SearchLibraryPutInPlayEffect extends SearchEffect { protected boolean optional; public SearchLibraryPutInPlayEffect(TargetCardInLibrary target) { - this(target, false, true); + this(target, false); } public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped) { - this(target, tapped, true); - } - - public SearchLibraryPutInPlayEffect(TargetCardInLibrary target, boolean tapped, boolean forceShuffle) { this(target, tapped, true, 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 ed114e237ed..ebbe052b57d 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukCallerOfBeastsEmblem.java @@ -22,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); + Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(new FilterCreatureCard("creature card")), false); 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 3ba9993644e..3ae58931f18 100644 --- a/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java +++ b/Mage/src/main/java/mage/game/command/emblems/GarrukUnleashedEmblem.java @@ -13,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) + Effect effect = new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), false) .setText("search your library for a creature card, put it onto the battlefield, then shuffle"); this.getAbilities().add(new BeginningOfYourEndStepTriggeredAbility(Zone.COMMAND, effect, true)); }