external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

some small tweaks for CardList operations in some deck generation files

Browse Source
This commit is contained in:
jendave
2011-08-07 01:49:29 +00:00
parent 34b60869c0
commit 7e301a5987
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/forge/deck/generate/GenerateConstructedDeck.java
View File

@@ -96,8 +96,8 @@ public class GenerateConstructedDeck
color2 = Constant.Color.onlyColors[b]; color2 = Constant.Color.onlyColors[b];
CardList out = new CardList(); CardList out = new CardList();
out.addAll(CardListUtil.getColor(in, color1).toArray()); out.addAll(CardListUtil.getColor(in, color1));
out.addAll(CardListUtil.getColor(in, color2).toArray()); out.addAll(CardListUtil.getColor(in, color2));
out.shuffle(); out.shuffle();
CardList artifact = in.filter(new CardListFilter() CardList artifact = in.filter(new CardListFilter()
@@ -111,7 +111,7 @@ public class GenerateConstructedDeck
!Gui_NewGame.removeArtifacts.isSelected(); !Gui_NewGame.removeArtifacts.isSelected();
} }
}); });
out.addAll(artifact.toArray()); out.addAll(artifact);
out = out.filter(new CardListFilter() out = out.filter(new CardListFilter()
{ {

22
src/forge/deck/generate/GenerateConstructedMultiColorDeck.java
View File

@@ -260,9 +260,9 @@ public class GenerateConstructedMultiColorDeck
color3 = Constant.Color.onlyColors[c]; color3 = Constant.Color.onlyColors[c];
CardList out = new CardList(); CardList out = new CardList();
out.addAll(CardListUtil.getColor(in, color1).toArray()); out.addAll(CardListUtil.getColor(in, color1));
out.addAll(CardListUtil.getColor(in, color2).toArray()); out.addAll(CardListUtil.getColor(in, color2));
out.addAll(CardListUtil.getColor(in, color3).toArray()); out.addAll(CardListUtil.getColor(in, color3));
out.shuffle(); out.shuffle();
CardList artifact = in.filter(new CardListFilter() CardList artifact = in.filter(new CardListFilter()
@@ -276,7 +276,7 @@ public class GenerateConstructedMultiColorDeck
!Gui_NewGame.removeArtifacts.isSelected(); !Gui_NewGame.removeArtifacts.isSelected();
} }
}); });
out.addAll(artifact.toArray()); out.addAll(artifact);
out = out.filter(new CardListFilter() out = out.filter(new CardListFilter()
{ {
@@ -308,13 +308,13 @@ public class GenerateConstructedMultiColorDeck
CardList out = new CardList(); CardList out = new CardList();
/* /*
out.addAll(CardListUtil.getColor(in, color1).toArray()); out.addAll(CardListUtil.getColor(in, color1));
out.addAll(CardListUtil.getColor(in, color2).toArray()); out.addAll(CardListUtil.getColor(in, color2));
out.addAll(CardListUtil.getColor(in, color3).toArray()); out.addAll(CardListUtil.getColor(in, color3));
out.addAll(CardListUtil.getColor(in, color4).toArray()); out.addAll(CardListUtil.getColor(in, color4));
out.addAll(CardListUtil.getColor(in, color5).toArray()); out.addAll(CardListUtil.getColor(in, color5));
*/ */
out.addAll(CardListUtil.getGoldCards(in).toArray()); out.addAll(CardListUtil.getGoldCards(in));
out.shuffle(); out.shuffle();
CardList artifact = in.filter(new CardListFilter() CardList artifact = in.filter(new CardListFilter()
@@ -328,7 +328,7 @@ public class GenerateConstructedMultiColorDeck
!Gui_NewGame.removeArtifacts.isSelected(); !Gui_NewGame.removeArtifacts.isSelected();
} }
}); });
out.addAll(artifact.toArray()); out.addAll(artifact);
out = out.filter(new CardListFilter() out = out.filter(new CardListFilter()
{ {

6
src/forge/deck/generate/GenerateSealedDeck.java
View File

@@ -88,8 +88,8 @@ public class GenerateSealedDeck
color2 = Constant.Color.onlyColors[b]; color2 = Constant.Color.onlyColors[b];
CardList out = new CardList(); CardList out = new CardList();
out.addAll(CardListUtil.getColor(in, color1).toArray()); out.addAll(CardListUtil.getColor(in, color1));
out.addAll(CardListUtil.getColor(in, color2).toArray()); out.addAll(CardListUtil.getColor(in, color2));
CardList artifact = in.filter(new CardListFilter() CardList artifact = in.filter(new CardListFilter()
{ {
@@ -102,7 +102,7 @@ public class GenerateSealedDeck
!Gui_NewGame.removeArtifacts.isSelected(); !Gui_NewGame.removeArtifacts.isSelected();
} }
}); });
out.addAll(artifact.toArray()); out.addAll(artifact);
out = out.filter(new CardListFilter() out = out.filter(new CardListFilter()
{ {