From 7484e46b04697b067c3bfacfd90f0984a0d67379 Mon Sep 17 00:00:00 2001 From: Justin Herlehy Date: Tue, 27 Dec 2016 22:41:29 -0500 Subject: [PATCH] Duskwatch Recruiter Fix Ability was incorrectly requiring a pick from the hidden zone if an applicable card was in the zone. Fixed to properly recognize the "may" ability. --- Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java index 6df06ab3b33..ac7299a3918 100644 --- a/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java +++ b/Mage.Sets/src/mage/cards/d/DuskwatchRecruiter.java @@ -27,7 +27,6 @@ */ package mage.cards.d; -import java.util.UUID; import mage.MageInt; import mage.abilities.TriggeredAbility; import mage.abilities.common.BeginningOfUpkeepTriggeredAbility; @@ -35,26 +34,28 @@ import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.condition.common.NoSpellsWereCastLastTurnCondition; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.decorator.ConditionalTriggeredAbility; -import mage.abilities.dynamicvalue.common.StaticValue; import mage.abilities.effects.common.LookLibraryAndPickControllerEffect; import mage.abilities.effects.common.TransformSourceEffect; import mage.abilities.keyword.TransformAbility; -import mage.cards.k.KrallenhordeHowler; import mage.cards.CardImpl; import mage.cards.CardSetInfo; +import mage.cards.k.KrallenhordeHowler; import mage.constants.CardType; import mage.constants.TargetController; import mage.constants.Zone; import mage.filter.common.FilterCreatureCard; +import java.util.UUID; + /** - * * @author fireshoes */ public class DuskwatchRecruiter extends CardImpl { + private static final FilterCreatureCard filter = new FilterCreatureCard("a creature card"); + public DuskwatchRecruiter(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); this.subtype.add("Human"); this.subtype.add("Warrior"); this.subtype.add("Werewolf"); @@ -68,7 +69,7 @@ public class DuskwatchRecruiter extends CardImpl { // {2}{G}: Look at the top three cards of your library. You may reveal a creature card from among them and put it into your hand. // Put the rest on the bottom of your library in any order. this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, - new LookLibraryAndPickControllerEffect(new StaticValue(3), false, new StaticValue(1), new FilterCreatureCard("a creature card"), false), + new LookLibraryAndPickControllerEffect(3, 1, filter, true, false, Zone.HAND, true), new ManaCostsImpl("{2}{G}"))); // At the beginning of each upkeep, if no spells were cast last turn, transform Duskwatch Recruiter. @@ -85,4 +86,5 @@ public class DuskwatchRecruiter extends CardImpl { public DuskwatchRecruiter copy() { return new DuskwatchRecruiter(this); } + }