From 6dfacfbca5eff906072cfee7a0739c52b0b498ed Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Thu, 25 Jun 2020 00:37:13 +0400 Subject: [PATCH] * Elspeth, Undaunted Hero - fixed wrong text; --- .../src/mage/cards/e/ElspethUndauntedHero.java | 2 +- .../SearchLibraryGraveyardPutInHandEffect.java | 3 ++- ...LibraryGraveyardPutOntoBattlefieldEffect.java | 16 ++++++---------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Mage.Sets/src/mage/cards/e/ElspethUndauntedHero.java b/Mage.Sets/src/mage/cards/e/ElspethUndauntedHero.java index 445548bb214..d04129b3531 100644 --- a/Mage.Sets/src/mage/cards/e/ElspethUndauntedHero.java +++ b/Mage.Sets/src/mage/cards/e/ElspethUndauntedHero.java @@ -28,7 +28,7 @@ import java.util.UUID; */ public final class ElspethUndauntedHero extends CardImpl { - private static final FilterCard filter = new FilterCard("Sunlit Hoplite"); + private static final FilterCard filter = new FilterCard("card named Sunlit Hoplite"); static { filter.add(new NamePredicate("Sunlit Hoplite")); diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java index 7af7131b283..15042461cbc 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java @@ -12,6 +12,7 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; +import mage.target.common.TargetCardInYourGraveyard; /** * @author Styxo @@ -67,7 +68,7 @@ public class SearchLibraryGraveyardPutInHandEffect extends OneShotEffect { } if (cardFound == null && controller.chooseUse(outcome, "Search your graveyard for a card named " + filter.getMessage() + '?', source, game)) { - TargetCard target = new TargetCard(0, 1, Zone.GRAVEYARD, filter); + TargetCard target = new TargetCardInYourGraveyard(0, 1, filter, true); target.clearChosen(); if (controller.choose(outcome, controller.getGraveyard(), target, game)) { if (!target.getTargets().isEmpty()) { diff --git a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java index 627244f47b5..726eec7a1e4 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java @@ -4,7 +4,6 @@ import mage.MageObject; import mage.abilities.Ability; import mage.abilities.effects.OneShotEffect; import mage.cards.Card; -import mage.cards.CardsImpl; import mage.constants.Outcome; import mage.constants.Zone; import mage.filter.FilterCard; @@ -12,9 +11,9 @@ import mage.game.Game; import mage.players.Player; import mage.target.TargetCard; import mage.target.common.TargetCardInLibrary; +import mage.target.common.TargetCardInYourGraveyard; /** - * * @author Styxo */ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffect { @@ -34,15 +33,14 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec super(Outcome.Benefit); this.filter = filter; this.forceToSearchBoth = forceToSearchBoth; - staticText = (youMay ? "You may" : "") + " search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a card named " + filter.getMessage() - + ", reveal it, and put it into your hand. " + (forceToSearchBoth ? "Then shuffle your library" : "If you search your library this way, shuffle it"); + staticText = (youMay ? "You may " : "") + "search your library and" + (forceToSearchBoth ? "" : "/or") + " graveyard for a " + filter.getMessage() + + " and put it onto the battlefield. " + (forceToSearchBoth ? "Then shuffle your library" : "If you search your library this way, shuffle it"); } public SearchLibraryGraveyardPutOntoBattlefieldEffect(final SearchLibraryGraveyardPutOntoBattlefieldEffect effect) { super(effect); this.filter = effect.filter; this.forceToSearchBoth = effect.forceToSearchBoth; - } @Override @@ -56,7 +54,7 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec MageObject sourceObject = source.getSourceObject(game); Card cardFound = null; if (controller != null && sourceObject != null) { - if (forceToSearchBoth || controller.chooseUse(outcome, "Search your library for a card named " + filter.getMessage() + '?', source, game)) { + if (forceToSearchBoth || controller.chooseUse(outcome, "Search your library for a " + filter.getMessage() + '?', source, game)) { TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter); target.clearChosen(); if (controller.searchLibrary(target, source, game)) { @@ -67,8 +65,8 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec controller.shuffleLibrary(source, game); } - if (cardFound == null && controller.chooseUse(outcome, "Search your graveyard for a card named " + filter.getMessage() + '?', source, game)) { - TargetCard target = new TargetCard(0, 1, Zone.GRAVEYARD, filter); + if (cardFound == null && controller.chooseUse(outcome, "Search your graveyard for a " + filter.getMessage() + '?', source, game)) { + TargetCard target = new TargetCardInYourGraveyard(0, 1, filter, true); target.clearChosen(); if (controller.choose(outcome, controller.getGraveyard(), target, game)) { if (!target.getTargets().isEmpty()) { @@ -78,7 +76,6 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec } if (cardFound != null) { - controller.revealCards(sourceObject.getIdName(), new CardsImpl(cardFound), game); controller.moveCards(cardFound, Zone.BATTLEFIELD, source, game); } @@ -87,5 +84,4 @@ public class SearchLibraryGraveyardPutOntoBattlefieldEffect extends OneShotEffec return false; } - }