sorted TokenCardDefinitions. added Plant token. added Avenger of Zendikar

resources/magic/data/cards.txt

@@ -12287,3 +12287,14 @@ converted=1
 cost={1}
 ability=modular
 timing=main
+
+>Avenger of Zendikar
+image=http://magiccards.info/scans/en/wwk/96.jpg
+value=5
+rarity=M
+type=Creature
+subtype=Elemental
+converted=7
+cost={5}{G}{G}
+pt=5/5
+timing=fmain

resources/magic/data/images.txt

@@ -87,6 +87,7 @@ Goblin Soldier.jpg;http://magiccards.info/extras/token/eventide/goblin-soldier.j
 Merfolk Wizard.jpg;http://magiccards.info/extras/token/lorwyn/merfolk-wizard.jpg
 Myr1.jpg;http://magiccards.info/extras/token/scars-of-mirrodin/myr.jpg
 Ogre.jpg;http://magiccards.info/extras/token/worldwake/ogre.jpg
+Plant.jpg;http://magiccards.info/extras/token/worldwake/plant.jpg
 Saproling.jpg;http://magiccards.info/extras/token/tenth-edition/saproling.jpg
 Snake.jpg;http://magiccards.info/extras/token/zendikar/snake.jpg
 Soldier.jpg;http://magiccards.info/extras/token/magic-2010/soldier.jpg

src/magic/card/Avenger_of_Zendikar.java

@@ -0,0 +1,88 @@
+package magic.card;
+
+import java.util.Collection;
+
+import magic.data.TokenCardDefinitions;
+import magic.model.MagicCounterType;
+import magic.model.MagicDamage;
+import magic.model.MagicGame;
+import magic.model.MagicPermanent;
+import magic.model.MagicPlayer;
+import magic.model.MagicType;
+import magic.model.action.MagicChangeCountersAction;
+import magic.model.action.MagicDealDamageAction;
+import magic.model.action.MagicPlayTokenAction;
+import magic.model.choice.MagicMayChoice;
+import magic.model.choice.MagicSimpleMayChoice;
+import magic.model.event.MagicEvent;
+import magic.model.target.MagicTarget;
+import magic.model.target.MagicTargetFilter;
+import magic.model.trigger.MagicWhenComesIntoPlayTrigger;
+import magic.model.trigger.MagicWhenOtherComesIntoPlayTrigger;
+
+public class Avenger_of_Zendikar {
+    public static final MagicWhenComesIntoPlayTrigger T1 =new MagicWhenComesIntoPlayTrigger() {
+		@Override
+		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
+			return new MagicEvent(
+                    permanent,
+                    player,
+                    new Object[]{player},
+                    this,
+                    player + " puts a 0/1 green Plant creature token onto " +
+                    "the battlefield for each land he or she controls.");
+		}
+		@Override
+		public void executeEvent(
+                final MagicGame game,
+                final MagicEvent event,
+                final Object data[],
+                final Object[] choiceResults) {
+			final MagicPlayer player = (MagicPlayer)data[0];
+			int amount = player.getNrOfPermanentsWithType(MagicType.Land,game);
+			for (;amount>0;amount--) {
+				game.doAction(new MagicPlayTokenAction(player,TokenCardDefinitions.PLANT_TOKEN_CARD));
+			}
+		}		
+    };
+    
+    public static final MagicWhenOtherComesIntoPlayTrigger T2 = new MagicWhenOtherComesIntoPlayTrigger() {
+		@Override
+		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent played) {
+			final MagicPlayer player = permanent.getController();
+			return (player == played.getController() &&
+					played.isLand()) ?
+                new MagicEvent(
+                        permanent,
+                        player,
+                        new MagicSimpleMayChoice(
+                        		player + " may put a +1/+1 counter on each Plant creature he or she controls.",
+                                MagicSimpleMayChoice.ADD_CHARGE_COUNTER,
+                                1,
+                                MagicSimpleMayChoice.DEFAULT_YES),
+                        new Object[]{player},
+                        this,
+                        player + " may$ put a +1/+1 counter on each Plant creature he or she controls."):
+                MagicEvent.NONE;
+		}
+		@Override
+		public void executeEvent(
+                final MagicGame game,
+                final MagicEvent event,
+                final Object data[],
+                final Object[] choiceResults) {
+			if (MagicMayChoice.isYesChoice(choiceResults[0])) {
+				final MagicPlayer player = (MagicPlayer)data[0];
+				final Collection<MagicTarget> targets =
+		                game.filterTargets(player,MagicTargetFilter.TARGET_PLANT_YOU_CONTROL);
+					for (final MagicTarget target : targets) {
+						game.doAction(new MagicChangeCountersAction(
+								(MagicPermanent)target,
+								MagicCounterType.PlusOne,
+								1,
+								true));
+					}
+			}
+		}		
+    };
+}

