Refactor & Fix Devotion

Fix Devotion Count example you have Mogis, God of Slaughter(2 B R),
Ashenmoor  Liege(1 B/R B/R B/R), and Rakdos Cackler (B/R) - will be 6
Devotion to Red and Black, since you count the symbol, B/R (hybrid mana)
should return as 1.

projects/mtg/src/MTGGameZones.cpp

@@ -642,7 +642,7 @@ unsigned int MTGGameZone::countTotalManaSymbols(TargetChooser * tc, int color)
     return result;
 }
 
-unsigned int MTGGameZone::countDevotion(TargetChooser * tc, int color)
+unsigned int MTGGameZone::countDevotion(TargetChooser * tc, int color1, int color2)
 {
     if (!tc) {
         return 0;
@@ -654,8 +654,13 @@ unsigned int MTGGameZone::countDevotion(TargetChooser * tc, int color)
     {
         if (tc->canTarget(cards[i], withoutProtections))
         {
-            result += cards[i]->getManaCost()->getManaSymbolsHybridMerged(color);
+            result += cards[i]->getManaCost()->getManaSymbolsHybridMerged(color1);
         }
+        if (tc->canTarget(cards[i], withoutProtections))
+        {
+            result += cards[i]->getManaCost()->getManaSymbolsHybridMerged(color2);
+        }
+        result -= cards[i]->getManaCost()->countHybridsNoPhyrexian();
     }
     return result;
 }

projects/mtg/src/ManaCost.cpp

@@ -667,7 +667,7 @@ int ManaCost::getManaSymbolsHybridMerged(int color)
     int result = cost[color];
     for (size_t i = 0; i < hybrids.size(); ++i)
     {
-        result = hybrids[i].getManaSymbolsHybridMerged(color);//removed +
+        result += hybrids[i].getManaSymbolsHybridMerged(color);
     }
     if (extraCosts && extraCosts->costs.size())
     {
@@ -683,6 +683,14 @@ int ManaCost::getManaSymbolsHybridMerged(int color)
     return result;
 }
 
+int ManaCost::countHybridsNoPhyrexian()
+{
+    int result = 0;
+    for (size_t i = 0; i < hybrids.size(); i++)
+        result ++;
+    return result;
+}
+
 int ManaCost::parseManaSymbol(char symbol)
 {
     switch (symbol)