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

Support generating proper Tiny Leaders decks

Browse Source
This commit is contained in:
drdev
2015-02-15 15:33:18 +00:00
parent e51a64242e
commit caf5817d0b
14 changed files with 127 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CDeckgen.java
View File

@@ -11,6 +11,7 @@ import forge.card.CardRulesPredicates;
import forge.card.MagicColor;
import forge.deck.Deck;
import forge.deck.DeckBase;
import forge.deck.DeckFormat;
import forge.deck.generation.*;
import forge.gui.framework.ICDoc;
import forge.item.InventoryItem;
@@ -112,10 +113,10 @@ public enum CDeckgen implements ICDoc {
CardDb cardDb = FModel.getMagicDb().getCommonCards();
DeckGeneratorBase gen = null;
switch (colorCount0) {
case 1: gen = new DeckGeneratorMonoColor(cardDb, null); break;
case 2: gen = new DeckGenerator2Color(cardDb, null, null); break;
case 3: gen = new DeckGenerator3Color(cardDb, null, null, null); break;
case 5: gen = new DeckGenerator5Color(cardDb); break;
case 1: gen = new DeckGeneratorMonoColor(cardDb, DeckFormat.Constructed, null); break;
case 2: gen = new DeckGenerator2Color(cardDb, DeckFormat.Constructed, null, null); break;
case 3: gen = new DeckGenerator3Color(cardDb, DeckFormat.Constructed, null, null, null); break;
case 5: gen = new DeckGenerator5Color(cardDb, DeckFormat.Constructed); break;
}
if( null != gen ) {

3
forge-gui-desktop/src/test/java/forge/deck/generate/Generate2ColorDeckTest.java
View File

@@ -1,6 +1,7 @@
package forge.deck.generate;
import forge.card.CardDb;
import forge.deck.DeckFormat;
import forge.deck.generation.DeckGenerator2Color;
import forge.item.PaperCard;
import forge.model.FModel;
@@ -21,7 +22,7 @@ public class Generate2ColorDeckTest {
@Test(enabled = false)
public void generate2ColorDeckTest1() {
CardDb cardDb = FModel.getMagicDb().getCommonCards();
final DeckGenerator2Color gen = new DeckGenerator2Color(cardDb, "white", "blue");
final DeckGenerator2Color gen = new DeckGenerator2Color(cardDb, DeckFormat.Constructed, "white", "blue");
final ItemPool<PaperCard> cardList = gen.getDeck(60, false);
Assert.assertNotNull(cardList);
}

3
forge-gui-desktop/src/test/java/forge/deck/generate/Generate3ColorDeckTest.java
View File

@@ -2,6 +2,7 @@ package forge.deck.generate;
import forge.card.CardDb;
import forge.deck.CardPool;
import forge.deck.DeckFormat;
import forge.deck.generation.DeckGenerator3Color;
import forge.model.FModel;
@@ -20,7 +21,7 @@ public class Generate3ColorDeckTest {
@Test(timeOut = 1000, enabled = false)
public void generate3ColorDeckTest1() {
CardDb cardDb = FModel.getMagicDb().getCommonCards();
final DeckGenerator3Color gen = new DeckGenerator3Color(cardDb, "white", "blue", "black");
final DeckGenerator3Color gen = new DeckGenerator3Color(cardDb, DeckFormat.Constructed, "white", "blue", "black");
final CardPool cardList = gen.getDeck(60, false);
Assert.assertNotNull(cardList);
}

3
forge-gui-desktop/src/test/java/forge/deck/generate/Generate5ColorDeckTest.java
View File

@@ -2,6 +2,7 @@ package forge.deck.generate;
import forge.card.CardDb;
import forge.deck.CardPool;
import forge.deck.DeckFormat;
import forge.deck.generation.DeckGenerator5Color;
import forge.model.FModel;
@@ -20,7 +21,7 @@ public class Generate5ColorDeckTest {
@Test(timeOut = 1000, enabled = false)
public void generate5ColorDeckTest1() {
CardDb cardDb = FModel.getMagicDb().getCommonCards();
final DeckGenerator5Color gen = new DeckGenerator5Color(cardDb);
final DeckGenerator5Color gen = new DeckGenerator5Color(cardDb, DeckFormat.Constructed);
final CardPool cardList = gen.getDeck(60, false);
Assert.assertNotNull(cardList);
}