convert quest booster generation to use unopened product and printsheets

src/main/java/forge/gui/match/QuestWinLose.java

@@ -563,7 +563,8 @@ public class QuestWinLose extends ControlWinLose {
             final GameFormat selected = GuiChoose.getChoices("Choose bonus booster format", 1, 1, formats, pref).get(0); //ch.getSelectedValue();
             Singletons.getModel().getQuestPreferences().setPref(QPref.BOOSTER_FORMAT, selected.toString());
 
-            cardsWon = qData.getCards().addCards(selected.getFilterPrinted());
+            cardsWon = qData.getCards().generateQuestBooster(selected.getFilterPrinted());
+            qData.getCards().addAllCards(cardsWon);
 
             // Generate Swing components and attach.
             this.lblTemp1 = new TitleLabel("Bonus booster pack from the \"" + selected.getName() + "\" format!");

src/main/java/forge/quest/BoosterUtils.java

@@ -171,52 +171,6 @@ public final class BoosterUtils {
         return result;
     }
 
-    /**
-     * Generate distinct cards.
-     * 
-     * @param filter
-     *            the filter
-     * @param cntNeeded
-     *            the cnt needed
-     * @return the list
-     */
-    public static List<CardPrinted> generateDistinctCards(final Predicate<CardPrinted> filter, final int cntNeeded) {
-        return BoosterUtils.generateDistinctCards(CardDb.instance().getAllCards(), filter, cntNeeded);
-    }
-
-    /**
-     * Generate distinct cards.
-     * 
-     * @param source
-     *            the source
-     * @param filter
-     *            the filter
-     * @param cntNeeded
-     *            the cnt needed
-     * @return the list
-     */
-    public static List<CardPrinted> generateDistinctCards(final Iterable<CardPrinted> source,
-            final Predicate<CardPrinted> filter, final int cntNeeded) {
-        final ArrayList<CardPrinted> result = new ArrayList<CardPrinted>();
-        int cntMade = 0;
-
-        // This will prevent endless loop @ while
-        int allowedMisses = (2 + 2) * cntNeeded; // lol, 2+2 is not magic
-                                                 // constant!
-
-        while ((cntMade < cntNeeded) && (allowedMisses > 0)) {
-            final CardPrinted card = Aggregates.random(Iterables.filter(source, filter));
-
-            if ((card != null) && !result.contains(card)) {
-                result.add(card);
-                cntMade++;
-            } else {
-                allowedMisses--;
-            }
-        }
-
-        return result;
-    }
 
     /**
      * Parse a limitation for a reward or chosen card.

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

@@ -31,6 +31,7 @@ import com.google.common.collect.Lists;
 
 import forge.Constant;
 import forge.Singletons;
+import forge.card.BoosterGenerator;
 import forge.card.CardEdition;
 import forge.card.CardRarity;
 import forge.card.FormatCollection;
@@ -147,21 +148,9 @@ public final class QuestUtilCards {
      *            the f sets
      * @return the array list
      */
-    public ArrayList<CardPrinted> addCards(final Predicate<CardPrinted> fSets) {
+    public List<CardPrinted> generateQuestBooster(final Predicate<CardPrinted> fSets) {
-        final int nCommon = this.qpref.getPrefInt(QPref.BOOSTER_COMMONS);
+        UnOpenedProduct unopened = new UnOpenedProduct(getBoosterTemplate(), fSets);
-        final int nUncommon = this.qpref.getPrefInt(QPref.BOOSTER_UNCOMMONS);
+        return unopened.get();
-        final int nRare = this.qpref.getPrefInt(QPref.BOOSTER_RARES);
-
-        final ArrayList<CardPrinted> newCards = new ArrayList<CardPrinted>();
-        Predicate<CardPrinted> predCommons = Predicates.and(fSets, IPaperCard.Predicates.Presets.IS_COMMON);
-        newCards.addAll(BoosterUtils.generateDistinctCards(predCommons, nCommon));
-        Predicate<CardPrinted> predUncommons = Predicates.and(fSets, IPaperCard.Predicates.Presets.IS_UNCOMMON);
-        newCards.addAll(BoosterUtils.generateDistinctCards(predUncommons, nUncommon));
-        Predicate<CardPrinted> predRareMythics = Predicates.and(fSets, IPaperCard.Predicates.Presets.IS_RARE_OR_MYTHIC);
-        newCards.addAll(BoosterUtils.generateDistinctCards(predRareMythics, nRare));
-
-        this.addAllCards(newCards);
-        return newCards;
     }
 
     /**
@@ -513,28 +502,31 @@ public final class QuestUtilCards {
         this.qa.getShopList().addAllFlat(Aggregates.random(meetRequirements, count));
     }
 
+    @SuppressWarnings("unchecked")
+    private SealedProductTemplate getBoosterTemplate() {
+        return new SealedProductTemplate(Lists.newArrayList( 
+            Pair.of(BoosterGenerator.COMMON, this.qpref.getPrefInt(QPref.SHOP_SINGLES_COMMON)), 
+            Pair.of(BoosterGenerator.UNCOMMON, this.qpref.getPrefInt(QPref.SHOP_SINGLES_UNCOMMON)), 
+            Pair.of(BoosterGenerator.RARE_MYTHIC, this.qpref.getPrefInt(QPref.SHOP_SINGLES_RARE))
+        ));
+    }
+    
     /**
      * Generate cards in shop.
      */
     private void generateCardsInShop() {
-
-
-        int nLevel = this.qc.getAchievements().getLevel();
-
         // Preferences
         final int startPacks = this.qpref.getPrefInt(QPref.SHOP_STARTING_PACKS);
         final int winsForPack = this.qpref.getPrefInt(QPref.SHOP_WINS_FOR_ADDITIONAL_PACK);
         final int maxPacks = this.qpref.getPrefInt(QPref.SHOP_MAX_PACKS);
-        final int common = this.qpref.getPrefInt(QPref.SHOP_SINGLES_COMMON);
-        final int uncommon = this.qpref.getPrefInt(QPref.SHOP_SINGLES_UNCOMMON);
-        final int rare = this.qpref.getPrefInt(QPref.SHOP_SINGLES_RARE);
 
-        final int levelPacks = nLevel > 0 ? startPacks / nLevel : startPacks;
+        int level = this.qc.getAchievements().getLevel();
+        final int levelPacks = level > 0 ? startPacks / level : startPacks;
         final int winPacks = this.qc.getAchievements().getWin() / winsForPack;
         final int totalPacks = Math.min(levelPacks + winPacks, maxPacks);
 
-        @SuppressWarnings("unchecked")
+        
-        SealedProductTemplate tpl = new SealedProductTemplate(Lists.newArrayList( Pair.of("Common", common), Pair.of("Uncommon", uncommon), Pair.of("RareMythic", rare)));
+        SealedProductTemplate tpl = getBoosterTemplate();
         UnOpenedProduct unopened = qc.getFormat() == null ?  new UnOpenedProduct( tpl ) : new UnOpenedProduct( tpl, qc.getFormat().getFilterPrinted());
         
         for (int i = 0; i < totalPacks; i++) {