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

removed player's picks map from boosterDraft interface (interface should not hold static data)

Browse Source 
removed the getCardsNumber function from BoosterGenerator (it doesn't know in advance how many cards caller will ask to generate)
moved upload picks from draft deckeditor to boosterDraft class
added an enum to describe limited game type
tests may start failing - they would need an initialized CardDb
This commit is contained in:
Maxmtg
2011-09-14 17:46:24 +00:00
parent 5b3c267162
commit 9988efc847
10 changed files with 176 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@@ -9822,6 +9822,7 @@ src/main/java/forge/game/limited/BoosterDraft.java svneol=native#text/plain
src/main/java/forge/game/limited/BoosterDraftAI.java svneol=native#text/plain
src/main/java/forge/game/limited/BoosterDraft_1.java svneol=native#text/plain
src/main/java/forge/game/limited/CCnt.java svneol=native#text/plain
src/main/java/forge/game/limited/CardPoolLimitation.java -text
src/main/java/forge/game/limited/CustomLimited.java svneol=native#text/plain
src/main/java/forge/game/limited/DeckColors.java svneol=native#text/plain
src/main/java/forge/game/limited/SealedDeck.java svneol=native#text/plain

9
src/main/java/forge/card/BoosterGenerator.java
View File

@@ -215,15 +215,6 @@ public class BoosterGenerator {
return temp;
}
/**
* <p>getBoosterPackSize.</p>
*
* @return a int.
*/
public final int getBoosterPackSize() {
return numCommons + numUncommons + numRareSlots + numSpecials;
}
private void addToRarity(final CardPrinted c) {
switch(c.getRarity()) {
case Common: commons.add(c); break;

11
src/main/java/forge/game/limited/BoosterDraft.java
View File

@@ -4,9 +4,6 @@ import forge.deck.Deck;
import forge.item.CardPrinted;
import forge.item.ItemPoolView;
import java.util.Map;
import java.util.TreeMap;
/**
* <p>BoosterDraft interface.</p>
*
@@ -45,11 +42,11 @@ public interface BoosterDraft {
/** Constant <code>LandSetCode="{}"</code>. */
public String LandSetCode[] = {""};
/** Constant <code>draftFormat="{}"</code>. */
public String draftFormat[] = {""};
/**
* Called when drafting is over - to upload picks.
*/
void finishedDrafting();
/** Constant <code>draftPicks="{}"</code>. */
public Map<String,Float> draftPicks = new TreeMap<String,Float>();
}

157
src/main/java/forge/game/limited/BoosterDraft_1.java
View File

@@ -5,6 +5,7 @@ import forge.Card;
import forge.CardList;
import forge.Constant;
import forge.FileUtil;
import forge.HttpUtil;
import forge.SetUtils;
import forge.card.BoosterGenerator;
import forge.card.CardBlock;
@@ -20,9 +21,14 @@ import forge.item.ItemPoolView;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
import java.util.TreeMap;
import javax.swing.JOptionPane;
import org.apache.commons.lang3.ArrayUtils;
import net.slightlymagic.braids.util.lambda.Lambda1;
import net.slightlymagic.maxmtg.Closure1;
@@ -31,58 +37,41 @@ import net.slightlymagic.maxmtg.Closure1;
* TODO Write javadoc for this type.
*
*/
public class BoosterDraft_1 implements BoosterDraft {
public final class BoosterDraft_1 implements BoosterDraft {
private final BoosterDraftAI draftAI = new BoosterDraftAI();
private static final int nPlayers = 8;
//private static int boosterPackSize = 14; // 10 com + 3 unc + 1 rare/myth
private static int stopCount = 42; //boosterPackSize * 3;//should total of 42 - because you don't draft lands
private int currentCount = 0;
private int nextBoosterGroup = 0;
private int currentBoosterSize = 0;
private int currentBoosterPick = 0;
private List<List<CardPrinted>> pack; //size 8
//private BoosterGenerator packs[] = {new BoosterGenerator(), new BoosterGenerator(), new BoosterGenerator()};
public Map<String,Float> draftPicks = new TreeMap<String,Float>();
private CardPoolLimitation draftFormat;
private ArrayList<Closure1<List<CardPrinted>, BoosterGenerator>> packs = new ArrayList<Closure1<List<CardPrinted>, BoosterGenerator>>();
private int currentBoosterPack = 0;
//helps the computer choose which booster packs to pick from
//the first row says "pick from boosters 1-7, skip 0" since the players picks from 0
//the second row says "pick from 0 and 2-7 boosters, skip 1" - player chooses from 1
private final int[][] computerChoose = {
{1, 2, 3, 4, 5, 6, 7},
{0, 2, 3, 4, 5, 6, 7},
{0, 1, 3, 4, 5, 6, 7},
{0, 1, 2, 4, 5, 6, 7},
{0, 1, 2, 3, 5, 6, 7},
{0, 1, 2, 3, 4, 6, 7},
{0, 1, 2, 3, 4, 5, 7},
{0, 1, 2, 3, 4, 5, 6}
};
/**
*
* TODO Write javadoc for Constructor.
*/
public BoosterDraft_1() {
pack = get8BoosterPack();
}
/**
* <p>Constructor for BoosterDraft_1.</p>
*
* @param draftType a {@link java.lang.String} object.
*/
public BoosterDraft_1(String draftType) {
public BoosterDraft_1(CardPoolLimitation draftType) {
draftAI.bd = this;
draftFormat[0] = draftType;
draftFormat = draftType;
if (draftType.equals("Full")) { // Draft from all cards in Forge
switch (draftType) {
case Full: // Draft from all cards in Forge
BoosterGenerator bpFull = new BoosterGenerator(CardDb.instance().getAllUniqueCards());
Closure1<List<CardPrinted>, BoosterGenerator> picker = BoosterGenerator.getSimplePicker(bpFull);
for (int i = 0; i < 3; i++) {
packs.add(picker);
}
LandSetCode[0] = AllZone.getCardFactory().getCard("Plains", AllZone.getHumanPlayer()).getMostRecentSet();
} else if (draftType.equals("Block")) { // Draft from cards by block or set
LandSetCode[0] = CardDb.instance().getCard("Plains").getSet();
break;
case Block: // Draft from cards by block or set
List<CardBlock> blocks = SetUtils.getBlocks();
Object o = GuiUtils.getChoice("Choose Block", blocks.toArray());
@@ -108,28 +97,25 @@ public class BoosterDraft_1 implements BoosterDraft {
setCombos.add(String.format("%s/%s/%s", sets[2], sets[2], sets[2]));
}
int sumCards = 0;
if (sets.length > 1) {
Object p = GuiUtils.getChoice("Choose Set Combination", setCombos.toArray());
String[] pp = p.toString().split("/");
for (int i = 0; i < nPacks; i++) {
BoosterGenerator bpMulti = new BoosterGenerator(pp[i]);
Closure1<List<CardPrinted>, BoosterGenerator> picker = BoosterGenerator.getSimplePicker(bpMulti);
packs.add(picker);
sumCards += bpMulti.getBoosterPackSize();
packs.add(BoosterGenerator.getSimplePicker(bpMulti));
}
} else {
BoosterGenerator bpOne = new BoosterGenerator(sets[0]);
Closure1<List<CardPrinted>, BoosterGenerator> picker = BoosterGenerator.getSimplePicker(bpOne);
for (int i = 0; i < nPacks; i++) {
packs.add(picker);
sumCards += bpOne.getBoosterPackSize();
Closure1<List<CardPrinted>, BoosterGenerator> pick1 = BoosterGenerator.getSimplePicker(bpOne);
for (int i = 0; i < nPacks; i++) { packs.add(pick1); }
}
}
stopCount = sumCards;
LandSetCode[0] = block.getLandSet().getCode();
} else if (draftType.equals("Custom")) { // Draft from user-defined cardpools
LandSetCode[0] = block.getLandSet().getCode();
break;
case Custom:
List<CustomLimited> myDrafts = loadCustomDrafts("res/draft/", ".draft");
if (myDrafts.size() < 1) {
@@ -138,6 +124,9 @@ public class BoosterDraft_1 implements BoosterDraft {
CustomLimited draft = (CustomLimited) GuiUtils.getChoice("Choose Custom Draft", myDrafts.toArray());
setupCustomDraft(draft);
}
break;
default:
throw new NoSuchElementException("Draft for mode " + draftType + " has not been set up!");
}
pack = get8BoosterPack();
@@ -162,13 +151,7 @@ public class BoosterDraft_1 implements BoosterDraft {
};
Closure1<List<CardPrinted>, BoosterGenerator> picker = new Closure1<List<CardPrinted>, BoosterGenerator>(fnPick, bpCustom);
int n = 0;
for (int i = 0; i < draft.NumPacks; i++) {
packs.add(picker);
n += draft.NumCards; //bpCustom.getBoosterPackSize();
}
stopCount = n;
for (int i = 0; i < draft.NumPacks; i++) { packs.add(picker); }
LandSetCode[0] = draft.LandSetCode;
}
@@ -206,7 +189,7 @@ public class BoosterDraft_1 implements BoosterDraft {
*
* @return a {@link forge.CardList} object.
*/
public final ItemPoolView<CardPrinted> nextChoice() {
public ItemPoolView<CardPrinted> nextChoice() {
if (pack.get(getCurrentBoosterIndex()).size() == 0) {
pack = get8BoosterPack();
}
@@ -220,19 +203,17 @@ public class BoosterDraft_1 implements BoosterDraft {
*
* @return an array of {@link forge.CardList} objects.
*/
public final List<List<CardPrinted>> get8BoosterPack() {
public List<List<CardPrinted>> get8BoosterPack() {
if (nextBoosterGroup >= packs.size()) { return null; }
List<List<CardPrinted>> list = new ArrayList<List<CardPrinted>>();
for (int i = 0; i < 8; i++) { list.add(packs.get(nextBoosterGroup).apply()); }
if (currentBoosterPack < packs.size()) {
for (int i = 0; i < 8; i++) {
list.add(packs.get(currentBoosterPack).apply());
}
}
currentBoosterPack++;
nextBoosterGroup++;
currentBoosterSize = list.get(0).size();
currentBoosterPick = 0;
return list;
} //get8BoosterPack()
}
//size 7, all the computers decks
@@ -241,21 +222,24 @@ public class BoosterDraft_1 implements BoosterDraft {
*
* @return an array of {@link forge.deck.Deck} objects.
*/
public final Deck[] getDecks() {
public Deck[] getDecks() {
return draftAI.getDecks();
}
private void computerChoose() {
int[] row = computerChoose[getCurrentBoosterIndex()];
for (int i = 0; i < row.length; i++) {
int iHumansBooster = getCurrentBoosterIndex();
int iPlayer = 0;
for (int i = 0; i < pack.size(); i++) {
if (iHumansBooster == i) { continue; } // don't touch player's booster
CardList forAi = new CardList();
List<CardPrinted> booster = pack.get(row[i]);
List<CardPrinted> booster = pack.get(i);
for (CardPrinted cr : booster) {
forAi.add(cr.toForgeCard());
}
// TODO Please write this drafting code to work without heavy cards
Card aiPick = draftAI.choose(forAi, i);
// TODO: Please write this drafting code to work without heavy card objects
Card aiPick = draftAI.choose(forAi, iPlayer++);
String pickedName = aiPick.getName();
for (int pick = booster.size() - 1; pick >= 0; pick--) {
@@ -269,7 +253,7 @@ public class BoosterDraft_1 implements BoosterDraft {
} //computerChoose()
private int getCurrentBoosterIndex() {
return currentCount % nPlayers;
return currentBoosterPick % nPlayers;
}
/**
@@ -277,12 +261,15 @@ public class BoosterDraft_1 implements BoosterDraft {
*
* @return a boolean.
*/
public final boolean hasNextChoice() {
return currentCount < stopCount;
public boolean hasNextChoice() {
boolean isLastGroup = nextBoosterGroup >= packs.size();
boolean isBoosterDepleted = currentBoosterPick >= currentBoosterSize;
boolean noMoreCards = isLastGroup && isBoosterDepleted;
return !noMoreCards;
}
/** {@inheritDoc} */
public final void setChoice(final CardPrinted c) {
public void setChoice(final CardPrinted c) {
List<CardPrinted> thisBooster = pack.get(getCurrentBoosterIndex());
if (!thisBooster.contains(c)) {
@@ -296,7 +283,7 @@ public class BoosterDraft_1 implements BoosterDraft {
float pickValue = 0;
if (cc.equals(c)) {
pickValue = thisBooster.size() * (1f - ((float) currentCount) / stopCount) * 2f;
pickValue = thisBooster.size() * (1f - ((float) currentBoosterPick / currentBoosterSize) * 2f);
} else {
pickValue = 0;
}
@@ -312,6 +299,26 @@ public class BoosterDraft_1 implements BoosterDraft {
}
thisBooster.remove(c);
currentCount++;
currentBoosterPick++;
} //setChoice()
/** This will upload drafting picks to cardforge HQ */
@Override public void finishedDrafting() {
if (Constant.Runtime.UpldDrft[0]) {
if (draftPicks.size() > 1) {
ArrayList<String> outDraftData = new ArrayList<String>();
String[] keys = draftPicks.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY);
for (int i = 0; i < keys.length; i++) {
outDraftData.add(keys[i] + "|" + draftPicks.get(keys[i]));
}
FileUtil.writeFile("res/draft/tmpDraftData.txt", outDraftData);
HttpUtil poster = new HttpUtil();
poster.upload("http://cardforge.org/draftAI/submitDraftData.php?fmt=" + draftFormat, "res/draft/tmpDraftData.txt");
}
}
}
}

11
src/main/java/forge/game/limited/CardPoolLimitation.java Normal file
View File

@@ -0,0 +1,11 @@
package forge.game.limited;
/**
* TODO: Write javadoc for this type.
*
*/
public enum CardPoolLimitation {
Full,
Block,
Custom
}

42
src/main/java/forge/gui/deckeditor/DeckEditorDraft.java
View File

@@ -2,8 +2,6 @@ package forge.gui.deckeditor;
import forge.AllZone;
import forge.Constant;
import forge.FileUtil;
import forge.HttpUtil;
import forge.deck.Deck;
import forge.deck.DeckManager;
import forge.error.ErrorViewer;
@@ -19,17 +17,26 @@ import forge.properties.ForgeProps;
import forge.properties.NewConstants;
import forge.view.swing.OldGuiNewGame;
import javax.swing.*;
import org.apache.commons.lang3.ArrayUtils;
import net.slightlymagic.maxmtg.Predicate;
import java.awt.*;
import java.awt.event.*;
import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.InputEvent;
import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.ArrayList;
import java.util.List;
import javax.swing.JButton;
import javax.swing.JOptionPane;
import javax.swing.JTable;
/**
* <p>Gui_BoosterDraft class.</p>
@@ -169,7 +176,7 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
jButtonPick.setBounds(new Rectangle(238, 418, 147, 44));
jButtonPick.setFont(new java.awt.Font("Dialog", 0, 16));
jButtonPick.setText("Choose Card");
jButtonPick.addActionListener(new java.awt.event.ActionListener() {
jButtonPick.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
jButtonPickClicked(e);
}
@@ -200,22 +207,7 @@ public class DeckEditorDraft extends DeckEditorBase implements NewConstants, New
if (boosterDraft.hasNextChoice()) {
showChoices(boosterDraft.nextChoice());
} else {
if (Constant.Runtime.UpldDrft[0]) {
if (BoosterDraft.draftPicks.size() > 1) {
ArrayList<String> outDraftData = new ArrayList<String>();
String[] keys = BoosterDraft.draftPicks.keySet().toArray(ArrayUtils.EMPTY_STRING_ARRAY);
for (int i = 0; i < keys.length; i++) {
outDraftData.add(keys[i] + "|" + BoosterDraft.draftPicks.get(keys[i]));
}
FileUtil.writeFile("res/draft/tmpDraftData.txt", outDraftData);
HttpUtil poster = new HttpUtil();
poster.upload("http://cardforge.org/draftAI/submitDraftData.php?fmt=" + BoosterDraft.draftFormat[0], "res/draft/tmpDraftData.txt");
}
}
boosterDraft.finishedDrafting();
//quit
saveDraft();

7
src/main/java/forge/view/swing/OldGuiNewGame.java
View File

@@ -10,6 +10,7 @@ import forge.error.BugzReporter;
import forge.error.ErrorViewer;
import forge.game.GameType;
import forge.game.limited.BoosterDraft_1;
import forge.game.limited.CardPoolLimitation;
import forge.game.limited.SealedDeck;
import forge.gui.GuiUtils;
import forge.gui.ListChooser;
@@ -392,15 +393,15 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
Object o = GuiUtils.getChoice(prompt, draftTypes.toArray());
if (o.toString().equals(draftTypes.get(0))) {
draft.showGui(new BoosterDraft_1("Full"));
draft.showGui(new BoosterDraft_1(CardPoolLimitation.Full));
}
else if (o.toString().equals(draftTypes.get(1))) {
draft.showGui(new BoosterDraft_1("Block"));
draft.showGui(new BoosterDraft_1(CardPoolLimitation.Block));
}
else if (o.toString().equals(draftTypes.get(2))) {
draft.showGui(new BoosterDraft_1("Custom"));
draft.showGui(new BoosterDraft_1(CardPoolLimitation.Custom));
}
}

5
src/test/java/forge/BoosterDraftTest.java
View File

@@ -72,4 +72,9 @@ public class BoosterDraftTest implements BoosterDraft {
public CardList getUnchosenCards() {
return null;
}
@Override
public void finishedDrafting() {
}
}

3
src/test/java/forge/BoosterDraft_1Test.java
View File

@@ -4,6 +4,7 @@ import org.testng.annotations.Test;
import forge.game.limited.BoosterDraft_1;
import forge.game.limited.CardPoolLimitation;
import forge.item.CardPrinted;
import forge.item.ItemPoolView;
@@ -19,7 +20,7 @@ public class BoosterDraft_1Test {
*/
@Test(groups = {"UnitTest", "fast"}, timeOut = 1000)
public void BoosterDraft_1Test1() throws Exception {
BoosterDraft_1 draft = new BoosterDraft_1();
BoosterDraft_1 draft = new BoosterDraft_1(CardPoolLimitation.Full);
while (draft.hasNextChoice()) {
ItemPoolView<CardPrinted> list = draft.nextChoice();
System.out.println(list.countAll());

3
src/test/java/forge/GuiBoosterDraftTest.java
View File

@@ -3,6 +3,7 @@ package forge;
import forge.deck.Deck;
import forge.game.GameType;
import forge.game.limited.BoosterDraft_1;
import forge.game.limited.CardPoolLimitation;
import forge.gui.deckeditor.DeckEditorDraft;
import org.testng.Assert;
@@ -25,7 +26,7 @@ public class GuiBoosterDraftTest {
Constant.Runtime.HumanDeck[0] = new Deck(GameType.Sealed);
DeckEditorDraft g = new DeckEditorDraft();
g.showGui(new BoosterDraft_1());
g.showGui(new BoosterDraft_1(CardPoolLimitation.Full));
Assert.assertNotNull(g);
g.dispose();
}