added new auto keys, this and thisforeach, functionallity similair to aslongas and foreach, but for properties of the card as opposed to cards on the field. More details in first comment.

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

@@ -31,6 +31,9 @@ generic/kicker.txt
 generic/kicker2.txt
 generic/landwalk.txt
 generic/legendary.txt
+###Level up tests disabled until knight of cliffhaven has an id
+###generic/level_up.txt
+###generic/level_up2.txt
 generic/lord_counter.txt
 generic/lord_counter_any.txt
 generic/lifelink.txt
@@ -55,6 +58,7 @@ generic/summoning_sickness.txt
 generic/targetController_life.txt
 generic/targetController_life2.txt
 generic/targetController_damage.txt
+generic/thisforeach.txt
 generic/tokens.txt
 generic/tokens2.txt
 generic/trample.txt
@@ -121,6 +125,7 @@ behemoth_sledge4.txt
 behemoth_sledge5.txt
 belligerent_hatchling.txt
 benalish_knight.txt
+black_market.txt
 black_vise.txt
 blessed_wine.txt
 blinking_spirit.txt
@@ -246,6 +251,7 @@ goblin_lackey2.txt
 goblin_lackey3.txt
 goblin_lackey4.txt
 goblin_offensive.txt
+goblin_razerunners.txt
 golgari_germination_i153.txt
 gravedigger.txt
 great_defender.txt
@@ -399,9 +405,10 @@ tanglesap.txt
 telekinetic_sliver.txt
 terror.txt
 terror2.txt
+thallid.txt
+thellon_of_havenwood.txt
 threaten.txt
 throne_of_bone.txt
-thallid.txt
 titanic_ultimatum.txt
 torture.txt
 tranquil_domain.txt

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

@@ -2,7 +2,7 @@
 FIRSTMAIN
 [PLAYER1]
 hand:Aven Riftwatcher
-manapool:{G}
+manapool:{2}{W}
 [PLAYER2]
 [DO]
 Aven Riftwatcher

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

@@ -2,7 +2,7 @@
 FIRSTMAIN
 [PLAYER1]
 hand:Aven Riftwatcher
-manapool:{G}
+manapool:{2}{W}
 [PLAYER2]
 [DO]
 aven riftwatcher

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

@@ -0,0 +1,21 @@
+[init]
+draw
+[player1]
+inplay:Brass Secretary,Heart Warden,Limestone Golem,Black Market
+manapool:{6}
+[player2]
+[do]
+Heart Warden
+choice 1
+Brass Secretary
+Limestone Golem
+p1
+next
+[assert]
+firstmain
+[player1]
+inplay:Black Market
+graveyard:Brass Secretary,Heart Warden,Limestone Golem
+manapool:{B}{B}{B}
+[player2]
+[end]

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

@@ -0,0 +1,35 @@
+[init]
+firstmain
+[player1]
+inplay:Knight of Cliffhaven
+manapool:{12}
+[player2]
+inplay:island,forest,swamp,moat
+hand:assassinate
+[do]
+Knight of Cliffhaven
+Knight of Cliffhaven
+Knight of Cliffhaven
+Knight of Cliffhaven
+next
+next
+Knight of Cliffhaven
+eot
+next
+next
+next
+island
+forest
+swamp
+assassinate
+Knight of Cliffhaven
+[assert]
+firstmain
+[player1]
+inplay:Knight of Cliffhaven
+[player2]
+inplay:island,forest,swamp,moat
+hand:assassinate
+manapool:{G}{U}{B}
+life:16
+[end]

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

@@ -0,0 +1,33 @@
+[init]
+firstmain
+[player1]
+inplay:Knight of Cliffhaven
+manapool:{9}
+[player2]
+inplay:island,forest,swamp,moat
+hand:assassinate
+[do]
+Knight of Cliffhaven
+Knight of Cliffhaven
+Knight of Cliffhaven
+next
+next
+Knight of Cliffhaven
+eot
+next
+next
+next
+island
+forest
+swamp
+assassinate
+Knight of Cliffhaven
+[assert]
+firstmain
+[player1]
+graveyard:Knight of Cliffhaven
+[player2]
+inplay:island,forest,swamp,moat
+graveyard:assassinate
+life:18
+[end]

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

@@ -0,0 +1,26 @@
+[init]
+untap
+[player1]
+inplay:Urza's Mine,Urza's Tower,Urza's Power Plant,Barrin's Codex
+library:forest,mountain,island,swamp
+[player2]
+[do]
+next
+choice 0
+eot
+eot
+next
+choice 0
+next
+next
+Urza's Mine
+Urza's Power Plant
+Barrin's Codex
+[assert]
+firstmain
+[player1]
+inplay:Urza's Mine,Urza's Tower,Urza's Power Plant
+graveyard:Barrin's Codex
+hand:forest,mountain,island,swamp
+[player2]
+[end]

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

@@ -0,0 +1,26 @@
+[init]
+firstmain
+[player1]
+inplay:Goblin Razerunners,Forest,Island
+manapool:{R}{R}{R}{R}
+[player2]
+[do]
+goblin razerunners
+forest
+goblin razerunners
+island
+next
+next
+next
+next
+next
+choice 0
+p2
+[assert]
+endofturn
+[player1]
+inplay:Goblin Razerunners
+graveyard:forest,island
+[player2]
+life:18
+[end]

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

@@ -0,0 +1,31 @@
+[init]
+untap
+[player1]
+inplay:Thelon Of Havenwood,Thallid,Deathspore Thallid,forest,swamp
+graveyard:fungusaur
+[player2]
+[do]
+next
+next
+next
+forest
+swamp
+Thelon of Havenwood
+fungusaur
+next
+next
+Thallid
+choice 0
+Deathspore thallid
+choice 0
+next
+next
+next
+next
+[assert]
+secondmain
+[player1]
+inplay:Thelon Of Havenwood,Thallid,Deathspore Thallid,forest,swamp
+[player2]
+life:14
+[end]