- Further integration of Add Basic Lands to Quest mode:

- Quest mode now depends on the player using Add Basic Lands to add basic lands to his decks instead of buying basic lands from the quest shop or using the generated basic lands from the initial card pool.
- Quest mode no longer generates basic lands for the starting card pool to avoid clutter.
- Quest mode shop no longer sells basic lands (to avoid clutter; you can add any basic lands you want anyway).
- Quest mode draft tournament correctly allows to use "Add Basic Lands" only after drafting is over and deck construction begins (and the button is hidden during the drafting process).
- Otherwise, basic lands found normally during the quest (e.g. found in booster packs, drafted in quest draft tournaments (if anyone ever drafts basic lands), purchased in preconstructed decks etc.) function as before and can be sold normally via the quest shop interface.

forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java

@@ -93,6 +93,8 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
         catalogManager.setAlwaysNonUnique(true);
         deckManager.setAlwaysNonUnique(true);
 
+        getBtnAddBasicLands().setVisible(false);
+
         this.setCatalogManager(catalogManager);
         this.setDeckManager(deckManager);
     }
@@ -174,7 +176,8 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
         // 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();
 
@@ -193,6 +196,7 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
                 deck.get(DeckSection.Sideboard).add(landName, landSet, 30);
             }
         }
+        */
 
         return deck;
     } // getPlayersDeck()

forge-gui-desktop/src/main/java/forge/screens/home/quest/VSubmenuQuestPrefs.java

@@ -302,8 +302,9 @@ public enum VSubmenuQuestPrefs implements IVSubmenu<CSubmenuQuestPrefs> {
         pnlDifficulty.add(new PrefInput(QPref.STARTING_CREDITS_HARD, QuestPreferencesErrType.DIFFICULTY), fieldConstraints);
         pnlDifficulty.add(new PrefInput(QPref.STARTING_CREDITS_EXPERT, QuestPreferencesErrType.DIFFICULTY), fieldConstraints);
 
-        pnlDifficulty.add(new FLabel.Builder().text("Starting Basic Lands").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
-        pnlDifficulty.add(new PrefInput(QPref.STARTING_BASIC_LANDS, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap");
+        // Basic lands are no longer generated for quest mode (we now use Add Basic Lands)
+        //pnlDifficulty.add(new FLabel.Builder().text("Starting Basic Lands").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
+        //pnlDifficulty.add(new PrefInput(QPref.STARTING_BASIC_LANDS, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap");
 
         pnlDifficulty.add(new FLabel.Builder().text("Wins for New Draft").fontAlign(SwingConstants.RIGHT).build(), labelConstraints);
         pnlDifficulty.add(new PrefInput(QPref.WINS_NEW_DRAFT, QuestPreferencesErrType.DIFFICULTY), fieldConstraints + ", wrap");

forge-gui-mobile/src/forge/screens/quest/QuestPrefsScreen.java

@@ -90,7 +90,7 @@ public class QuestPrefsScreen extends FScreen {
 
         //Difficulty Adjustments (All)
         scroller.add(new PrefsHeader("Difficulty Adjustments (All)", FSkinImage.QUEST_NOTES, PrefsGroup.DIFFICULTY_ALL));
-        scroller.add(new PrefsOption("Starting basic lands", QPref.STARTING_BASIC_LANDS, PrefsGroup.DIFFICULTY_ALL));
+        //scroller.add(new PrefsOption("Starting basic lands", QPref.STARTING_BASIC_LANDS, PrefsGroup.DIFFICULTY_ALL)); // Add Basic Lands is used instead
         scroller.add(new PrefsOption("Starting snow lands", QPref.STARTING_SNOW_LANDS, PrefsGroup.DIFFICULTY_ALL));
         scroller.add(new PrefsOption("Color bias (1-100%)", QPref.STARTING_POOL_COLOR_BIAS, PrefsGroup.DIFFICULTY_ALL));
         scroller.add(new PrefsOption("Penalty for loss", QPref.PENALTY_LOSS, PrefsGroup.DIFFICULTY_ALL));

forge-gui/src/main/java/forge/quest/QuestUtilCards.java

@@ -710,7 +710,8 @@ public final class QuestUtilCards {
         if (qc.getFormat() != null && !qc.getFormat().hasSnowLands()) {
             numberSnowLands = 0;
         }
-        this.qa.getShopList().addAll(QuestUtilCards.generateBasicLands(10, numberSnowLands, qc.getFormat()));
+        // Spell shop no longer sells basic lands (we use "Add Basic Lands" instead)
+        this.qa.getShopList().addAll(QuestUtilCards.generateBasicLands(/*10*/0, numberSnowLands, qc.getFormat()));
     }
 
     /**

forge-gui/src/main/java/forge/quest/data/QuestAssets.java

@@ -177,8 +177,9 @@ public class QuestAssets {
         if (useFormat != null && !useFormat.hasSnowLands()) {
             snowLands = 0;
         }
+        // Non-snow basic lands are no longer generated (we use Add Basic Lands)
         final ItemPool<PaperCard> lands = QuestUtilCards.generateBasicLands(
-                prefs.getPrefInt(QPref.STARTING_BASIC_LANDS), snowLands, useFormat);
+                /*prefs.getPrefInt(QPref.STARTING_BASIC_LANDS)*/0,  snowLands, useFormat);
         this.getCardPool().addAll(lands);
     }
 

forge-gui/src/main/java/forge/quest/data/QuestPreferences.java

@@ -70,7 +70,7 @@ public class QuestPreferences extends PreferencesStore<QuestPreferences.QPref> i
         REWARDS_TURN1("1500"),
 
         // How many basic your starting pool has (if appropriate)
-        STARTING_BASIC_LANDS("20"),
+        //STARTING_BASIC_LANDS("20"),
         STARTING_SNOW_LANDS("5"),
 
         // Starting pool color bias effect