Erwan

-fixed a memory leak
- Added P02 and PTK 
- New way to create tokens in the parser, much more flexible, see the Hive in RV. Tokens can now be written as other cards, with a rarity of "T". I suggest their id to be the negative value of the card that generates them when possible. Naming convention for images is the same as before: a negative id such as -1138 will need a [id]t.jpg image (1138t.jpg). Positive ids work as "normal" pictures

projects/mtg/bin/Res/sets/P02/_cards.dat

@@ -0,0 +1,11 @@
+[card]
+id=6536
+name=Air Elemental
+mana={3}{U}{U}
+type=Creature
+subtype=Elemental
+power=4
+toughness=4
+text=Flying
+rarity=U
+[/card]

projects/mtg/bin/Res/sets/PTK/_cards.dat

@@ -0,0 +1,12 @@
+[card]
+id=10487
+name=Alert Shu Infantry
+mana={2}{W}
+type=Creature
+subtype=Human Soldier
+power=2
+toughness=2
+text=Vigilance
+abilities=vigilance
+rarity=U
+[/card]

projects/mtg/bin/Res/sets/RV/_cards.dat

@@ -2112,7 +2112,7 @@ type=Instant
 [/card]
 [card]
 text={5}, {T}: Put a 1/1 Insect artifact creature token with flying named Wasp onto the battlefield. (It can't be blocked except by creatures with flying or reach.)
-auto={5},{T}:token(Wasp,creature artifact insect, 1/1,flying artifact)
+auto={5},{T}:token(-1138)
 id=1138
 name=The Hive
 rarity=R
@@ -2120,6 +2120,17 @@ mana={5}
 type=Artifact
 [/card]
 [card]
+text=Flying
+abilities=flying
+id=-1138
+name=Wasp
+type=Artifact Creature
+rarity=T
+power=1
+toughness=1
+type=Artifact
+[/card]
+[card]
 text=As The Rack enters the battlefield, choose an opponent.   At the beginning of the chosen player's upkeep, The Rack deals X damage to that player, where X is 3 minus the number of cards in his or her hand.
 id=1139
 name=The Rack

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

@@ -37,6 +37,7 @@ generic/targetController_life.txt
 generic/targetController_life2.txt
 generic/targetController_damage.txt
 generic/tokens.txt
+generic/tokens2.txt
 generic/trample.txt
 generic/trample_vs_indestructible.txt
 generic/trample_vs_multiblock.txt

projects/mtg/bin/Res/test/generic/tokens2.txt

@@ -0,0 +1,39 @@
+#Bug:Segfault in GuiPlay.cpp
+[INIT]
+SECONDMAIN
+[PLAYER1]
+inplay:135253
+manapool:{5}
+[PLAYER2]
+inplay:hypnotic specter
+[DO]
+135253
+eot
+eot
+next
+#upkeep
+next
+#draw
+next
+#main
+next
+#combat begins
+next
+#attackers
+-135253
+next
+#blockers
+hypnotic specter
+next
+#damage
+next
+#end combat
+eot
+next
+[ASSERT]
+UPKEEP
+[PLAYER1]
+inplay:135253
+[PLAYER2]
+inplay:hypnotic specter
+[END]