- Added 242 successfully tested cards based on rev2444 (Card list --> First comment).

- Optimized 163 cards (Card list --> First comment). 
Most of them profit from the much more detailed combat trigger system and the new types of damage prevention.


- Added 17 tests to save Zethfox's additions for the future.


- Fixed issue182.

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

@@ -299,7 +299,7 @@ id=74609
 rarity=C
 [/card]
 [card]
-primitive=Isao Enlightened Bushi
+primitive=Isao, Enlightened Bushi
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to mtg.txt as well.
 id=74039

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

@@ -764,7 +764,7 @@ id=50445
 rarity=R
 [/card]
 [card]
-primitive=Konda Lord of Eiganjo
+primitive=Konda, Lord of Eiganjo
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to mtg.txt as well.
 id=78594
@@ -936,7 +936,7 @@ id=79188
 rarity=C
 [/card]
 [card]
-primitive=Nagao Bound by Honor
+primitive=Nagao, Bound by Honor
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to mtg.txt as well.
 id=79136

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

@@ -1154,7 +1154,7 @@ id=31814
 rarity=C
 [/card]
 [card]
-primitive=Pianna Nomad Captain
+primitive=Pianna, Nomad Captain
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to mtg.txt as well.
 id=31790

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

@@ -556,7 +556,7 @@ id=122436
 rarity=U
 [/card]
 [card]
-primitive=Radha Heir to Keld
+primitive=Radha, Heir to Keld
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to mtg.txt as well.
 id=128949

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

@@ -814,7 +814,7 @@ id=10604
 rarity=R
 [/card]
 [card]
-primitive=Zhang He Wei General
+primitive=Zhang He, Wei General
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to mtg.txt as well.
 id=10520
@@ -826,7 +826,7 @@ id=10727
 rarity=R
 [/card]
 [card]
-primitive=Zhao Zilong Tiger General
+primitive=Zhao Zilong, Tiger General
 #The comma needed to be stripped from the name to make the card work.
 #Reintroducing it requires an update to mtg.txt as well.
 id=10686

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

@@ -4,9 +4,7 @@ year=2005
 block=Guild
 [/meta]
 [card]
-primitive=Agrus Kos Wojek Veteran
+primitive=Agrus Kos, Wojek Veteran
-#The comma needed to be stripped from the name to make the card work.
-#Reintroducing it requires an update to mtg.txt as well.
 id=89101
 rarity=R
 [/card]

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

@@ -1,7 +1,16 @@
 ########################
 #Generic engine features
 ########################
+generic/@attacking.txt
+generic/@blocking.txt
+generic/@combatdamaged_1.txt
+generic/@combatdamaged_2.txt
+generic/@drawn.txt
+generic/@noncombatdamaged.txt
+generic/@untapped.txt
 generic/attacks_each_turn.txt
+generic/bushido_1.txt
+generic/bushido_2.txt
 generic/cycling.txt
 generic/cycling2.txt
 generic/deathtouch.txt
@@ -24,6 +33,8 @@ generic/first_and_double_strike2_i187.txt
 generic/first_strike.txt
 generic/first_strike2.txt
 generic/first_strike3.txt
+generic/flanking.txt
+generic/fresh.txt
 generic/hybrid_mana.txt
 generic/hybrid_mana_2.txt
 generic/hybrid_mana_3.txt
@@ -46,6 +57,7 @@ generic/persist.txt
 generic/persist2.txt
 generic/persist3.txt
 generic/phases.txt
+generic/preventalldamage.txt
 generic/rampage.txt
 generic/rampage2.txt
 generic/rampage3.txt
@@ -54,6 +66,7 @@ generic/regenerate.txt
 generic/regenerate_wither_i146.txt
 generic/sacrifice.txt
 generic/summoning_sickness.txt
+generic/sunburst.txt
 generic/tap_other_card_as_cost.txt
 generic/targetController_life.txt
 generic/targetController_life2.txt
@@ -298,6 +311,7 @@ hopping_automaton_i232.txt
 horned_helm.txt
 howl_from_beyond.txt
 howl_of_the_night_pack.txt
+hunted_dragon.txt
 hunting_pack.txt
 hurricane.txt
 hyalopterous_lemure.txt
@@ -344,6 +358,7 @@ living_artifact_i169.txt
 living_lands.txt
 lord_of_the_pit.txt
 lord_of_the_pit2.txt
+magma_spray.txt
 martial_coup.txt
 martial_coup2.txt
 master_decoy.txt
@@ -486,6 +501,7 @@ twinstrike.txt
 twinstrike2.txt
 twinstrike3.txt
 twitch.txt
+uncle_istvan.txt
 undermine_i408.txt
 underworld_dreams.txt
 unearth1.txt

projects/mtg/bin/Res/test/generic/@attacking.txt

@@ -0,0 +1,26 @@
+#Testing "@attacking" trigger with Bramble Creeper.
+#"Whenever Bramble Creeper attacks, it gets +5/+0 until end of turn."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Bramble Creeper
+[PLAYER2]
+[DO]
+next
+#begin
+next
+#attackers
+Bramble Creeper
+next
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Bramble Creeper
+[PLAYER2]
+life:15
+[END]

