added support for no max hand size, added nonstatic lifetotal checks, added a check for how many equips a card has, added a fix for a typo in affinityswamp.

projects/mtg/src/ThisDescriptor.cpp

@@ -126,7 +126,40 @@ ThisDescriptor * ThisDescriptorFactory::createThisDescriptor(string s){
     return NULL;
   }
 
-  //power
+  //equips
+  found = s.find("equip");
+  if (found != string::npos) {
+    ThisEquip * td = NEW ThisEquip(criterion);
+    if (td) {
+      td->comparisonMode = mode;
+      return td;
+    }
+    return NULL;
+  }
+
+     //controller life
+  found = s.find("opponentlife");
+  if (found != string::npos) {
+    ThisOpponentlife * td = NEW ThisOpponentlife(criterion);
+    if (td) {
+      td->comparisonMode = mode;
+      return td;
+    }
+    return NULL;
+  }
+
+   //controller life
+  found = s.find("controllerlife");
+  if (found != string::npos) {
+    ThisControllerlife * td = NEW ThisControllerlife(criterion);
+    if (td) {
+      td->comparisonMode = mode;
+      return td;
+    }
+    return NULL;
+  }
+
+     //power
   found = s.find("power");
   if (found != string::npos) {
     ThisPower * td = NEW ThisPower(criterion);
@@ -198,6 +231,22 @@ ThisCounter::~ThisCounter() {
   SAFE_DELETE(counter);
 }
 
+ThisOpponentlife::ThisOpponentlife(int olife){
+  comparisonCriterion = olife;
+}
+
+int ThisOpponentlife::match(MTGCardInstance * card){
+	return matchValue(card->controller()->opponent()->life);
+}
+
+ThisControllerlife::ThisControllerlife(int life){
+  comparisonCriterion = life;
+}
+
+int ThisControllerlife::match(MTGCardInstance * card){
+	return matchValue(card->controller()->life);
+}
+
 ThisPower::ThisPower(int power){
   comparisonCriterion = power;
 }
@@ -206,6 +255,14 @@ int ThisPower::match(MTGCardInstance * card){
   return matchValue(card->power);
 }
 
+ThisEquip::ThisEquip(int equipment){
+  comparisonCriterion = equipment;
+}
+int ThisEquip::match(MTGCardInstance * card){
+  return matchValue(card->equipment);
+}
+
+
 ThisToughness::ThisToughness(int toughness){
   comparisonCriterion = toughness;
 }