Merge remote-tracking branch 'WagicProject/master'

projects/mtg/bin/Res/test/CDA#1.txt

@@ -0,0 +1,46 @@
+#Testing CDA Tarmogoyf vs Godhead of Awe
+#Godhead of Awe makes other creatures 1/1 on layer 7b
+#Tarmogoyf's CDA ability is on layer 7a so it will be overriden
+#by Godhead of Awe. Giant Growth's ability is on layer 7c so
+#the +3/+3 bonus is intact. :)
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Concordant Crossroads, Godhead of Awe, Forest
+hand:Tarmogoyf, Giant Growth
+graveyard:mountain, lightning bolt, grizzly bear
+manapool:{1}{G}
+[PLAYER2]
+[DO]
+Tarmogoyf
+next
+next
+Tarmogoyf
+next
+eot
+eot
+#untap
+next
+#upkeep
+next
+#draw
+next
+#main1
+Forest
+Giant Growth
+Tarmogoyf
+next
+#combat begin
+next
+#attackers
+Tarmogoyf
+eot
+[ASSERT]
+UNTAP
+[PLAYER1]
+inplay:Concordant Crossroads, Godhead of Awe, Tarmogoyf, Forest
+graveyard:mountain, lightning bolt, grizzly bear, Giant Growth
+manapool:{0}
+[PLAYER2]
+life:15
+[END] 

projects/mtg/bin/Res/test/CDA#2.txt

@@ -0,0 +1,38 @@
+#Testing CDA Turn to Frog vs Krosan Cloudscraper
+#Krosan Cloudscraper that is turned into frog with 1 damage
+#from Lightning Dart must die because when you change
+#the power and toughness into 1/1, the 1 point of damage
+#is taken into account...
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Krosan Cloudscraper
+[PLAYER2]
+inplay:Mountain, Plains, Swamp, Island
+hand:Lightning Dart, Turn to Frog
+[DO]
+next
+next
+Krosan Cloudscraper
+next
+no
+yes
+Mountain
+Plains
+Lightning Dart
+Krosan Cloudscraper
+Swamp
+Island
+Turn to Frog
+Krosan Cloudscraper
+endinterruption
+eot
+[ASSERT]
+UNTAP
+[PLAYER1]
+graveyard:Krosan Cloudscraper
+[PLAYER2]
+inplay:Mountain, Plains, Swamp, Island
+graveyard:Lightning Dart, Turn to Frog
+life:20
+[END] 

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

@@ -210,6 +210,8 @@ Call_to_Heel_1.txt
 Call_to_Heel_2.txt
 castle.txt
 cathodion.txt
+CDA#1.txt
+CDA#2.txt
 celestial_mantle.txt
 celestial_purge.txt
 celestial_sword.txt

projects/mtg/src/Token.cpp

@@ -52,7 +52,7 @@ Token::Token(const Token& source) :
     origpower = source.origpower;
     origtoughness = source.origtoughness;
     basepower = source.origpower;
-    basetoughness = source.origpower;
+    basetoughness = source.origtoughness;
     pbonus = source.pbonus;
     tbonus = source.tbonus;
     rarity = source.rarity;