Erwan

- fix issue 153 (Tokens should go to graveyard)
- "token" keyword can now be used in the parser with things such as Creature[-token] for "noncreature token"
- Let's stop using "token" as a type

projects/mtg/bin/Res/test/_tests.txt

@@ -165,6 +165,7 @@ death_ward.txt
 deja_vu.txt
 delusions_of_mediocrity.txt
 dingus_egg.txt
+dingus_staff_i153.txt
 divergent_growth.txt
 doomed_necromancer.txt
 double_strike_i145.txt
@@ -230,6 +231,7 @@ goblin_lackey2.txt
 goblin_lackey3.txt
 goblin_lackey4.txt
 goblin_offensive.txt
+golgari_germination_i153.txt
 gravedigger.txt
 great_defender.txt
 hannas_custody.txt

projects/mtg/bin/Res/test/dingus_staff_i153.txt

@@ -0,0 +1,21 @@
+#Bug: Tokens don't go to the graveyard
+#see: http://code.google.com/p/wagic/issues/detail?id=153
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:1138,dingus staff
+hand:shock
+manapool:{5}{R}
+[PLAYER2]
+[DO]
+1138
+shock
+-1138
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+life:18
+inplay:1138,dingus staff
+graveyard:shock
+[PLAYER2]
+[END]

projects/mtg/bin/Res/test/golgari_germination_i153.txt

@@ -0,0 +1,21 @@
+#Bug: Tokens and graveyard
+#see http://code.google.com/p/wagic/issues/detail?id=153
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:grizzly bears,89069
+manapool:{R}{R}
+hand:lightning bolt,shock
+[PLAYER2]
+[DO]
+lightning bolt
+grizzly bears
+shock
+-89069
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:lightning bolt,grizzly bears,shock
+inplay:89069
+[PLAYER2]
+[END]