Update this(X) so that it works with spells as well as activated abilities. Also fixed a bug were this(X) did not work with targeting.

Adds Martial Coup

projects/mtg/include/ThisDescriptor.h

@@ -12,11 +12,9 @@
 
 class ThisDescriptor{
  public:
-   int compareAbility;
    int comparisonMode;
    int comparisonCriterion;
    virtual int match(MTGCardInstance * card) = 0;
-   virtual int match(MTGAbility * ability) = 0;
    int matchValue(int value);  
 };
 
@@ -29,7 +27,7 @@ class ThisCounter:public ThisDescriptor{
  public:
   Counter * counter;
   virtual int match(MTGCardInstance * card);
-  virtual int match(MTGAbility * ability) {return 0;};
+
   ThisCounter(Counter * _counter);
   ThisCounter(int power, int toughness, int nb, const char * name);
   ~ThisCounter();
@@ -38,28 +36,27 @@ class ThisCounter:public ThisDescriptor{
 class ThisCounterAny:public ThisDescriptor{
  public:
   virtual int match(MTGCardInstance *card);
-  virtual int match(MTGAbility * ability) {return 0;};
+
   ThisCounterAny(int nb);
 };
 
 class ThisPower:public ThisDescriptor{
  public:
     virtual int match(MTGCardInstance * card);
-    virtual int match(MTGAbility * ability) {return 0;};
+  
     ThisPower(int power);
 };
 
 class ThisToughness:public ThisDescriptor{
  public:
     virtual int match(MTGCardInstance * card);
-    virtual int match(MTGAbility * ability) {return 0;};
+  
     ThisToughness(int toughness);
 };
 
 class ThisX:public ThisDescriptor{
   public:
-    virtual int match(MTGAbility * ability);
-    virtual int match(MTGCardInstance * card) {return 0;};
+    virtual int match(MTGCardInstance * card);
     ThisX(int x);
 };