src/magic/data/TokenCardDefinitions.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 public class TokenCardDefinitions {
 
-	public static final MagicCardDefinition ANGEL4_TOKEN_CARD=new MagicCardDefinition("Angel","Angel4") {
+	public static final MagicCardDefinition ANGEL4_TOKEN_CARD = new MagicCardDefinition("Angel","Angel4") {
 		public void initialize() {
 			setToken();
 			setValue(4);
@@ -27,6 +27,88 @@ public class TokenCardDefinitions {
 		}
 	};
 	
+	public static final MagicCardDefinition APE_TOKEN_CARD = new MagicCardDefinition("Ape","Ape") {
+		public void initialize() {
+			setToken();
+			setValue(3);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Ape"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Green);
+			setColoredType();
+			setPowerToughness(3,3);
+		}
+	};
+	
+	public static final MagicCardDefinition BAT_TOKEN_CARD = new MagicCardDefinition("Bat") {
+		public void initialize() {
+			setToken();
+			setValue(2);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Bat"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Black);
+			setColoredType();
+			setPowerToughness(1,1);
+			setAbility(MagicAbility.Flying);
+		}
+	};
+
+	public static final MagicCardDefinition BEAST3_TOKEN_CARD = new MagicCardDefinition("Beast","Beast3") {
+		public void initialize() {
+			setToken();
+			setValue(3);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Beast"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Green);
+			setColoredType();
+			setPowerToughness(3,3);
+		}
+	};
+	
+	public static final MagicCardDefinition BEAST4_TOKEN_CARD = new MagicCardDefinition("Beast","Beast4") {
+		public void initialize() {
+			setToken();
+			setValue(4);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Beast"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Green);
+			setColoredType();
+			setPowerToughness(4,4);
+		}
+	};
+	
+	public static final MagicCardDefinition BEAST8_TOKEN_CARD = new MagicCardDefinition("Beast","Beast8") {
+		public void initialize() {
+			setToken();
+			setValue(5);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Beast"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Red);
+			setColor(MagicColor.Green);
+			setColor(MagicColor.White);			
+			setColoredType();
+			setPowerToughness(8,8);
+		}
+	};
+	
+	public static final MagicCardDefinition BIRD_TOKEN_CARD = new MagicCardDefinition("Bird") {
+		public void initialize() {
+			setToken();
+			setValue(3);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Bird"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.White);
+			setColoredType();
+			setPowerToughness(3,3);
+			setAbility(MagicAbility.Flying);
+		}
+	};
+	
 	public static final MagicCardDefinition CAT2_TOKEN_CARD = new MagicCardDefinition("Cat","Cat2") {
 		public void initialize() {
 			setToken();
@@ -38,9 +120,9 @@ public class TokenCardDefinitions {
 			setColoredType();
 			setPowerToughness(2,2);
 		}
-	};
-	
-	public static final MagicCardDefinition DRAGON4_TOKEN_CARD=new MagicCardDefinition("Dragon","Dragon4") {
+	};	
+
+	public static final MagicCardDefinition DRAGON4_TOKEN_CARD = new MagicCardDefinition("Dragon","Dragon4") {
 		public void initialize() {
 			setToken();
 			setValue(4);
@@ -53,8 +135,8 @@ public class TokenCardDefinitions {
 			setAbility(MagicAbility.Flying);
 		}
 	};
-
-	public static final MagicCardDefinition DRAGON5_TOKEN_CARD=new MagicCardDefinition("Dragon","Dragon5") {
+	
+	public static final MagicCardDefinition DRAGON5_TOKEN_CARD = new MagicCardDefinition("Dragon","Dragon5") {
 		public void initialize() {
 			setToken();
 			setValue(5);
@@ -67,115 +149,62 @@ public class TokenCardDefinitions {
 			setAbility(MagicAbility.Flying);
 		}
 	};
-	
-	public static final MagicCardDefinition GOLEM3_ARTIFACT_TOKEN_CARD = new MagicCardDefinition("Golem","Golem3") {
+
+	public static final MagicCardDefinition ELDRAZI_SPAWN_TOKEN_CARD = new MagicCardDefinition("Eldrazi Spawn") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Eldrazi","Spawn"});
+			setCost(MagicManaCost.ZERO);
+			setColoredType();
+			setPowerToughness(0,1);
+			addManaActivation(new MagicSacrificeManaActivation(Arrays.asList(MagicManaType.Colorless)));
+			setExcludeManaOrCombat();
+		}
+	};
+
+	public static final MagicCardDefinition ELEPHANT_TOKEN_CARD = new MagicCardDefinition("Elephant") {
 		public void initialize() {
 			setToken();
 			setValue(3);
-			addType(MagicType.Artifact);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Golem"});
+			setSubTypes(new String[]{"Elephant"});
 			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Green);
 			setColoredType();
 			setPowerToughness(3,3);
 		}
 	};
 	
-	public static final MagicCardDefinition INSECT1_TOKEN_CARD = new MagicCardDefinition("Insect","Insect1") {
+	public static final MagicCardDefinition FAERIE_ROGUE_TOKEN_CARD = new MagicCardDefinition("Faerie Rogue") {
 		public void initialize() {
 			setToken();
-			setValue(1);
+			setValue(2);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Insect"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
-			setColoredType();
-			setPowerToughness(1,1);
-			setAbility(MagicAbility.Infect);
-		}
-	};
-	
-	public static final MagicCardDefinition WORM_TOKEN_CARD=new MagicCardDefinition("Worm") {
-		public void initialize() {
-			setToken();
-			setValue(1);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Worm"});
+			setSubTypes(new String[]{"Faerie","Rogue"});
 			setCost(MagicManaCost.ZERO);
 			setColor(MagicColor.Black);
-			setColor(MagicColor.Green);
 			setColoredType();
 			setPowerToughness(1,1);
+			setAbility(MagicAbility.Flying);
 		}
 	};
-	
-	public static final MagicCardDefinition SAPROLING_TOKEN_CARD=new MagicCardDefinition("Saproling") {
+
+	public static final MagicCardDefinition GERM_TOKEN_CARD = new MagicCardDefinition("Germ") {
 		public void initialize() {
 			setToken();
 			setValue(1);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Saproling"});
+			setSubTypes(new String[]{"Germ"});
 			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
+			setColor(MagicColor.Black);
 			setColoredType();
-			setPowerToughness(1,1);
+			setPowerToughness(0,0);
 		}
 	};	
-
-	public static final MagicCardDefinition SNAKE_TOKEN_CARD=new MagicCardDefinition("Snake") {
-		public void initialize() {
-			setToken();
-			setValue(1);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Snake"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
-			setColoredType();
-			setPowerToughness(1,1);
-		}
-	};
 	
-	public static final MagicCardDefinition SOLDIER_TOKEN_CARD=new MagicCardDefinition("Soldier") {
-		public void initialize() {
-			setToken();
-			setValue(1);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Soldier"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.White);
-			setColoredType();
-			setPowerToughness(1,1);
-		}
-	};
-
-	public static final MagicCardDefinition GOBLIN1_TOKEN_CARD=new MagicCardDefinition("Goblin","Goblin1") {
-		public void initialize() {
-			setToken();
-			setValue(1);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Goblin"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Red);
-			setColoredType();
-			setPowerToughness(1,1);
-		}
-	};
-
-	public static final MagicCardDefinition GOBLIN2_TOKEN_CARD=new MagicCardDefinition("Goblin","Goblin2") {
-		public void initialize() {
-			setToken();
-			setValue(1);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Goblin"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Red);
-			setColoredType();
-			setPowerToughness(2,1);
-			setAbility(MagicAbility.Haste);
-		}
-	};
-	
-	public static final MagicCardDefinition GOBLIN_SOLDIER_TOKEN_CARD=new MagicCardDefinition("Goblin Soldier") {
+	public static final MagicCardDefinition GOBLIN_SOLDIER_TOKEN_CARD = new MagicCardDefinition("Goblin Soldier") {
 		public void initialize() {
 			setToken();
 			setValue(1);
@@ -188,75 +217,48 @@ public class TokenCardDefinitions {
 			setPowerToughness(1,1);
 		}
 	};
+	
+	public static final MagicCardDefinition GOBLIN1_TOKEN_CARD = new MagicCardDefinition("Goblin","Goblin1") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Goblin"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Red);
+			setColoredType();
+			setPowerToughness(1,1);
+		}
+	};
 
-	public static final MagicCardDefinition OGRE_TOKEN_CARD=new MagicCardDefinition("Ogre") {
+	public static final MagicCardDefinition GOBLIN2_TOKEN_CARD = new MagicCardDefinition("Goblin","Goblin2") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Goblin"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Red);
+			setColoredType();
+			setPowerToughness(2,1);
+			setAbility(MagicAbility.Haste);
+		}
+	};	
+	
+	public static final MagicCardDefinition GOLEM3_ARTIFACT_TOKEN_CARD = new MagicCardDefinition("Golem","Golem3") {
 		public void initialize() {
 			setToken();
 			setValue(3);
+			addType(MagicType.Artifact);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Ogre"});
+			setSubTypes(new String[]{"Golem"});
 			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Red);
 			setColoredType();
 			setPowerToughness(3,3);
 		}
 	};	
 	
-	public static final MagicCardDefinition SPIRIT1_TOKEN_CARD = new MagicCardDefinition("Spirit","Spirit1") {
-		public void initialize() {
-			setToken();
-			setValue(1);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Spirit"});
-			setCost(MagicManaCost.ZERO);
-			setColoredType();
-			setPowerToughness(1,1);
-		}
-	};
-	
-	public static final MagicCardDefinition SPIRIT2_TOKEN_CARD = new MagicCardDefinition("Spirit","Spirit2") {
-		public void initialize() {
-			setToken();
-			setValue(1);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Spirit"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.White);
-			setColoredType();
-			setPowerToughness(1,1);
-			setAbility(MagicAbility.Flying);
-		}
-	};
-
-	public static final MagicCardDefinition BAT_TOKEN_CARD=new MagicCardDefinition("Bat") {
-		public void initialize() {
-			setToken();
-			setValue(2);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Bat"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Black);
-			setColoredType();
-			setPowerToughness(1,1);
-			setAbility(MagicAbility.Flying);
-		}
-	};	
-	
-	public static final MagicCardDefinition FAERIE_ROGUE_TOKEN_CARD=new MagicCardDefinition("Faerie Rogue") {
-		public void initialize() {
-			setToken();
-			setValue(2);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Faerie","Rogue"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Black);
-			setColoredType();
-			setPowerToughness(1,1);
-			setAbility(MagicAbility.Flying);
-		}
-	};	
-	
-	public static final MagicCardDefinition GRIFFIN_TOKEN_CARD=new MagicCardDefinition("Griffin") {
+	public static final MagicCardDefinition GRIFFIN_TOKEN_CARD = new MagicCardDefinition("Griffin") {
 		public void initialize() {
 			setToken();
 			setValue(3);
@@ -270,17 +272,17 @@ public class TokenCardDefinitions {
 		}
 	};	
 	
-	public static final MagicCardDefinition BIRD_TOKEN_CARD=new MagicCardDefinition("Bird") {
+	public static final MagicCardDefinition INSECT1_TOKEN_CARD = new MagicCardDefinition("Insect","Insect1") {
 		public void initialize() {
 			setToken();
-			setValue(3);
+			setValue(1);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Bird"});
+			setSubTypes(new String[]{"Insect"});
 			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.White);
+			setColor(MagicColor.Green);
 			setColoredType();
-			setPowerToughness(3,3);
-			setAbility(MagicAbility.Flying);
+			setPowerToughness(1,1);
+			setAbility(MagicAbility.Infect);
 		}
 	};
 	
@@ -310,127 +312,112 @@ public class TokenCardDefinitions {
 		}
 	};
 	
-	public static final MagicCardDefinition APE_TOKEN_CARD=new MagicCardDefinition("Ape","Ape") {
+	public static final MagicCardDefinition OGRE_TOKEN_CARD = new MagicCardDefinition("Ogre") {
 		public void initialize() {
 			setToken();
 			setValue(3);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Ape"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
-			setColoredType();
-			setPowerToughness(3,3);
-		}
-	};	
-	
-	public static final MagicCardDefinition BEAST3_TOKEN_CARD=new MagicCardDefinition("Beast","Beast3") {
-		public void initialize() {
-			setToken();
-			setValue(3);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Beast"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
-			setColoredType();
-			setPowerToughness(3,3);
-		}
-	};	
-	
-	public static final MagicCardDefinition BEAST4_TOKEN_CARD=new MagicCardDefinition("Beast","Beast4") {
-		public void initialize() {
-			setToken();
-			setValue(4);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Beast"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
-			setColoredType();
-			setPowerToughness(4,4);
-		}
-	};	
-	
-	public static final MagicCardDefinition BEAST8_TOKEN_CARD=new MagicCardDefinition("Beast","Beast8") {
-		public void initialize() {
-			setToken();
-			setValue(5);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Beast"});
+			setSubTypes(new String[]{"Ogre"});
 			setCost(MagicManaCost.ZERO);
 			setColor(MagicColor.Red);
-			setColor(MagicColor.Green);
-			setColor(MagicColor.White);			
-			setColoredType();
-			setPowerToughness(8,8);
-		}
-	};	
-
-	public static final MagicCardDefinition ELEPHANT_TOKEN_CARD=new MagicCardDefinition("Elephant") {
-		public void initialize() {
-			setToken();
-			setValue(3);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Elephant"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
 			setColoredType();
 			setPowerToughness(3,3);
 		}
-	};	
+	};
 	
-	public static final MagicCardDefinition GERM_TOKEN_CARD=new MagicCardDefinition("Germ") {
+	public static final MagicCardDefinition PLANT_TOKEN_CARD = new MagicCardDefinition("Plant") {
 		public void initialize() {
 			setToken();
 			setValue(1);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Germ"});
+			setSubTypes(new String[]{"Plant"});
 			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Black);
+			setColor(MagicColor.Green);
 			setColoredType();
-			setPowerToughness(0,0);
+			setPowerToughness(0,1);
 		}
-	};
+	};	
 	
-	public static final MagicCardDefinition ZOMBIE_TOKEN_CARD=new MagicCardDefinition("Zombie") {
+	public static final MagicCardDefinition SAPROLING_TOKEN_CARD = new MagicCardDefinition("Saproling") {
 		public void initialize() {
 			setToken();
-			setValue(2);
+			setValue(1);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Zombie"});
+			setSubTypes(new String[]{"Saproling"});
 			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Black);
+			setColor(MagicColor.Green);
 			setColoredType();
-			setPowerToughness(2,2);
+			setPowerToughness(1,1);
+		}
+	};	
+	
+	public static final MagicCardDefinition SNAKE_TOKEN_CARD = new MagicCardDefinition("Snake") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Snake"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Green);
+			setColoredType();
+			setPowerToughness(1,1);
+		}
+	};	
+	
+	public static final MagicCardDefinition SOLDIER_TOKEN_CARD = new MagicCardDefinition("Soldier") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Soldier"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.White);
+			setColoredType();
+			setPowerToughness(1,1);
+		}
+	};	
+
+	public static final MagicCardDefinition SPIRIT1_TOKEN_CARD = new MagicCardDefinition("Spirit","Spirit1") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Spirit"});
+			setCost(MagicManaCost.ZERO);
+			setColoredType();
+			setPowerToughness(1,1);
+		}
+	};	
+	
+	public static final MagicCardDefinition SPIRIT2_TOKEN_CARD = new MagicCardDefinition("Spirit","Spirit2") {
+		public void initialize() {
+			setToken();
+			setValue(1);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Spirit"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.White);
+			setColoredType();
+			setPowerToughness(1,1);
+			setAbility(MagicAbility.Flying);
 		}
 	};
 	
