github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-12 03:00:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed Nissa, Genesis Mage -10 forcing players to put 10 cards into play in order to continue

Browse source
This commit is contained in:
Evan Kranzler 2017-10-22 09:16:51 -04:00
parent 3f62c8d896
commit f29141605b
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Mage.Sets/src/mage/cards/n/NissaGenesisMage.java
View file

@ -42,8 +42,7 @@ import mage.constants.SubType;
import mage.constants.SuperType;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.common.FilterLandPermanent;
import mage.filter.StaticFilters;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.CardTypePredicate;
import mage.target.common.TargetCreaturePermanent;
@ -55,6 +54,15 @@ import mage.target.common.TargetLandPermanent;
*/
public class NissaGenesisMage extends CardImpl {
private static final FilterCard filter = new FilterCard("any number of creature and/or land cards");
static {
filter.add(Predicates.or(
new CardTypePredicate(CardType.CREATURE),
new CardTypePredicate(CardType.LAND)
));
}
public NissaGenesisMage(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.PLANESWALKER}, "{5}{G}{G}");
this.addSuperType(SuperType.LEGENDARY);
@ -64,8 +72,8 @@ public class NissaGenesisMage extends CardImpl {
//+2: Untap up to two target creatures and up to two target lands.
Ability ability = new LoyaltyAbility(new UntapTargetEffect(false).setText("Untap up to two target creatures and up to two target lands"), +2);
ability.addTarget(new TargetCreaturePermanent(0, 2, new FilterCreaturePermanent("target creatures"), false));
ability.addTarget(new TargetLandPermanent(0, 2, new FilterLandPermanent("target land"), false));
ability.addTarget(new TargetCreaturePermanent(0, 2, StaticFilters.FILTER_PERMANENT_CREATURES, false));
ability.addTarget(new TargetLandPermanent(0, 2, StaticFilters.FILTER_LANDS, false));
this.addAbility(ability);
//-3: Target creature gets +5/+5 until end of turn.
@ -74,10 +82,8 @@ public class NissaGenesisMage extends CardImpl {
this.addAbility(ability);
//-10: Look at the top ten cards of your library. You may put any number of creature and/or land cards from among them onto the battlefield. Put the rest on the bottom of your library in a random order.);
FilterCard filter = new FilterCard("creature and/or land cards");
filter.add(Predicates.or(new CardTypePredicate(CardType.CREATURE), new CardTypePredicate(CardType.LAND)));
this.addAbility(new LoyaltyAbility(
new LookLibraryAndPickControllerEffect(10, 10, filter, false, false, Zone.BATTLEFIELD, true).setBackInRandomOrder(true),
new LookLibraryAndPickControllerEffect(10, 10, filter, false, true, Zone.BATTLEFIELD, false).setBackInRandomOrder(true),
-10));
}

2
Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java
View file

@ -270,7 +270,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff
} else {
sb.append('P');
}
sb.append("put ").append(filter.getMessage()).append(" from among them onto the ");
sb.append("ut ").append(filter.getMessage()).append(" from among them onto the ");
} else {
sb.append(". Put ");
if (numberToPick.calculate(null, null, this) > 1) {