From b005e7b03f7b0575dcf8813b814526a6dbadcda2 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sun, 13 Oct 2013 01:59:11 +0200
Subject: [PATCH] * Deck generator - Fixed a bug that during the generation
 cards with multiple colored mana symbols of the same color were unintended
 rated higher. So all generated decks tend to include more or nearly only
 cards with double or tripple colored mana symbols ignoring all other cards.

---
 Mage.Common/src/mage/utils/DeckBuilder.java | 22 ++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/Mage.Common/src/mage/utils/DeckBuilder.java b/Mage.Common/src/mage/utils/DeckBuilder.java
index be56560a32..f387f7faa2 100644
--- a/Mage.Common/src/mage/utils/DeckBuilder.java
+++ b/Mage.Common/src/mage/utils/DeckBuilder.java
@@ -13,6 +13,7 @@ import mage.cards.decks.Deck;
 import mage.constants.CardType;
 import mage.constants.ColoredManaSymbol;
 import mage.interfaces.rate.RateCallback;
+import org.apache.log4j.Logger;
 
 /**
  * Builds deck from provided card pool.
@@ -52,6 +53,19 @@ public class DeckBuilder {
             remainingCards.add(new MageScoredCard(card, allowedColors, callback));
             names.add(card.getName());
         }
+// prints score and manaScore to log
+//        for(MageScoredCard scoreCard :remainingCards) {
+//            Logger.getLogger(DeckBuilder.class).info(
+//                    new StringBuilder("Score: ")
+//                    .append(scoreCard.getScore())
+//                    .append(" ManaScore: ")
+//                    .append(scoreCard.getManaCostScore(scoreCard.getCard(), allowedColors))
+//                    .append(" ")
+//                    .append(scoreCard.getCard().getName())
+//                    .append(" ")
+//                    .append(scoreCard.getCard().getManaCost().getText()).toString()
+//                    );
+//        }
         int min = 0;
         if (deckSize == 40) {
             deckCount = DECK_COUNT40;
@@ -147,7 +161,7 @@ public class DeckBuilder {
                 symbol = symbol.replace("{", "").replace("}", "");
                 if (isColoredMana(symbol)) {
                     for (ColoredManaSymbol allowed : allowedColors) {
-                        if (allowed.toString().equals(symbol)) {
+                        if (symbol.contains(allowed.toString())) {
                             count++;
                         }
                     }
@@ -255,15 +269,17 @@ public class DeckBuilder {
                 symbol = symbol.replace("{", "").replace("}", "");
                 if (isColoredMana(symbol)) {
                     for (ColoredManaSymbol allowed : allowedColors) {
-                        if (allowed.toString().equals(symbol)) {
+                        if (symbol.contains(allowed.toString())) {
                             count++;
                         }
                     }
+                    // colored but no selected colors, go back with negative value
                     if (count == 0) {
                         return -30;
                     }
                     if (!colors.contains(symbol)) {
                         multicolor += 1;
+                        colors.add(symbol);
                     }
                     Integer typeCount = singleCount.get(symbol);
                     if (typeCount == null) {
@@ -293,7 +309,7 @@ public class DeckBuilder {
     }
 
     protected static boolean isColoredMana(String symbol) {
-        return symbol.equals("W") || symbol.equals("G") || symbol.equals("U") || symbol.equals("B") || symbol.equals("R");
+        return symbol.equals("W") || symbol.equals("G") || symbol.equals("U") || symbol.equals("B") || symbol.equals("R") || symbol.contains("/");
     }
 
 }