Erwan

- Fixed empty ActionStack "interrupt" messages
- If no attackers are declared, go straight to Combat end phase
- Once First strike damage is declared, attacking player needs to "actively" request a next phase event to go to the next damage step
- Second Damage step is called "Combat Damage (2)"
- UserRequestNextPhase is to be used knowing that it might not succeed
- Step change for GuiCombat is now computed at GameObserver::nextGamePhase

Note: Combat damage to creatures is not assigned when AI attacks. As this seems to be a problem with the previous SVN version, I4m still committing this change

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

@@ -17,9 +17,7 @@ belligerent hatchling
 next
 #blockers
 next
-#first strike
-next
-#damage
+#first strike damage
 next
 #end of combat
 [ASSERT]

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

@@ -16,9 +16,7 @@ swamp
 benalish knight
 benalish knight
 next
-#first strike
-next
-#damage
+#first strike damage
 next
 #end
 [ASSERT]

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

@@ -11,8 +11,6 @@ next
 1250
 next
 next
-next
-1370
 [ASSERT]
 COMBATEND
 [PLAYER1]

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

@@ -10,8 +10,11 @@ white knight
 next
 fire elemental
 next
+#combat damage first strike
 next
-fire elemental
+#combat damage
+next
+#ocombat end
 [ASSERT]
 COMBATEND
 [PLAYER1]

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

@@ -13,7 +13,7 @@ next
 1365
 next
 next
-1370
+next
 [ASSERT]
 COMBATEND
 [PLAYER1]

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

@@ -9,10 +9,6 @@ next
 next
 #attackers
 next
-#blockers
-next
-#damage
-next
 #combat end
 [ASSERT]
 COMBATEND

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

@@ -8,30 +8,7 @@ life:20
 inplay:1302
 [DO]
 next
-#untap 2
-next
-#upkeep 2
-next
-#draw 2
-next
-#main 2
-next
-#combatbegin 2
-next
-#attackers 2
-next
-#blockers 2
-next
-#combatdamage 2
-next
-#endofcombat 2
-next
-#main phase II 2
-next
-#eot 2
-next
-#cleanup2
-next
+eot
 #untap
 next
 #upkeep

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

@@ -14,9 +14,7 @@ harpoon sniper
 choice 1
 grizzly bears
 next
-#damage
-next
-#combat end
+#combat end (no combat damage because no attacking creatures)
 [ASSERT]
 COMBATEND
 [PLAYER1]

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

@@ -33,23 +33,7 @@ next
 1393
 1229
 1308
-next
-#combatbegin 2
-next
-#combatattackers 2
-next
-#combatblockers 2
-next
-#combatdamage 2
-next
-#endofcombat 2
-next
-#main phase II  2
-next
-#eot  2
-next
-#cleanup 2
-next
+eot
 #untap 
 next
 #upkeep 

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

@@ -14,10 +14,6 @@ next
 next
 #attack
 next
-#blockers
-next
-#dmage
-next
 #end
 next
 #secondmain

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

@@ -28,10 +28,6 @@ next
 #attackers 2
 1250
 next
-#blockers 2
-next
-#combatdamage 2
-next
 #endofcombat 2
 1250
 [ASSERT]

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

@@ -19,10 +19,6 @@ next
 #attackers
 1250
 next
-#blockers
-next
-#damages
-next
 #combat end
 [ASSERT]
 COMBATEND

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

@@ -7,8 +7,6 @@ inplay:Steelclad Serpent
 [DO]
 Steelclad Serpent
 next
-next
-next
 [ASSERT]
 COMBATEND
 [PLAYER1]

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

@@ -14,10 +14,6 @@ next
 #attackers
 grizzly bears
 next
-#blockers
-next
-#damage
-next
 #combat ends
 [ASSERT]
 COMBATEND

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

@@ -14,7 +14,7 @@ next
 1370
 next
 next
-1370
+next
 [ASSERT]
 COMBATEND
 [PLAYER1]