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

Merge branch 'deckgenimprovements' into 'master'

Browse Source 
Updated card deck generation files, plus fixed bug with recent generation code change

See merge request core-developers/forge!368
This commit is contained in:
Michael Kamensky
2018-04-09 08:43:09 +00:00
parent 334be5afc7 bd321edd20
commit aabfb0ab1c
4 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
forge-gui/res/deckgendecks/Commander.dat
View File

Binary file not shown.

BIN
forge-gui/res/deckgendecks/Modern.dat
View File

Binary file not shown.

BIN
forge-gui/res/deckgendecks/Standard.dat
View File

Binary file not shown.

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

@@ -506,8 +506,8 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
&&!card.getRules().getManaCost().isPureGeneric() &&!card.getRules().getManaCost().isPureGeneric()
&& colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor()) && colors.containsAllColorsFrom(card.getRules().getColorIdentity().getColor())
&& !deckList.contains(card) && !deckList.contains(card)
&& !keyCard.equals(card) && (keyCard!=null && !keyCard.equals(card))
&& !secondKeyCard.equals(card) && (secondKeyCard!=null && !secondKeyCard.equals(card))
&&!card.getRules().getAiHints().getRemAIDecks() &&!card.getRules().getAiHints().getRemAIDecks()
&&!card.getRules().getAiHints().getRemRandomDecks() &&!card.getRules().getAiHints().getRemRandomDecks()
&&!card.getRules().getMainPart().getType().isLand(); &&!card.getRules().getMainPart().getType().isLand();