From 7df721a863c917e20fffc48ad6d92f3ca8a9eaaf Mon Sep 17 00:00:00 2001 From: austinio7116 Date: Fri, 20 Apr 2018 18:04:54 +0100 Subject: [PATCH] Fix for colourless brawl commanders --- .../main/java/forge/limited/CardThemedDeckBuilder.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java index 1cc024b89ef..af3df242278 100644 --- a/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java @@ -749,8 +749,9 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { @Override public boolean apply(PaperCard card) { return format.isLegalCard(card) - &&!card.getRules().getManaCost().isPureGeneric() - && colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor()) + &&((!card.getRules().getManaCost().isPureGeneric() + && colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor()))|| + card.getRules().getManaCost().isPureGeneric()) && !deckListNames.contains(card.getName()) &&!card.getRules().getAiHints().getRemAIDecks() &&!card.getRules().getAiHints().getRemRandomDecks() @@ -765,7 +766,9 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { if (secondKeyCard != null) { possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName())); } - List randomPool = CardRanker.rankCardsInDeck(possibleList).subList(0,new Float(possibleList.size()*0.25).intValue()); + //reduce pool to more powerful cards to use as filler + int poolSize = new Float(possibleList.size()*0.25).intValue(); + List randomPool = CardRanker.rankCardsInDeck(possibleList).subList(0,poolSize); Collections.shuffle(randomPool); Iterator iRandomPool=randomPool.iterator(); for(int i=0;i