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

- CheckStyle.

Browse Source
This commit is contained in:
Chris
2012-04-16 19:47:39 +00:00
parent 05e62a0e69
commit 90cc030c48
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -186,11 +186,11 @@ public abstract class GenerateColoredDeckBase {
// start with all cards
// remove cards that generated decks don't like
Predicate<CardRules> canPlay = pt == PlayerType.HUMAN ? GenerateDeckUtil.humanCanPlay : GenerateDeckUtil.aiCanPlay;
Predicate<CardRules> canPlay = pt == PlayerType.HUMAN ? GenerateDeckUtil.HUMAN_CAN_PLAY : GenerateDeckUtil.AI_CAN_PLAY;
Predicate<CardRules> hasColor = new GenerateDeckUtil.ContainsAllColorsFrom(colors);
if (!Singletons.getModel().getPreferences().getPrefBoolean(FPref.DECKGEN_ARTIFACTS)) {
hasColor = Predicate.or(hasColor, GenerateDeckUtil.colorlessCards);
hasColor = Predicate.or(hasColor, GenerateDeckUtil.COLORLESS_CARDS);
}
return Predicate.and(canPlay, hasColor).select(CardDb.instance().getAllCards(), CardPrinted.FN_GET_RULES);

6
src/main/java/forge/deck/generate/GenerateDeckUtil.java
View File

@@ -38,21 +38,21 @@ import forge.util.closures.Predicate;
*/
public class GenerateDeckUtil {
public static final Predicate<CardRules> aiCanPlay = new Predicate<CardRules>() {
public static final Predicate<CardRules> AI_CAN_PLAY = new Predicate<CardRules>() {
@Override
public boolean isTrue(CardRules c) {
return !c.getRemAIDecks() && !c.getRemRandomDecks();
}
};
public static final Predicate<CardRules> humanCanPlay = new Predicate<CardRules>() {
public static final Predicate<CardRules> HUMAN_CAN_PLAY = new Predicate<CardRules>() {
@Override
public boolean isTrue(CardRules c) {
return !c.getRemRandomDecks();
}
};
public static final Predicate<CardRules> colorlessCards = new Predicate<CardRules>() {
public static final Predicate<CardRules> COLORLESS_CARDS = new Predicate<CardRules>() {
@Override
public boolean isTrue(CardRules c) {
CardManaCost mc = c.getManaCost();