diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js
index 97ffd8e7e..0548bdd1f 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js
@@ -214,6 +214,13 @@ var CardFilter = Class.extend({
+ ""
+ ""
+ "");
+ combos.append(" ");
this.filterDiv.append(combos);
elem.append(this.filterDiv);
@@ -240,6 +247,7 @@ var CardFilter = Class.extend({
$("#cardType").change(filterOut);
$("#keyword").change(filterOut);
+ $("#type").change(filterOut);
$("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH").click(filterOut);
},
@@ -272,7 +280,7 @@ var CardFilter = Class.extend({
var cardType = $("#cardType option:selected").prop("value");
if (cardType == "")
- cardType = "cardType:-SITE,THE_ONE_RING";
+ cardType = "cardType:-THE_ONE_RING";
else
cardType = "cardType:" + cardType;
@@ -280,10 +288,14 @@ var CardFilter = Class.extend({
if (keyword != "")
keyword = " keyword:" + keyword;
+ var type = $("#type option:selected").prop("value");
+ if (type != "")
+ type = " type:" + type;
+
if (cultures.length > 0)
- return cardType + " culture:" + cultures + keyword;
+ return cardType + " culture:" + cultures + keyword + type;
else
- return cardType + keyword;
+ return cardType + keyword + type;
},
calculateFullFilterPostfix: function() {
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
index cc77356fd..bc2ad6aa9 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js
@@ -165,7 +165,7 @@ var GempLotrDeckBuildingUI = Class.extend({
this.ringBearerDiv.click(
function() {
if ($(".card", that.ringBearerDiv).length == 0) {
- that.showPredefinedFilter("keyword:CAN_START_WITH_RING", that.ringBearerDiv);
+ that.showPredefinedFilter("keyword:CAN_START_WITH_RING type:card", that.ringBearerDiv);
}
});
this.ringBearerGroup = new NormalCardGroup(this.ringBearerDiv, function(card) {
@@ -177,7 +177,7 @@ var GempLotrDeckBuildingUI = Class.extend({
this.ringDiv.click(
function() {
if ($(".card", that.ringDiv).length == 0)
- that.showPredefinedFilter("cardType:THE_ONE_RING", that.ringDiv);
+ that.showPredefinedFilter("cardType:THE_ONE_RING type:card", that.ringDiv);
});
this.ringGroup = new NormalCardGroup(this.ringDiv, function(card) {
return true;