diff --git a/Mage.Sets/src/mage/cards/k/KelpieGuide.java b/Mage.Sets/src/mage/cards/k/KelpieGuide.java index 9334115538e..3368a814c16 100644 --- a/Mage.Sets/src/mage/cards/k/KelpieGuide.java +++ b/Mage.Sets/src/mage/cards/k/KelpieGuide.java @@ -7,11 +7,9 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.Condition; import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; import mage.abilities.costs.common.TapSourceCost; -import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount; import mage.abilities.effects.common.TapTargetEffect; import mage.abilities.effects.common.UntapTargetEffect; -import mage.abilities.hint.Hint; -import mage.abilities.hint.ValueHint; +import mage.abilities.hint.common.LandsYouControlHint; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -33,8 +31,6 @@ public final class KelpieGuide extends CardImpl { = new FilterControlledLandPermanent("you control eight or more lands"); private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter, ComparisonType.MORE_THAN, 7); - private static final Hint hint - = new ValueHint("Lands you control", new PermanentsOnBattlefieldCount(filter)); public KelpieGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); @@ -53,7 +49,7 @@ public final class KelpieGuide extends CardImpl { Zone.BATTLEFIELD, new TapTargetEffect(), new TapSourceCost(), condition ); ability.addTarget(new TargetPermanent()); - this.addAbility(ability.addHint(hint)); + this.addAbility(ability.addHint(LandsYouControlHint.instance)); } private KelpieGuide(final KelpieGuide card) { diff --git a/Mage.Sets/src/mage/cards/z/ZimoneQuandrixProdigy.java b/Mage.Sets/src/mage/cards/z/ZimoneQuandrixProdigy.java new file mode 100644 index 00000000000..57a85e9078a --- /dev/null +++ b/Mage.Sets/src/mage/cards/z/ZimoneQuandrixProdigy.java @@ -0,0 +1,68 @@ +package mage.cards.z; + +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.condition.Condition; +import mage.abilities.condition.common.PermanentsOnTheBattlefieldCondition; +import mage.abilities.costs.common.TapSourceCost; +import mage.abilities.costs.mana.GenericManaCost; +import mage.abilities.decorator.ConditionalOneShotEffect; +import mage.abilities.effects.common.DrawCardSourceControllerEffect; +import mage.abilities.effects.common.PutCardFromHandOntoBattlefieldEffect; +import mage.abilities.hint.common.LandsYouControlHint; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.ComparisonType; +import mage.constants.SubType; +import mage.constants.SuperType; +import mage.filter.StaticFilters; + +import java.util.UUID; + +/** + * @author TheElk801 + */ +public final class ZimoneQuandrixProdigy extends CardImpl { + + private static final Condition condition = new PermanentsOnTheBattlefieldCondition( + StaticFilters.FILTER_CONTROLLED_PERMANENT_LAND, ComparisonType.MORE_THAN, 7 + ); + + public ZimoneQuandrixProdigy(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}{U}"); + + this.addSuperType(SuperType.LEGENDARY); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.WIZARD); + this.power = new MageInt(1); + this.toughness = new MageInt(2); + + // {1}, {T}: You may put a land card from your hand onto the battlefield tapped. + Ability ability = new SimpleActivatedAbility( + new PutCardFromHandOntoBattlefieldEffect(StaticFilters.FILTER_CARD_LAND_A), new GenericManaCost(1) + ); + ability.addCost(new TapSourceCost()); + this.addAbility(ability); + + // {4}, {T}: Draw a card. If you control eight or more lands, draw two cards instead. + ability = new SimpleActivatedAbility(new ConditionalOneShotEffect( + new DrawCardSourceControllerEffect(2), + new DrawCardSourceControllerEffect(1), + condition, "draw a card. If you control " + + "eight or more lands, draw two cards instead" + ), new GenericManaCost(4)); + ability.addCost(new TapSourceCost()); + this.addAbility(ability.addHint(LandsYouControlHint.instance)); + } + + private ZimoneQuandrixProdigy(final ZimoneQuandrixProdigy card) { + super(card); + } + + @Override + public ZimoneQuandrixProdigy copy() { + return new ZimoneQuandrixProdigy(this); + } +} diff --git a/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java b/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java index 3503a155487..c3b33c9601f 100644 --- a/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java +++ b/Mage.Sets/src/mage/sets/StrixhavenSchoolOfMages.java @@ -239,6 +239,7 @@ public final class StrixhavenSchoolOfMages extends ExpansionSet { cards.add(new SetCardInfo("Witherbloom Command", 248, Rarity.RARE, mage.cards.w.WitherbloomCommand.class)); cards.add(new SetCardInfo("Witherbloom Pledgemage", 249, Rarity.COMMON, mage.cards.w.WitherbloomPledgemage.class)); cards.add(new SetCardInfo("Wormhole Serpent", 62, Rarity.UNCOMMON, mage.cards.w.WormholeSerpent.class)); + cards.add(new SetCardInfo("Zimone, Quandrix Prodigy", 250, Rarity.UNCOMMON, mage.cards.z.ZimoneQuandrixProdigy.class)); } @Override