Adding cards to leagues (not boosters).

gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/AdminResource.java

@@ -102,6 +102,8 @@ public class AdminResource extends AbstractResource {
     public String addLeagueProduct(
             @FormParam("leagueType") String leagueType,
             @FormParam("packProduct") String packProduct,
+            @FormParam("cardProduct") String cardProduct,
+            @FormParam("skipBaseCollection") String skipBaseCollection,
             @Context HttpServletRequest request) throws Exception {
         validateAdmin(request);
 
@@ -109,16 +111,25 @@ public class AdminResource extends AbstractResource {
         if (league == null)
             throw new WebApplicationException(Response.Status.NOT_FOUND);
 
-        MutableCardCollection baseCollection = league.getBaseCollection();
-
         List<CardCollection.Item> items = new LinkedList<CardCollection.Item>();
 
         List<String> packs = getPacks(packProduct);
-        for (String pack : packs) {
+        List<String> cards = getCards(cardProduct);
-            baseCollection.addPacks(pack, 1);
+
+        for (String pack : packs)
             items.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, pack));
+        for (String card : cards)
+            items.add(new CardCollection.Item(CardCollection.Item.Type.CARD, 1, card));
+
+        if (skipBaseCollection == null || !skipBaseCollection.equals("true")) {
+            MutableCardCollection baseCollection = league.getBaseCollection();
+
+            for (String pack : packs)
+                baseCollection.addPacks(pack, 1);
+            for (String card : cards)
+                baseCollection.addCards(card, 1);
+            _leagueDao.setBaseCollectionForLeague(league, baseCollection);
         }
-        _leagueDao.setBaseCollectionForLeague(league, baseCollection);
 
         Map<Integer, MutableCardCollection> playerCollections = _collectionDao.getPlayerCollectionsByType(leagueType);
         for (Map.Entry<Integer, MutableCardCollection> playerCollection : playerCollections.entrySet()) {
@@ -126,6 +137,8 @@ public class AdminResource extends AbstractResource {
             MutableCardCollection collection = playerCollection.getValue();
             for (String pack : packs)
                 collection.addPacks(pack, 1);
+            for (String card : cards)
+                collection.addCards(card, 1);
             Player player = _playerDao.getPlayer(playerId);
             _collectionDao.setCollectionForPlayer(player, leagueType, collection);
             _deliveryService.addPackage(player, leagueType, items);
@@ -141,6 +154,13 @@ public class AdminResource extends AbstractResource {
         return result;
     }
 
+    private List<String> getCards(String packProduct) {
+        List<String> result = new LinkedList<String>();
+        for (String pack : packProduct.split("\n"))
+            result.add(pack.trim());
+        return result;
+    }
+
     private League getLeagueByType(String leagueType) {
         for (League league : _leagueDao.getActiveLeagues())
             if (league.getType().equals(leagueType))

gemp-lotr/gemp-lotr-web/src/main/webapp/admin.html

@@ -39,6 +39,8 @@
 <form method="POST" action="server/admin/addLeagueProduct">
     Type: <input type="text" name="leagueType"><br/>
     Packs: <textarea rows="5" cols="20" name="packProduct"></textarea><br/>
+    Cards: <textarea rows="5" cols="20" name="cardProduct"></textarea><br/>
+    Skip base collection: <input type="checkbox" name="skipBaseCollection" value="true"/><br/>
     <input type="submit" value="Create">
 </form>