mirror of
https://github.com/magefree/mage.git
synced 2025-12-24 04:22:01 -08:00
rework RevealCardsFromLibraryUntilEffect to use PutCards
This commit is contained in:
theelk801
parent
39d78aff2f
commit
a3c4dc2395
18 changed files with 122 additions and 159 deletions
|
|
@ -1,6 +1,5 @@
|
|||
package mage.abilities.effects.common;
|
||||
|
||||
import mage.MageObject;
|
||||
import mage.abilities.Ability;
|
||||
import mage.abilities.Mode;
|
||||
import mage.abilities.effects.OneShotEffect;
|
||||
|
|
@ -8,10 +7,10 @@ import mage.cards.Card;
|
|||
import mage.cards.Cards;
|
||||
import mage.cards.CardsImpl;
|
||||
import mage.constants.Outcome;
|
||||
import mage.constants.PutCards;
|
||||
import mage.constants.Zone;
|
||||
import mage.filter.FilterCard;
|
||||
import mage.game.Game;
|
||||
import mage.players.Library;
|
||||
import mage.players.Player;
|
||||
import mage.util.CardUtil;
|
||||
|
||||
|
|
@ -21,35 +20,21 @@ import mage.util.CardUtil;
|
|||
public class RevealCardsFromLibraryUntilEffect extends OneShotEffect {
|
||||
|
||||
private final FilterCard filter;
|
||||
private final Zone zoneToPutRest;
|
||||
private final Zone zoneToPutCard;
|
||||
private final boolean shuffleRestInto;
|
||||
private final boolean anyOrder;
|
||||
private final PutCards putPickedCard;
|
||||
private final PutCards putRemainingCards;
|
||||
|
||||
public RevealCardsFromLibraryUntilEffect(FilterCard filter, Zone zoneToPutCard, Zone zoneToPutRest) {
|
||||
this(filter, zoneToPutCard, zoneToPutRest, false, false);
|
||||
}
|
||||
|
||||
public RevealCardsFromLibraryUntilEffect(FilterCard filter, Zone zoneToPutCard, Zone zoneToPutRest, boolean shuffleRestInto) {
|
||||
this(filter, zoneToPutCard, zoneToPutRest, shuffleRestInto, false);
|
||||
}
|
||||
|
||||
public RevealCardsFromLibraryUntilEffect(FilterCard filter, Zone zoneToPutCard, Zone zoneToPutRest, boolean shuffleRestInto, boolean anyOrder) {
|
||||
public RevealCardsFromLibraryUntilEffect(FilterCard filter, PutCards putPickedCard, PutCards putRemainingCards) {
|
||||
super(Outcome.Benefit);
|
||||
this.filter = filter;
|
||||
this.zoneToPutCard = zoneToPutCard;
|
||||
this.zoneToPutRest = zoneToPutRest;
|
||||
this.shuffleRestInto = shuffleRestInto;
|
||||
this.anyOrder = anyOrder;
|
||||
this.putPickedCard = putPickedCard;
|
||||
this.putRemainingCards = putRemainingCards;
|
||||
}
|
||||
|
||||
private RevealCardsFromLibraryUntilEffect(final RevealCardsFromLibraryUntilEffect effect) {
|
||||
super(effect);
|
||||
this.filter = effect.filter;
|
||||
this.zoneToPutCard = effect.zoneToPutCard;
|
||||
this.zoneToPutRest = effect.zoneToPutRest;
|
||||
this.shuffleRestInto = effect.shuffleRestInto;
|
||||
this.anyOrder = effect.anyOrder;
|
||||
this.putPickedCard = effect.putPickedCard;
|
||||
this.putRemainingCards = effect.putRemainingCards;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -57,47 +42,32 @@ public class RevealCardsFromLibraryUntilEffect extends OneShotEffect {
|
|||
return new RevealCardsFromLibraryUntilEffect(this);
|
||||
}
|
||||
|
||||
private Card getCard(Player controller, Cards cards, Ability source, Game game) {
|
||||
for (Card card : controller.getLibrary().getCards(game)) {
|
||||
cards.add(card);
|
||||
if (filter.match(card, source.getControllerId(), source, game)) {
|
||||
return card;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean apply(Game game, Ability source) {
|
||||
Player controller = game.getPlayer(source.getControllerId());
|
||||
MageObject sourceObject = game.getObject(source);
|
||||
if (controller == null || !controller.getLibrary().hasCards()) {
|
||||
return false;
|
||||
}
|
||||
Cards cards = new CardsImpl();
|
||||
Library library = controller.getLibrary();
|
||||
Card card = null;
|
||||
do {
|
||||
card = library.removeFromTop(game);
|
||||
if (card != null) {
|
||||
cards.add(card);
|
||||
}
|
||||
} while (library.hasCards() && !filter.match(card, game));
|
||||
// reveal cards
|
||||
if (cards.isEmpty()) {
|
||||
return true;
|
||||
}
|
||||
controller.revealCards(sourceObject.getIdName(), cards, game);
|
||||
if (filter.match(card, game)) {
|
||||
// put card in correct zone
|
||||
controller.moveCards(card, zoneToPutCard, source, game);
|
||||
// remove it from revealed card list
|
||||
Card card = getCard(controller, cards, source, game);
|
||||
controller.revealCards(source, cards, game);
|
||||
putPickedCard.moveCard(controller, card, source, game, "card");
|
||||
if (putPickedCard.getZone() == Zone.LIBRARY) {
|
||||
cards.remove(card);
|
||||
}
|
||||
// Put the rest in correct zone
|
||||
if (zoneToPutRest == Zone.LIBRARY) {
|
||||
if (!cards.isEmpty()) {
|
||||
if (shuffleRestInto) {
|
||||
library.addAll(cards.getCards(game), game);
|
||||
} else {
|
||||
controller.putCardsOnBottomOfLibrary(cards, game, source, anyOrder);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (!cards.isEmpty()) {
|
||||
controller.moveCards(cards, zoneToPutRest, source, game);
|
||||
}
|
||||
cards.retainZone(Zone.LIBRARY, game);
|
||||
}
|
||||
putRemainingCards.moveCards(controller, cards, source, game);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -109,42 +79,20 @@ public class RevealCardsFromLibraryUntilEffect extends OneShotEffect {
|
|||
StringBuilder sb = new StringBuilder("reveal cards from the top of your library until you reveal ");
|
||||
sb.append(CardUtil.addArticle(filter.getMessage()));
|
||||
sb.append(". Put that card ");
|
||||
|
||||
switch (zoneToPutCard) {
|
||||
case HAND: {
|
||||
sb.append("into your hand");
|
||||
sb.append(putPickedCard.getMessage(false, false));
|
||||
switch (putRemainingCards) {
|
||||
case SHUFFLE:
|
||||
sb.append(" and shuffle the rest into your library");
|
||||
break;
|
||||
}
|
||||
case BATTLEFIELD: {
|
||||
sb.append("onto the battlefield");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
switch (zoneToPutRest) {
|
||||
case GRAVEYARD: {
|
||||
sb.append(" and put all other cards revealed this way into your graveyard.");
|
||||
break;
|
||||
}
|
||||
case LIBRARY: {
|
||||
if (shuffleRestInto) {
|
||||
sb.append(", then shuffles the rest into their library.");
|
||||
} else {
|
||||
sb.append(" and the rest on the bottom of your library in ");
|
||||
if (anyOrder) {
|
||||
sb.append("any");
|
||||
} else {
|
||||
sb.append("a random");
|
||||
|
||||
}
|
||||
sb.append(" order");
|
||||
}
|
||||
break;
|
||||
}
|
||||
case EXILED: {
|
||||
case EXILED:
|
||||
sb.append(" and exile all other cards revealed this way.");
|
||||
break;
|
||||
}
|
||||
case GRAVEYARD:
|
||||
sb.append(" and all other cards revealed this way into your graveyard");
|
||||
break;
|
||||
default:
|
||||
sb.append(" and the rest ");
|
||||
sb.append(putRemainingCards.getMessage(false, true));
|
||||
}
|
||||
return sb.toString();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ public enum PutCards {
|
|||
TOP_OR_BOTTOM(Outcome.Benefit, Zone.LIBRARY, "on the top or bottom of your library"),
|
||||
TOP_ANY(Outcome.Benefit, Zone.LIBRARY, "on top of your library", " in any order"),
|
||||
BOTTOM_ANY(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in any order"),
|
||||
BOTTOM_RANDOM(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in a random order");
|
||||
BOTTOM_RANDOM(Outcome.Benefit, Zone.LIBRARY, "on the bottom of your library", " in a random order"),
|
||||
SHUFFLE(Outcome.Benefit, Zone.LIBRARY, "shuffled into your library"); // may need special case code to generate correct text
|
||||
|
||||
private final Outcome outcome;
|
||||
private final Zone zone;
|
||||
|
|
@ -74,6 +75,8 @@ public enum PutCards {
|
|||
return player.putCardsOnBottomOfLibrary(new CardsImpl(card), game, source, false);
|
||||
case BATTLEFIELD_TAPPED:
|
||||
return player.moveCards(card, Zone.BATTLEFIELD, source, game, true, false, false, null);
|
||||
case SHUFFLE:
|
||||
return player.shuffleCardsToLibrary(card, game, source);
|
||||
case BATTLEFIELD_TRANSFORMED:
|
||||
game.getState().setValue(TransformAbility.VALUE_KEY_ENTER_TRANSFORMED + card.getId(), Boolean.TRUE);
|
||||
case BATTLEFIELD:
|
||||
|
|
@ -98,6 +101,8 @@ public enum PutCards {
|
|||
return player.putCardsOnBottomOfLibrary(cards, game, source, false);
|
||||
case BATTLEFIELD_TAPPED:
|
||||
return player.moveCards(cards.getCards(game), Zone.BATTLEFIELD, source, game, true, false, false, null);
|
||||
case SHUFFLE:
|
||||
return player.shuffleCardsToLibrary(cards, game, source);
|
||||
case BATTLEFIELD_TRANSFORMED:
|
||||
cards.stream().forEach(uuid -> game.getState().setValue(TransformAbility.VALUE_KEY_ENTER_TRANSFORMED + uuid, Boolean.TRUE));
|
||||
case BATTLEFIELD:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue