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

Fixed bug where adding random cards to deck would mess up land count - also shuffling random cards before adding. This code is only executed for rare cases where the learnt archetypes have a very tight cardlist, so if cards are non-AI playable or get randomly removed from the pool, the generator has a way to validly fill the gap.

Browse Source
This commit is contained in:
austinio7116
2018-06-17 07:30:41 +01:00
committed by maustin
parent cb082f1e31
commit b9e8528029
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
// Views for aiPlayable // Views for aiPlayable
protected Iterable<PaperCard> onColorCreaturesAndSpells; protected Iterable<PaperCard> onColorCreaturesAndSpells;
protected static final boolean logToConsole = false; protected static final boolean logToConsole = true;
protected static final boolean logColorsToConsole = false; protected static final boolean logColorsToConsole = false;
protected Iterable<PaperCard> keyCards; protected Iterable<PaperCard> keyCards;
@@ -314,11 +314,15 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
} }
//Extend to playsets for non land cards to fill out deck for when no other suitable cards are available
protected void extendPlaysets(int numSpellsNeeded){ protected void extendPlaysets(int numSpellsNeeded){
Map<PaperCard,Integer> currentCounts = new HashMap<>(); Map<PaperCard,Integer> currentCounts = new HashMap<>();
List<PaperCard> cardsToAdd = new ArrayList<>(); List<PaperCard> cardsToAdd = new ArrayList<>();
int i=0; int i=0;
for(PaperCard card: deckList){ for(PaperCard card: deckList){
if(card.getRules().getType().isLand()){
continue;
}
if(currentCounts.containsKey(card)){ if(currentCounts.containsKey(card)){
currentCounts.put(card, currentCounts.get(card) + 1); currentCounts.put(card, currentCounts.get(card) + 1);
}else{ }else{
@@ -606,6 +610,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName())); possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName()));
} }
//Iterator<PaperCard> iRandomPool = CardRanker.rankCardsInDeck(possibleList.subList(0, targetSize <= possibleList.size() ? targetSize : possibleList.size())).iterator(); //Iterator<PaperCard> iRandomPool = CardRanker.rankCardsInDeck(possibleList.subList(0, targetSize <= possibleList.size() ? targetSize : possibleList.size())).iterator();
Collections.shuffle(possibleList);
Iterator<PaperCard> iRandomPool = possibleList.iterator(); Iterator<PaperCard> iRandomPool = possibleList.iterator();
while (deckList.size() < targetSize) { while (deckList.size() < targetSize) {
if (logToConsole) { if (logToConsole) {