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

Avoid automatically adding basic lands to draft/sealed pools

Browse Source
This commit is contained in:
drdev
2015-09-27 13:30:35 +00:00
parent 25924bbab9
commit 57d3b64c65
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -18,7 +18,6 @@
package forge.screens.deckeditor.controllers; package forge.screens.deckeditor.controllers;
import forge.Singletons; import forge.Singletons;
import forge.card.MagicColor;
import forge.deck.Deck; import forge.deck.Deck;
import forge.deck.DeckGroup; import forge.deck.DeckGroup;
import forge.deck.DeckSection; import forge.deck.DeckSection;
@@ -30,7 +29,6 @@ import forge.itemmanager.ItemManagerConfig;
import forge.limited.BoosterDraft; import forge.limited.BoosterDraft;
import forge.limited.IBoosterDraft; import forge.limited.IBoosterDraft;
import forge.model.FModel; import forge.model.FModel;
import forge.properties.ForgePreferences.FPref;
import forge.screens.deckeditor.CDeckEditorUI; import forge.screens.deckeditor.CDeckEditorUI;
import forge.screens.deckeditor.views.VAllDecks; import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VCurrentDeck; import forge.screens.deckeditor.views.VCurrentDeck;
@@ -39,8 +37,6 @@ import forge.screens.home.sanctioned.CSubmenuDraft;
import forge.screens.match.controllers.CDetailPicture; import forge.screens.match.controllers.CDetailPicture;
import forge.toolbox.FOptionPane; import forge.toolbox.FOptionPane;
import forge.util.ItemPool; import forge.util.ItemPool;
import forge.util.MyRandom;
import java.util.Map.Entry; import java.util.Map.Entry;
/** /**
@@ -159,7 +155,8 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
// add sideboard to deck // add sideboard to deck
deck.getOrCreate(DeckSection.Sideboard).addAll(this.getDeckManager().getPool()); 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 isZendikarSet = landSet.equals("ZEN"); // we want to generate one kind of Zendikar lands at a time only
final boolean zendikarSetMode = MyRandom.getRandom().nextBoolean(); final boolean zendikarSetMode = MyRandom.getRandom().nextBoolean();
@@ -177,7 +174,7 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> {
} else { } else {
deck.get(DeckSection.Sideboard).add(landName, landSet, 30); deck.get(DeckSection.Sideboard).add(landName, landSet, 30);
} }
} }*/
return deck; return deck;
} // getPlayersDeck() } // getPlayersDeck()

2
forge-gui-desktop/src/main/java/forge/screens/home/sanctioned/CSubmenuSealed.java
View File

@@ -120,7 +120,7 @@ public enum CSubmenuSealed implements ICDoc {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private <T extends DeckBase> void setupSealed() { private <T extends DeckBase> void setupSealed() {
final DeckGroup sealed = SealedCardPoolGenerator.generateSealedDeck(true); final DeckGroup sealed = SealedCardPoolGenerator.generateSealedDeck(false);
if (sealed == null) { return; } if (sealed == null) { return; }
final ACEditorBase<? extends InventoryItem, T> editor = (ACEditorBase<? extends InventoryItem, T>) new CEditorLimited( final ACEditorBase<? extends InventoryItem, T> editor = (ACEditorBase<? extends InventoryItem, T>) new CEditorLimited(