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

Hide old deck generators

Browse Source
This commit is contained in:
jendave
2011-08-17 08:23:01 +00:00
parent bab16c027c
commit a4a6ac7cbc
1 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -803,13 +803,16 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
Deck d = null; Deck d = null;
ArrayList<String> decks = new ArrayList<String>(); ArrayList<String> decks = new ArrayList<String>();
decks.add("2-Color Deck (original)"); decks.add("2-Color Deck");
decks.add("3-Color Deck (original)"); decks.add("3-Color Deck");
decks.add("5-Color Deck (original)"); decks.add("5-Color Deck");
//decks.add("2-Color Deck (original)");
//decks.add("3-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("2-Color Deck (new)");
decks.add("3-Color Deck (new)"); //decks.add("3-Color Deck (new)");
decks.add("5-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)) {
@@ -822,19 +825,22 @@ 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 = generateConstructedDeck();
d = generate2ColorDeck(playerType);
} else if (o.toString().equals(decks.get(1))) { } else if (o.toString().equals(decks.get(1))) {
d = generateConstructed3ColorDeck(); //d = generateConstructed3ColorDeck();
d = generate3ColorDeck(playerType);
} else if (o.toString().equals(decks.get(2))) { } else if (o.toString().equals(decks.get(2))) {
d = generateConstructed5ColorDeck(); //d = generateConstructed5ColorDeck();
d = generate5ColorDeck(playerType);
} else if (o.toString().equals(decks.get(3))) { } else if (o.toString().equals(decks.get(3))) {
d = generateConstructedThemeDeck(); d = generateConstructedThemeDeck();
} else if (o.toString().equals(decks.get(4))) { //} else if (o.toString().equals(decks.get(4))) {
d = generate2ColorDeck(playerType); // d = generate2ColorDeck(playerType);
} else if (o.toString().equals(decks.get(5))) { //} else if (o.toString().equals(decks.get(5))) {
d = generate3ColorDeck(playerType); // d = generate3ColorDeck(playerType);
} else if (o.toString().equals(decks.get(6))) { //} else if (o.toString().equals(decks.get(6))) {
d = generate5ColorDeck(playerType); // d = generate5ColorDeck(playerType);
} }
if (playerType.equals(PlayerType.HUMAN)) { if (playerType.equals(PlayerType.HUMAN)) {
@@ -844,14 +850,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);
@@ -860,16 +866,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);
@@ -878,16 +884,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);
@@ -896,7 +902,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>
@@ -1060,15 +1066,15 @@ public class OldGuiNewGame extends JFrame implements NewConstants, NewConstants.
* @return a {@link forge.deck.Deck} object. * @return a {@link forge.deck.Deck} object.
*/ */
private Deck generate5ColorDeck(final PlayerType p) { private Deck generate5ColorDeck(final PlayerType p) {
Random r = MyRandom.random; //Random r = MyRandom.random;
ArrayList<String> colors = new ArrayList<String>(); //ArrayList<String> colors = new ArrayList<String>();
colors.add("Random"); //colors.add("Random");
colors.add("white"); //colors.add("white");
colors.add("blue"); //colors.add("blue");
colors.add("black"); //colors.add("black");
colors.add("red"); //colors.add("red");
colors.add("green"); //colors.add("green");
Generate5ColorDeck gen = new Generate5ColorDeck("white", "blue", "black", "red", "green"); Generate5ColorDeck gen = new Generate5ColorDeck("white", "blue", "black", "red", "green");