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

Generic mana fix for deck generation

Browse Source
This commit is contained in:
austinio7116
2018-04-20 19:11:52 +01:00
committed by maustin
parent 51bf8a5286
commit e6c4f6c703
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,8 +513,7 @@ 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().getColorIdentity().hasNoColorsExcept(colors)
&& colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor())
&& !deckListNames.contains(card.getName()) && !deckListNames.contains(card.getName())
&& !card.getRules().getAiHints().getRemAIDecks() && !card.getRules().getAiHints().getRemAIDecks()
&& !card.getRules().getAiHints().getRemRandomDecks() && !card.getRules().getAiHints().getRemRandomDecks()
@@ -747,9 +746,8 @@ 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().getColorIdentity().hasNoColorsExcept(colors)
&& 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()