Erwan

- Parser: Added possibility to add multiple abilities for one cost, using keyword && (see Ardakar wastes in 10E). Currently only works with mana and damage
- Added a dozen new cards
- Improved testing suite : new keyword "choice" to select an item in the abilities popup menu

projects/mtg/include/MTGAbility.h

@@ -147,6 +147,8 @@ class TriggerNextPhase:public TriggerAtPhase{
 
 class TriggeredEvent:public MTGAbilityBasicFeatures{
  public:
+   TriggeredEvent();
+   TriggeredEvent(MTGCardInstance * source, Damageable * target = NULL);
   virtual int resolve()=0;
 };
 
@@ -163,6 +165,15 @@ class BuryEvent: public TriggeredEvent{
   int resolve();
 };
 
+class DamageEvent:public TriggeredEvent{
+  public:
+    int damage;
+    DamageEvent(MTGCardInstance * _source, Damageable * _target, int _damage);
+    int resolve();
+};
+
+
+
 class DestroyCondition:public MTGAbilityBasicFeatures{
  public:
   virtual int testDestroy();
@@ -189,6 +200,7 @@ class AbilityFactory{
   int putInPlayFromZone(MTGCardInstance * card, MTGGameZone * zone, Player * p);
   int parsePowerToughness(string s, int *power, int *toughness);
   Trigger * parseTrigger(string magicText);
+  Damageable * parseCollateralTarget(MTGCardInstance * card, string s);
  public:
   int magicText(int id, Spell * spell, MTGCardInstance * card = NULL);
   void addAbilities(int _id, Spell * spell);