From f087520b32f380c2ae1769e163fcb8a6d5c5328d Mon Sep 17 00:00:00 2001 From: Sloth Date: Sat, 27 Aug 2011 21:22:23 +0000 Subject: [PATCH] - The random 3- and 5-color deck generators will now also include colorless cards. --- src/main/java/forge/deck/generate/Generate3ColorDeck.java | 3 ++- src/main/java/forge/deck/generate/Generate5ColorDeck.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/forge/deck/generate/Generate3ColorDeck.java b/src/main/java/forge/deck/generate/Generate3ColorDeck.java index dd1950fb105..453775e3098 100644 --- a/src/main/java/forge/deck/generate/Generate3ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate3ColorDeck.java @@ -136,6 +136,7 @@ public class Generate3ColorDeck { // reduce to cards that match the colors CardList CL1 = AllCards.getColor(color1); + CL1.addAll(AllCards.getColor(Constant.Color.Colorless)); CardList CL2 = AllCards.getColor(color2); CardList CL3 = AllCards.getColor(color3); @@ -158,7 +159,7 @@ public class Generate3ColorDeck { CardList Cr2 = CL2.getType("Creature"); CardList Cr3 = CL3.getType("Creature"); - String ISE[] = {"Instant", "Sorcery", "Enchantment", "Planeswalker"}; + String ISE[] = {"Instant", "Sorcery", "Enchantment", "Planeswalker", "Artifact"}; CardList Sp1 = CL1.getValidCards(ISE, null, null); CardList Sp2 = CL2.getValidCards(ISE, null, null); CardList Sp3 = CL3.getValidCards(ISE, null, null); diff --git a/src/main/java/forge/deck/generate/Generate5ColorDeck.java b/src/main/java/forge/deck/generate/Generate5ColorDeck.java index d9da0feb3eb..e10c1f840d2 100644 --- a/src/main/java/forge/deck/generate/Generate5ColorDeck.java +++ b/src/main/java/forge/deck/generate/Generate5ColorDeck.java @@ -10,6 +10,7 @@ import forge.Card; import forge.CardFilter; import forge.CardList; import forge.CardListFilter; +import forge.Constant; import forge.MyRandom; import forge.error.ErrorViewer; import forge.properties.ForgeProps; @@ -137,6 +138,7 @@ public class Generate5ColorDeck { // reduce to cards that match the colors CardList cL1 = allCards.getColor(color1); + cL1.addAll(allCards.getColor(Constant.Color.Colorless)); CardList cL2 = allCards.getColor(color2); CardList cL3 = allCards.getColor(color3); CardList cL4 = allCards.getColor(color4); @@ -166,7 +168,7 @@ public class Generate5ColorDeck { CardList cr4 = cL4.getType("Creature"); CardList cr5 = cL5.getType("Creature"); - String[] ise = {"Instant", "Sorcery", "Enchantment", "Planeswalker"}; + String[] ise = {"Instant", "Sorcery", "Enchantment", "Planeswalker", "Artifact"}; CardList sp1 = cL1.getValidCards(ise, null, null); CardList sp2 = cL2.getValidCards(ise, null, null); CardList sp3 = cL3.getValidCards(ise, null, null);