From e1f43b03498c5b2d3387b37e4b13f7b2c38b32dd Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 08:43:07 +0000
Subject: [PATCH] convert Wolfbriar Elemental to keyword (xCount now accepts
 Count$TimesKicked)

---
 res/cardsfolder/wolfbriar_elemental.txt | 2 ++
 src/forge/CardFactoryUtil.java          | 3 +++
 src/forge/CardFactory_Creatures.java    | 4 ++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/res/cardsfolder/wolfbriar_elemental.txt b/res/cardsfolder/wolfbriar_elemental.txt
index 97ef3ad1d3f..1f43881de21 100644
--- a/res/cardsfolder/wolfbriar_elemental.txt
+++ b/res/cardsfolder/wolfbriar_elemental.txt
@@ -4,6 +4,8 @@ Types:Creature Elemental
 Text:When Wolfbriar Elemental enters the battlefield, put a 2/2 green Wolf creature token onto the battlefield for each time it was kicked.
 PT:4/4
 K:Multikicker G
+K:etbMakeToken<>X<>Wolf<>G 2 2 Wolf<>Controller<>G<>Creature;Wolf<>2<>2<>None<>put a 2/2 green Wolf creature token onto the battlefield for each time it was kicked.
+SVar:X:Count$TimesKicked
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/wolfbriar_elemental.jpg
 End
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index e09b75689a6..a47b96cc41b 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -3602,6 +3602,9 @@ public class CardFactoryUtil {
         // Count$CardCounters.<counterType>
         if (sq[0].contains("CardCounters"))
         	return doXMath(c.getCounters(Counters.getType(sq[1])), m);
+        // Count$TimesKicked
+        if(sq[0].contains("TimesKicked"))
+        	return c.getMultiKickerMagnitude();
         
         //Count$IfMainPhase.<numMain>.<numNotMain> // 7/10
         if (sq[0].contains("IfMainPhase"))
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index b542302d365..ceeda6c370c 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -17309,7 +17309,7 @@ public class CardFactory_Creatures {
         	card.addSpellAbility(ma);
         }//*************** END ************ END **************************
         
-        
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Wolfbriar Elemental"))
         {
@@ -17338,7 +17338,7 @@ public class CardFactory_Creatures {
             };
             card.addComesIntoPlayCommand(comesIntoPlay);
         }//*************** END ************ END **************************
-        
+        */
         
         //*************** START *********** START **************************
         else if (cardName.equals("Lightkeeper of Emeria"))