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/src/MTGRules.cpp

@@ -103,16 +103,19 @@ int MTGAttackRule::isReactingToClick(MTGCardInstance * card, ManaCost * mana){
   return 0;
 }
 
-void MTGAttackRule::Update(float dt){
-  if (currentPhase != newPhase && currentPhase == Constants::MTG_PHASE_COMBATATTACKERS){
-    Player * p = game->currentPlayer;
-    MTGGameZone * z = p->game->inPlay;
-    for (int i= 0; i < z->nb_cards; i++){
-      MTGCardInstance * card = z->cards[i];
-      if (!card->isAttacker() && card->has(Constants::MUSTATTACK)) reactToClick(card);
+int MTGAttackRule::receiveEvent(WEvent *e){
+  if (WEventPhaseChange* event = dynamic_cast<WEventPhaseChange*>(e)) {
+    if (Constants::MTG_PHASE_COMBATATTACKERS == event->from->id) {
+      Player * p = game->currentPlayer;
+      MTGGameZone * z = p->game->inPlay;
+      for (int i= 0; i < z->nb_cards; i++){
+        MTGCardInstance * card = z->cards[i];
+        if (!card->isAttacker() && card->has(Constants::MUSTATTACK)) reactToClick(card);
+      }
+      return 1;
     }
   }
-  MTGAbility::Update(dt);
+  return 0;
 }
 
 int MTGAttackRule::reactToClick(MTGCardInstance * card){