Deck builder now has culture filter.

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_120.java

@@ -38,14 +38,14 @@ public class Card1_120 extends AbstractPermanent {
     @Override
     public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int twilightModifier) {
         return super.checkPlayRequirements(playerId, game, self, twilightModifier)
-                && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.culture(Culture.URUK_HAI), Filters.canExert());
+                && Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.race(Race.URUK_HAI), Filters.canExert());
     }
 
     @Override
     public PlayPermanentAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier) {
         final PlayPermanentAction action = super.getPlayCardAction(playerId, game, self, twilightModifier);
         action.addCost(
-                new ChooseAndExertCharacterEffect(action, playerId, "Choose an Uruk-hai", true, Filters.culture(Culture.URUK_HAI), Filters.canExert()));
+                new ChooseAndExertCharacterEffect(action, playerId, "Choose an Uruk-hai", true, Filters.race(Race.URUK_HAI), Filters.canExert()));
         return action;
     }
 

gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/sauron/Card1_254.java

@@ -25,7 +25,7 @@ import java.util.List;
  */
 public class Card1_254 extends AbstractAttachable {
     public Card1_254() {
-        super(Side.SHADOW, CardType.CONDITION, 0, Culture.SHIRE, null, "Mordor Enraged");
+        super(Side.SHADOW, CardType.CONDITION, 0, Culture.SAURON, null, "Mordor Enraged");
     }
 
     @Override

gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Culture.java

@@ -2,5 +2,5 @@ package com.gempukku.lotro.common;
 
 public enum Culture {
     DWARVEN, ELVEN, GANDALF, GOLLUM, GONDOR, ROHAN, SHIRE,
-    DUNLAND, ISENGARD, MEN, MORIA, ORC, RAIDER, SAURON, URUK_HAI, WRAITH
+    DUNLAND, ISENGARD, MEN, MORIA, ORC, RAIDER, SAURON, WRAITH
 }

gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java

@@ -1,6 +1,7 @@
 package com.gempukku.lotro.game;
 
 import com.gempukku.lotro.common.CardType;
+import com.gempukku.lotro.common.Culture;
 import com.gempukku.lotro.common.Keyword;
 
 import java.util.*;
@@ -20,7 +21,8 @@ public class DefaultCardCollection implements CardCollection {
             filter = "";
         String[] filterParams = filter.split(" ");
 
-        List<CardType> cardTypes = getEnumFilter(CardType.values(), CardType.class, "cardType", Arrays.asList(CardType.values()), filterParams);
+        List<CardType> cardTypes = getEnumFilter(CardType.values(), CardType.class, "cardType", null, filterParams);
+        List<Culture> cultures = getEnumFilter(Culture.values(), Culture.class, "culture", null, filterParams);
         List<Keyword> keywords = getEnumFilter(Keyword.values(), Keyword.class, "keyword", Collections.<Keyword>emptyList(), filterParams);
         Integer siteNumber = getSiteNumber(filterParams);
 
@@ -28,10 +30,11 @@ public class DefaultCardCollection implements CardCollection {
         for (Map.Entry<String, LotroCardBlueprint> stringLotroCardBlueprintEntry : _cards.entrySet()) {
             String blueprintId = stringLotroCardBlueprintEntry.getKey();
             LotroCardBlueprint blueprint = stringLotroCardBlueprintEntry.getValue();
-            if (cardTypes.contains(blueprint.getCardType()))
-                if (containsAllKeywords(blueprint, keywords))
-                    if (siteNumber == null || blueprint.getSiteNumber() == siteNumber.intValue())
-                        result.put(blueprintId, _cardsCount.get(blueprintId));
+            if (cardTypes == null || cardTypes.contains(blueprint.getCardType()))
+                if (cultures == null || cultures.contains(blueprint.getCulture()))
+                    if (containsAllKeywords(blueprint, keywords))
+                        if (siteNumber == null || blueprint.getSiteNumber() == siteNumber.intValue())
+                            result.put(blueprintId, _cardsCount.get(blueprintId));
         }
         return result;
     }

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

@@ -35,7 +35,7 @@ import java.util.Set;
 @Path("/")
 public class ServerResource {
     private static final Logger _logger = Logger.getLogger(ServerResource.class);
-    private boolean _test = false;
+    private boolean _test = true;
 
     private HallServer _hallServer;
     private LotroServer _lotroServer;

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

@@ -46,8 +46,6 @@
     <script type="text/javascript" src="js/deckBuildingUi.js"></script>
 
     <script type="text/javascript">
-        var ui;
-        var communication;
 
         // TODO: delete - Only for debugging
         function getUrlParam(param) {
@@ -74,7 +72,7 @@
 
         $(document).ready(
                 function() {
-                    ui = new GempLotrDeckBuildingUI();
+                    var ui = new GempLotrDeckBuildingUI();
 
                     $('body').layout({
                         applyDefaultStyles: true,
@@ -86,32 +84,11 @@
 
                     $(".ui-layout-pane").css({"background-color": "#000000"});
 
-                    communication = new GempLotrCommunication("/gemp-lotr/server",
-                            function() {
-                                ui.processError();
-                            });
-
                     $(window).resize(function() {
                         ui.layoutUI();
                     });
 
-                    ui.setLoadCollectionFunc(function(collectionType, filter, start, count) {
-                        communication.getCollection(collectionType, filter, start, count, function(xml) {
-                            ui.displayCollection(xml);
-                        });
-                    });
-
-                    ui.setSaveDeckFunc(function(deckType, contents) {
-                        communication.saveDeck(deckType, contents, function(xml) {
-                            alert("Deck was saved");
-                        });
-                    });
-
                     ui.layoutUI();
-
-                    communication.getDeck("default", function(xml) {
-                        ui.setupDeck(xml);
-                    });
                 });
     </script>
 

gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js

@@ -1,4 +1,7 @@
 var GempLotrDeckBuildingUI = Class.extend({
+    comm: null,
+
+    collectionType: "default",
     deckDiv: null,
     ringBearerDiv: null,
     ringBearerGroup: null,
@@ -11,53 +14,103 @@ var GempLotrDeckBuildingUI = Class.extend({
     normalCollectionGroup: null,
     specialCollectionDiv: null,
     specialCollectionGroup: null,
-    loadCollectionFunc: null,
-    saveDeckFunc: null,
     selectionFunc: null,
+    pageDiv: null,
     filterDiv: null,
     drawDeckDiv: null,
     drawDeckGroup: null,
     start: 0,
     count: 18,
+    filter: null,
 
     init: function() {
         var that = this;
 
+        this.filter = "cardType:-SITE,THE_ONE_RING";
+
+        this.comm = new GempLotrCommunication("/gemp-lotr/server", that.processError);
+
         this.deckDiv = $("#deckDiv");
 
         this.collectionDiv = $("#collectionDiv");
 
+        this.pageDiv = $("<div></div>");
+        this.pageDiv.append("<button id='previousPage' style='float: left;'>Previous page</button>");
+        this.pageDiv.append("<button id='nextPage' style='float: right;'>Next page</button>");
+        this.pageDiv.append("<div id='countSlider' style='left: 33px; top: 10px; width: 200px;'></div>");
+        this.collectionDiv.append(this.pageDiv);
+
         this.filterDiv = $("<div></div>");
-        this.filterDiv.append("<button id='previousPage' style='float: left;'>Previous page</button>");
-        this.filterDiv.append("<button id='nextPage' style='float: right;'>Next page</button>");
+
+        this.filterDiv.append("<div id='culture'>"
+                + "<input type='checkbox' id='DWARVEN'/><label for='DWARVEN' id='labelDWARVEN'><img src='images/cultures/dwarven.gif'/></label>"
+                + "<input type='checkbox' id='ELVEN'/><label for='ELVEN' id='labelELVEN'><img src='images/cultures/elven.gif'/></label>"
+                + "<input type='checkbox' id='GANDALF'/><label for='GANDALF' id='labelGANDALF'><img src='images/cultures/gandalf.gif'/></label>"
+                + "<input type='checkbox' id='GONDOR'/><label for='GONDOR' id='labelGONDOR'><img src='images/cultures/gondor.gif'/></label>"
+                + "<input type='checkbox' id='SHIRE'/><label for='SHIRE' id='labelSHIRE'><img src='images/cultures/shire.gif'/></label>"
+                + "<input type='checkbox' id='ISENGARD'/><label for='ISENGARD' id='labelISENGARD'><img src='images/cultures/isengard.gif'/></label>"
+                + "<input type='checkbox' id='MORIA'/><label for='MORIA' id='labelMORIA'><img src='images/cultures/moria.gif'/></label>"
+                + "<input type='checkbox' id='SAURON'/><label for='SAURON' id='labelSAURON'><img src='images/cultures/sauron.gif'/></label>"
+                + "<input type='checkbox' id='WRAITH'/><label for='WRAITH' id='labelWRAITH'><img src='images/cultures/wraith.gif'/></label>"
+                + "</div>");
+
         this.collectionDiv.append(this.filterDiv);
 
+        $("#culture").buttonset();
+
+        $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelSHIRE,#labelISENGARD,#labelMORIA,#labelSAURON,#labelWRAITH").click(
+                function() {
+                    that.filter = that.calculateNormalFilter();
+                    that.start = 0;
+                    that.getCollection();
+                    return true;
+                });
+
+        $("#countSlider").slider({
+            value:18,
+            min: 4,
+            max: 40,
+            step: 1,
+            disabled: true,
+            slide: function(event, ui) {
+                that.start = 0;
+                that.count = ui.value;
+                that.getCollection();
+            }
+        });
+
         $("#previousPage").button({
             text: false,
             icons: {
                 primary: "ui-icon-circle-triangle-w"
-            }
+            },
+            disabled: true
         }).click(
                 function() {
                     $("#previousPage").button("option", "disabled", true);
                     $("#nextPage").button("option", "disabled", true);
+                    $("#countSlider").button("option", "disabled", true);
                     $(".card", that.normalCollectionDiv).remove();
+                    $(".card", that.specialCollectionDiv).remove();
                     that.start -= that.count;
-                    that.loadCollectionFunc("default", "cardType:-SITE,THE_ONE_RING", that.start, that.count);
+                    that.getCollection();
                 });
 
         $("#nextPage").button({
             text: false,
             icons: {
                 primary: "ui-icon-circle-triangle-e"
-            }
+            },
+            disabled: true
         }).click(
                 function() {
                     $("#previousPage").button("option", "disabled", true);
                     $("#nextPage").button("option", "disabled", true);
+                    $("#countSlider").button("option", "disabled", true);
                     $(".card", that.normalCollectionDiv).remove();
+                    $(".card", that.specialCollectionDiv).remove();
                     that.start += that.count;
-                    that.loadCollectionFunc("default", "cardType:-SITE,THE_ONE_RING", that.start, that.count);
+                    that.getCollection();
                 });
 
         this.normalCollectionDiv = $("<div></div>");
@@ -78,8 +131,8 @@ var GempLotrDeckBuildingUI = Class.extend({
         this.ringBearerDiv = $("<div>Ring Bearer</div>");
         this.ringBearerDiv.click(
                 function() {
-                    $(".card", that.ringBearerDiv).remove();
-                    that.showPredefinedFilter("keyword:RING_BEARER", that.ringBearerDiv);
+                    if ($(".card", this.ringBearerDiv).length == 0)
+                        that.showPredefinedFilter("keyword:RING_BEARER", that.ringBearerDiv);
                 });
         this.ringBearerGroup = new NormalCardGroup(this.ringBearerDiv, function(card) {
             return true;
@@ -89,8 +142,8 @@ var GempLotrDeckBuildingUI = Class.extend({
         this.ringDiv = $("<div>Ring</div>");
         this.ringDiv.click(
                 function() {
-                    $(".card", that.ringDiv).remove();
-                    that.showPredefinedFilter("cardType:THE_ONE_RING", that.ringDiv);
+                    if ($(".card", this.ringDiv).length == 0)
+                        that.showPredefinedFilter("cardType:THE_ONE_RING", that.ringDiv);
                 });
         this.ringGroup = new NormalCardGroup(this.ringDiv, function(card) {
             return true;
@@ -104,8 +157,8 @@ var GempLotrDeckBuildingUI = Class.extend({
             siteDiv.click(
                     (function (siteNumber, container) {
                         return function() {
-                            $(".card", container).remove();
-                            that.showPredefinedFilter("cardType:SITE siteNumber:" + siteNumber, container);
+                            if ($(".card", container).length == 0)
+                                that.showPredefinedFilter("cardType:SITE siteNumber:" + siteNumber, container);
                         };
                     })(i, siteDiv));
             this.deckDiv.append(siteDiv);
@@ -141,17 +194,52 @@ var GempLotrDeckBuildingUI = Class.extend({
                     var selectedCardElem = tar.parent();
                     if (event.which == 1) {
                         if (event.shiftKey) {
-                            // that.displayCardInfo(selectedCardElem.data("card"));
+                            that.displayCardInfo(selectedCardElem.data("card"));
                         } else  if (selectedCardElem.hasClass("cardInCollection")) {
                             that.selectionFunc(selectedCardElem.data("card").blueprintId);
                         } else if (selectedCardElem.hasClass("cardInDeck")) {
                             that.removeCardFromDeck(selectedCardElem);
                         }
+                        return false;
                     }
                 }
             }
             return false;
         });
+
+        this.infoDialog = $("<div></div>")
+                .dialog({
+            autoOpen: false,
+            closeOnEscape: true,
+            resizable: true,
+            title: "Card information",
+            minHeight: 80,
+            minWidth: 200,
+            width: 600,
+            height: 300
+        });
+
+        var swipeOptions = {
+            threshold: 20,
+            swipeUp: function (event) {
+                that.infoDialog.prop({ scrollTop: that.infoDialog.prop("scrollHeight") });
+                return false;
+            },
+            swipeDown: function (event) {
+                that.infoDialog.prop({ scrollTop: 0 });
+                return false;
+            }
+        };
+        this.infoDialog.swipe(swipeOptions);
+
+        this.comm.getDeck("default", function(xml) {
+            that.setupDeck(xml);
+        });
+    },
+
+    displayCardInfo: function(card) {
+        this.infoDialog.html("<div style='scroll: auto'><img src='" + card.imageUrl + "'></div>");
+        this.infoDialog.dialog("open");
     },
 
     saveDeck: function() {
@@ -189,7 +277,9 @@ var GempLotrDeckBuildingUI = Class.extend({
                         cards.push($(this).data("card").blueprintId);
                     });
 
-            this.saveDeckFunc("default", "" + cards);
+            this.comm.saveDeck("default", "" + cards, function(xml) {
+                alert("Deck was saved");
+            });
         }
     },
 
@@ -206,16 +296,41 @@ var GempLotrDeckBuildingUI = Class.extend({
         this.normalCollectionDiv.hide();
         this.filterDiv.hide();
         this.specialCollectionDiv.show();
-        this.loadCollectionFunc("default", filter, 0, 18);
+
+        this.filter = filter;
+        this.start = 0;
+        this.getCollection();
         this.selectionFunc = function(blueprintId) {
-            this.addCardToContainer(blueprintId, "special", container);
-            this.specialCollectionDiv.hide();
-            this.normalCollectionDiv.show();
-            this.filterDiv.show();
-            this.selectionFunc = this.addCardToDeck;
+            var cardDiv = this.addCardToContainer(blueprintId, "special", container);
+            cardDiv.addClass("cardInDeck");
+            this.showNormalFilter();
         };
     },
 
+    showNormalFilter: function() {
+        this.specialCollectionDiv.hide();
+        this.normalCollectionDiv.show();
+        this.filterDiv.show();
+
+        this.filter = this.calculateNormalFilter();
+        this.start = 0;
+        this.getCollection();
+        this.selectionFunc = this.addCardToDeck;
+    },
+
+    calculateNormalFilter: function() {
+        var cultures = new Array();
+        $("label", $("#culture")).each(
+                function() {
+                    if ($(this).hasClass("ui-state-active"))
+                        cultures.push($(this).prop("id").substring(5));
+                });
+        if (cultures.length > 0)
+            return "cardType:-SITE,THE_ONE_RING culture:" + cultures;
+        else
+            return "cardType:-SITE,THE_ONE_RING";
+    },
+
     addCardToDeck: function(blueprintId) {
         var that = this;
         var added = false;
@@ -246,12 +361,11 @@ var GempLotrDeckBuildingUI = Class.extend({
         this.layoutUI();
     },
 
-    setLoadCollectionFunc: function(func) {
-        this.loadCollectionFunc = func;
-    },
-
-    setSaveDeckFunc: function(func) {
-        this.saveDeckFunc = func;
+    getCollection: function() {
+        var that = this;
+        this.comm.getCollection(this.collectionType, this.filter, this.start, this.count, function(xml) {
+            that.displayCollection(xml);
+        });
     },
 
     setupDeck: function(xml) {
@@ -259,11 +373,11 @@ var GempLotrDeckBuildingUI = Class.extend({
         if (root.tagName == "deck") {
             var ringBearer = root.getElementsByTagName("ringBearer");
             if (ringBearer.length == 1) {
-                this.addCardToContainer(ringBearer[0].getAttribute("blueprintId"), "deck", this.ringBearerDiv);
-                this.addCardToContainer(root.getElementsByTagName("ring")[0].getAttribute("blueprintId"), "deck", this.ringDiv);
+                this.addCardToContainer(ringBearer[0].getAttribute("blueprintId"), "deck", this.ringBearerDiv).addClass("cardInDeck");
+                this.addCardToContainer(root.getElementsByTagName("ring")[0].getAttribute("blueprintId"), "deck", this.ringDiv).addClass("cardInDeck");
                 var sites = root.getElementsByTagName("site");
                 for (var i = 0; i < 9; i++)
-                    this.addCardToContainer(sites[i].getAttribute("blueprintId"), "deck", this.siteDivs[i]);
+                    this.addCardToContainer(sites[i].getAttribute("blueprintId"), "deck", this.siteDivs[i]).addClass("cardInDeck");
 
                 var cards = root.getElementsByTagName("card");
                 for (var i = 0; i < cards.length; i++)
@@ -272,7 +386,7 @@ var GempLotrDeckBuildingUI = Class.extend({
                 this.layoutUI();
             }
 
-            this.loadCollectionFunc("default", "cardType:-SITE,THE_ONE_RING", this.start, this.count);
+            this.getCollection();
         }
     },
 
@@ -304,11 +418,10 @@ var GempLotrDeckBuildingUI = Class.extend({
             this.normalCollectionGroup.layoutCards();
             this.specialCollectionGroup.layoutCards();
 
-            if (this.normalCollectionDiv.is(":visible")) {
-                $("#previousPage").button("option", "disabled", this.start == 0);
-                var cnt = parseInt(root.getAttribute("count"));
-                $("#nextPage").button("option", "disabled", (this.start + this.count) >= cnt);
-            }
+            $("#previousPage").button("option", "disabled", this.start == 0);
+            var cnt = parseInt(root.getAttribute("count"));
+            $("#nextPage").button("option", "disabled", (this.start + this.count) >= cnt);
+            $("#countSlider").slider("option", "disabled", false);
         }
     },
 
@@ -341,11 +454,12 @@ var GempLotrDeckBuildingUI = Class.extend({
 
         this.bottomBarDiv.css({ position: "absolute", left: sitesWidth * 2, top: deckHeight - 50, width: deckWidth - sitesWidth * 2, height: 50 });
 
-        this.normalCollectionDiv.css({ position: "absolute", left: padding, top: 50, width: collectionWidth - padding * 2, height: collectionHeight - 50 });
-        this.filterDiv.css({ position: "absolute", left: padding, top: 0, width: collectionWidth - padding, height: 50 });
-        this.specialCollectionDiv.css({ position: "absolute", left: padding, top: 0, width: collectionWidth - padding * 2, height: collectionHeight });
+        this.filterDiv.css({ position: "absolute", left: padding, top: 50, width: collectionWidth - padding, height: 50 });
+        this.normalCollectionDiv.css({ position: "absolute", left: padding, top: 100, width: collectionWidth - padding * 2, height: collectionHeight - 100 });
+        this.pageDiv.css({ position: "absolute", left: padding, top: 0, width: collectionWidth - padding, height: 50 });
+        this.specialCollectionDiv.css({ position: "absolute", left: padding, top: 50, width: collectionWidth - padding * 2, height: collectionHeight - 50 });
 
-        this.normalCollectionGroup.setBounds(0, 0, collectionWidth - padding * 2, collectionHeight - 50);
+        this.normalCollectionGroup.setBounds(0, 0, collectionWidth - padding * 2, collectionHeight - 100);
         this.specialCollectionGroup.setBounds(0, 0, collectionWidth - padding * 2, collectionHeight);
     },