From 83b97fc101ccb76af7fc8327ca0f1ca925cfd2b7 Mon Sep 17 00:00:00 2001 From: Sloth Date: Tue, 1 May 2012 15:37:57 +0000 Subject: [PATCH] - Added "AITgts" parameter to AF Counter (Example: Burnout). --- res/cardsfolder/b/burnout.txt | 2 +- .../forge/card/abilityfactory/AbilityFactoryCounterMagic.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/res/cardsfolder/b/burnout.txt b/res/cardsfolder/b/burnout.txt index 3d4fcdc4a94..cf7465fdd87 100644 --- a/res/cardsfolder/b/burnout.txt +++ b/res/cardsfolder/b/burnout.txt @@ -2,7 +2,7 @@ Name:Burnout ManaCost:1 R Types:Instant Text:no text -A:SP$ Counter | Cost$ 1 R | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Card.Instant | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SpellDescription$ Counter target instant spell if it's blue. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DBDraw +A:SP$ Counter | Cost$ 1 R | TargetType$ Spell | TgtPrompt$ Select target spell | ValidTgts$ Instant | AITgts$ Card.Blue | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SpellDescription$ Counter target instant spell if it's blue. Draw a card at the beginning of the next turn's upkeep. | SubAbility$ DBDraw SVar:DBDraw:DB$Draw | NumCards$ 1 | NextUpkeep$ True | Defined$ You SVar:X:Targeted$Valid Card.Blue SVar:RemRandomDeck:True diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java index ff75bc26769..725bdef9fc0 100644 --- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java +++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCounterMagic.java @@ -242,6 +242,10 @@ public class AbilityFactoryCounterMagic { if (!CardFactoryUtil.isCounterable(topSA.getSourceCard()) || topSA.getActivatingPlayer().isComputer()) { return false; } + if (params.containsKey("AITgts") && (topSA.getSourceCard() == null + || !topSA.getSourceCard().isValid(params.get("AITgts"), sa.getActivatingPlayer(), source))) { + return false; + } tgt.resetTargets(); if (TargetSelection.matchSpellAbility(sa, topSA, tgt)) {