J :

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

projects/mtg/include/GuiCombat.h

@@ -19,11 +19,12 @@ class GuiCombat : public GuiLayer
   DamagerDamaged* current;
   enum { BLK, ATK, OK, NONE } cursor_pos;
   CombatStep step;
+  void validateDamage();
   void addOne(DefenserDamaged* blocker, CombatStep);
   void removeOne(DefenserDamaged* blocker, CombatStep);
   void autoaffectDamage(AttackerDamaged* attacker, CombatStep);
   void remaskBlkViews(AttackerDamaged* before, AttackerDamaged* after);
-  void resolve();
+  int resolve();
 
  public:
   GuiCombat(GameObserver* go);

projects/mtg/include/PhaseRing.h

@@ -10,7 +10,7 @@ using std::list;
 
 class Player;
 
-typedef enum { BLOCKERS, ORDER, FIRST_STRIKE, DAMAGE } CombatStep;
+typedef enum { BLOCKERS, ORDER, FIRST_STRIKE, END_FIRST_STRIKE, DAMAGE, END_DAMAGE } CombatStep;
 class Phase{
  public:
   int id;

projects/mtg/include/WEvent.h

@@ -38,6 +38,7 @@ struct WEventZoneChange : public WEvent {
 struct WEventDamage : public WEvent {
   Damage * damage;
   WEventDamage(Damage * damage);
+  virtual std::ostream& toString(std::ostream& out) const;
 };
 
 struct WEventPhaseChange : public WEvent {