J :

* Fix almost all tests. * This version "nearly" works.
2009-09-07 14:37:32 +00:00
parent 635c87202a
commit 5b473a1505
19 changed files with 160 additions and 106 deletions
@@ -14,6 +14,7 @@ generic/legendary.txt
 generic/lifelink.txt
 generic/persist.txt
 generic/persist2.txt
+generic/phases.txt
 generic/rampage.txt
 generic/regenerate.txt
 generic/sacrifice.txt
@@ -201,4 +202,4 @@ zombify.txt
 #Momir Basic Tests
 ########################
 momir/keldon_warlord.txt
-momir/overcost.txt
+momir/overcost.txt
@@ -17,6 +17,8 @@ belligerent hatchling
 next
 #blockers
 next
+#first strike
+next
 #damage
 next
 #end of combat
@@ -27,4 +29,4 @@ inplay:belligerent hatchling
 graveyard:shock
 [PLAYER2]
 life:15
-[END]
+[END]
@@ -16,6 +16,8 @@ swamp
 benalish knight
 benalish knight
 next
+#first strike
+next
 #damage
 next
 #end
@@ -25,4 +27,4 @@ COMBATEND
 graveyard:grizzly bears
 [PLAYER2]
 inplay:plains,mountain,swamp,benalish knight
-[END]
+[END]
@@ -11,6 +11,7 @@ next
 1250
 next
 next
+next
 1370
 [ASSERT]
 COMBATEND
@@ -18,4 +19,4 @@ COMBATEND
 inplay:1370
 [PLAYER2]
 graveyard:1250
-[END]
+[END]
@@ -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]
@@ -25,4 +25,4 @@ graveyard:Puppeteer
 [PLAYER2]
 graveyard:Drudge Skeletons
 inplay:raging goblin
-[END]
+[END]
@@ -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]
@@ -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]