projects/mtg/bin/Res/test/generic/@blocked.txt

@@ -0,0 +1,28 @@
+#Testing "@blocking" trigger with Brushwagg.
+#"Whenever Brushwagg blocks or becomes blocked, it gets -2/+2 until end of turn."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Hill Giant
+[PLAYER2]
+inplay:Brushwagg
+[DO]
+next
+#begin
+next
+#attackers
+Hill Giant
+next
+Brushwagg
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+graveyard:Hill Giant
+[PLAYER2]
+inplay:Brushwagg
+[END]

projects/mtg/bin/Res/test/generic/@blocking.txt

@@ -0,0 +1,28 @@
+#Testing "@blocking" trigger with Brushwagg.
+#"Whenever Brushwagg blocks or becomes blocked, it gets -2/+2 until end of turn."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Brushwagg
+[PLAYER2]
+inplay:Hill Giant
+[DO]
+next
+#begin
+next
+#attackers
+Brushwagg
+next
+Hill Giant
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Brushwagg
+[PLAYER2]
+graveyard:Hill Giant
+[END]

projects/mtg/bin/Res/test/generic/@combatdamaged_1.txt

@@ -0,0 +1,30 @@
+#Testing "@combatdamage" trigger with Coastal Piracy.
+#"Whenever a creature you control deals combat damage to an opponent, you may draw a card."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+library:counterspell
+hand:lightning bolt
+inplay:coastal piracy,grizzly bears
+[PLAYER2]
+[DO]
+next
+#begin
+next
+#attackers
+grizzly bears
+next
+#blockers
+next
+#damage
+choice 0
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+hand:lightning bolt,counterspell
+inplay:coastal piracy,grizzly bears
+[PLAYER2]
+life:18
+[END]

projects/mtg/bin/Res/test/generic/@combatdamaged_2.txt

@@ -0,0 +1,31 @@
+#Testing "@combatdamage" trigger.
+#Prodigal Sorcerer's damage should not let Coastal Piracy trigger, even if activated during combat. 
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+library:counterspell
+hand:lightning bolt
+inplay:coastal piracy,prodigal sorcerer
+[PLAYER2]
+[DO]
+next
+#begin
+next
+#attackers
+next
+#blockers
+prodigal sorcerer
+p2
+next
+#damage
+next
+#end combat
+[ASSERT]
+ENDOFTURN
+[PLAYER1]
+library:counterspell
+hand:lightning bolt
+inplay:coastal piracy,prodigal sorcerer
+[PLAYER2]
+life:19
+[END]

projects/mtg/bin/Res/test/generic/@drawn.txt

@@ -0,0 +1,24 @@
+#Testing "@drawn" trigger with Underworld Dreams.
+#"Whenever an opponent draws a card, Underworld Dreams deals 1 damage to him or her."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:oona's grace
+inplay:underworld dreams
+manapool:{2}{U}
+[PLAYER2]
+library:counterspell
+life:20
+[DO]
+oona's grace
+p2
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:underworld dreams
+graveyard:oona's grace
+manapool:{0}
+[PLAYER2]
+hand:counterspell
+life:19
+[END]

projects/mtg/bin/Res/test/generic/@noncombatdamaged.txt

@@ -0,0 +1,32 @@
+#Testing "@noncombatdamaged" trigger.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:lightning bolt
+inplay:chandra's spitfire
+manapool:{R}
+[PLAYER2]
+life:20
+[DO]
+lightning bolt
+p2
+next
+#begin
+next
+#attackers
+chandra's spitfire
+next
+#blockers
+next
+#damage
+next
+#end combat
+next
+[ASSERT]
+SECONDMAIN
+[PLAYER1]
+inplay:chandra's spitfire
+graveyard:lightning bolt
+[PLAYER2]
+life:13
+[END]

projects/mtg/bin/Res/test/generic/@untapped.txt

@@ -0,0 +1,33 @@
+#Testing "@untapped" trigger.
+#"Whenever a permanent you control becomes untapped, Wake Thrasher gets +1/+1 until end of turn."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:thundermare,vitalize
+inplay:wake thrasher,grizzly bears,elvish berserker
+manapool:{5}{R}{G}
+[PLAYER2]
+life:20
+[DO]
+thundermare
+vitalize
+next
+#begin
+next
+#attackers
+wake thrasher
+next
+#blockers
+next
+#damage
+next
+#end combat
+next
+[ASSERT]
+SECONDMAIN
+[PLAYER1]
+inplay:wake thrasher,grizzly bears,elvish berserker,thundermare
+graveyard:vitalize
+[PLAYER2]
+life:16
+[END]

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

@@ -0,0 +1,28 @@
+#Testing the "becomes blocked"-part of the ability "bushido" with Devoted Retainer.
+#"When this blocks or becomes blocked, it gets +1/+1 until end of turn."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Devoted Retainer
+[PLAYER2]
+inplay:Raging Goblin
+[DO]
+next
+#begin
+next
+#attackers
+Devoted Retainer
+next
+Raging Goblin
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Devoted Retainer
+[PLAYER2]
+graveyard:Raging Goblin
+[END]

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

