From 57d3b64c656fd8a07283699687bdfe4d71c1634f Mon Sep 17 00:00:00 2001 From: drdev Date: Sun, 27 Sep 2015 13:30:35 +0000 Subject: [PATCH] Avoid automatically adding basic lands to draft/sealed pools --- .../deckeditor/controllers/CEditorDraftingProcess.java | 9 +++------ .../forge/screens/home/sanctioned/CSubmenuSealed.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java index c57b98249f9..99ced3037df 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java +++ b/forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java @@ -18,7 +18,6 @@ package forge.screens.deckeditor.controllers; import forge.Singletons; -import forge.card.MagicColor; import forge.deck.Deck; import forge.deck.DeckGroup; import forge.deck.DeckSection; @@ -30,7 +29,6 @@ import forge.itemmanager.ItemManagerConfig; import forge.limited.BoosterDraft; import forge.limited.IBoosterDraft; import forge.model.FModel; -import forge.properties.ForgePreferences.FPref; import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.views.VAllDecks; import forge.screens.deckeditor.views.VCurrentDeck; @@ -39,8 +37,6 @@ import forge.screens.home.sanctioned.CSubmenuDraft; import forge.screens.match.controllers.CDetailPicture; import forge.toolbox.FOptionPane; import forge.util.ItemPool; -import forge.util.MyRandom; - import java.util.Map.Entry; /** @@ -159,7 +155,8 @@ public class CEditorDraftingProcess extends ACEditorBase { // add sideboard to deck deck.getOrCreate(DeckSection.Sideboard).addAll(this.getDeckManager().getPool()); - final String landSet = IBoosterDraft.LAND_SET_CODE[0].getCode(); + //no need to add basic lands now that Add Basic Lands button exists + /*final String landSet = IBoosterDraft.LAND_SET_CODE[0].getCode(); final boolean isZendikarSet = landSet.equals("ZEN"); // we want to generate one kind of Zendikar lands at a time only final boolean zendikarSetMode = MyRandom.getRandom().nextBoolean(); @@ -177,7 +174,7 @@ public class CEditorDraftingProcess extends ACEditorBase { } else { deck.get(DeckSection.Sideboard).add(landName, landSet, 30); } - } + }*/ return deck; } // getPlayersDeck() diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java index 4a1f262f5c0..a96335c7ade 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java @@ -120,7 +120,7 @@ public enum CSubmenuSealed implements ICDoc { @SuppressWarnings("unchecked") private void setupSealed() { - final DeckGroup sealed = SealedCardPoolGenerator.generateSealedDeck(true); + final DeckGroup sealed = SealedCardPoolGenerator.generateSealedDeck(false); if (sealed == null) { return; } final ACEditorBase editor = (ACEditorBase) new CEditorLimited(