Put back original deck generators into menu. There is a bug with the 5 color generator however

This commit is contained in:
jendave
2011-11-14 18:16:19 +00:00
parent 875b6ecda8
commit 0c55fd7c2d

View File

@@ -39,9 +39,9 @@ public abstract class DeckGeneration {
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");
final String playerName = playerType.equals(PlayerType.HUMAN) ? "Human" : "Computer"; final String playerName = playerType.equals(PlayerType.HUMAN) ? "Human" : "Computer";
@@ -55,14 +55,13 @@ public abstract class DeckGeneration {
d = DeckGeneration.generate3ColorDeck(playerType); d = DeckGeneration.generate3ColorDeck(playerType);
} else if (o.toString().equals(decks.get(2))) { } else if (o.toString().equals(decks.get(2))) {
d = DeckGeneration.generate5ColorDeck(playerType); d = DeckGeneration.generate5ColorDeck(playerType);
//} else if (o.toString().equals(decks.get(3))) {
// d = DeckGeneration.generateConstructedDeck();
//} else if (o.toString().equals(decks.get(4))) {
// d = DeckGeneration.generateConstructed3ColorDeck();
//} else if (o.toString().equals(decks.get(5))) {
// d = DeckGeneration.generateConstructed5ColorDeck();
//} else if (o.toString().equals(decks.get(6))) {
} else if (o.toString().equals(decks.get(3))) { } else if (o.toString().equals(decks.get(3))) {
d = DeckGeneration.generateConstructedDeck();
} else if (o.toString().equals(decks.get(4))) {
d = DeckGeneration.generateConstructed3ColorDeck();
} else if (o.toString().equals(decks.get(5))) {
d = DeckGeneration.generateConstructed5ColorDeck();
} else if (o.toString().equals(decks.get(6))) {
d = DeckGeneration.generateConstructedThemeDeck(); d = DeckGeneration.generateConstructedThemeDeck();
} }