external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for colourless brawl commanders

Browse Source
This commit is contained in:
austinio7116
2018-04-20 18:04:54 +01:00
committed by maustin
parent ee7a3e934e
commit 7df721a863
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
View File

@@ -749,8 +749,9 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
@Override @Override
public boolean apply(PaperCard card) { public boolean apply(PaperCard card) {
return format.isLegalCard(card) return format.isLegalCard(card)
&&!card.getRules().getManaCost().isPureGeneric() &&((!card.getRules().getManaCost().isPureGeneric()
&& colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor()) && colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor()))||
card.getRules().getManaCost().isPureGeneric())
&& !deckListNames.contains(card.getName()) && !deckListNames.contains(card.getName())
&&!card.getRules().getAiHints().getRemAIDecks() &&!card.getRules().getAiHints().getRemAIDecks()
&&!card.getRules().getAiHints().getRemRandomDecks() &&!card.getRules().getAiHints().getRemRandomDecks()
@@ -765,7 +766,9 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
if (secondKeyCard != null) { if (secondKeyCard != null) {
possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName())); possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName()));
} }
List<PaperCard> 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<PaperCard> randomPool = CardRanker.rankCardsInDeck(possibleList).subList(0,poolSize);
Collections.shuffle(randomPool); Collections.shuffle(randomPool);
Iterator<PaperCard> iRandomPool=randomPool.iterator(); Iterator<PaperCard> iRandomPool=randomPool.iterator();
for(int i=0;i<num;++i){ for(int i=0;i<num;++i){