External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Elspeth, Undaunted Hero - fixed wrong text;

Browse source
This commit is contained in:
Oleg Agafonov 2020-06-25 00:37:13 +04:00
parent e33505ff7d
commit 6dfacfbca5
3 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutInHandEffect.java
View file

@ -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()) {

16
Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryGraveyardPutOntoBattlefieldEffect.java
View file

@ -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;
}
}