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

add old deck generators back due to popular demand

Browse Source
This commit is contained in:
jendave
2011-08-29 08:00:15 +00:00
parent 9ca9a91ae0
commit 3eefc0899a
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -805,13 +805,10 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
decks.add("2-Color Deck"); decks.add("2-Color Deck");
decks.add("3-Color Deck"); decks.add("3-Color Deck");
decks.add("5-Color Deck"); decks.add("5-Color Deck");
//decks.add("2-Color Deck (original)"); decks.add("2-Color Deck (original)");
//decks.add("3-Color Deck (original)"); decks.add("3-Color Deck (original)");
//decks.add("5-Color Deck (original)"); decks.add("5-Color Deck (original)");
decks.add("Semi-Random Theme Deck"); decks.add("Semi-Random Theme Deck");
//decks.add("2-Color Deck (new)");
//decks.add("3-Color Deck (new)");
//decks.add("5-Color Deck (new)");
String prompt = "Generate "; String prompt = "Generate ";
if (playerType.equals(PlayerType.HUMAN)) { if (playerType.equals(PlayerType.HUMAN)) {
@@ -824,22 +821,19 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
Object o = GuiUtils.getChoice(prompt, decks.toArray()); Object o = GuiUtils.getChoice(prompt, decks.toArray());
if (o.toString().equals(decks.get(0))) { if (o.toString().equals(decks.get(0))) {
//d = generateConstructedDeck();
d = generate2ColorDeck(playerType); d = generate2ColorDeck(playerType);
} else if (o.toString().equals(decks.get(1))) { } else if (o.toString().equals(decks.get(1))) {
//d = generateConstructed3ColorDeck();
d = generate3ColorDeck(playerType); d = generate3ColorDeck(playerType);
} else if (o.toString().equals(decks.get(2))) { } else if (o.toString().equals(decks.get(2))) {
//d = generateConstructed5ColorDeck();
d = generate5ColorDeck(playerType); d = generate5ColorDeck(playerType);
} else if (o.toString().equals(decks.get(3))) { } else if (o.toString().equals(decks.get(3))) {
d = generateConstructedDeck();
} else if (o.toString().equals(decks.get(4))) {
d = generateConstructed3ColorDeck();
} else if (o.toString().equals(decks.get(5))) {
d = generateConstructed5ColorDeck();
} else if (o.toString().equals(decks.get(6))) {
d = generateConstructedThemeDeck(); d = generateConstructedThemeDeck();
//} else if (o.toString().equals(decks.get(4))) {
// d = generate2ColorDeck(playerType);
//} else if (o.toString().equals(decks.get(5))) {
// d = generate3ColorDeck(playerType);
//} else if (o.toString().equals(decks.get(6))) {
// d = generate5ColorDeck(playerType);
} }
if (playerType.equals(PlayerType.HUMAN)) { if (playerType.equals(PlayerType.HUMAN)) {
@@ -849,14 +843,14 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
} }
} }
/* /**
* <p> * <p>
* generateConstructedDeck. * generateConstructedDeck.
* </p> * </p>
* *
* @return a {@link forge.deck.Deck} object. * @return a {@link forge.deck.Deck} object.
*/ */
/* private Deck generateConstructedDeck() { private Deck generateConstructedDeck() {
GenerateConstructedDeck gen = new GenerateConstructedDeck(); GenerateConstructedDeck gen = new GenerateConstructedDeck();
CardList name = gen.generateDeck(); CardList name = gen.generateDeck();
Deck deck = new Deck(Constant.GameType.Constructed); Deck deck = new Deck(Constant.GameType.Constructed);
@@ -865,16 +859,16 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
deck.addMain(name.get(i).getName()); deck.addMain(name.get(i).getName());
} }
return deck; return deck;
}*/ }
/* /**
* <p> * <p>
* generateConstructed3ColorDeck. * generateConstructed3ColorDeck.
* </p> * </p>
* *
* @return a {@link forge.deck.Deck} object. * @return a {@link forge.deck.Deck} object.
*/ */
/* private Deck generateConstructed3ColorDeck() { private Deck generateConstructed3ColorDeck() {
GenerateConstructedMultiColorDeck gen = new GenerateConstructedMultiColorDeck(); GenerateConstructedMultiColorDeck gen = new GenerateConstructedMultiColorDeck();
CardList name = gen.generate3ColorDeck(); CardList name = gen.generate3ColorDeck();
Deck deck = new Deck(Constant.GameType.Constructed); Deck deck = new Deck(Constant.GameType.Constructed);
@@ -883,16 +877,16 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
deck.addMain(name.get(i).getName()); deck.addMain(name.get(i).getName());
} }
return deck; return deck;
}*/ }
/* /**
* <p> * <p>
* generateConstructed5ColorDeck. * generateConstructed5ColorDeck.
* </p> * </p>
* *
* @return a {@link forge.deck.Deck} object. * @return a {@link forge.deck.Deck} object.
*/ */
/* private Deck generateConstructed5ColorDeck() { private Deck generateConstructed5ColorDeck() {
GenerateConstructedMultiColorDeck gen = new GenerateConstructedMultiColorDeck(); GenerateConstructedMultiColorDeck gen = new GenerateConstructedMultiColorDeck();
CardList name = gen.generate5ColorDeck(); CardList name = gen.generate5ColorDeck();
Deck deck = new Deck(Constant.GameType.Constructed); Deck deck = new Deck(Constant.GameType.Constructed);
@@ -901,7 +895,7 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
deck.addMain(name.get(i).getName()); deck.addMain(name.get(i).getName());
} }
return deck; return deck;
}*/ }
/** /**
* <p> * <p>