Made damager keyword work. Fixed Executioner's Swing in mtg.txt

projects/mtg/bin/Res/sets/primitives/mtg.txt

@@ -28204,7 +28204,7 @@ subtype=Equipment
 [card]
 name=Executioner's Swing
 text=Target creature that dealt damage this turn gets -5/-5 until end of turn.
-target=creature[damaged]
+target=creature[damager]
 auto=-5/-5 ueot
 mana={W}{B}
 type=Instant
@@ -104298,4 +104298,4 @@ type=Land Creature
 subtype=Forest Dryad
 power=1
 toughness=1
-[/card]
+[/card]

projects/mtg/include/CardDescriptor.h

@@ -64,6 +64,7 @@ class CardDescriptor: public MTGCardInstance
   string compareName;
   int CDopponentDamaged;
   int CDcontrollerDamaged;
+  int CDdamager;
 };
 
 #endif

projects/mtg/include/MTGCardInstance.h

@@ -65,6 +65,7 @@ public:
     bool wasDealtDamage;
     bool damageToOpponent;
     bool damageToController;
+    bool damageToCreature;
     bool mPropertiesChangedSinceLastUpdate;
     int reduxamount;
     int flanked;

projects/mtg/src/CardDescriptor.cpp

@@ -23,6 +23,7 @@ CardDescriptor::CardDescriptor()
     colorComparisonMode = COMPARISON_NONE;
     CDopponentDamaged = 0;
     CDcontrollerDamaged = 0;
+    CDdamager = 0;
 }
 
 int CardDescriptor::init()
@@ -226,6 +227,12 @@ MTGCardInstance * CardDescriptor::match(MTGCardInstance * card)
         {
             match = NULL;
         }
+
+        if ((CDdamager == -1 && (card->damageToOpponent || card->damageToController || card->damageToCreature)) || (CDdamager == 1 && !(card->damageToOpponent || card->damageToController || card->damageToCreature)))
+	{
+            match = NULL;
+        }
+
     if(CDopponentDamaged == -1 || CDopponentDamaged == 1)
     {
         Player * p = card->controller()->opponent();//controller()->opponent();

projects/mtg/src/CardGui.cpp

@@ -1224,6 +1224,14 @@ bool CardGui::FilterCard(MTGCard * _card,string filter)
                         cd.CDcontrollerDamaged = 1;
                     }
                 }
+                //creature dealt damage to anything
+                else if (attribute.find("damager") != string::npos){
+                    if (minus){
+                        cd.CDdamager = -1;
+                    } else {
+                        cd.CDdamager = 1;
+                    }
+                }
                 else if (attribute.find("multicolor") != string::npos)
                 {
                     //card is multicolored?

projects/mtg/src/Damage.cpp

@@ -192,8 +192,10 @@ int Damage::resolve()
         //return the left over amount after effects have been applied to them.
         a = target->dealDamage(damage);
         target->damageCount += damage;//the amount must be the actual damage so i changed this from 1 to damage, this fixes pdcount and odcount
-        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE)
+        if (target->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE){
             ((MTGCardInstance*)target)->wasDealtDamage = true;
+	    ((MTGCardInstance*)source)->damageToCreature = true;
+	}
         if (target->type_as_damageable == Damageable::DAMAGEABLE_PLAYER)
         {
             if(target == source->controller())

projects/mtg/src/GameObserver.cpp

@@ -795,6 +795,7 @@ void GameObserver::gameStateBasedEffects()
                     c->wasDealtDamage = false;
                 c->damageToController = false;
                 c->damageToOpponent = false;
+		c->damageToCreature = false;
                 c->isAttacking = NULL;
             }
             for (int t = 0; t < nbcards; t++)

projects/mtg/src/MTGCardInstance.cpp

@@ -158,6 +158,7 @@ void MTGCardInstance::initMTGCI()
     auras = 0;
     damageToOpponent = false;
     damageToController = false;
+    damageToCreature = false;
     wasDealtDamage = false;
     isDualWielding = false;
     suspended = false;

projects/mtg/src/TargetChooser.cpp

@@ -485,6 +485,14 @@ TargetChooser * TargetChooserFactory::createTargetChooser(string s, MTGCardInsta
                         cd->CDcontrollerDamaged = 1;
                     }
                 }
+                //creature dealt damage to anything
+                else if (attribute.find("damager") != string::npos){
+                    if (minus){
+                        cd->CDdamager = -1;
+                    } else {
+                        cd->CDdamager = 1;
+                    }
+                }
                 else if (attribute.find("multicolor") != string::npos)
                 {
                     //card is multicolored?