@@ -0,0 +1,28 @@
+#Testing the "blocks"-part of the ability "bushido" with Devoted Retainer.
+#"When this blocks or becomes blocked, it gets +1/+1 until end of turn."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Raging Goblin
+[PLAYER2]
+inplay:Devoted Retainer
+[DO]
+next
+#begin
+next
+#attackers
+Raging Goblin
+next
+Devoted Retainer
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+graveyard:Raging Goblin
+[PLAYER2]
+inplay:Devoted Retainer
+[END]

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

@@ -0,0 +1,28 @@
+#Testing ability "flanking" with Mtenda Herder.
+#"Whenever a creature without flanking blocks this creature, the blocking creature gets -1/-1 until end of turn."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Mtenda Herder
+[PLAYER2]
+inplay:Raging Goblin
+[DO]
+next
+#begin
+next
+#attackers
+Mtenda Herder
+next
+#blockers
+Raging Goblin
+next
+#damage
+next
+#end combat
+[ASSERT]
+SECONDMAIN
+[PLAYER1]
+inplay:Mtenda Herder
+[PLAYER2]
+graveyard:Raging Goblin
+[END]

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

@@ -0,0 +1,20 @@
+#Testing "fresh" with Caller of the Claw.
+When Caller of the Claw enters the battlefield, put a 2/2 green Bear creature token onto the battlefield for each nontoken creature put into your graveyard from the battlefield this turn.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Wrath of God,Caller of the Claw
+inplay:Grizzly Bears,Llanowar Elves
+graveyard:Serra Angel,Runeclaw Bear
+manapool:{4}{W}{W}{G}
+[PLAYER2]
+[DO]
+Wrath of God
+Caller of the Claw
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Caller of the Claw,*,*
+graveyard:Wrath of God,Grizzly Bears,Llanowar Elves,Serra Angel,Runeclaw Bear
+[PLAYER2]
+[END]

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

@@ -0,0 +1,37 @@
+#Testing "preventalldamage" with Bubble Matrix.
+Prevent all damage that would be dealt to creatures.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Pyroclasm,Lightning Bolt
+inplay:Bubble Matrix,Grizzly Bears,Llanowar Elves
+manapool:{1}{R}{R}
+[PLAYER2]
+life:20
+inplay:Runeclaw Bear
+[DO]
+pyroclasm
+lightning bolt
+p2
+next
+#begin
+next
+#attackers
+Grizzly Bears
+next
+Runeclaw Bear
+#blockers
+next
+#damage
+next
+#end combat
+next
+[ASSERT]
+SECONDMAIN
+[PLAYER1]
+inplay:Bubble Matrix,Grizzly Bears,Llanowar Elves
+graveyard:Pyroclasm,Lightning Bolt
+[PLAYER2]
+life:17
+inplay:Runeclaw Bear
+[END]

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

@@ -0,0 +1,29 @@
+#Testing ability "sunburst" with Arcbound Wanderer.
+#"This enters the battlefield with a +1/+1 counter on it for each color of mana spent to cast it."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Arcbound Wanderer
+inplay:Fervor
+manapool:{1}{W}{U}{B}{R}{G}
+[PLAYER2]
+[DO]
+Arcbound Wanderer
+next
+#begin
+next
+#attackers
+Arcbound Wanderer
+next
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Arcbound Wanderer,Fervor
+[PLAYER2]
+life:15
+[END]

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

@@ -0,0 +1,17 @@
+#Testing "token(x,x,x) opponent" with Hunted Dragon.
+When Hunted Dragon enters the battlefield, put three 2/2 white Knight creature tokens with first strike onto the battlefield under target opponent's control.
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Hunted Dragon
+manapool:{3}{R}{R}
+[PLAYER2]
+[DO]
+Hunted Dragon
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Hunted Dragon
+[PLAYER2]
+inplay:*,*,*
+[END]

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

@@ -0,0 +1,19 @@
+#Testing Magma Spray.
+#"Magma Spray deals 2 damage to target creature. If that creature would be put into a graveyard this turn, exile it instead."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+hand:Magma Spray
+inplay:Grizzly Bears
+manapool:{R}
+[PLAYER2]
+[DO]
+Magma Spray
+Grizzly Bears
+[ASSERT]
+FIRSTMAIN
+[PLAYER1]
+graveyard:Magma Spray
+exile:grizzly bears
+[PLAYER2]
+[END]

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

@@ -0,0 +1,28 @@
+#Testing Uncle Istvan.
+#"Prevent all damage that would be dealt to Uncle Istvan by creatures."
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+inplay:Uncle Istvan
+[PLAYER2]
+inplay:Trained Orgg
+[DO]
+next
+#begin
+next
+#attackers
+Uncle Istvan
+next
+Trained Orgg
+#blockers
+next
+#damage
+next
+#end combat
+[ASSERT]
+COMBATEND
+[PLAYER1]
+inplay:Uncle Istvan
+[PLAYER2]
+inplay:Trained Orgg
+[END]