Added X to the filters for this() and thisforeach(), for use with {X} costed activated abilities, although it should theoretically work with spells as well if necessary.

projects/mtg/include/ThisDescriptor.h

@@ -12,9 +12,11 @@
 
 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);  
 };
 
@@ -27,6 +29,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();
@@ -35,19 +38,29 @@ 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;};
+    ThisX(int x);
+};
+
 #endif