From 5a7e8df44e3c1b378e04b47b7a7a631f30309fe5 Mon Sep 17 00:00:00 2001 From: Sloth Date: Fri, 23 Nov 2012 19:06:17 +0000 Subject: [PATCH] - Fixed Sleeper Agent. --- res/cardsfolder/s/sleeper_agent.txt | 2 +- .../forge/card/abilityfactory/effects/ControlGainEffect.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/res/cardsfolder/s/sleeper_agent.txt b/res/cardsfolder/s/sleeper_agent.txt index 4de5e1391f3..9ed5d33641a 100644 --- a/res/cardsfolder/s/sleeper_agent.txt +++ b/res/cardsfolder/s/sleeper_agent.txt @@ -4,7 +4,7 @@ Types:Creature Minion Text:no text PT:3/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigGainControl | TriggerDescription$ When CARDNAME enters the battlefield, target opponent gains control of it. -SVar:TrigGainControl:AB$GainControl | Cost$ 0 | Defined$ Self | ValidTgts$ Opponent | TgtPrompt$ Select target opponent +SVar:TrigGainControl:AB$ GainControl | Cost$ 0 | Defined$ Self | ValidTgts$ Opponent | TgtPrompt$ Select target opponent T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ At the beginning of your upkeep, CARDNAME deals 2 damage to you. SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2 SVar:RemAIDeck:True diff --git a/src/main/java/forge/card/abilityfactory/effects/ControlGainEffect.java b/src/main/java/forge/card/abilityfactory/effects/ControlGainEffect.java index 972bc1a0863..dd61b349c3f 100644 --- a/src/main/java/forge/card/abilityfactory/effects/ControlGainEffect.java +++ b/src/main/java/forge/card/abilityfactory/effects/ControlGainEffect.java @@ -91,6 +91,8 @@ public class ControlGainEffect extends SpellEffect { if (sa.hasParam("AllValid")) { tgtCards = Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield); tgtCards = AbilityFactory.filterListByType(tgtCards, sa.getParam("AllValid"), sa); + } else if (sa.hasParam("Defined")) { + tgtCards = AbilityFactory.getDefinedCards(source, sa.getParam("Defined"), sa); } else { tgtCards = getTargetCards(sa); } @@ -99,7 +101,7 @@ public class ControlGainEffect extends SpellEffect { if (sa.hasParam("NewController")) { controllers = AbilityFactory.getDefinedPlayers(sa.getSourceCard(), sa.getParam("NewController"), sa); - } else if ((tgt != null) && (tgt.getTargetPlayers() != null) && tgt.canTgtPlayer()) { + } else if (tgt != null && tgt.getTargetPlayers() != null && tgt.canTgtPlayer()) { controllers = tgt.getTargetPlayers(); }