vector count of abilities

remove unused ones

projects/mtg/include/AllAbilities.h

@@ -2211,7 +2211,12 @@ public:
 
         assert(modifier < 2);
         ((MTGCardInstance *) target)->basicAbilities.set(ability, modifier > 0);
-
+        //---add or subtract so we can keep track - for future use
+        ((MTGCardInstance *) target)->modbasicAbilities[ability] += modifier;
+        //---make sure no negative values
+        if(((MTGCardInstance *) target)->modbasicAbilities[ability] < 0)
+            ((MTGCardInstance *) target)->modbasicAbilities[ability] = 0;
+        //---end add or subtract abilities
         return MTGAbility::addToGame();
     }
 
@@ -2262,7 +2267,7 @@ public:
 
             assert(value < 2);
             _target->basicAbilities.set(ability, value > 0);
-            _target->modifiedbAbi += 1;
+
             return InstantAbility::addToGame();
         }
 
@@ -2275,10 +2280,7 @@ public:
     {
         MTGCardInstance * _target = (MTGCardInstance *) target;
         if (_target)
-        {
             _target->basicAbilities.set(ability, stateBeforeActivation);
-            _target->modifiedbAbi -= 1;
-        }
         return 1;
     }
 

projects/mtg/include/CardPrimitive.h

@@ -57,8 +57,8 @@ public:
 
     uint8_t colors;
     typedef std::bitset<Constants::NB_BASIC_ABILITIES> BasicAbilitiesSet;
+    vector<int> modbasicAbilities;
     BasicAbilitiesSet basicAbilities;
-    BasicAbilitiesSet origbasicAbilities;
     BasicAbilitiesSet LKIbasicAbilities;
 
     map<string,string> magicTexts;

projects/mtg/include/MTGCardInstance.h

@@ -256,7 +256,6 @@ public:
     bool bypassTC;
     bool discarded;
     int copiedID;
-    int modifiedbAbi;
     bool StackIsEmptyandSorcerySpeed();
     bool isTargetted();
     int cardistargetted;