J :

* Fix almost all tests.
* This version "nearly" works.

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

@@ -11,6 +11,7 @@ next
 1250
 next
 next
+next
 1370
 [ASSERT]
 COMBATEND
@@ -18,4 +19,4 @@ COMBATEND
 inplay:1370
 [PLAYER2]
 graveyard:1250
-[END]
+[END]

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

@@ -2,20 +2,20 @@
 [INIT]
 COMBATATTACKERS
 [PLAYER1]
-inplay:1370
+inplay:white knight
 [PLAYER2]
-inplay:1290
+inplay:fire elemental
 [DO]
-1370
+white knight
 next
-1290
+fire elemental
 next
 next
-1370
+fire elemental
 [ASSERT]
 COMBATEND
 [PLAYER1]
-graveyard:1370
+graveyard:white knight
 [PLAYER2]
-inplay:1290
-[END]
+inplay:fire elemental
+[END]

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

@@ -25,4 +25,4 @@ graveyard:Puppeteer
 [PLAYER2]
 graveyard:Drudge Skeletons
 inplay:raging goblin
-[END]
+[END]

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

@@ -15,7 +15,7 @@ Drudge Skeletons
 next
 #blockers order
 dragon engine
-dragon engine
+Drudge Skeletons
 next
 #combat damage
 next
@@ -27,4 +27,4 @@ graveyard:grizzly bears
 [PLAYER2]
 graveyard:Drudge Skeletons,raging goblin
 inplay:dragon engine
-[END]
+[END]

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

@@ -0,0 +1,23 @@
+#Pass phases
+[INIT]
+FIRSTMAIN
+[PLAYER1]
+[PLAYER2]
+[DO]
+next
+#combat begin
+next
+#attackers
+next
+#blockers
+next
+#damage
+next
+#combat end
+[ASSERT]
+COMBATEND
+[PLAYER1]
+life:20
+[PLAYER2]
+life:20
+[END]