Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[Refactor] Edited RevealLibraryPutIntoHandEffect, deleted the same effect class (EnvoyEffect) and changed some cards

Browse source
This commit is contained in:
Styxo 2017-01-03 10:05:58 +01:00
parent 656e658fb4
commit a4a9e41464
19 changed files with 123 additions and 473 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Mage/src/main/java/mage/abilities/effects/common/RevealLibraryPutIntoHandEffect.java
View file

@ -51,16 +51,22 @@ public class RevealLibraryPutIntoHandEffect extends OneShotEffect {
private DynamicValue amountCards;
private FilterCard filter;
private Zone zoneToPutRest;
private boolean anyOrder;
public RevealLibraryPutIntoHandEffect(int amountCards, FilterCard filter, boolean anyOrder) {
this(new StaticValue(amountCards), filter, anyOrder);
public RevealLibraryPutIntoHandEffect(int amountCards, FilterCard filter, Zone zoneToPutRest) {
this(amountCards, filter, zoneToPutRest, true);
}
public RevealLibraryPutIntoHandEffect(DynamicValue amountCards, FilterCard filter, boolean anyOrder) {
public RevealLibraryPutIntoHandEffect(int amountCards, FilterCard filter, Zone zoneToPutRest, boolean anyOrder) {
this(new StaticValue(amountCards), filter, zoneToPutRest, anyOrder);
}
public RevealLibraryPutIntoHandEffect(DynamicValue amountCards, FilterCard filter, Zone zoneToPutRest, boolean anyOrder) {
super(Outcome.DrawCard);
this.amountCards = amountCards;
this.filter = filter;
this.zoneToPutRest = zoneToPutRest;
this.anyOrder = anyOrder;
this.staticText = setText();
}
@ -69,6 +75,7 @@ public class RevealLibraryPutIntoHandEffect extends OneShotEffect {
super(effect);
this.amountCards = effect.amountCards;
this.filter = effect.filter;
this.zoneToPutRest = effect.zoneToPutRest;
this.anyOrder = effect.anyOrder;
}
@ -98,7 +105,14 @@ public class RevealLibraryPutIntoHandEffect extends OneShotEffect {
}
}
controller.moveCards(cardsToHand, Zone.HAND, source, game);
controller.putCardsOnBottomOfLibrary(cards, game, source, anyOrder);
switch (zoneToPutRest) {
case LIBRARY: {
controller.putCardsOnBottomOfLibrary(cards, game, source, anyOrder);
break;
}
default:
controller.moveCards(cards, zoneToPutRest, source, game);
}
return true;
}
@ -106,10 +120,21 @@ public class RevealLibraryPutIntoHandEffect extends OneShotEffect {
StringBuilder sb = new StringBuilder("Reveal the top ");
sb.append(CardUtil.numberToText(amountCards.toString())).append(" cards of your library. Put all ");
sb.append(filter.getMessage());
sb.append(" revealed this way into your hand and the rest on the bottom of your library");
if (anyOrder) {
sb.append(" in any order");
sb.append(" revealed this way into your hand and the rest ");
switch (zoneToPutRest) {
case LIBRARY: {
sb.append("on the bottom of your library");
if (anyOrder) {
sb.append(" in any order");
} else {
sb.append(" in a random order");
}
break;
}
case GRAVEYARD:
sb.append("into your graveyard");
}
return sb.toString();
}
}