-	public static final MagicCardDefinition ZOMBIE_GIANT_TOKEN_CARD=new MagicCardDefinition("Zombie Giant") {
+	public static final MagicCardDefinition TUKTUK_THE_RETURNED_TOKEN_CARD = new MagicCardDefinition("Tuktuk the Returned") {
 		public void initialize() {
 			setToken();
 			setValue(4);
+			addType(MagicType.Legendary);
+			addType(MagicType.Artifact);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Zombie","Giant"});
+			setSubTypes(new String[]{"Goblin","Golem"});
 			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Black);
 			setColoredType();
 			setPowerToughness(5,5);
 		}
 	};
 
-	public static final MagicCardDefinition WOLF_TOKEN_CARD=new MagicCardDefinition("Wolf") {
-		public void initialize() {
-
-			setToken();
-			setValue(2);
-			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Wolf"});
-			setCost(MagicManaCost.ZERO);
-			setColor(MagicColor.Green);
-			setColoredType();
-			setPowerToughness(2,2);
-		}
-	};
-	
-	public static final MagicCardDefinition VOJA_TOKEN_CARD=new MagicCardDefinition("Voja") {
+	public static final MagicCardDefinition VOJA_TOKEN_CARD = new MagicCardDefinition("Voja") {
 		public void initialize() {
 			setToken();
 			setValue(2);
@@ -444,36 +431,36 @@ public class TokenCardDefinitions {
 			setPowerToughness(2,2);
 		}
 	};
-
-	public static final MagicCardDefinition TUKTUK_THE_RETURNED_TOKEN_CARD=new MagicCardDefinition("Tuktuk the Returned") {
+	
+	public static final MagicCardDefinition WOLF_TOKEN_CARD = new MagicCardDefinition("Wolf") {
 		public void initialize() {
+
 			setToken();
-			setValue(4);
-			addType(MagicType.Legendary);
-			addType(MagicType.Artifact);
+			setValue(2);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Goblin","Golem"});
+			setSubTypes(new String[]{"Wolf"});
 			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Green);
 			setColoredType();
-			setPowerToughness(5,5);
+			setPowerToughness(2,2);
 		}
 	};
-	
-	public static final MagicCardDefinition ELDRAZI_SPAWN_TOKEN_CARD=new MagicCardDefinition("Eldrazi Spawn") {
+
+	public static final MagicCardDefinition WORM_TOKEN_CARD = new MagicCardDefinition("Worm") {
 		public void initialize() {
 			setToken();
 			setValue(1);
 			addType(MagicType.Creature);
-			setSubTypes(new String[]{"Eldrazi","Spawn"});
+			setSubTypes(new String[]{"Worm"});
 			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Black);
+			setColor(MagicColor.Green);
 			setColoredType();
-			setPowerToughness(0,1);
-			addManaActivation(new MagicSacrificeManaActivation(Arrays.asList(MagicManaType.Colorless)));
-			setExcludeManaOrCombat();
+			setPowerToughness(1,1);
 		}
-	};	
+	};
 	
-	public static final MagicCardDefinition WURM1_TOKEN_CARD=new MagicCardDefinition("Wurm","Wurm1") {
+	public static final MagicCardDefinition WURM1_TOKEN_CARD = new MagicCardDefinition("Wurm","Wurm1") {
 		public void initialize() {
 			setToken();
 			setValue(3);
@@ -485,9 +472,9 @@ public class TokenCardDefinitions {
 			setPowerToughness(3,3);
 			setAbility(MagicAbility.Deathtouch);
 		}
-	};
-
-	public static final MagicCardDefinition WURM2_TOKEN_CARD=new MagicCardDefinition("Wurm","Wurm2") {
+	};	
+	
+	public static final MagicCardDefinition WURM2_TOKEN_CARD = new MagicCardDefinition("Wurm","Wurm2") {
 		public void initialize() {
 			setToken();
 			setValue(3);
@@ -500,43 +487,70 @@ public class TokenCardDefinitions {
 			setAbility(MagicAbility.LifeLink);
 		}
 	};
+
+	public static final MagicCardDefinition ZOMBIE_GIANT_TOKEN_CARD = new MagicCardDefinition("Zombie Giant") {
+		public void initialize() {
+			setToken();
+			setValue(4);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Zombie","Giant"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Black);
+			setColoredType();
+			setPowerToughness(5,5);
+		}
+	};
 	
-	public static final List<MagicCardDefinition> TOKEN_CARDS=Arrays.asList(
-		ANGEL4_TOKEN_CARD,
-		CAT2_TOKEN_CARD,
-		DRAGON4_TOKEN_CARD,
-		DRAGON5_TOKEN_CARD,
-		GOLEM3_ARTIFACT_TOKEN_CARD,
-		INSECT1_TOKEN_CARD,
-		WORM_TOKEN_CARD,
-		SAPROLING_TOKEN_CARD,
-		SNAKE_TOKEN_CARD,
-		SOLDIER_TOKEN_CARD,
-		GOBLIN1_TOKEN_CARD,
-		GOBLIN2_TOKEN_CARD,
-		GOBLIN_SOLDIER_TOKEN_CARD,
-		OGRE_TOKEN_CARD,
-		SPIRIT1_TOKEN_CARD,
-		SPIRIT2_TOKEN_CARD,
-		BAT_TOKEN_CARD,
-		FAERIE_ROGUE_TOKEN_CARD,
-		GRIFFIN_TOKEN_CARD,
-		BIRD_TOKEN_CARD,
-		MERFOLK_WIZARD_TOKEN_CARD,
-		MYR1_TOKEN_CARD,
-		APE_TOKEN_CARD,
-		BEAST3_TOKEN_CARD,
-		BEAST4_TOKEN_CARD,
-		BEAST8_TOKEN_CARD,
-		ELEPHANT_TOKEN_CARD,
-		GERM_TOKEN_CARD,
-		ZOMBIE_TOKEN_CARD,
-		ZOMBIE_GIANT_TOKEN_CARD,
-		WOLF_TOKEN_CARD,
-		VOJA_TOKEN_CARD,
-		TUKTUK_THE_RETURNED_TOKEN_CARD,
-		ELDRAZI_SPAWN_TOKEN_CARD,
-		WURM1_TOKEN_CARD,
-		WURM2_TOKEN_CARD
-	);
+	public static final MagicCardDefinition ZOMBIE_TOKEN_CARD = new MagicCardDefinition("Zombie") {
+		public void initialize() {
+			setToken();
+			setValue(2);
+			addType(MagicType.Creature);
+			setSubTypes(new String[]{"Zombie"});
+			setCost(MagicManaCost.ZERO);
+			setColor(MagicColor.Black);
+			setColoredType();
+			setPowerToughness(2,2);
+		}
+	};
+	
+	public static final List<MagicCardDefinition> TOKEN_CARDS = Arrays.asList(
+			ANGEL4_TOKEN_CARD,
+			APE_TOKEN_CARD,
+			BAT_TOKEN_CARD,
+			BEAST3_TOKEN_CARD,
+			BEAST4_TOKEN_CARD,
+			BEAST8_TOKEN_CARD,
+			BIRD_TOKEN_CARD,
+			CAT2_TOKEN_CARD,
+			DRAGON4_TOKEN_CARD,
+			DRAGON5_TOKEN_CARD,
+			ELDRAZI_SPAWN_TOKEN_CARD,
+			ELEPHANT_TOKEN_CARD,
+			FAERIE_ROGUE_TOKEN_CARD,
+			GERM_TOKEN_CARD,
+			GOBLIN1_TOKEN_CARD,
+			GOBLIN2_TOKEN_CARD,
+			GOBLIN_SOLDIER_TOKEN_CARD,
+			GOLEM3_ARTIFACT_TOKEN_CARD,
+			GRIFFIN_TOKEN_CARD,
+			INSECT1_TOKEN_CARD,
+			MERFOLK_WIZARD_TOKEN_CARD,
+			MYR1_TOKEN_CARD,
+			OGRE_TOKEN_CARD,
+			PLANT_TOKEN_CARD,
+			SAPROLING_TOKEN_CARD,
+			SNAKE_TOKEN_CARD,
+			SOLDIER_TOKEN_CARD,
+			SPIRIT1_TOKEN_CARD,
+			SPIRIT2_TOKEN_CARD,
+			TUKTUK_THE_RETURNED_TOKEN_CARD,
+			VOJA_TOKEN_CARD,
+			WOLF_TOKEN_CARD,
+			WORM_TOKEN_CARD,
+			WURM1_TOKEN_CARD,
+			WURM2_TOKEN_CARD,
+			ZOMBIE_GIANT_TOKEN_CARD,
+			ZOMBIE_TOKEN_CARD
+		);
 }

src/magic/model/target/MagicTargetFilter.java

@@ -970,6 +970,17 @@ public interface MagicTargetFilter {
 		}		
 	};
 	
+	MagicTargetFilter TARGET_PLANT_YOU_CONTROL = new MagicTargetFilter() {
+		public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {
+			return target.getController() == player && 
+                   ((MagicPermanent)target).isCreature(game) && 
+                   ((MagicPermanent)target).hasSubType(MagicSubType.Plant,game);
+		}
+		public boolean acceptType(final MagicTargetType targetType) {
+			return targetType == MagicTargetType.Permanent;
+		}		
+	};
+	
 	MagicTargetFilter TARGET_CREATURE_YOUR_OPPONENT_CONTROLS=new MagicTargetFilter() {
 		
 		public boolean accept(final MagicGame game,final MagicPlayer player,final MagicTarget target) {