From 0c55fd7c2d56a7caeaf8e27c5b9070796abd0234 Mon Sep 17 00:00:00 2001 From: jendave Date: Mon, 14 Nov 2011 18:16:19 +0000 Subject: [PATCH] Put back original deck generators into menu. There is a bug with the 5 color generator however --- src/main/java/forge/deck/DeckGeneration.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/main/java/forge/deck/DeckGeneration.java b/src/main/java/forge/deck/DeckGeneration.java index 4a3f143a6b2..2c3d4d688a3 100644 --- a/src/main/java/forge/deck/DeckGeneration.java +++ b/src/main/java/forge/deck/DeckGeneration.java @@ -39,9 +39,9 @@ public abstract class DeckGeneration { decks.add("2-Color Deck"); decks.add("3-Color Deck"); 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("2-Color Deck (original)"); + decks.add("3-Color Deck (original)"); + decks.add("5-Color Deck (original)"); decks.add("Semi-Random Theme Deck"); final String playerName = playerType.equals(PlayerType.HUMAN) ? "Human" : "Computer"; @@ -55,14 +55,13 @@ public abstract class DeckGeneration { d = DeckGeneration.generate3ColorDeck(playerType); } else if (o.toString().equals(decks.get(2))) { 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))) { + 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(); }