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

Merge branch 'traxisfix' into 'master'

Browse Source 
Deck generation fix and performance issue

See merge request core-developers/forge!446
This commit is contained in:
Michael Kamensky
2018-04-20 18:52:07 +00:00
parent ee7a3e934e a60f5d1660
commit f342fe3351
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -513,8 +513,7 @@ 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().getColorIdentity().hasNoColorsExcept(colors)
&& !deckListNames.contains(card.getName())
&& !card.getRules().getAiHints().getRemAIDecks()
&& !card.getRules().getAiHints().getRemRandomDecks()
@@ -529,9 +528,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
if (secondKeyCard != null) {
possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName()));
}
List<PaperCard> randomPool = CardRanker.rankCardsInDeck(possibleList).subList(0,new Float(possibleList.size()*0.25).intValue());
Collections.shuffle(randomPool, MyRandom.getRandom());
Iterator<PaperCard> iRandomPool=randomPool.iterator();
Iterator<PaperCard> iRandomPool=possibleList.iterator();
while (deckList.size() < targetSize) {
if (logToConsole) {
System.out.println("WARNING: Fixing deck size, currently " + deckList.size() + " cards.");
@@ -749,8 +746,7 @@ 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().getColorIdentity().hasNoColorsExcept(colors)
&& !deckListNames.contains(card.getName())
&&!card.getRules().getAiHints().getRemAIDecks()
&&!card.getRules().getAiHints().getRemRandomDecks()
@@ -765,9 +761,8 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
if (secondKeyCard != null) {
possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName()));
}
List<PaperCard> randomPool = CardRanker.rankCardsInDeck(possibleList).subList(0,new Float(possibleList.size()*0.25).intValue());
Collections.shuffle(randomPool);
Iterator<PaperCard> iRandomPool=randomPool.iterator();
Collections.shuffle(possibleList);
Iterator<PaperCard> iRandomPool=possibleList.iterator();
for(int i=0;i<num;++i){
PaperCard randomCard=iRandomPool.next();
deckList.add(randomCard);