diff --git a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java index 713bdb149fc..65d9e74be90 100644 --- a/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java +++ b/forge-gui/src/main/java/forge/gui/deckeditor/controllers/CEditorDraftingProcess.java @@ -154,10 +154,15 @@ public class CEditorDraftingProcess extends ACEditorBase { // add sideboard to deck deck.getOrCreate(DeckSection.Sideboard).addAll(this.getDeckManager().getPool()); - final CardEdition landSet = IBoosterDraft.LAND_SET_CODE[0]; - final int landsCount = 20; + final String landSet = IBoosterDraft.LAND_SET_CODE[0].getCode(); + + final int landsCount = 50; for(String landName : MagicColor.Constant.BASIC_LANDS) { - deck.get(DeckSection.Sideboard).add(landName, landSet.getCode(), -1, landsCount); + final int numArt = Singletons.getMagicDb().getCommonCards().getArtCount(landName, landSet); + + for (int i = 0; i < numArt; i++) { + deck.get(DeckSection.Sideboard).add(landName, landSet, i, landsCount); + } } return deck; diff --git a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java index e6539fedccd..475adb7887b 100644 --- a/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java +++ b/forge-gui/src/main/java/forge/gui/home/sanctioned/CSubmenuSealed.java @@ -36,6 +36,7 @@ import forge.limited.SealedCardPoolGenerator; import forge.limited.SealedDeckBuilder; import forge.properties.ForgePreferences.FPref; import forge.util.ItemPool; +import forge.util.MyRandom; import forge.util.storage.IStorage; /** @@ -171,8 +172,13 @@ public enum CSubmenuSealed implements ICDoc { final Deck deck = new Deck(sDeckName); deck.getOrCreate(DeckSection.Sideboard).addAll(humanPool); + final int landsCount = 50; for (final String element : MagicColor.Constant.BASIC_LANDS) { - deck.get(DeckSection.Sideboard).add(element, sd.getLandSetCode(), -1, 18); + final int numArt = Singletons.getMagicDb().getCommonCards().getArtCount(element, sd.getLandSetCode()); + + for (int i = 0; i < numArt; i++) { + deck.get(DeckSection.Sideboard).add(element, sd.getLandSetCode(), i, landsCount); + } } final IStorage sealedDecks = Singletons.getModel().getDecks().getSealed();