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

- The random 3- and 5-color deck generators will now also include colorless cards.

Browse Source
This commit is contained in:
Sloth
2011-08-27 21:22:23 +00:00
parent d24145b072
commit f087520b32
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/forge/deck/generate/Generate3ColorDeck.java
View File

@@ -136,6 +136,7 @@ public class Generate3ColorDeck {
// reduce to cards that match the colors // reduce to cards that match the colors
CardList CL1 = AllCards.getColor(color1); CardList CL1 = AllCards.getColor(color1);
CL1.addAll(AllCards.getColor(Constant.Color.Colorless));
CardList CL2 = AllCards.getColor(color2); CardList CL2 = AllCards.getColor(color2);
CardList CL3 = AllCards.getColor(color3); CardList CL3 = AllCards.getColor(color3);
@@ -158,7 +159,7 @@ public class Generate3ColorDeck {
CardList Cr2 = CL2.getType("Creature"); CardList Cr2 = CL2.getType("Creature");
CardList Cr3 = CL3.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 Sp1 = CL1.getValidCards(ISE, null, null);
CardList Sp2 = CL2.getValidCards(ISE, null, null); CardList Sp2 = CL2.getValidCards(ISE, null, null);
CardList Sp3 = CL3.getValidCards(ISE, null, null); CardList Sp3 = CL3.getValidCards(ISE, null, null);

4
src/main/java/forge/deck/generate/Generate5ColorDeck.java
View File

@@ -10,6 +10,7 @@ import forge.Card;
import forge.CardFilter; import forge.CardFilter;
import forge.CardList; import forge.CardList;
import forge.CardListFilter; import forge.CardListFilter;
import forge.Constant;
import forge.MyRandom; import forge.MyRandom;
import forge.error.ErrorViewer; import forge.error.ErrorViewer;
import forge.properties.ForgeProps; import forge.properties.ForgeProps;
@@ -137,6 +138,7 @@ public class Generate5ColorDeck {
// reduce to cards that match the colors // reduce to cards that match the colors
CardList cL1 = allCards.getColor(color1); CardList cL1 = allCards.getColor(color1);
cL1.addAll(allCards.getColor(Constant.Color.Colorless));
CardList cL2 = allCards.getColor(color2); CardList cL2 = allCards.getColor(color2);
CardList cL3 = allCards.getColor(color3); CardList cL3 = allCards.getColor(color3);
CardList cL4 = allCards.getColor(color4); CardList cL4 = allCards.getColor(color4);
@@ -166,7 +168,7 @@ public class Generate5ColorDeck {
CardList cr4 = cL4.getType("Creature"); CardList cr4 = cL4.getType("Creature");
CardList cr5 = cL5.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 sp1 = cL1.getValidCards(ise, null, null);
CardList sp2 = cL2.getValidCards(ise, null, null); CardList sp2 = cL2.getValidCards(ise, null, null);
CardList sp3 = cL3.getValidCards(ise, null, null); CardList sp3 = cL3.getValidCards(ise, null, null);