move reducedCost and increasedCost out of cardprimitives and into MTGCardInstance

projects/mtg/src/CardPrimitive.cpp

@@ -23,8 +23,8 @@ CardPrimitive::CardPrimitive(CardPrimitive * source)
     for (int i = 0; i < Constants::MTG_NB_COLORS; ++i)
         colors[i] = source->colors[i];
     manaCost.copy(source->getManaCost());
-    reducedCost.copy(source->getReducedManaCost());
-    increasedCost.copy(source->getIncreasedManaCost());
+    //reducedCost.copy(source->getReducedManaCost());
+    //increasedCost.copy(source->getIncreasedManaCost());
     if(source->getManaCost()->alternative)
         manaCost.alternative->alternativeName = source->getManaCost()->alternative->alternativeName;
 
@@ -276,15 +276,6 @@ ManaCost* CardPrimitive::getManaCost()
     return &manaCost;
 }
 
-ManaCost* CardPrimitive::getReducedManaCost()
-{
-    return &reducedCost;
-}
-ManaCost* CardPrimitive::getIncreasedManaCost()
-{
-    return &increasedCost;
-}
-
 bool CardPrimitive::hasType(int _type)
 {
     for (size_t i = 0; i < types.size(); i++)

projects/mtg/src/MTGCardInstance.cpp

@@ -333,6 +333,15 @@ int MTGCardInstance::has(int basicAbility)
     return basicAbilities[basicAbility];
 }
 
+ManaCost* MTGCardInstance::getReducedManaCost()
+{
+    return &reducedCost;
+}
+ManaCost* MTGCardInstance::getIncreasedManaCost()
+{
+    return &increasedCost;
+}
+
 //sets card as attacked and sends events
 void MTGCardInstance::eventattacked()
 {

projects/mtg/src/ManaCost.cpp

@@ -539,7 +539,11 @@ int ManaCost::remove(ManaCost * _cost)
         return 0;
     for (unsigned int i = 0; i < Constants::MTG_NB_COLORS; i++)
     {
-        cost[i] -= _cost->getCost(i);
+        for(int c = 0;c < _cost->getCost(i);c++)
+        {
+            if(cost[i])//remove 1 at a time to avoid dipping into negitive cost.
+                cost[i] -= 1;
+        }
     }
     return 1;
 }