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

Deck generation card quality and mana curve improvements

Browse Source
This commit is contained in:
austinio7116
2018-04-20 23:59:19 +01:00
committed by maustin
parent a60f5d1660
commit 7cb11e5191
1 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,11 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
protected Iterable<PaperCard> onColorNonCreatures; protected Iterable<PaperCard> onColorNonCreatures;
protected Iterable<PaperCard> keyCards; protected Iterable<PaperCard> keyCards;
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 Map<Integer,Integer> targetCMCs;
public CardThemedDeckBuilder(IDeckGenPool pool, DeckFormat format){ public CardThemedDeckBuilder(IDeckGenPool pool, DeckFormat format){
super(pool,format); super(pool,format);
@@ -169,6 +171,8 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
// as filters and iterate over _source_ collection each time. So even if // as filters and iterate over _source_ collection each time. So even if
// aiPlayable has changed, there is no need to create a new iterable. // aiPlayable has changed, there is no need to create a new iterable.
generateTargetCMCs();
// 2. Add keycards // 2. Add keycards
addKeyCards(); addKeyCards();
@@ -299,6 +303,29 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
} }
protected void generateTargetCMCs(){
targetCMCs = new HashMap<>();
targetCMCs.put(1,Math.round((MyRandom.getRandom().nextInt(4)+2)*targetSize/60));//2
targetCMCs.put(2,Math.round((MyRandom.getRandom().nextInt(5)+5)*targetSize/60));//6
targetCMCs.put(3,Math.round((MyRandom.getRandom().nextInt(5)+6)*targetSize/60));//7
targetCMCs.put(4,Math.round((MyRandom.getRandom().nextInt(3)+3)*targetSize/60));//4
targetCMCs.put(5,Math.round((MyRandom.getRandom().nextInt(3)+3)*targetSize/60));//3
targetCMCs.put(6,Math.round((MyRandom.getRandom().nextInt(3)+1)*targetSize/60));//2
while(sumMapValues(targetCMCs) < numSpellsNeeded){
int randomKey = MyRandom.getRandom().nextInt(6)+1;
targetCMCs.put(randomKey,targetCMCs.get(randomKey) + 1);
}
}
private int sumMapValues(Map<Integer, Integer> integerMap){
int sum = 0;
for (float f : integerMap.values()) {
sum += f;
}
return sum;
}
protected void addKeyCards(){ protected void addKeyCards(){
// Add the first keycard if not land // Add the first keycard if not land
if(!keyCard.getRules().getMainPart().getType().isLand()) { if(!keyCard.getRules().getMainPart().getType().isLand()) {
@@ -528,7 +555,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
if (secondKeyCard != null) { if (secondKeyCard != null) {
possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName())); possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName()));
} }
Iterator<PaperCard> iRandomPool=possibleList.iterator(); Iterator<PaperCard> iRandomPool = CardRanker.rankCardsInDeck(possibleList.subList(0, targetSize <= possibleList.size() ? targetSize : possibleList.size())).iterator();
while (deckList.size() < targetSize) { while (deckList.size() < targetSize) {
if (logToConsole) { if (logToConsole) {
System.out.println("WARNING: Fixing deck size, currently " + deckList.size() + " cards."); System.out.println("WARNING: Fixing deck size, currently " + deckList.size() + " cards.");
@@ -762,14 +789,16 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName())); possibleList.removeAll(StaticData.instance().getCommonCards().getAllCards(secondKeyCard.getName()));
} }
Collections.shuffle(possibleList); Collections.shuffle(possibleList);
Iterator<PaperCard> iRandomPool=possibleList.iterator(); addManaCurveCards(CardRanker.rankCardsInDeck(possibleList.subList(0, targetSize*3 <= possibleList.size() ? targetSize*3 : possibleList.size())),
for(int i=0;i<num;++i){ num, "Random Card");
/*for(int i=0;i<num;++i){
PaperCard randomCard=iRandomPool.next(); PaperCard randomCard=iRandomPool.next();
deckList.add(randomCard); deckList.add(randomCard);
if(logToConsole) { if(logToConsole) {
System.out.println("Random Card[" + i + "]:" + randomCard.getName() + " (" + randomCard.getRules().getManaCost() + ")"); System.out.println("Random Card[" + i + "]:" + randomCard.getName() + " (" + randomCard.getRules().getManaCost() + ")");
} }
} }*/
} }
/** /**
@@ -820,13 +849,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
aiPlayables.removeAll(keyCardList); aiPlayables.removeAll(keyCardList);
rankedColorList.removeAll(keyCardList); rankedColorList.removeAll(keyCardList);
}*/ }*/
final Map<Integer,Integer> targetCMCs = new HashMap<>();
targetCMCs.put(1,Math.round((MyRandom.getRandom().nextInt(4)+2)*targetSize/60));//2
targetCMCs.put(2,Math.round((MyRandom.getRandom().nextInt(5)+5)*targetSize/60));//6
targetCMCs.put(3,Math.round((MyRandom.getRandom().nextInt(5)+6)*targetSize/60));//7
targetCMCs.put(4,Math.round((MyRandom.getRandom().nextInt(3)+3)*targetSize/60));//4
targetCMCs.put(5,Math.round((MyRandom.getRandom().nextInt(3)+3)*targetSize/60));//3
targetCMCs.put(6,Math.round((MyRandom.getRandom().nextInt(3)+1)*targetSize/60));//2
final Map<Integer, Integer> creatureCosts = new HashMap<Integer, Integer>(); final Map<Integer, Integer> creatureCosts = new HashMap<Integer, Integer>();