diff --git a/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java b/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java index 13cab130e38..247175e96fd 100644 --- a/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java +++ b/Mage.Sets/src/mage/cards/a/AlpineHoundmaster.java @@ -51,7 +51,7 @@ public final class AlpineHoundmaster extends CardImpl { // When Alpine Houndmaster enters the battlefield, you may search your library for a card named Alpine Watchdog and/or a card named Igneous Cur, reveal them, put them into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardWithDifferentNameInLibrary(0, 2, filter2), true, true + new TargetCardWithDifferentNameInLibrary(0, 2, filter2), true ).setText("search your library for a card named Alpine Watchdog and/or a card named Igneous Cur, reveal them, put them into your hand, then shuffle"), true)); // Whenever Alpine Houndmaster attacks, it gets +X/+0 until end of turn, where X is the number of other attacking creatures. diff --git a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java index 473a9383d62..d33311cf118 100644 --- a/Mage.Sets/src/mage/cards/a/ArmillarySphere.java +++ b/Mage.Sets/src/mage/cards/a/ArmillarySphere.java @@ -27,7 +27,7 @@ public final class ArmillarySphere extends CardImpl { // {2}, {tap}, Sacrifice Armillary Sphere: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(2)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/a/AssemblyHall.java b/Mage.Sets/src/mage/cards/a/AssemblyHall.java index b9a5055a3a3..0d07ecdf66b 100644 --- a/Mage.Sets/src/mage/cards/a/AssemblyHall.java +++ b/Mage.Sets/src/mage/cards/a/AssemblyHall.java @@ -87,6 +87,6 @@ class AssemblyHallEffect extends OneShotEffect { String nameToSearch = CardUtil.getCardNameForSameNameSearch(cardToReveal); FilterCard filterCard = new FilterCard("card named " + nameToSearch); filterCard.add(new NamePredicate(nameToSearch)); - return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true, true).apply(game, source); + return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/a/Avarax.java b/Mage.Sets/src/mage/cards/a/Avarax.java index 7b8dc4ba362..8a8d71597a8 100644 --- a/Mage.Sets/src/mage/cards/a/Avarax.java +++ b/Mage.Sets/src/mage/cards/a/Avarax.java @@ -40,7 +40,7 @@ public final class Avarax extends CardImpl { // When Avarax enters the battlefield, you may search your library for a card named Avarax, reveal it, and put it into your hand. If you do, shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(1, filter), true, true + new TargetCardInLibrary(1, filter), true ), true)); // {1}{R}: Avarax gets +1/+0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/a/AyarasOathsworn.java b/Mage.Sets/src/mage/cards/a/AyarasOathsworn.java index 8525bf20fe8..25c7360f97b 100644 --- a/Mage.Sets/src/mage/cards/a/AyarasOathsworn.java +++ b/Mage.Sets/src/mage/cards/a/AyarasOathsworn.java @@ -47,7 +47,7 @@ public final class AyarasOathsworn extends CardImpl { "search your library for a card, put it into your hand, then shuffle." ); ability.addEffect(new ConditionalOneShotEffect( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), condition2 + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), condition2 )); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/b/BattalionFootSoldier.java b/Mage.Sets/src/mage/cards/b/BattalionFootSoldier.java index 1d3b9ad80c3..9c0d32a3df1 100644 --- a/Mage.Sets/src/mage/cards/b/BattalionFootSoldier.java +++ b/Mage.Sets/src/mage/cards/b/BattalionFootSoldier.java @@ -34,7 +34,7 @@ public final class BattalionFootSoldier extends CardImpl { // When Battalion Foot Soldier enters the battlefield, you may search your library for any number of cards named Battalion Foot Soldier, reveal them, put them into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), true, true + new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java b/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java index a0d235b6920..97f584788c7 100644 --- a/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java +++ b/Mage.Sets/src/mage/cards/b/BeholdTheBeyond.java @@ -23,7 +23,7 @@ public final class BeholdTheBeyond extends CardImpl { // Discard your hand. Search your library for three cards and put those cards into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new DiscardHandControllerEffect()); TargetCardInLibrary target = new TargetCardInLibrary(0, 3, new FilterCard("cards")); - Effect effect = new SearchLibraryPutInHandEffect(target); + Effect effect = new SearchLibraryPutInHandEffect(target, false); effect.setText("Search your library for three cards, put those cards into your hand, then shuffle"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java b/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java index 4ce848f2d64..0e3801e0ad3 100644 --- a/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java +++ b/Mage.Sets/src/mage/cards/b/BeseechTheQueen.java @@ -27,7 +27,7 @@ public final class BeseechTheQueen extends CardImpl { // ({2B} can be paid with any two mana or with {B}. This card's converted mana cost is 6.) // Search your library for a card with converted mana cost less than or equal to the number of lands you control, reveal it, and put it into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); } private BeseechTheQueen(final BeseechTheQueen card) { diff --git a/Mage.Sets/src/mage/cards/b/BloodSpeaker.java b/Mage.Sets/src/mage/cards/b/BloodSpeaker.java index e7d9f887e06..455779fcadc 100644 --- a/Mage.Sets/src/mage/cards/b/BloodSpeaker.java +++ b/Mage.Sets/src/mage/cards/b/BloodSpeaker.java @@ -43,7 +43,7 @@ public final class BloodSpeaker extends CardImpl { // At the beginning of your upkeep, you may sacrifice Blood Speaker. If you do, search your library for a Demon card, reveal that card, and put it into your hand. Then shuffle your library. Ability ability = new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new DoIfCostPaid( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true, true, "search your library for "), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true), new SacrificeSourceCost() ), TargetController.YOU, diff --git a/Mage.Sets/src/mage/cards/b/BorderlandRanger.java b/Mage.Sets/src/mage/cards/b/BorderlandRanger.java index 228c9674041..8d142a7b83b 100644 --- a/Mage.Sets/src/mage/cards/b/BorderlandRanger.java +++ b/Mage.Sets/src/mage/cards/b/BorderlandRanger.java @@ -27,7 +27,7 @@ public final class BorderlandRanger extends CardImpl { this.toughness = new MageInt(2); // When Borderland Ranger enters the battlefield, you may search your library for a basic land card, reveal it, and put it into your hand. If you do, shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } private BorderlandRanger(final BorderlandRanger card) { diff --git a/Mage.Sets/src/mage/cards/b/BoseijuReachesSkyward.java b/Mage.Sets/src/mage/cards/b/BoseijuReachesSkyward.java index 61aa70ab4e1..a7d623109af 100644 --- a/Mage.Sets/src/mage/cards/b/BoseijuReachesSkyward.java +++ b/Mage.Sets/src/mage/cards/b/BoseijuReachesSkyward.java @@ -45,7 +45,7 @@ public final class BoseijuReachesSkyward extends CardImpl { this, SagaChapter.CHAPTER_I, new SearchLibraryPutInHandEffect(new TargetCardInLibrary( 0, 2, filter - ), true, true) + ), true) ); // II — Put up to one target land card from your graveyard on top of your library. diff --git a/Mage.Sets/src/mage/cards/b/Bossk.java b/Mage.Sets/src/mage/cards/b/Bossk.java index d6b2f40b4b1..58c0f24c7a6 100644 --- a/Mage.Sets/src/mage/cards/b/Bossk.java +++ b/Mage.Sets/src/mage/cards/b/Bossk.java @@ -44,7 +44,7 @@ public final class Bossk extends CardImpl { this.addAbility(new BosskTriggeredAbility()); // Bounty — Whenever a creature an opponent controls with a bounty counter on it dies, you may search your library for a basic land card, reveal it, and put it in to your hand. If you do, shuffle your library. - this.addAbility(new BountyAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new BountyAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } private Bossk(final Bossk card) { diff --git a/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java b/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java index 86ef5e1b780..6d499756344 100644 --- a/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java +++ b/Mage.Sets/src/mage/cards/b/BraidwoodSextant.java @@ -27,7 +27,7 @@ public final class BraidwoodSextant extends CardImpl { // {2}, {tap}, Sacrifice Braidwood Sextant: Search your library for a basic land card, reveal that card, and put it into your hand. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{2}")); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java index 770c29971e5..4a454ff8398 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainPhasma.java +++ b/Mage.Sets/src/mage/cards/c/CaptainPhasma.java @@ -51,7 +51,7 @@ public final class CaptainPhasma extends CardImpl { new GainAbilityControlledEffect(ability, Duration.WhileOnBattlefield, filter, false))); // {W}{U}{B}{R}{G}: Search your library for a Trooper creature card, reveal it, put it into your hand, then shuffle your library. - this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true, true), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); + this.addAbility(new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true), new ManaCostsImpl<>("{W}{U}{B}{R}{G}"))); } private CaptainPhasma(final CaptainPhasma card) { diff --git a/Mage.Sets/src/mage/cards/c/CaptainSisay.java b/Mage.Sets/src/mage/cards/c/CaptainSisay.java index 1fe7331e7da..8bafa8a502d 100644 --- a/Mage.Sets/src/mage/cards/c/CaptainSisay.java +++ b/Mage.Sets/src/mage/cards/c/CaptainSisay.java @@ -37,7 +37,7 @@ public final class CaptainSisay extends CardImpl { this.toughness = new MageInt(2); // {tap}: Search your library for a legendary card, reveal that card, and put it into your hand. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new TapSourceCost())); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new TapSourceCost())); } private CaptainSisay(final CaptainSisay card) { diff --git a/Mage.Sets/src/mage/cards/c/Conflux.java b/Mage.Sets/src/mage/cards/c/Conflux.java index 3c95b7aced8..72e1ec7587d 100644 --- a/Mage.Sets/src/mage/cards/c/Conflux.java +++ b/Mage.Sets/src/mage/cards/c/Conflux.java @@ -23,7 +23,7 @@ public final class Conflux extends CardImpl { // Search your library for a white card, a blue card, a black card, a red card, and a green card. Reveal those cards and put them into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect( - new ConfluxTarget(), true, true + new ConfluxTarget(), true ).setText("search your library for a white card, a blue card, a black card, a red card, and a green card. " + "Reveal those cards, put them into your hand, then shuffle")); } diff --git a/Mage.Sets/src/mage/cards/c/CovetedPrize.java b/Mage.Sets/src/mage/cards/c/CovetedPrize.java index 95a0aee9705..84fe8962dfb 100644 --- a/Mage.Sets/src/mage/cards/c/CovetedPrize.java +++ b/Mage.Sets/src/mage/cards/c/CovetedPrize.java @@ -39,7 +39,7 @@ public final class CovetedPrize extends CardImpl { ).addHint(PartyCountHint.instance).setRuleAtTheTop(true)); // Search your library for a card, put it into your hand, then shuffle your library. If you have a full party, you may cast a spell with converted mana cost 4 or less from your hand without paying its mana cost. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new CastFromHandForFreeEffect(filter), FullPartyCondition.instance, "If you have a full party, " + diff --git a/Mage.Sets/src/mage/cards/d/DarkPetition.java b/Mage.Sets/src/mage/cards/d/DarkPetition.java index 1b3733e5da0..74e7c82851d 100644 --- a/Mage.Sets/src/mage/cards/d/DarkPetition.java +++ b/Mage.Sets/src/mage/cards/d/DarkPetition.java @@ -23,7 +23,7 @@ public final class DarkPetition extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{3}{B}{B}"); // Search your library for a card and put that card into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); // Spell mastery — If there are two or more instant and/or sorcery cards in your graveyard, add {B}{B}{B}. Effect effect = new ConditionalOneShotEffect(new AddManaToManaPoolSourceControllerEffect(Mana.BlackMana(3)), diff --git a/Mage.Sets/src/mage/cards/d/DaruCavalier.java b/Mage.Sets/src/mage/cards/d/DaruCavalier.java index 509c5cc528e..9e01ab2555e 100644 --- a/Mage.Sets/src/mage/cards/d/DaruCavalier.java +++ b/Mage.Sets/src/mage/cards/d/DaruCavalier.java @@ -39,7 +39,7 @@ public final class DaruCavalier extends CardImpl { // When Daru Cavalier enters the battlefield, you may search your library for a card named Daru Cavalier, reveal it, and put it into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private DaruCavalier(final DaruCavalier card) { diff --git a/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java b/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java index eb8de3581c0..bd5a61690c2 100644 --- a/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java +++ b/Mage.Sets/src/mage/cards/d/DeadeyeQuartermaster.java @@ -38,7 +38,7 @@ public final class DeadeyeQuartermaster extends CardImpl { // When Deadeye Quartermaster enters the battlefield, you may search your library for an Equipment or a Vehicle card and put it into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private DeadeyeQuartermaster(final DeadeyeQuartermaster card) { diff --git a/Mage.Sets/src/mage/cards/d/DemonicTutor.java b/Mage.Sets/src/mage/cards/d/DemonicTutor.java index 512e9d0f12e..52bcecfb3f5 100644 --- a/Mage.Sets/src/mage/cards/d/DemonicTutor.java +++ b/Mage.Sets/src/mage/cards/d/DemonicTutor.java @@ -17,7 +17,7 @@ public final class DemonicTutor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}"); // Search your library for a card and put that card into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); } private DemonicTutor(final DemonicTutor card) { diff --git a/Mage.Sets/src/mage/cards/d/DiabolicIntent.java b/Mage.Sets/src/mage/cards/d/DiabolicIntent.java index 010f7a8a02f..4748b36592c 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicIntent.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicIntent.java @@ -24,7 +24,7 @@ public final class DiabolicIntent extends CardImpl { this.getSpellAbility().addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT))); // Search your library for a card and put that card into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); } private DiabolicIntent(final DiabolicIntent card) { diff --git a/Mage.Sets/src/mage/cards/d/DiabolicTutor.java b/Mage.Sets/src/mage/cards/d/DiabolicTutor.java index e82ecc17fe6..505e5ce75fc 100644 --- a/Mage.Sets/src/mage/cards/d/DiabolicTutor.java +++ b/Mage.Sets/src/mage/cards/d/DiabolicTutor.java @@ -19,7 +19,7 @@ public final class DiabolicTutor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}{B}"); TargetCardInLibrary target = new TargetCardInLibrary(); - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(target)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(target, false)); } private DiabolicTutor(final DiabolicTutor card) { diff --git a/Mage.Sets/src/mage/cards/d/DigUp.java b/Mage.Sets/src/mage/cards/d/DigUp.java index e13037699a0..2e3687d139e 100644 --- a/Mage.Sets/src/mage/cards/d/DigUp.java +++ b/Mage.Sets/src/mage/cards/d/DigUp.java @@ -19,7 +19,7 @@ public final class DigUp extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{G}"); // Cleave {1}{B}{B}{G} - this.addAbility(new CleaveAbility(this, new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), "{1}{B}{B}{G}")); + this.addAbility(new CleaveAbility(this, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), "{1}{B}{B}{G}")); // Search your library for a [basic land] card, [reveal it,] put it into your hand, then shuffle. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect( diff --git a/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java b/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java index 1834f1c9d86..855cb3b1c02 100644 --- a/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java +++ b/Mage.Sets/src/mage/cards/d/DiscipleOfDeceit.java @@ -87,7 +87,7 @@ class DiscipleOfDeceitEffect extends OneShotEffect { String targetName = "card with mana value of " + card.getManaValue(); FilterCard filter = new FilterCard(targetName); filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, card.getManaValue())); - return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true).apply(game, source); + return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true).apply(game, source); } } return true; diff --git a/Mage.Sets/src/mage/cards/d/DistrictGuide.java b/Mage.Sets/src/mage/cards/d/DistrictGuide.java index 86787896f78..9f4ce28ccbc 100644 --- a/Mage.Sets/src/mage/cards/d/DistrictGuide.java +++ b/Mage.Sets/src/mage/cards/d/DistrictGuide.java @@ -42,7 +42,7 @@ public final class DistrictGuide extends CardImpl { // When District Guide enters the battlefield, you may search your library for a basic land card or Gate card, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility( new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true )); } diff --git a/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java b/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java index 677d0369073..601d24a6202 100644 --- a/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java +++ b/Mage.Sets/src/mage/cards/d/DjeruWithEyesOpen.java @@ -48,7 +48,7 @@ public final class DjeruWithEyesOpen extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // When Djeru, With Eyes Open enters the battlefield, you may search your library for a planeswalker card, reveal it, put it into your hand, then shuffle your library. - Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, filter), true, true); + Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, filter), true); effect.setText("you may search your library for a planeswalker card, reveal it, put it into your hand, then shuffle"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); diff --git a/Mage.Sets/src/mage/cards/d/DraconicMuralists.java b/Mage.Sets/src/mage/cards/d/DraconicMuralists.java index 50e7bd7483b..79799af73be 100644 --- a/Mage.Sets/src/mage/cards/d/DraconicMuralists.java +++ b/Mage.Sets/src/mage/cards/d/DraconicMuralists.java @@ -33,7 +33,7 @@ public final class DraconicMuralists extends CardImpl { // When Draconic Muralists dies, you may search your library for a Dragon card, reveal it, put it into your hand, then shuffle. this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/e/EladamrisCall.java b/Mage.Sets/src/mage/cards/e/EladamrisCall.java index 5084d7b851e..06ee7c2e286 100644 --- a/Mage.Sets/src/mage/cards/e/EladamrisCall.java +++ b/Mage.Sets/src/mage/cards/e/EladamrisCall.java @@ -25,7 +25,7 @@ public final class EladamrisCall extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{G}{W}"); // Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); } private EladamrisCall(final EladamrisCall card) { diff --git a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java index 034eb05e374..5c390bff330 100644 --- a/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java +++ b/Mage.Sets/src/mage/cards/e/EmbermageGoblin.java @@ -41,7 +41,7 @@ public final class EmbermageGoblin extends CardImpl { // When Embermage Goblin enters the battlefield, you may search your library for a card named Embermage Goblin, reveal it, and put it into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); // {tap}: Embermage Goblin deals 1 damage to any target. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(1), new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/e/EverythingamajigE.java b/Mage.Sets/src/mage/cards/e/EverythingamajigE.java index a45f3cfdc79..7174c0582f4 100644 --- a/Mage.Sets/src/mage/cards/e/EverythingamajigE.java +++ b/Mage.Sets/src/mage/cards/e/EverythingamajigE.java @@ -92,7 +92,7 @@ class UrzasHotTubEffect extends OneShotEffect { if (discardedCard != null) { FilterCard filter = new FilterCard(); filter.add(new UrzasHotTubPredicate(discardedCard.getName())); - return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true).apply(game, source); + return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true).apply(game, source); } } } diff --git a/Mage.Sets/src/mage/cards/e/EvolutionCharm.java b/Mage.Sets/src/mage/cards/e/EvolutionCharm.java index cf42236dfa5..55bfbf874aa 100644 --- a/Mage.Sets/src/mage/cards/e/EvolutionCharm.java +++ b/Mage.Sets/src/mage/cards/e/EvolutionCharm.java @@ -25,7 +25,7 @@ public final class EvolutionCharm extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{G}"); // Choose one - Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library; - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true).setText("Search your library for a basic land card, reveal it, put it into your hand, then shuffle")); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true).setText("Search your library for a basic land card, reveal it, put it into your hand, then shuffle")); // or return target creature card from your graveyard to your hand; Mode mode = new Mode(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/f/Farfinder.java b/Mage.Sets/src/mage/cards/f/Farfinder.java index 02595becd95..b18b585be18 100644 --- a/Mage.Sets/src/mage/cards/f/Farfinder.java +++ b/Mage.Sets/src/mage/cards/f/Farfinder.java @@ -30,7 +30,7 @@ public final class Farfinder extends CardImpl { // When Farfinder etners the battlefield, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true + new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/f/FierceEmpath.java b/Mage.Sets/src/mage/cards/f/FierceEmpath.java index d1d7307c7ba..d3ff09356df 100644 --- a/Mage.Sets/src/mage/cards/f/FierceEmpath.java +++ b/Mage.Sets/src/mage/cards/f/FierceEmpath.java @@ -34,7 +34,7 @@ public final class FierceEmpath extends CardImpl { // When Fierce Empath enters the battlefield, you may search your library for a creature card with converted mana cost 6 or greater, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true) + new TargetCardInLibrary(filter), true) .setText("search your library for a creature card with mana value 6 or greater, reveal it, put it into your hand, then shuffle"), true)); } diff --git a/Mage.Sets/src/mage/cards/f/FlowerFlourish.java b/Mage.Sets/src/mage/cards/f/FlowerFlourish.java index f9aab0988ff..3d53d47189b 100644 --- a/Mage.Sets/src/mage/cards/f/FlowerFlourish.java +++ b/Mage.Sets/src/mage/cards/f/FlowerFlourish.java @@ -38,7 +38,7 @@ public final class FlowerFlourish extends SplitCard { // Search your library for a basic Forest or Plains card, reveal it, put it into your hand, then shuffle your library. this.getLeftHalfCard().getSpellAbility().addEffect( new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ) ); diff --git a/Mage.Sets/src/mage/cards/f/FromBeyond.java b/Mage.Sets/src/mage/cards/f/FromBeyond.java index 986433be3ba..aa3a78cc174 100644 --- a/Mage.Sets/src/mage/cards/f/FromBeyond.java +++ b/Mage.Sets/src/mage/cards/f/FromBeyond.java @@ -43,7 +43,7 @@ public final class FromBeyond extends CardImpl { // {1}{G}, Sacrifice From Beyond: Search your library for an Eldrazi card, reveal it, put it into your hand, then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{1}{G}")); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java b/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java index e6b0102c6aa..0c40a3f676a 100644 --- a/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java +++ b/Mage.Sets/src/mage/cards/f/FrostpyreArcanist.java @@ -65,7 +65,7 @@ public final class FrostpyreArcanist extends CardImpl { // When Frostpyre Arcanist enters the battlefield, search your library for an instant or sorcery card with the same name as a card in your graveyard, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter2), true, true + new TargetCardInLibrary(filter2), true ))); } @@ -95,4 +95,4 @@ enum FrostpyreArcanistPredicate implements ObjectSourcePlayerPredicate { .map(MageObject::getName) .anyMatch(input.getObject().getName()::equals); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/g/Gamble.java b/Mage.Sets/src/mage/cards/g/Gamble.java index 79d4114fcf6..dbda8c5554f 100644 --- a/Mage.Sets/src/mage/cards/g/Gamble.java +++ b/Mage.Sets/src/mage/cards/g/Gamble.java @@ -21,7 +21,7 @@ public final class Gamble extends CardImpl { // Search your library for a card, put that card into your hand, discard a card at random, then shuffle your library. - Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true); + Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false); effect.setText("Search your library for a card, put that card into your hand"); this.getSpellAbility().addEffect(effect); effect = new DiscardControllerEffect(1, true); diff --git a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java index 5ff914cd617..4a7300c6f36 100644 --- a/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java +++ b/Mage.Sets/src/mage/cards/g/GarrukTheVeilCursed.java @@ -49,7 +49,7 @@ public final class GarrukTheVeilCursed extends CardImpl { this.addAbility(new LoyaltyAbility(new DoIfCostPaid( new SearchLibraryPutInHandEffect(new TargetCardInLibrary( StaticFilters.FILTER_CARD_CREATURE_A - ), true, true), + ), true), null, new SacrificeTargetCost(new TargetControlledPermanent( StaticFilters.FILTER_CONTROLLED_CREATURE_SHORT_TEXT diff --git a/Mage.Sets/src/mage/cards/g/GatecreeperVine.java b/Mage.Sets/src/mage/cards/g/GatecreeperVine.java index 1a3f2eabc47..d13ba0f4d87 100644 --- a/Mage.Sets/src/mage/cards/g/GatecreeperVine.java +++ b/Mage.Sets/src/mage/cards/g/GatecreeperVine.java @@ -45,7 +45,7 @@ public final class GatecreeperVine extends CardImpl { // When Gatecreeper Vine enters the battlefield, you may search your library for a basic land card or a Gate card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private GatecreeperVine(final GatecreeperVine card) { diff --git a/Mage.Sets/src/mage/cards/g/GatheringThrong.java b/Mage.Sets/src/mage/cards/g/GatheringThrong.java index 05ea13dd378..e97ab916257 100644 --- a/Mage.Sets/src/mage/cards/g/GatheringThrong.java +++ b/Mage.Sets/src/mage/cards/g/GatheringThrong.java @@ -34,7 +34,7 @@ public final class GatheringThrong extends CardImpl { // When Gathering Throng enters the battlefield, you may search your library for any number of cards named Gathering Throng, reveal them, put them into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), true, true + new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/g/GeneralTazri.java b/Mage.Sets/src/mage/cards/g/GeneralTazri.java index 1e0dd30a35d..988231f2b63 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralTazri.java +++ b/Mage.Sets/src/mage/cards/g/GeneralTazri.java @@ -43,7 +43,7 @@ public final class GeneralTazri extends CardImpl { // When General Tazri enters the battlefield, you may search your library for an Ally creature card, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true), true)); + new TargetCardInLibrary(filter), true), true)); // {W}{U}{B}{R}{G}: Ally creatures you control get +X/+X until end of turn, where X is the number of colors among those creatures. DynamicValue xValue = new GeneralTazriColorCount(); BoostControlledEffect effect = new BoostControlledEffect(xValue, xValue, Duration.EndOfTurn, new FilterCreaturePermanent(SubType.ALLY, "Ally creatures"), false); diff --git a/Mage.Sets/src/mage/cards/g/Greenseeker.java b/Mage.Sets/src/mage/cards/g/Greenseeker.java index cc36223b333..587d891de60 100644 --- a/Mage.Sets/src/mage/cards/g/Greenseeker.java +++ b/Mage.Sets/src/mage/cards/g/Greenseeker.java @@ -33,7 +33,7 @@ public final class Greenseeker extends CardImpl { // {G}, {tap}, Discard a card: Search your library for a basic land card, reveal it, and put it into your hand. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, StaticFilters.FILTER_CARD_BASIC_LAND), true), new ManaCostsImpl<>("{G}")); ability.addCost(new TapSourceCost()); ability.addCost(new DiscardCardCost()); diff --git a/Mage.Sets/src/mage/cards/g/GrimTutor.java b/Mage.Sets/src/mage/cards/g/GrimTutor.java index bb8c3f5d687..312eb32b0a3 100644 --- a/Mage.Sets/src/mage/cards/g/GrimTutor.java +++ b/Mage.Sets/src/mage/cards/g/GrimTutor.java @@ -18,7 +18,7 @@ public final class GrimTutor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{B}{B}"); // Search your library for a card and put that card into your hand, then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); // You lose 3 life. this.getSpellAbility().addEffect(new LoseLifeSourceControllerEffect(3)); diff --git a/Mage.Sets/src/mage/cards/g/Grozoth.java b/Mage.Sets/src/mage/cards/g/Grozoth.java index 9bafeffc8be..0e5d3165328 100644 --- a/Mage.Sets/src/mage/cards/g/Grozoth.java +++ b/Mage.Sets/src/mage/cards/g/Grozoth.java @@ -42,7 +42,7 @@ public final class Grozoth extends CardImpl { // When Grozoth enters the battlefield, you may search your library for any number of cards that have converted mana cost 9, reveal them, and put them into your hand. If you do, shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), true, true + new TargetCardInLibrary(0, Integer.MAX_VALUE, filter), true ), true)); // {4}: Grozoth loses defender until end of turn. diff --git a/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java b/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java index 74ea14fa65d..4564a714385 100644 --- a/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java +++ b/Mage.Sets/src/mage/cards/h/HeliodsPilgrim.java @@ -34,7 +34,7 @@ public final class HeliodsPilgrim extends CardImpl { this.toughness = new MageInt(2); // When Heliod's Pilgrim enters the battlefield, you may search your library for an Aura card, reveal it, put it into your hand, then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); } diff --git a/Mage.Sets/src/mage/cards/h/HerdMigration.java b/Mage.Sets/src/mage/cards/h/HerdMigration.java index adb3973d806..8cacc166860 100644 --- a/Mage.Sets/src/mage/cards/h/HerdMigration.java +++ b/Mage.Sets/src/mage/cards/h/HerdMigration.java @@ -37,7 +37,7 @@ public final class HerdMigration extends CardImpl { Ability ability = new SimpleActivatedAbility( Zone.HAND, new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND_A), true, true + new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND_A), true ), new ManaCostsImpl<>("{1}{G}") ); ability.addCost(new DiscardSourceCost()); diff --git a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java index bf35319a744..eb5599d7e3a 100644 --- a/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java +++ b/Mage.Sets/src/mage/cards/h/HigureTheStillWind.java @@ -7,7 +7,6 @@ import mage.abilities.Ability; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.mana.GenericManaCost; -import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.combat.CantBeBlockedTargetEffect; import mage.abilities.effects.common.search.SearchLibraryPutInHandEffect; import mage.abilities.keyword.NinjutsuAbility; @@ -49,7 +48,7 @@ public final class HigureTheStillWind extends CardImpl { this.addAbility(new NinjutsuAbility("{2}{U}{U}")); // Whenever Higure, the Still Wind deals combat damage to a player, you may search your library for a Ninja card, reveal it, and put it into your hand. If you do, shuffle your library. - this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, false), true)); + this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); // {2}: Target Ninja creature can't be blocked this turn. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeBlockedTargetEffect(), new GenericManaCost(2)); diff --git a/Mage.Sets/src/mage/cards/h/HowlingWolf.java b/Mage.Sets/src/mage/cards/h/HowlingWolf.java index 66c5d5cae21..1d3e8ffbfe6 100644 --- a/Mage.Sets/src/mage/cards/h/HowlingWolf.java +++ b/Mage.Sets/src/mage/cards/h/HowlingWolf.java @@ -33,7 +33,7 @@ public final class HowlingWolf extends CardImpl { // When Howling Wolf enters the battlefield, you may search your library for up to three cards named Howling Wolf, reveal them, and put them into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 3, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private HowlingWolf(final HowlingWolf card) { diff --git a/Mage.Sets/src/mage/cards/i/IllicitShipment.java b/Mage.Sets/src/mage/cards/i/IllicitShipment.java index 0a68caf7df4..9f2aef2ab07 100644 --- a/Mage.Sets/src/mage/cards/i/IllicitShipment.java +++ b/Mage.Sets/src/mage/cards/i/IllicitShipment.java @@ -21,7 +21,7 @@ public final class IllicitShipment extends CardImpl { this.addAbility(new CasualtyAbility(3)); // Search your library for a card, put that card into your hand, then shuffle. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); } private IllicitShipment(final IllicitShipment card) { diff --git a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java index b4828d0c6e6..d4dbbd9d431 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialHellkite.java +++ b/Mage.Sets/src/mage/cards/i/ImperialHellkite.java @@ -35,7 +35,7 @@ public final class ImperialHellkite extends CardImpl { this.addAbility(new MorphAbility(new ManaCostsImpl<>("{6}{R}{R}"))); // When Imperial Hellkite is turned face up, you may search your library for a Dragon card, reveal it, and put it into your hand. If you do, shuffle your library. - Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, new FilterBySubtypeCard(SubType.DRAGON)), true, true); + Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, new FilterBySubtypeCard(SubType.DRAGON)), true); effect.setText("you may search your library for a Dragon card, reveal it, and put it into your hand. If you do, shuffle"); this.addAbility(new TurnedFaceUpSourceTriggeredAbility(effect)); } diff --git a/Mage.Sets/src/mage/cards/i/ImperialRecruiter.java b/Mage.Sets/src/mage/cards/i/ImperialRecruiter.java index 9fead6309c2..475b4b084c6 100644 --- a/Mage.Sets/src/mage/cards/i/ImperialRecruiter.java +++ b/Mage.Sets/src/mage/cards/i/ImperialRecruiter.java @@ -35,7 +35,7 @@ public final class ImperialRecruiter extends CardImpl { this.toughness = new MageInt(1); // When Imperial Recruiter enters the battlefield, search your library for a creature card with power 2 or less, reveal it, and put it into your hand. Then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true))); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true))); } private ImperialRecruiter(final ImperialRecruiter card) { diff --git a/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java b/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java index 37c60155d8b..fd82a208830 100644 --- a/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java +++ b/Mage.Sets/src/mage/cards/i/IncreasingAmbition.java @@ -9,7 +9,6 @@ import mage.abilities.keyword.FlashbackAbility; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.TimingRule; import mage.constants.Zone; import mage.filter.StaticFilters; import mage.game.Game; @@ -28,8 +27,8 @@ public final class IncreasingAmbition extends CardImpl { // Search your library for a card and put that card into your hand. If this spell was cast from a graveyard, instead search your library for two cards and put those cards into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new ConditionalOneShotEffect( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(2, StaticFilters.FILTER_CARD)), - new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(2, StaticFilters.FILTER_CARD), false), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), IncreasingAmbitionCondition.instance, "Search your library for a card " + "and put that card into your hand. If this spell was cast from a graveyard, " + "instead search your library for two cards and put those cards into your hand. " + diff --git a/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java b/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java index d9c8d2c1ced..d3d264e2c8d 100644 --- a/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java +++ b/Mage.Sets/src/mage/cards/i/InfectiousBloodlust.java @@ -55,7 +55,7 @@ public final class InfectiousBloodlust extends CardImpl { // When enchanted creature dies, you may search your library for a card named Infectious Bloodlust, reveal it, put it into your hand, then shuffle your library. this.addAbility(new DiesAttachedTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), "enchanted creature", true)); } diff --git a/Mage.Sets/src/mage/cards/i/InfernalTutor.java b/Mage.Sets/src/mage/cards/i/InfernalTutor.java index 1b7f4d8d2b9..60e0bc23d20 100644 --- a/Mage.Sets/src/mage/cards/i/InfernalTutor.java +++ b/Mage.Sets/src/mage/cards/i/InfernalTutor.java @@ -37,7 +37,7 @@ public final class InfernalTutor extends CardImpl { this.getSpellAbility().addEffect(new InfernalTutorEffect()); // Hellbent - If you have no cards in hand, instead search your library for a card, put it into your hand, then shuffle your library. Effect effect = new ConditionalOneShotEffect( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD), false, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD), false), HellbentCondition.instance, "

Hellbent — If you have no cards in hand, instead search your library for a card, put it into your hand, then shuffle"); this.getSpellAbility().addEffect(effect); @@ -95,7 +95,7 @@ class InfernalTutorEffect extends OneShotEffect { } else { filterCard = new FilterCard(); } - return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true, true).apply(game, source); + return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterCard), true).apply(game, source); } return true; diff --git a/Mage.Sets/src/mage/cards/i/InvasionOfTheros.java b/Mage.Sets/src/mage/cards/i/InvasionOfTheros.java index 4e8111d1050..91f8f74d716 100644 --- a/Mage.Sets/src/mage/cards/i/InvasionOfTheros.java +++ b/Mage.Sets/src/mage/cards/i/InvasionOfTheros.java @@ -40,7 +40,7 @@ public final class InvasionOfTheros extends CardImpl { // When Invasion of Theros enters the battlefield, search your library for an Aura, God, or Demigod card, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true) + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true) )); } diff --git a/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java b/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java index 7bd20cc5e2c..368932ce42c 100644 --- a/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java +++ b/Mage.Sets/src/mage/cards/i/IsperiaTheInscrutable.java @@ -83,7 +83,7 @@ class IsperiaTheInscrutableEffect extends OneShotEffect { player.revealCards(player.getLogName() + " hand", player.getHand(), game, true); for (Card card : player.getHand().getCards(game)) { if (CardUtil.haveSameNames(card, cardName, game)) { - return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true).apply(game, source); + return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true).apply(game, source); } } return true; diff --git a/Mage.Sets/src/mage/cards/i/IthorianInitiate.java b/Mage.Sets/src/mage/cards/i/IthorianInitiate.java index d8dc6622b19..6a28add5319 100644 --- a/Mage.Sets/src/mage/cards/i/IthorianInitiate.java +++ b/Mage.Sets/src/mage/cards/i/IthorianInitiate.java @@ -29,7 +29,7 @@ public final class IthorianInitiate extends CardImpl { this.toughness = new MageInt(1); // When Ithorian Initiate enters the battlefield, you may search your library for a basic land, reveal it, and put it into your hand. If you do shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); // Meditate {1}{G} this.addAbility(new MeditateAbility(new ManaCostsImpl<>("{1}{G}"))); diff --git a/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java b/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java index 104d1fea071..085ddd232e0 100644 --- a/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java +++ b/Mage.Sets/src/mage/cards/j/JohnnyComboPlayer.java @@ -30,7 +30,7 @@ public final class JohnnyComboPlayer extends CardImpl { this.toughness = new MageInt(1); // {4}: Search your library for a card, put that card into your hand, then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("a card")), false, true), new ManaCostsImpl<>("{4}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("a card")), false), new ManaCostsImpl<>("{4}"))); } private JohnnyComboPlayer(final JohnnyComboPlayer card) { diff --git a/Mage.Sets/src/mage/cards/k/KrosanTusker.java b/Mage.Sets/src/mage/cards/k/KrosanTusker.java index ec0049af67c..eaf04433b2c 100644 --- a/Mage.Sets/src/mage/cards/k/KrosanTusker.java +++ b/Mage.Sets/src/mage/cards/k/KrosanTusker.java @@ -32,7 +32,7 @@ public final class KrosanTusker extends CardImpl { this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}{G}"))); // When you cycle Krosan Tusker, you may search your library for a basic land card, reveal that card, put it into your hand, then shuffle your library. this.addAbility(new CycleTriggeredAbility( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } diff --git a/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java b/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java index 88624be110f..41499e22738 100644 --- a/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java +++ b/Mage.Sets/src/mage/cards/l/LagomosHandOfHatred.java @@ -43,7 +43,7 @@ public final class LagomosHandOfHatred extends CardImpl { // {T}: Search your library for a card, put it into your hand, then shuffle. Activate only if five or more creatures died this turn. this.addAbility(new ConditionalActivatedAbility( Zone.BATTLEFIELD, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), new TapSourceCost(), LagomosHandOfHatredCondition.instance )); diff --git a/Mage.Sets/src/mage/cards/l/LandGrant.java b/Mage.Sets/src/mage/cards/l/LandGrant.java index 26050ac8aa7..ce14a183263 100644 --- a/Mage.Sets/src/mage/cards/l/LandGrant.java +++ b/Mage.Sets/src/mage/cards/l/LandGrant.java @@ -38,7 +38,7 @@ public final class LandGrant extends CardImpl { "If you have no land cards in hand, you may reveal your hand rather than pay this spell's mana cost.")); // Search your library for a Forest card, reveal that card, and put it into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); } private LandGrant(final LandGrant card) { diff --git a/Mage.Sets/src/mage/cards/l/LandTax.java b/Mage.Sets/src/mage/cards/l/LandTax.java index 00664975ede..7658c1dde72 100644 --- a/Mage.Sets/src/mage/cards/l/LandTax.java +++ b/Mage.Sets/src/mage/cards/l/LandTax.java @@ -25,7 +25,7 @@ public final class LandTax extends CardImpl { // At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, and put them into your hand. If you do, shuffle your library. this.addAbility(new ConditionalInterveningIfTriggeredAbility( - new BeginningOfUpkeepTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LAND), true, true), TargetController.YOU, true), + new BeginningOfUpkeepTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 3, StaticFilters.FILTER_CARD_BASIC_LAND), true), TargetController.YOU, true), new OpponentControlsMoreCondition(StaticFilters.FILTER_LANDS), "At the beginning of your upkeep, if an opponent controls more lands than you, you may search your library for up to three basic land cards, reveal them, put them into your hand, then shuffle." )); diff --git a/Mage.Sets/src/mage/cards/l/LegionConquistador.java b/Mage.Sets/src/mage/cards/l/LegionConquistador.java index 7ad23daa867..74a4ed87910 100644 --- a/Mage.Sets/src/mage/cards/l/LegionConquistador.java +++ b/Mage.Sets/src/mage/cards/l/LegionConquistador.java @@ -36,7 +36,7 @@ public final class LegionConquistador extends CardImpl { // When Legion Conquistador enters the battlefield, you may search your library for any number of cards named Legion Conquistador, reveal them, put them into your hand, then shuffle your library TargetCardInLibrary target = new TargetCardInLibrary(0, Integer.MAX_VALUE, filter); - Effect effect = new SearchLibraryPutInHandEffect(target, true, true); + Effect effect = new SearchLibraryPutInHandEffect(target, true); effect.setText("you may search your library for any number of cards named Legion Conquistador, reveal them, put them into your hand, then shuffle"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java b/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java index 7fa69b2d3df..cff075692ff 100644 --- a/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java +++ b/Mage.Sets/src/mage/cards/l/LibraryOfLatNam.java @@ -28,7 +28,7 @@ public final class LibraryOfLatNam extends CardImpl { this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new AtTheBeginOfNextUpkeepDelayedTriggeredAbility(new DrawCardSourceControllerEffect(3).setText("you draw three cards")), false)); // or you search your library for a card, put that card into your hand, then shuffle your library. - this.getSpellAbility().addMode(new Mode(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true).setText("you search your library for a card, put that card into your hand, then shuffle"))); + this.getSpellAbility().addMode(new Mode(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false).setText("you search your library for a card, put that card into your hand, then shuffle"))); } private LibraryOfLatNam(final LibraryOfLatNam card) { diff --git a/Mage.Sets/src/mage/cards/l/LilianasShade.java b/Mage.Sets/src/mage/cards/l/LilianasShade.java index 817e07d473b..0fbda14c09d 100644 --- a/Mage.Sets/src/mage/cards/l/LilianasShade.java +++ b/Mage.Sets/src/mage/cards/l/LilianasShade.java @@ -37,7 +37,7 @@ public final class LilianasShade extends CardImpl { this.toughness = new MageInt(1); // When Liliana's Shade enters the battlefield, you may search your library for a Swamp card, reveal it, put it into your hand, then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); // {B}: Liliana's Shade gets +1/+1 until end of turn. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{B}"))); } diff --git a/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java b/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java index 8957f7fea2f..938d1cbdaa5 100644 --- a/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java +++ b/Mage.Sets/src/mage/cards/m/MastermindsAcquisition.java @@ -21,7 +21,7 @@ public final class MastermindsAcquisition extends CardImpl { // Choose one - // Search your library for a card and put that card into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); // Put a card you own from outside the game into your hand. Mode mode = new Mode(new WishEffect().setText("put a card you own from outside the game into your hand")); diff --git a/Mage.Sets/src/mage/cards/m/Micromancer.java b/Mage.Sets/src/mage/cards/m/Micromancer.java index 2d0f517f02c..1a706b50d6b 100644 --- a/Mage.Sets/src/mage/cards/m/Micromancer.java +++ b/Mage.Sets/src/mage/cards/m/Micromancer.java @@ -37,7 +37,7 @@ public final class Micromancer extends CardImpl { // When Micromancer enters the battlefield, you may search your library for an instant or sorcery card with mana value 1, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/m/MoonsilverKey.java b/Mage.Sets/src/mage/cards/m/MoonsilverKey.java index 50d95fe7dcb..16024751de2 100644 --- a/Mage.Sets/src/mage/cards/m/MoonsilverKey.java +++ b/Mage.Sets/src/mage/cards/m/MoonsilverKey.java @@ -35,7 +35,7 @@ public final class MoonsilverKey extends CardImpl { // {1}, {T}, Sacrifice Moonsilver Key: Search your library for an artifact card with a mana ability or a basic land card, reveal it, put it into your hand, then shuffle. Ability ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), new GenericManaCost(1)); ability.addCost(new TapSourceCost()); ability.addCost(new SacrificeSourceCost()); @@ -66,4 +66,4 @@ enum MoonsilverKeyPredicate implements Predicate { .stream() .anyMatch(ManaAbility.class::isInstance); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java b/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java index 44166a2b92a..2d113af4d9c 100644 --- a/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java +++ b/Mage.Sets/src/mage/cards/m/MycosynthWellspring.java @@ -22,7 +22,7 @@ public final class MycosynthWellspring extends CardImpl { // When Mycosynth Wellspring enters the battlefield or is put into a graveyard from the battlefield, // you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldOrDiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true + new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true ), true, false)); } diff --git a/Mage.Sets/src/mage/cards/m/MyrKinsmith.java b/Mage.Sets/src/mage/cards/m/MyrKinsmith.java index 4601b8aa8af..191f11cf49d 100644 --- a/Mage.Sets/src/mage/cards/m/MyrKinsmith.java +++ b/Mage.Sets/src/mage/cards/m/MyrKinsmith.java @@ -32,7 +32,7 @@ public final class MyrKinsmith extends CardImpl { // When Myr Kinsmith enters the battlefield, you may search your library for a Myr card, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/m/MysticalTeachings.java b/Mage.Sets/src/mage/cards/m/MysticalTeachings.java index 12519821cb4..e50a457de80 100644 --- a/Mage.Sets/src/mage/cards/m/MysticalTeachings.java +++ b/Mage.Sets/src/mage/cards/m/MysticalTeachings.java @@ -9,7 +9,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.FilterCard; import mage.filter.predicate.Predicates; import mage.filter.predicate.mageobject.AbilityPredicate; @@ -35,7 +34,7 @@ public final class MysticalTeachings extends CardImpl { // Search your library for an instant card or a card with flash, reveal it, and put it into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); // Flashback {5}{B} this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{5}{B}"))); } diff --git a/Mage.Sets/src/mage/cards/n/NestingWurm.java b/Mage.Sets/src/mage/cards/n/NestingWurm.java index 98ee8eb9645..a18b7cb0913 100644 --- a/Mage.Sets/src/mage/cards/n/NestingWurm.java +++ b/Mage.Sets/src/mage/cards/n/NestingWurm.java @@ -38,7 +38,7 @@ public final class NestingWurm extends CardImpl { // When Nesting Wurm enters the battlefield, you may search your library for up to three cards named Nesting Wurm, reveal them, and put them into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 3, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private NestingWurm(final NestingWurm card) { diff --git a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java index 0d0d19a1927..c8193fc710f 100644 --- a/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java +++ b/Mage.Sets/src/mage/cards/n/NissaVastwoodSeer.java @@ -41,7 +41,7 @@ public final class NissaVastwoodSeer extends CardImpl { this.secondSideCardClazz = mage.cards.n.NissaSageAnimist.class; // When Nissa, Vastwood Seer enters the battlefield, you may search your library for a basic Forest card, reveal it, put it into your hand, then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); // Whenever a land enters the battlefield under your control, if you control seven or more lands, exile Nissa, then return her to the battlefield transformed under her owner's control. this.addAbility(new TransformAbility()); diff --git a/Mage.Sets/src/mage/cards/n/NissasTriumph.java b/Mage.Sets/src/mage/cards/n/NissasTriumph.java index 97755fc6298..b331f7faaaf 100644 --- a/Mage.Sets/src/mage/cards/n/NissasTriumph.java +++ b/Mage.Sets/src/mage/cards/n/NissasTriumph.java @@ -39,10 +39,10 @@ public final class NissasTriumph extends CardImpl { this.getSpellAbility().addEffect(new ConditionalOneShotEffect( new SearchLibraryPutInHandEffect(new TargetCardInLibrary( 0, 3, StaticFilters.FILTER_CARD_LAND - ), true, true), + ), true), new SearchLibraryPutInHandEffect(new TargetCardInLibrary( 0, 2, filter - ), true, true), + ), true), new PermanentsOnTheBattlefieldCondition(filter2), "Search your library for up to two basic Forest cards. If you control a Nissa planeswalker, " + "instead search your library for up to three land cards. " + diff --git a/Mage.Sets/src/mage/cards/n/NyleasIntervention.java b/Mage.Sets/src/mage/cards/n/NyleasIntervention.java index 4ab142f94f4..fae1b80bca7 100644 --- a/Mage.Sets/src/mage/cards/n/NyleasIntervention.java +++ b/Mage.Sets/src/mage/cards/n/NyleasIntervention.java @@ -79,6 +79,6 @@ class NyleasInterventionEffect extends OneShotEffect { int xValue = source.getManaCostsToPay().getX(); return new SearchLibraryPutInHandEffect(new TargetCardInLibrary( 0, xValue, StaticFilters.FILTER_CARD_LAND - ), true, true).apply(game, source); + ), true).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/o/OpenTheArmory.java b/Mage.Sets/src/mage/cards/o/OpenTheArmory.java index 98fe6de2a97..03051d749dd 100644 --- a/Mage.Sets/src/mage/cards/o/OpenTheArmory.java +++ b/Mage.Sets/src/mage/cards/o/OpenTheArmory.java @@ -28,7 +28,7 @@ public final class OpenTheArmory extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{1}{W}"); // Search your library for an Aura or Equipment card, reveal it, and put it into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, auraOrEquipmentTarget), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(1, 1, auraOrEquipmentTarget), true)); } private OpenTheArmory(final OpenTheArmory card) { @@ -39,4 +39,4 @@ public final class OpenTheArmory extends CardImpl { public OpenTheArmory copy() { return new OpenTheArmory(this); } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/p/PatternMatcher.java b/Mage.Sets/src/mage/cards/p/PatternMatcher.java index 7ff91538d38..f5ec6f0019b 100644 --- a/Mage.Sets/src/mage/cards/p/PatternMatcher.java +++ b/Mage.Sets/src/mage/cards/p/PatternMatcher.java @@ -88,7 +88,7 @@ class RegularExpression extends OneShotEffect { = new FilterCard("a creature card with the same name as another creature you control"); filter.add(Predicates.or(predicates)); return new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/p/PilgrimOfTheAges.java b/Mage.Sets/src/mage/cards/p/PilgrimOfTheAges.java index f3eb502311a..d5253ad0410 100644 --- a/Mage.Sets/src/mage/cards/p/PilgrimOfTheAges.java +++ b/Mage.Sets/src/mage/cards/p/PilgrimOfTheAges.java @@ -38,7 +38,7 @@ public final class PilgrimOfTheAges extends CardImpl { // When Pilgrim of the Ages enters the battlefield, you may search your library for a basic Plains card, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); // {6}: Return Pilgrim of the Ages from your graveyard to your hand. diff --git a/Mage.Sets/src/mage/cards/p/PlanarPortal.java b/Mage.Sets/src/mage/cards/p/PlanarPortal.java index 05a5af0a11a..bae853d653f 100644 --- a/Mage.Sets/src/mage/cards/p/PlanarPortal.java +++ b/Mage.Sets/src/mage/cards/p/PlanarPortal.java @@ -23,7 +23,7 @@ public final class PlanarPortal extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{6}"); // {6}, {tap}: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{6}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), new ManaCostsImpl<>("{6}")); ability.addCost(new TapSourceCost()); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/p/PleaForGuidance.java b/Mage.Sets/src/mage/cards/p/PleaForGuidance.java index ecaa50a6d9b..2274e7bfe2d 100644 --- a/Mage.Sets/src/mage/cards/p/PleaForGuidance.java +++ b/Mage.Sets/src/mage/cards/p/PleaForGuidance.java @@ -25,7 +25,7 @@ public final class PleaForGuidance extends CardImpl { // Search your library for up to two enchantment cards, reveal them, and put them into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0,2, filter), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0,2, filter), true)); } private PleaForGuidance(final PleaForGuidance card) { diff --git a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java index 927f0020a37..e5f5ebe282c 100644 --- a/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java +++ b/Mage.Sets/src/mage/cards/p/PriestOfTheWakeningSun.java @@ -52,7 +52,7 @@ public final class PriestOfTheWakeningSun extends CardImpl { // {3}{W}{W}, Sacrifice Priest of the Wakening Sun: Search your library for a Dinosaur card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(filter); - Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(target), true, true), new ManaCostsImpl<>("{3}{W}{W}")); + Ability ability2 = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(target), true), new ManaCostsImpl<>("{3}{W}{W}")); ability2.addCost(new SacrificeSourceCost()); this.addAbility(ability2); } diff --git a/Mage.Sets/src/mage/cards/p/PrimalCommand.java b/Mage.Sets/src/mage/cards/p/PrimalCommand.java index 5a14a3c7377..dc6fed7f7ef 100644 --- a/Mage.Sets/src/mage/cards/p/PrimalCommand.java +++ b/Mage.Sets/src/mage/cards/p/PrimalCommand.java @@ -54,7 +54,7 @@ public final class PrimalCommand extends CardImpl { mode.addTarget(new TargetPlayer()); this.getSpellAbility().getModes().addMode(mode); // or search your library for a creature card, reveal it, put it into your hand, then shuffle your library. - mode = new Mode(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true, true)); + mode = new Mode(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true)); this.getSpellAbility().getModes().addMode(mode); } diff --git a/Mage.Sets/src/mage/cards/p/ProfaneTutor.java b/Mage.Sets/src/mage/cards/p/ProfaneTutor.java index f226c1fcb4c..a37535a22a1 100644 --- a/Mage.Sets/src/mage/cards/p/ProfaneTutor.java +++ b/Mage.Sets/src/mage/cards/p/ProfaneTutor.java @@ -24,7 +24,7 @@ public final class ProfaneTutor extends CardImpl { this.addAbility(new SuspendAbility(2, new ManaCostsImpl<>("{1}{B}"), this)); // Search your library for a card, put that card into your hand, then shuffle. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary())); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false)); } private ProfaneTutor(final ProfaneTutor card) { diff --git a/Mage.Sets/src/mage/cards/r/RangerOfEos.java b/Mage.Sets/src/mage/cards/r/RangerOfEos.java index 7ecfd126a35..15d351e022c 100644 --- a/Mage.Sets/src/mage/cards/r/RangerOfEos.java +++ b/Mage.Sets/src/mage/cards/r/RangerOfEos.java @@ -40,7 +40,7 @@ public final class RangerOfEos extends CardImpl { // When Ranger of Eos enters the battlefield, you may search your library for up to two creature cards with converted mana cost 1 or less, // reveal them, and put them into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 2, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private RangerOfEos(final RangerOfEos card) { diff --git a/Mage.Sets/src/mage/cards/r/Ratcatcher.java b/Mage.Sets/src/mage/cards/r/Ratcatcher.java index 49a7c0d8ce7..c39758bcf85 100644 --- a/Mage.Sets/src/mage/cards/r/Ratcatcher.java +++ b/Mage.Sets/src/mage/cards/r/Ratcatcher.java @@ -39,7 +39,7 @@ public final class Ratcatcher extends CardImpl { // At the beginning of your upkeep, you may search your library for a Rat card, reveal it, and put it into your hand. If you do, shuffle your library. TargetCardInLibrary targetCard = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(targetCard, true, true), TargetController.YOU, true)); + this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(targetCard, true), TargetController.YOU, true)); } diff --git a/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java b/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java index 0ac2d389cd3..d17a0b7fadd 100644 --- a/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java +++ b/Mage.Sets/src/mage/cards/r/RazakethTheFoulblooded.java @@ -41,7 +41,7 @@ public final class RazakethTheFoulblooded extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Pay 2 life, Sacrifice another creature: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new PayLifeCost(2)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), new PayLifeCost(2)); ability.addCost(new SacrificeTargetCost( new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, false))); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RazakethsRite.java b/Mage.Sets/src/mage/cards/r/RazakethsRite.java index a80620f451f..5dbd84c93fe 100644 --- a/Mage.Sets/src/mage/cards/r/RazakethsRite.java +++ b/Mage.Sets/src/mage/cards/r/RazakethsRite.java @@ -17,7 +17,7 @@ public final class RazakethsRite extends CardImpl { // Search your library for a card and put that card into your hand // Then shuffle your library TargetCardInLibrary target = new TargetCardInLibrary(); - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(target)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(target, false)); // Cycling {B} diff --git a/Mage.Sets/src/mage/cards/r/RecklessHandling.java b/Mage.Sets/src/mage/cards/r/RecklessHandling.java index 40e9b09fbc1..d6ccc2df0c4 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessHandling.java +++ b/Mage.Sets/src/mage/cards/r/RecklessHandling.java @@ -25,7 +25,7 @@ public final class RecklessHandling extends CardImpl { // Search your library for an artifact card, reveal it, put it into your hand, shuffle, then discard a card at random. If an artifact card was discarded this way, Reckless Handling deals 2 damage to each opponent. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(StaticFilters.FILTER_CARD_ARTIFACT_AN), true, true + new TargetCardInLibrary(StaticFilters.FILTER_CARD_ARTIFACT_AN), true ).setText("search your library for an artifact card, reveal it, put it into your hand, shuffle")); this.getSpellAbility().addEffect(new RecklessHandlingEffect()); } diff --git a/Mage.Sets/src/mage/cards/r/RecruiterOfTheGuard.java b/Mage.Sets/src/mage/cards/r/RecruiterOfTheGuard.java index 67bfce4f68d..1b2c06740d0 100644 --- a/Mage.Sets/src/mage/cards/r/RecruiterOfTheGuard.java +++ b/Mage.Sets/src/mage/cards/r/RecruiterOfTheGuard.java @@ -35,7 +35,7 @@ public final class RecruiterOfTheGuard extends CardImpl { // When Recruiter of the Guard enters the battlefield, you may search your library for a creature card with toughness 2 or less, // reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true), true)); + new TargetCardInLibrary(filter), true), true)); } private RecruiterOfTheGuard(final RecruiterOfTheGuard card) { diff --git a/Mage.Sets/src/mage/cards/r/RelicSeeker.java b/Mage.Sets/src/mage/cards/r/RelicSeeker.java index 67fd2daef88..765fd798cbe 100644 --- a/Mage.Sets/src/mage/cards/r/RelicSeeker.java +++ b/Mage.Sets/src/mage/cards/r/RelicSeeker.java @@ -38,7 +38,7 @@ public final class RelicSeeker extends CardImpl { // When Relic Seeker becomes renowned, you may search your library for an Equipment card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new BecomesRenownedSourceTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new BecomesRenownedSourceTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } diff --git a/Mage.Sets/src/mage/cards/r/Remembrance.java b/Mage.Sets/src/mage/cards/r/Remembrance.java index 5bf25d53825..347bf2c4b58 100644 --- a/Mage.Sets/src/mage/cards/r/Remembrance.java +++ b/Mage.Sets/src/mage/cards/r/Remembrance.java @@ -79,7 +79,7 @@ class RemembranceTriggeredAbility extends TriggeredAbilityImpl { filterCard.add(new NamePredicate(permanent.getName())); this.getEffects().clear(); this.addEffect(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filterCard), true, true + new TargetCardInLibrary(filterCard), true )); return true; } diff --git a/Mage.Sets/src/mage/cards/r/RhysticTutor.java b/Mage.Sets/src/mage/cards/r/RhysticTutor.java index a69c5feacc0..8399bfd1493 100644 --- a/Mage.Sets/src/mage/cards/r/RhysticTutor.java +++ b/Mage.Sets/src/mage/cards/r/RhysticTutor.java @@ -21,7 +21,7 @@ public final class RhysticTutor extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.SORCERY},"{2}{B}"); // Unless any player pays {2}, search your library for a card, put that card into your hand, then shuffle your library. - Effect effect = new DoUnlessAnyPlayerPaysEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), new ManaCostsImpl<>("{2}")); + Effect effect = new DoUnlessAnyPlayerPaysEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), new ManaCostsImpl<>("{2}")); effect.setText("Unless any player pays {2}, search your library for a card, put that card into your hand, then shuffle"); this.getSpellAbility().addEffect(effect); } diff --git a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java index 2356d1fbd8b..36d6ff26f84 100644 --- a/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java +++ b/Mage.Sets/src/mage/cards/r/RingOfThreeWishes.java @@ -29,7 +29,7 @@ public final class RingOfThreeWishes extends CardImpl { // Ring of Three Wishes enters the battlefield with three wish counters on it. this.addAbility(new EntersBattlefieldAbility(new AddCountersSourceEffect(CounterType.WISH.createInstance(3)), "with three wish counters on it")); // {5}, {T}, Remove a wish counter from Ring of Three Wishes: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new ManaCostsImpl<>("{5}")); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), new ManaCostsImpl<>("{5}")); ability.addCost(new TapSourceCost()); ability.addCost(new RemoveCountersSourceCost(CounterType.WISH.createInstance())); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/r/RuneScarredDemon.java b/Mage.Sets/src/mage/cards/r/RuneScarredDemon.java index ae78688ba43..1dfdf772800 100644 --- a/Mage.Sets/src/mage/cards/r/RuneScarredDemon.java +++ b/Mage.Sets/src/mage/cards/r/RuneScarredDemon.java @@ -29,7 +29,7 @@ public final class RuneScarredDemon extends CardImpl { this.toughness = new MageInt( 6); this.addAbility(FlyingAbility.getInstance()); TargetCardInLibrary target = new TargetCardInLibrary(); - Ability ability = new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target)); + Ability ability = new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, false)); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java b/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java index f225e87ae05..38cc9940c4d 100644 --- a/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java +++ b/Mage.Sets/src/mage/cards/s/SarkhansTriumph.java @@ -26,7 +26,7 @@ public final class SarkhansTriumph extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{2}{R}"); // Search your library for a Dragon creature card, reveal it, put it into your hand, then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); } private SarkhansTriumph(final SarkhansTriumph card) { diff --git a/Mage.Sets/src/mage/cards/s/ScreamingSeahawk.java b/Mage.Sets/src/mage/cards/s/ScreamingSeahawk.java index 17aee7dd85c..706625a0b59 100644 --- a/Mage.Sets/src/mage/cards/s/ScreamingSeahawk.java +++ b/Mage.Sets/src/mage/cards/s/ScreamingSeahawk.java @@ -38,7 +38,7 @@ public final class ScreamingSeahawk extends CardImpl { // When Screaming Seahawk enters the battlefield, you may search your library for a card named Screaming Seahawk, reveal it, and put it into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private ScreamingSeahawk(final ScreamingSeahawk card) { diff --git a/Mage.Sets/src/mage/cards/s/SecretSalvage.java b/Mage.Sets/src/mage/cards/s/SecretSalvage.java index 928cb2b2fed..3d6b2708cdc 100644 --- a/Mage.Sets/src/mage/cards/s/SecretSalvage.java +++ b/Mage.Sets/src/mage/cards/s/SecretSalvage.java @@ -77,6 +77,6 @@ class SecretSalvageEffect extends OneShotEffect { nameFilter.add(new NamePredicate(nameToSearch)); return new SearchLibraryPutInHandEffect(new TargetCardInLibrary( 0, Integer.MAX_VALUE, nameFilter - ), true, true).apply(game, source); + ), true).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/s/SelfAssembler.java b/Mage.Sets/src/mage/cards/s/SelfAssembler.java index a2f0ab77514..db02a72591f 100644 --- a/Mage.Sets/src/mage/cards/s/SelfAssembler.java +++ b/Mage.Sets/src/mage/cards/s/SelfAssembler.java @@ -33,7 +33,7 @@ public final class SelfAssembler extends CardImpl { // When Self-Assembler enters the battlefield, you may search your library for an Assembly-Worker creature card, reveal it, put it into your hand, // then shuffle your library. - Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, filter), true, true); + Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, filter), true); effect.setText("you may search your library for an Assembly-Worker creature card, reveal it, put it into your hand, then shuffle"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/s/SharedSummons.java b/Mage.Sets/src/mage/cards/s/SharedSummons.java index 56d0673270c..8634fd6371a 100644 --- a/Mage.Sets/src/mage/cards/s/SharedSummons.java +++ b/Mage.Sets/src/mage/cards/s/SharedSummons.java @@ -22,7 +22,7 @@ public final class SharedSummons extends CardImpl { // Search your library for up to two creature cards with different names, reveal them, put them into your hand, then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect( - new TargetCardWithDifferentNameInLibrary(0, 2, filter), true, true + new TargetCardWithDifferentNameInLibrary(0, 2, filter), true )); } diff --git a/Mage.Sets/src/mage/cards/s/ShieldWallSentinel.java b/Mage.Sets/src/mage/cards/s/ShieldWallSentinel.java index 1b3d4e6341f..44b2f306dd2 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldWallSentinel.java +++ b/Mage.Sets/src/mage/cards/s/ShieldWallSentinel.java @@ -38,7 +38,7 @@ public final class ShieldWallSentinel extends CardImpl { // When Shield-Wall Sentinel enters the battlefield, you may search your library for a creature card with defender, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/s/ShrineSteward.java b/Mage.Sets/src/mage/cards/s/ShrineSteward.java index 4a8f451da0a..d4d4132ac37 100644 --- a/Mage.Sets/src/mage/cards/s/ShrineSteward.java +++ b/Mage.Sets/src/mage/cards/s/ShrineSteward.java @@ -36,7 +36,7 @@ public final class ShrineSteward extends CardImpl { // When Shrine Steward enters the battlefield, you may search your library for an Aura or Shrine card, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java b/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java index b6f7b72a309..3df320d242c 100644 --- a/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java +++ b/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java @@ -36,7 +36,7 @@ public final class SidisiUndeadVizier extends CardImpl { this.addAbility(new ExploitAbility()); // When Sidisi, Undead Vizier exploits a creature, you may search your library for a card, put it into your hand, then shuffle your library. - this.addAbility(new ExploitCreatureTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("card")), false, true), false)); + this.addAbility(new ExploitCreatureTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("card")), false), false)); } private SidisiUndeadVizier(final SidisiUndeadVizier card) { diff --git a/Mage.Sets/src/mage/cards/s/SithWayfinder.java b/Mage.Sets/src/mage/cards/s/SithWayfinder.java index f9a3094f10a..5bf9f6e1387 100644 --- a/Mage.Sets/src/mage/cards/s/SithWayfinder.java +++ b/Mage.Sets/src/mage/cards/s/SithWayfinder.java @@ -23,7 +23,7 @@ public class SithWayfinder extends CardImpl { //{2}, {T}, Sacrifice Sith Wayfinder: Search your library for a land card, reveal it, and put it into your hand. //Then shuffle your library. SimpleActivatedAbility simpleActivatedAbility = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(StaticFilters.FILTER_CARD_LAND), true, true), + new TargetCardInLibrary(StaticFilters.FILTER_CARD_LAND), true), new ManaCostsImpl<>("{2}")); simpleActivatedAbility.addCost(new TapSourceCost()); simpleActivatedAbility.addCost(new SacrificeSourceCost()); diff --git a/Mage.Sets/src/mage/cards/s/SivitriDragonMaster.java b/Mage.Sets/src/mage/cards/s/SivitriDragonMaster.java index 1ad8ef59bf6..07c54bac227 100644 --- a/Mage.Sets/src/mage/cards/s/SivitriDragonMaster.java +++ b/Mage.Sets/src/mage/cards/s/SivitriDragonMaster.java @@ -52,7 +52,7 @@ public final class SivitriDragonMaster extends CardImpl { // -3: Search your library for a Dragon card, reveal it, put it into your hand, then shuffle. this.addAbility(new LoyaltyAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), -3)); // -7: Destroy all non-Dragon creatures. diff --git a/Mage.Sets/src/mage/cards/s/SkitteringSurveyor.java b/Mage.Sets/src/mage/cards/s/SkitteringSurveyor.java index a60322bb6f2..ef06744f555 100644 --- a/Mage.Sets/src/mage/cards/s/SkitteringSurveyor.java +++ b/Mage.Sets/src/mage/cards/s/SkitteringSurveyor.java @@ -26,7 +26,7 @@ public final class SkitteringSurveyor extends CardImpl { this.toughness = new MageInt(2); // When Skittering Surveyor enters the battlefield, you may search your library for a basic land, reveal it, put it into your hand, then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true), true)); } private SkitteringSurveyor(final SkitteringSurveyor card) { diff --git a/Mage.Sets/src/mage/cards/s/SkyshroudSentinel.java b/Mage.Sets/src/mage/cards/s/SkyshroudSentinel.java index c3f2be84fe5..731c848ae2f 100644 --- a/Mage.Sets/src/mage/cards/s/SkyshroudSentinel.java +++ b/Mage.Sets/src/mage/cards/s/SkyshroudSentinel.java @@ -34,7 +34,7 @@ public final class SkyshroudSentinel extends CardImpl { // When Skyshroud Sentinel enters the battlefield, you may search your library for up to three cards named Skyshroud Sentinel, reveal them, and put them into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 3, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private SkyshroudSentinel(final SkyshroudSentinel card) { diff --git a/Mage.Sets/src/mage/cards/s/SliverOverlord.java b/Mage.Sets/src/mage/cards/s/SliverOverlord.java index a5e5a484ec9..707cecb0769 100644 --- a/Mage.Sets/src/mage/cards/s/SliverOverlord.java +++ b/Mage.Sets/src/mage/cards/s/SliverOverlord.java @@ -39,7 +39,7 @@ public final class SliverOverlord extends CardImpl { this.toughness = new MageInt(7); // {3}: Search your library for a Sliver card, reveal that card, and put it into your hand. Then shuffle your library. - this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), new ManaCostsImpl<>("{3}"))); + this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), new ManaCostsImpl<>("{3}"))); // {3}: Gain control of target Sliver. Ability ability = (new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainControlTargetEffect(Duration.Custom), new ManaCostsImpl<>("{3}"))); diff --git a/Mage.Sets/src/mage/cards/s/SolveTheEquation.java b/Mage.Sets/src/mage/cards/s/SolveTheEquation.java index 7c6d6fbe6b6..e70a215f4c7 100644 --- a/Mage.Sets/src/mage/cards/s/SolveTheEquation.java +++ b/Mage.Sets/src/mage/cards/s/SolveTheEquation.java @@ -19,7 +19,7 @@ public final class SolveTheEquation extends CardImpl { // Search your library for an instant or sorcery card, reveal it, put it into your hand, then shuffle. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY), true, true + new TargetCardInLibrary(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY), true )); } diff --git a/Mage.Sets/src/mage/cards/s/Spellseeker.java b/Mage.Sets/src/mage/cards/s/Spellseeker.java index 24ab0d1121e..7ce43458132 100644 --- a/Mage.Sets/src/mage/cards/s/Spellseeker.java +++ b/Mage.Sets/src/mage/cards/s/Spellseeker.java @@ -36,7 +36,7 @@ public final class Spellseeker extends CardImpl { // When Spellseeker enters the battlefield, you may search your library for an instant or sorcery card with converted mana cost 2 or less, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true )); } diff --git a/Mage.Sets/src/mage/cards/s/SquadronHawk.java b/Mage.Sets/src/mage/cards/s/SquadronHawk.java index 27a2f44bbae..be873f3c41e 100644 --- a/Mage.Sets/src/mage/cards/s/SquadronHawk.java +++ b/Mage.Sets/src/mage/cards/s/SquadronHawk.java @@ -37,7 +37,7 @@ public final class SquadronHawk extends CardImpl { this.addAbility(FlyingAbility.getInstance()); // When Squadron Hawk enters the battlefield, you may search your library for up to three cards named Squadron Hawk, reveal them, put them into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 3, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private SquadronHawk(final SquadronHawk card) { diff --git a/Mage.Sets/src/mage/cards/s/StoicFarmer.java b/Mage.Sets/src/mage/cards/s/StoicFarmer.java index 115067f3179..11f8a35e49d 100644 --- a/Mage.Sets/src/mage/cards/s/StoicFarmer.java +++ b/Mage.Sets/src/mage/cards/s/StoicFarmer.java @@ -45,7 +45,7 @@ public final class StoicFarmer extends CardImpl { this.addAbility(new EntersBattlefieldTriggeredAbility( new ConditionalOneShotEffect( new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter), true), - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter)), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), false), condition, "search your library for a basic Plains card and reveal it. " + "If an opponent controls more lands than you, put it onto the battlefield tapped. " + "Otherwise put it into your hand. Then shuffle" diff --git a/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java b/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java index 756df2a70f0..fc66a5671e2 100644 --- a/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java +++ b/Mage.Sets/src/mage/cards/s/StoneforgeMystic.java @@ -40,7 +40,7 @@ public final class StoneforgeMystic extends CardImpl { // When Stoneforge Mystic enters the battlefield, you may search your library for an Equipment card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); // {1}{W}, {T}: You may put an Equipment card from your hand onto the battlefield. SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new PutCardFromHandOntoBattlefieldEffect(filter), new ManaCostsImpl<>("{1}{W}")); diff --git a/Mage.Sets/src/mage/cards/s/SummonersPact.java b/Mage.Sets/src/mage/cards/s/SummonersPact.java index 23fe2f68728..f1a9c919f8b 100644 --- a/Mage.Sets/src/mage/cards/s/SummonersPact.java +++ b/Mage.Sets/src/mage/cards/s/SummonersPact.java @@ -31,7 +31,7 @@ public final class SummonersPact extends CardImpl { this.color.setGreen(true); // Search your library for a green creature card, reveal it, and put it into your hand. Then shuffle your library. - this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true)); + this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true)); // At the beginning of your next upkeep, pay {2}{G}{G}. If you don't, you lose the game. this.getSpellAbility().addEffect(new CreateDelayedTriggeredAbilityEffect(new PactDelayedTriggeredAbility(new ManaCostsImpl<>("{2}{G}{G}")))); } diff --git a/Mage.Sets/src/mage/cards/s/SunbladeSamurai.java b/Mage.Sets/src/mage/cards/s/SunbladeSamurai.java index 4ce1e4fc9ea..7224e1a3e64 100644 --- a/Mage.Sets/src/mage/cards/s/SunbladeSamurai.java +++ b/Mage.Sets/src/mage/cards/s/SunbladeSamurai.java @@ -43,7 +43,7 @@ public final class SunbladeSamurai extends CardImpl { Ability ability = new ChannelAbility( "{2}", new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ) ); ability.addEffect(new GainLifeEffect(2)); diff --git a/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java b/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java index 5021f8ffa32..9a95681375b 100644 --- a/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java +++ b/Mage.Sets/src/mage/cards/s/SurvivalOfTheFittest.java @@ -27,7 +27,7 @@ public final class SurvivalOfTheFittest extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{G}"); // {G}, Discard a creature card: Search your library for a creature card, reveal that card, and put it into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true, true), new ColoredManaCost(ColoredManaSymbol.G)); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_CREATURE), true), new ColoredManaCost(ColoredManaSymbol.G)); ability.addCost(new DiscardTargetCost(new TargetCardInHand(StaticFilters.FILTER_CARD_CREATURE))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/s/SylvanRanger.java b/Mage.Sets/src/mage/cards/s/SylvanRanger.java index 90eccbe7e03..0c6704e8043 100644 --- a/Mage.Sets/src/mage/cards/s/SylvanRanger.java +++ b/Mage.Sets/src/mage/cards/s/SylvanRanger.java @@ -31,7 +31,7 @@ public final class SylvanRanger extends CardImpl { // When Sylvan Ranger enters the battlefield, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND); - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private SylvanRanger(final SylvanRanger card) { diff --git a/Mage.Sets/src/mage/cards/t/Tallowisp.java b/Mage.Sets/src/mage/cards/t/Tallowisp.java index b513e1266ac..f56734c047d 100644 --- a/Mage.Sets/src/mage/cards/t/Tallowisp.java +++ b/Mage.Sets/src/mage/cards/t/Tallowisp.java @@ -41,7 +41,7 @@ public final class Tallowisp extends CardImpl { this.toughness = new MageInt(3); // Whenever you cast a Spirit or Arcane spell, you may search your library for an Aura card with enchant creature, reveal it, and put it into your hand. If you do, shuffle your library. - this.addAbility(new SpellCastControllerTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterAura), true, true), StaticFilters.FILTER_SPIRIT_OR_ARCANE_CARD, true)); + this.addAbility(new SpellCastControllerTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filterAura), true), StaticFilters.FILTER_SPIRIT_OR_ARCANE_CARD, true)); } private Tallowisp(final Tallowisp card) { diff --git a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java index 6a36d15458b..322db6a3458 100644 --- a/Mage.Sets/src/mage/cards/t/TamiyosJournal.java +++ b/Mage.Sets/src/mage/cards/t/TamiyosJournal.java @@ -36,7 +36,7 @@ public final class TamiyosJournal extends CardImpl { this.addAbility(new BeginningOfUpkeepTriggeredAbility(Zone.BATTLEFIELD, new InvestigateEffect(), TargetController.YOU, false)); // {T}, Sacrifice three Clues: Search your library for a card and put that card into your hand. Then shuffle your library. - Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false, true), new TapSourceCost()); + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), new TapSourceCost()); ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(3, 3, filter, false))); this.addAbility(ability); } diff --git a/Mage.Sets/src/mage/cards/t/ThaliasLancers.java b/Mage.Sets/src/mage/cards/t/ThaliasLancers.java index 9808929eab3..24b216cec73 100644 --- a/Mage.Sets/src/mage/cards/t/ThaliasLancers.java +++ b/Mage.Sets/src/mage/cards/t/ThaliasLancers.java @@ -38,7 +38,7 @@ public final class ThaliasLancers extends CardImpl { this.addAbility(FirstStrikeAbility.getInstance()); // When Thalia's Lancers enters the battlefield, you may search your library for a legendary card, reveal it, put it into your hand, then shuffle your library. - Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, filter), true, true); + Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, filter), true); effect.setText("you may search your library for a legendary card, reveal it, put it into your hand, then shuffle"); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/t/TheBirthOfMeletis.java b/Mage.Sets/src/mage/cards/t/TheBirthOfMeletis.java index ec8f4c058d3..a5c02de00f0 100644 --- a/Mage.Sets/src/mage/cards/t/TheBirthOfMeletis.java +++ b/Mage.Sets/src/mage/cards/t/TheBirthOfMeletis.java @@ -39,7 +39,7 @@ public final class TheBirthOfMeletis extends CardImpl { // I — Search your library for a basic Plains card, reveal it, put it into your hand, then shuffle your library. sagaAbility.addChapterEffect( this, SagaChapter.CHAPTER_I, new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ) ); diff --git a/Mage.Sets/src/mage/cards/t/TheCrueltyOfGix.java b/Mage.Sets/src/mage/cards/t/TheCrueltyOfGix.java index a87d04b03ca..786286c767d 100644 --- a/Mage.Sets/src/mage/cards/t/TheCrueltyOfGix.java +++ b/Mage.Sets/src/mage/cards/t/TheCrueltyOfGix.java @@ -52,7 +52,7 @@ public final class TheCrueltyOfGix extends CardImpl { // II -- Search your library for a card, put that card into your hand, then shuffle. You lose 3 life. sagaAbility.addChapterEffect( this, SagaChapter.CHAPTER_II, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary()), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false), new LoseLifeSourceControllerEffect(3) ); diff --git a/Mage.Sets/src/mage/cards/t/TheRestorationOfEiganjo.java b/Mage.Sets/src/mage/cards/t/TheRestorationOfEiganjo.java index 06c81e03c48..6d8e353f4c7 100644 --- a/Mage.Sets/src/mage/cards/t/TheRestorationOfEiganjo.java +++ b/Mage.Sets/src/mage/cards/t/TheRestorationOfEiganjo.java @@ -47,7 +47,7 @@ public final class TheRestorationOfEiganjo extends CardImpl { // I - Search your library for a basic Plains card, reveal it, put it into your hand, then shuffle. sagaAbility.addChapterEffect( this, SagaChapter.CHAPTER_I, new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ) ); diff --git a/Mage.Sets/src/mage/cards/t/ThreeDreams.java b/Mage.Sets/src/mage/cards/t/ThreeDreams.java index 164f99cb7f4..9c4796978ad 100644 --- a/Mage.Sets/src/mage/cards/t/ThreeDreams.java +++ b/Mage.Sets/src/mage/cards/t/ThreeDreams.java @@ -27,7 +27,7 @@ public final class ThreeDreams extends CardImpl { // Search your library for up to three Aura cards with different names, reveal them, and put them into your hand. Then shuffle your library. this.getSpellAbility().addEffect(new SearchLibraryPutInHandEffect( new TargetCardWithDifferentNameInLibrary(0, 3, aurafilter), - true, true + true )); } diff --git a/Mage.Sets/src/mage/cards/t/Tiamat.java b/Mage.Sets/src/mage/cards/t/Tiamat.java index 21e33d530d0..d1bfa5f6a38 100644 --- a/Mage.Sets/src/mage/cards/t/Tiamat.java +++ b/Mage.Sets/src/mage/cards/t/Tiamat.java @@ -47,7 +47,7 @@ public final class Tiamat extends CardImpl { // When Tiamat enters the battlefield, if you cast it, search your library for up to five Dragon cards named Tiama that each have different names, reveal them, put them into your hand, then shuffle. this.addAbility(new ConditionalInterveningIfTriggeredAbility(new EntersBattlefieldTriggeredAbility( new SearchLibraryPutInHandEffect( - new TargetCardWithDifferentNameInLibrary(0, 5, filter), true, true + new TargetCardWithDifferentNameInLibrary(0, 5, filter), true )), CastFromEverywhereSourceCondition.instance, "When {this} enters the battlefield, " + "if you cast it, search your library for up to five Dragon cards not named Tiamat " + "that each have different names, reveal them, put them into your hand, then shuffle." diff --git a/Mage.Sets/src/mage/cards/t/TotemGuideHartebeest.java b/Mage.Sets/src/mage/cards/t/TotemGuideHartebeest.java index 7a3883cdf01..663bb2bfb90 100644 --- a/Mage.Sets/src/mage/cards/t/TotemGuideHartebeest.java +++ b/Mage.Sets/src/mage/cards/t/TotemGuideHartebeest.java @@ -33,7 +33,7 @@ public final class TotemGuideHartebeest extends CardImpl { this.toughness = new MageInt(5); // When Totem-Guide Hartebeest enters the battlefield, you may search your library for an Aura card, reveal it, put it into your hand, then shuffle your library. - this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), true)); + this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); } private TotemGuideHartebeest(final TotemGuideHartebeest card) { diff --git a/Mage.Sets/src/mage/cards/t/TrailOfMystery.java b/Mage.Sets/src/mage/cards/t/TrailOfMystery.java index 396d2d8720a..911dd504856 100644 --- a/Mage.Sets/src/mage/cards/t/TrailOfMystery.java +++ b/Mage.Sets/src/mage/cards/t/TrailOfMystery.java @@ -33,7 +33,7 @@ public final class TrailOfMystery extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{G}"); // Whenever a face-down creature enters the battlefield under your control, you may search your library for a basic land card, reveal it, put it into your hand, then shuffle your library. - Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true, true); + Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true); this.addAbility(new EntersBattlefieldControlledTriggeredAbility(Zone.BATTLEFIELD, effect, filter, true)); // Whenever a permanent you control is turned face up, if it's a creature, it gets +2/+2 until end of turn. diff --git a/Mage.Sets/src/mage/cards/t/TreasureMage.java b/Mage.Sets/src/mage/cards/t/TreasureMage.java index ac3db080b1a..26905e84b1f 100644 --- a/Mage.Sets/src/mage/cards/t/TreasureMage.java +++ b/Mage.Sets/src/mage/cards/t/TreasureMage.java @@ -40,7 +40,7 @@ public final class TreasureMage extends CardImpl { // When Treasure Mage enters the battlefield, you may search your library for an artifact card with converted mana cost 6 or greater, // reveal that card, and put it into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter); - SearchEffect effect = new SearchLibraryPutInHandEffect(target, true, true); + SearchEffect effect = new SearchLibraryPutInHandEffect(target, true); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/t/TributeMage.java b/Mage.Sets/src/mage/cards/t/TributeMage.java index 5ac4531e8a3..7e2853e5780 100644 --- a/Mage.Sets/src/mage/cards/t/TributeMage.java +++ b/Mage.Sets/src/mage/cards/t/TributeMage.java @@ -36,7 +36,7 @@ public final class TributeMage extends CardImpl { // When Tribute Mage enters the battlefield, you may search your library for an artifact card with converted mana cost 2, reveal that card, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/t/TrinketMage.java b/Mage.Sets/src/mage/cards/t/TrinketMage.java index 16ae9dc2579..80df3f24e69 100644 --- a/Mage.Sets/src/mage/cards/t/TrinketMage.java +++ b/Mage.Sets/src/mage/cards/t/TrinketMage.java @@ -39,7 +39,7 @@ public final class TrinketMage extends CardImpl { // When Trinket Mage enters the battlefield, you may search your library for an artifact card with converted mana cost 1 or less, reveal that card, and put it into your hand. If you do, shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(filter); - SearchEffect effect = new SearchLibraryPutInHandEffect(target, true, true); + SearchEffect effect = new SearchLibraryPutInHandEffect(target, true); this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true)); } diff --git a/Mage.Sets/src/mage/cards/t/TrophyMage.java b/Mage.Sets/src/mage/cards/t/TrophyMage.java index 83931678c9b..3d1230080ad 100644 --- a/Mage.Sets/src/mage/cards/t/TrophyMage.java +++ b/Mage.Sets/src/mage/cards/t/TrophyMage.java @@ -36,7 +36,7 @@ public final class TrophyMage extends CardImpl { // When Trophy Mage enters the battlefield, you may search your library for an artifact card with converted mana cost 3, reveal it, put it into your hand, then shuffle your library. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/t/TrugaCliffcharger.java b/Mage.Sets/src/mage/cards/t/TrugaCliffcharger.java index 179ae89246f..79f4a82dd9c 100644 --- a/Mage.Sets/src/mage/cards/t/TrugaCliffcharger.java +++ b/Mage.Sets/src/mage/cards/t/TrugaCliffcharger.java @@ -46,7 +46,7 @@ public final class TrugaCliffcharger extends CardImpl { // When Truga Cliffcharger enters the battlefield, you may discard a card. If you do, search your library for a land or battle card, reveal it, put it into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility( new DoIfCostPaid(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), new DiscardCardCost()) )); } diff --git a/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java b/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java index c86ef8e16fa..a4e985b8a71 100644 --- a/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java +++ b/Mage.Sets/src/mage/cards/u/UncageTheMenagerie.java @@ -61,7 +61,7 @@ class UncageTheMenagerieEffect extends OneShotEffect { FilterCard filter = new FilterCreatureCard(xValue + " creature cards with different names that each have mana value " + xValue); filter.add(new ManaValuePredicate(ComparisonType.EQUAL_TO, xValue)); return new SearchLibraryPutInHandEffect( - new TargetCardWithDifferentNameInLibrary(0, xValue, filter), true, true + new TargetCardWithDifferentNameInLibrary(0, xValue, filter), true ).apply(game, source); } } diff --git a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java index 7afc4314f36..d474f4ffcf1 100644 --- a/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java +++ b/Mage.Sets/src/mage/cards/u/UrzaAcademyHeadmaster.java @@ -286,7 +286,7 @@ class UrzaAcademyHeadmasterRandomEffect extends OneShotEffect { break; case 12: // (altered) LILIANA VESS 2 sb.append("Search your library for a card and put that card into your hand. Then shuffle."); - effects.add(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("a card")), false, true)); + effects.add(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterCard("a card")), false)); break; case 13: // (double) LILIANA OF THE VEIL 2 sb.append("Target player sacrifices two creatures."); diff --git a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java index 2672f1ddba6..45381bd4b5d 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java +++ b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java @@ -71,7 +71,7 @@ class UrzasHotTubEffect extends OneShotEffect { if (discardedCard != null) { FilterCard filter = new FilterCard(); filter.add(new UrzasHotTubPredicate(discardedCard.getName())); - return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true).apply(game, source); + return new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true).apply(game, source); } } } diff --git a/Mage.Sets/src/mage/cards/u/UrzasSylex.java b/Mage.Sets/src/mage/cards/u/UrzasSylex.java index 60dc572369d..29d8ef13f64 100644 --- a/Mage.Sets/src/mage/cards/u/UrzasSylex.java +++ b/Mage.Sets/src/mage/cards/u/UrzasSylex.java @@ -55,7 +55,7 @@ public final class UrzasSylex extends CardImpl { Zone.BATTLEFIELD, Zone.EXILED, new DoIfCostPaid( new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), new GenericManaCost(2) ), "When {this} is put into exile from the battlefield, ", false )); diff --git a/Mage.Sets/src/mage/cards/v/Vorinclex.java b/Mage.Sets/src/mage/cards/v/Vorinclex.java index 2eea6c0b00b..65313f60c00 100644 --- a/Mage.Sets/src/mage/cards/v/Vorinclex.java +++ b/Mage.Sets/src/mage/cards/v/Vorinclex.java @@ -49,7 +49,7 @@ public final class Vorinclex extends CardImpl { // When Vorinclex enters the battlefield, search your library for up to two Forest cards, reveal them, put them into your hand, then shuffle. this.addAbility(new EntersBattlefieldTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(0, 2, filter), true, true + new TargetCardInLibrary(0, 2, filter), true ))); // {6}{G}{G}: Exile Vorinclex, then return it to the battlefield transformed under its owner's control. Activate only as a sorcery. diff --git a/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java b/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java index 15e9e8e3920..5805aa12f84 100644 --- a/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java +++ b/Mage.Sets/src/mage/cards/w/WeatheredWayfarer.java @@ -36,7 +36,7 @@ public final class WeatheredWayfarer extends CardImpl { // {W}, {tap}: Search your library for a land card, reveal it, and put it into your hand. Then shuffle your library. Activate this ability only if an opponent controls more lands than you. Ability ability = new ActivateIfConditionActivatedAbility( Zone.BATTLEFIELD, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterLandCard()), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(new FilterLandCard()), true), new ManaCostsImpl<>("{W}"), new OpponentControlsMoreCondition(StaticFilters.FILTER_LANDS)); ability.addCost(new TapSourceCost()); diff --git a/Mage.Sets/src/mage/cards/w/WelkinHawk.java b/Mage.Sets/src/mage/cards/w/WelkinHawk.java index 3ed005f2fda..3189b506207 100644 --- a/Mage.Sets/src/mage/cards/w/WelkinHawk.java +++ b/Mage.Sets/src/mage/cards/w/WelkinHawk.java @@ -37,7 +37,7 @@ public final class WelkinHawk extends CardImpl { // When Welkin Hawk dies, you may search your library for a card named Welkin Hawk, reveal that card, put it into your hand, then shuffle your library. TargetCardInLibrary target = new TargetCardInLibrary(1, 1, filter); - this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect(target, true, true), true)); + this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect(target, true), true)); } private WelkinHawk(final WelkinHawk card) { diff --git a/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java b/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java index f476e1e38df..ee0741eb37a 100644 --- a/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java +++ b/Mage.Sets/src/mage/cards/w/WildFieldScarecrow.java @@ -34,7 +34,7 @@ public final class WildFieldScarecrow extends CardImpl { // {2}, Sacrifice Wild-Field Scarecrow: Search your library for up to two basic land cards, reveal them, and put them into your hand. Then shuffle your library. Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true), new GenericManaCost(2)); ability.addCost(new SacrificeSourceCost()); this.addAbility(ability); diff --git a/Mage.Sets/src/mage/cards/w/WirewoodHerald.java b/Mage.Sets/src/mage/cards/w/WirewoodHerald.java index c8e88357d74..060c65603f8 100644 --- a/Mage.Sets/src/mage/cards/w/WirewoodHerald.java +++ b/Mage.Sets/src/mage/cards/w/WirewoodHerald.java @@ -33,7 +33,7 @@ public final class WirewoodHerald extends CardImpl { // When Wirewood Herald dies, you may search your library for an Elf card, reveal that card, put it into your hand, then shuffle your library. this.addAbility(new DiesSourceTriggeredAbility( - new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), + new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), true)); } diff --git a/Mage.Sets/src/mage/cards/w/WishclawTalisman.java b/Mage.Sets/src/mage/cards/w/WishclawTalisman.java index 45cccbf08a1..5d535e65450 100644 --- a/Mage.Sets/src/mage/cards/w/WishclawTalisman.java +++ b/Mage.Sets/src/mage/cards/w/WishclawTalisman.java @@ -66,7 +66,7 @@ public final class WishclawTalisman extends CardImpl { class WishclawTalismanEffect extends OneShotEffect { - private static final Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary()); + private static final Effect effect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(), false); WishclawTalismanEffect() { super(Outcome.Benefit); @@ -101,4 +101,4 @@ class WishclawTalismanEffect extends OneShotEffect { game.addEffect(continuousEffect, source); return true; } -} \ No newline at end of file +} diff --git a/Mage.Sets/src/mage/cards/w/WretchedThrong.java b/Mage.Sets/src/mage/cards/w/WretchedThrong.java index d695e88c130..0f4036c0496 100644 --- a/Mage.Sets/src/mage/cards/w/WretchedThrong.java +++ b/Mage.Sets/src/mage/cards/w/WretchedThrong.java @@ -34,7 +34,7 @@ public final class WretchedThrong extends CardImpl { // When Wretched Throng dies, you may search your library for a card named Wretched Throng, reveal it, put it into your hand, then shuffle. this.addAbility(new DiesSourceTriggeredAbility(new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(filter), true, true + new TargetCardInLibrary(filter), true ), true)); } diff --git a/Mage.Sets/src/mage/cards/y/YouHappenOnAGlade.java b/Mage.Sets/src/mage/cards/y/YouHappenOnAGlade.java index b0b63c6b15e..33452a5887a 100644 --- a/Mage.Sets/src/mage/cards/y/YouHappenOnAGlade.java +++ b/Mage.Sets/src/mage/cards/y/YouHappenOnAGlade.java @@ -28,7 +28,7 @@ public final class YouHappenOnAGlade extends CardImpl { // • Journey On — Search your library for up to two basic land cards, reveal them, put them into your hand, then shuffle. this.getSpellAbility().addEffect( new SearchLibraryPutInHandEffect( - new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true, true) + new TargetCardInLibrary(0, 2, StaticFilters.FILTER_CARD_BASIC_LANDS), true) ); this.getSpellAbility().withFirstModeFlavorWord("Journey On"); diff --git a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java index 85ef29888b7..1632f5187e4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java +++ b/Mage.Tests/src/test/java/org/mage/test/serverside/base/MageTestPlayerBase.java @@ -544,7 +544,7 @@ public abstract class MageTestPlayerBase { ); // library - ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD)).setText("return from library"), new ManaCostsImpl<>("")); + ability = new SimpleActivatedAbility(new SearchLibraryPutInHandEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD), false).setText("return from library"), new ManaCostsImpl<>("")); addCustomCardWithAbility( "return from library for " + controller.getName(), controller, diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java index f34d46931d2..c2d09be5030 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryPutInHandEffect.java @@ -20,35 +20,17 @@ import java.util.UUID; */ public class SearchLibraryPutInHandEffect extends SearchEffect { - private boolean revealCards = false; - private boolean forceShuffle; - private String rulePrefix; - - public SearchLibraryPutInHandEffect(TargetCardInLibrary target) { - this(target, false, true); - } + private boolean revealCards; public SearchLibraryPutInHandEffect(TargetCardInLibrary target, boolean revealCards) { - this(target, revealCards, true); - } - - public SearchLibraryPutInHandEffect(TargetCardInLibrary target, boolean revealCards, boolean forceShuffle) { - this(target, revealCards, forceShuffle, "search your library for "); - } - - public SearchLibraryPutInHandEffect(TargetCardInLibrary target, boolean revealCards, boolean forceShuffle, String rulePrefix) { super(target, Outcome.DrawCard); this.revealCards = revealCards; - this.forceShuffle = forceShuffle; - this.rulePrefix = rulePrefix; setText(); } public SearchLibraryPutInHandEffect(final SearchLibraryPutInHandEffect effect) { super(effect); this.revealCards = effect.revealCards; - this.forceShuffle = effect.forceShuffle; - this.rulePrefix = effect.rulePrefix; } @Override @@ -85,34 +67,22 @@ public class SearchLibraryPutInHandEffect extends SearchEffect { controller.shuffleLibrary(source, game); return true; } - if (forceShuffle) { - controller.shuffleLibrary(source, game); - } + controller.shuffleLibrary(source, game); return false; } private void setText() { StringBuilder sb = new StringBuilder(); - sb.append(rulePrefix); + sb.append("search your library for "); if (target.getNumberOfTargets() == 0 && target.getMaxNumberOfTargets() > 0) { sb.append("up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets())).append(' '); sb.append(target.getTargetName()); - if (forceShuffle) { - sb.append(revealCards ? ", reveal them" : ""); - sb.append(", put them into your hand, then shuffle"); - } else { - sb.append(revealCards ? ", reveal them," : ""); - sb.append(" and put them into your hand. If you do, shuffle"); - } + sb.append(revealCards ? ", reveal them" : ""); + sb.append(", put them into your hand, then shuffle"); } else { sb.append(CardUtil.addArticle(target.getTargetName())); - if (forceShuffle) { - sb.append(revealCards ? ", reveal it, put it" : ", put that card"); - sb.append(" into your hand, then shuffle"); - } else { - sb.append(revealCards ? ", reveal it," : ""); - sb.append(" and put that card into your hand. If you do, shuffle"); - } + sb.append(revealCards ? ", reveal it, put it" : ", put that card"); + sb.append(" into your hand, then shuffle"); } staticText = sb.toString(); } diff --git a/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java b/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java index 83fb2c1071a..fa634a37c65 100644 --- a/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/CyclingAbility.java @@ -27,7 +27,7 @@ public class CyclingAbility extends ActivatedAbilityImpl { } public CyclingAbility(Cost cost, FilterCard filter, String text) { - super(Zone.HAND, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true, true), cost); + super(Zone.HAND, new SearchLibraryPutInHandEffect(new TargetCardInLibrary(filter), true), cost); this.addCost(new CyclingDiscardCost()); this.cost = cost; this.text = text; diff --git a/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java b/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java index 8294154413c..bd8ab7290e9 100644 --- a/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java +++ b/Mage/src/main/java/mage/game/command/planes/TrailOfTheMageRingsPlane.java @@ -49,7 +49,7 @@ public class TrailOfTheMageRingsPlane extends Plane { this.getAbilities().add(ability); // Active player can roll the planar die: Whenever you roll {CHAOS}, you may search your library for an instant or sorcery card, reveal it, put it into your hand, then shuffle your library - Effect chaosEffect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, new FilterInstantOrSorceryCard()), true, true); + Effect chaosEffect = new SearchLibraryPutInHandEffect(new TargetCardInLibrary(0, 1, new FilterInstantOrSorceryCard()), true); Target chaosTarget = null; List chaosEffects = new ArrayList();