From 3f0974d05c76f3ff6e3e3e3499f7cc169ac6a16b Mon Sep 17 00:00:00 2001 From: mcrawford620 Date: Fri, 8 Jul 2016 04:32:04 +0000 Subject: [PATCH] Wrap System.out.printlns so they don't always show --- .../java/forge/limited/BoosterDraftAI.java | 8 ++++-- .../forge/limited/LimitedDeckBuilder.java | 28 +++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java index 2762bda2f2b..48fea0762aa 100644 --- a/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java +++ b/forge-gui/src/main/java/forge/limited/BoosterDraftAI.java @@ -120,7 +120,9 @@ public class BoosterDraftAI { deckCols.addColorsOf(bestPick); } - System.out.println("Player[" + player + "] picked: " + bestPick + " ranking of " + bestRanking); + if (ForgePreferences.DEV_MODE) { + System.out.println("Player[" + player + "] picked: " + bestPick + " ranking of " + bestRanking); + } this.deck.get(player).add(bestPick); return bestPick; @@ -153,7 +155,9 @@ public class BoosterDraftAI { } if (rank == null) { - System.out.println("Draft Rankings - Card Not Found: " + card.getName()); + if (ForgePreferences.DEV_MODE) { + System.out.println("Draft Rankings - Card Not Found: " + card.getName()); + } rank = RANK_UNPICKABLE; } } diff --git a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java index 5ecaf515d12..9152743e8fe 100644 --- a/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/limited/LimitedDeckBuilder.java @@ -67,7 +67,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase { private Iterable onColorCreatures; private Iterable onColorNonCreatures; - private static final boolean logToConsole = false; + private static final boolean logToConsole = true; /** * @@ -148,7 +148,7 @@ public class LimitedDeckBuilder extends DeckGeneratorBase { deckList.addAll(walkers); aiPlayables.removeAll(walkers); - if (walkers.size() > 0) { + if (walkers.size() > 0 && logToConsole) { System.out.println("Planeswalker: " + walkers.get(0).getName()); } @@ -260,32 +260,44 @@ public class LimitedDeckBuilder extends DeckGeneratorBase { */ private void fixDeckSize(final int[] clrCnts, final String landSetCode) { while (deckList.size() > 40) { - System.out.println("WARNING: Fixing deck size, currently " + deckList.size() + " cards."); + if (logToConsole) { + System.out.println("WARNING: Fixing deck size, currently " + deckList.size() + " cards."); + } final PaperCard c = deckList.get(MyRandom.getRandom().nextInt(deckList.size() - 1)); deckList.remove(c); getAiPlayables().add(c); - System.out.println(" - Removed " + c.getName() + " randomly."); + if (logToConsole) { + System.out.println(" - Removed " + c.getName() + " randomly."); + } } while (deckList.size() < 40) { - System.out.println("WARNING: Fixing deck size, currently " + deckList.size() + " cards."); + if (logToConsole) { + System.out.println("WARNING: Fixing deck size, currently " + deckList.size() + " cards."); + } if (getAiPlayables().size() > 1) { final PaperCard c = getAiPlayables().get(MyRandom.getRandom().nextInt(getAiPlayables().size() - 1)); deckList.add(c); getAiPlayables().remove(c); - System.out.println(" - Added " + c.getName() + " randomly."); + if (logToConsole) { + System.out.println(" - Added " + c.getName() + " randomly."); + } } else if (getAiPlayables().size() == 1) { final PaperCard c = getAiPlayables().get(0); deckList.add(c); getAiPlayables().remove(c); - System.out.println(" - Added " + c.getName() + " randomly."); + if (logToConsole) { + System.out.println(" - Added " + c.getName() + " randomly."); + } } else { // if no playable cards remain fill up with basic lands for (int i = 0; i < 5; i++) { if (clrCnts[i] > 0) { final PaperCard cp = getBasicLand(i, landSetCode); deckList.add(cp); - System.out.println(" - Added " + cp.getName() + " as last resort."); + if (logToConsole) { + System.out.println(" - Added " + cp.getName() + " as last resort."); + } break; } }