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 draft duplicates bug

Browse Source
This commit is contained in:
Adam Pantel
2019-03-23 00:48:58 -04:00
parent 5cd5020595
commit 18f32a1657
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java
View File

@@ -92,7 +92,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
final Iterable<PaperCard> conspiracies = Iterables.filter(aiPlayables, final Iterable<PaperCard> conspiracies = Iterables.filter(aiPlayables,
Predicates.compose(CardRulesPredicates.coreType(true, "Conspiracy"), PaperCard.FN_GET_RULES)); Predicates.compose(CardRulesPredicates.coreType(true, "Conspiracy"), PaperCard.FN_GET_RULES));
this.draftedConspiracies = Lists.newArrayList(conspiracies); this.draftedConspiracies = Lists.newArrayList(conspiracies);
aiPlayables.removeAll(draftedConspiracies); this.aiPlayables.removeAll(draftedConspiracies);
findBasicLandSets(); findBasicLandSets();
} }
@@ -177,6 +177,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
if (card != null) { if (card != null) {
deckList.add(card); deckList.add(card);
aiPlayables.remove(card); aiPlayables.remove(card);
rankedColorList.remove(card);
landsNeeded--; landsNeeded--;
if (logToConsole) { if (logToConsole) {
System.out.println("Low CMC: " + card.getName()); System.out.println("Low CMC: " + card.getName());
@@ -291,6 +292,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
final PaperCard c = aiPlayables.get(MyRandom.getRandom().nextInt(aiPlayables.size() - 1)); final PaperCard c = aiPlayables.get(MyRandom.getRandom().nextInt(aiPlayables.size() - 1));
deckList.add(c); deckList.add(c);
aiPlayables.remove(c); aiPlayables.remove(c);
rankedColorList.remove(c);
if (logToConsole) { if (logToConsole) {
System.out.println(" - Added " + c.getName() + " randomly."); System.out.println(" - Added " + c.getName() + " randomly.");
} }
@@ -298,6 +300,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
final PaperCard c = aiPlayables.get(0); final PaperCard c = aiPlayables.get(0);
deckList.add(c); deckList.add(c);
aiPlayables.remove(c); aiPlayables.remove(c);
rankedColorList.remove(c);
if (logToConsole) { if (logToConsole) {
System.out.println(" - Added " + c.getName() + " randomly."); System.out.println(" - Added " + c.getName() + " randomly.");
} }
@@ -522,6 +525,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase {
} }
deckList.addAll(toAdd); deckList.addAll(toAdd);
aiPlayables.removeAll(toAdd); aiPlayables.removeAll(toAdd);
rankedColorList.removeAll(toAdd);
} }
} }