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

Improved land counts in deck generation to use linear regression to generate land requirements from average CMC - also increased variance of CMC ratios and reduced land count requirements if filtered decks enabled

Browse Source
This commit is contained in:
austinio7116
2019-06-19 19:52:08 +01:00
committed by churrufli
parent 97082267d1
commit 2c12e12e89
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ import forge.game.GameFormat;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgePreferences;
import forge.util.MyRandom; import forge.util.MyRandom;
import java.util.*; import java.util.*;
@@ -206,22 +207,27 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
// 5. If there are still on-color cards, and the average cmc is low, add // 5. If there are still on-color cards, and the average cmc is low, add
// extras. // extras.
double avCMC = getAverageCMC(deckList); double avCMC = getAverageCMC(deckList);
int maxCMC = getMaxCMC(deckList); //calculated required lands based on https://www.channelfireball.com/articles/how-many-lands-do-you-need-to-consistently-hit-your-land-drops/
if (avCMC < 4) { float baseLandParameter = 16f;
addLowCMCCard(); //reduce landcount if filtered hands enabled
if (targetSize > 60) { if(FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.FILTERED_HANDS)){
addLowCMCCard(); baseLandParameter--;
} }
} landsNeeded = new Double((baseLandParameter + 3.14f * avCMC) * targetSize/60f).intValue();
if (avCMC < 3 && maxCMC < 6) { if (logToConsole) {
addLowCMCCard(); System.out.println("Required lands from linear regression : " + avCMC + " cmc, needed: " + landsNeeded);
} }
if (avCMC < 2.5 && maxCMC < 5) { numSpellsNeeded = targetSize-landsNeeded;
addLowCMCCard(); int extraCardsToAdd = numSpellsNeeded - deckList.size();
if (targetSize > 60) { if (logToConsole) {
System.out.println("Extra cards to add : " + extraCardsToAdd);
}
if(extraCardsToAdd>0){
for(int i=0; i<extraCardsToAdd; ++i){
addLowCMCCard(); addLowCMCCard();
} }
} }
if (logToConsole) { if (logToConsole) {
System.out.println("Post lowcoc : " + deckList.size()); System.out.println("Post lowcoc : " + deckList.size());
} }
@@ -237,6 +243,9 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
// 7. If there are still less than 22 non-land cards add off-color // 7. If there are still less than 22 non-land cards add off-color
// cards. This should be avoided. // cards. This should be avoided.
int stillNeeds = numSpellsNeeded - deckList.size(); int stillNeeds = numSpellsNeeded - deckList.size();
if (logToConsole) {
System.out.println("Still Needs? : " + stillNeeds);
}
if (stillNeeds > 0) if (stillNeeds > 0)
addCards(onColorCreaturesAndSpells, stillNeeds); addCards(onColorCreaturesAndSpells, stillNeeds);
stillNeeds = numSpellsNeeded - deckList.size(); stillNeeds = numSpellsNeeded - deckList.size();
@@ -274,12 +283,13 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
} }
} }
if (logToConsole) {
System.out.println("Lands needed : " + landsNeeded);
}
if (landsNeeded > 0) { if (landsNeeded > 0) {
addLands(clrCnts); addLands(clrCnts);
} }
if (logToConsole) { if (logToConsole) {
System.out.println("Lands needed : " + landsNeeded);
System.out.println("Post Lands : " + deckList.size()); System.out.println("Post Lands : " + deckList.size());
} }
addWastesIfRequired(); addWastesIfRequired();
@@ -345,8 +355,8 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
protected void generateTargetCMCs(){ protected void generateTargetCMCs(){
targetCMCs = new HashMap<>(); targetCMCs = new HashMap<>();
targetCMCs.put(1,Math.round((MyRandom.getRandom().nextInt(12)+4)*targetSize/60));//10 targetCMCs.put(1,Math.round((MyRandom.getRandom().nextInt(16)+2)*targetSize/60));//10
targetCMCs.put(2,Math.round((MyRandom.getRandom().nextInt(16)+8)*targetSize/60));//16 targetCMCs.put(2,Math.round((MyRandom.getRandom().nextInt(20)+6)*targetSize/60));//16
targetCMCs.put(3,Math.round((MyRandom.getRandom().nextInt(10)+8)*targetSize/60));//13 targetCMCs.put(3,Math.round((MyRandom.getRandom().nextInt(10)+8)*targetSize/60));//13
targetCMCs.put(4,Math.round((MyRandom.getRandom().nextInt(8)+6)*targetSize/60));//8 targetCMCs.put(4,Math.round((MyRandom.getRandom().nextInt(8)+6)*targetSize/60));//8
targetCMCs.put(5,Math.round((MyRandom.getRandom().nextInt(8)+6)*targetSize/60));//7 targetCMCs.put(5,Math.round((MyRandom.getRandom().nextInt(8)+6)*targetSize/60));//7
@@ -488,7 +498,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
aiPlayables.remove(card); aiPlayables.remove(card);
rankedColorList.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());
} }
@@ -681,7 +691,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
float p = (float) clrCnts[i] / (float) totalColor; float p = (float) clrCnts[i] / (float) totalColor;
int nLand = Math.round(landsNeeded * p); // desired truncation to int int nLand = Math.round(landsNeeded * p); // desired truncation to int
if (logToConsole) { if (logToConsole) {
System.out.printf("Basics[%s]: %d/%d = %f%% = %d cards%n", MagicColor.Constant.BASIC_LANDS.get(i), clrCnts[i], totalColor, 100*p, nLand); System.out.printf("Basics[%s]: %d/%d = %f%% = %d cards%n", MagicColor.Constant.BASIC_LANDS.get(i), clrCnts[i], totalColor, 100*p, nLand + 1);
} }
PaperCard snowLand = null; PaperCard snowLand = null;