From d3bc6b3b2492ba4091e196c6c7e6f65e435fb98f Mon Sep 17 00:00:00 2001
From: PhallenCassidy <leoplurodyn@gmail.com>
Date: Wed, 14 Jun 2017 22:59:26 -0400
Subject: [PATCH] Consolidated Hobbit Shadow cultures

Intent is to remove the filter checkbox for all now-redundant cultures. Edited The Hobbit: The Short Rest deckbuilding option to include The Main Deck (not as useful for a player by itself).
---
 .../src/main/web/js/gemp-019/cardFilter.js           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js
index 6d2a9fc93..5455e7dc6 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/cardFilter.js
@@ -138,7 +138,7 @@ var CardFilter = Class.extend({
             + "<option value='20'>20 - Second Edition</option>"
 			//Additional Hobbit Draft blocks
 			+ "<option value='30'> The Hobbit: Main Deck</option>"
-			+ "<option value='31'> The Hobbit: The Short Rest</option>"
+			+ "<option value='hobbit_tsr'> The Hobbit: The Short Rest</option>"
             + "</select>");
         this.nameInput = $("<input type='text' value='Card name' style='width: 130px; font-size: 70%;'>");
         this.sortSelect = $("<select style='width: 80px; font-size: 80%;'>"
@@ -194,10 +194,10 @@ var CardFilter = Class.extend({
             + "<input type='checkbox' id='WRAITH'/><label for='WRAITH' id='labelWRAITH'><img src='images/cultures/wraith.png'/></label>"
             //Additional Hobbit Draft Shadow cultures
             + "<input type='checkbox' id='GUNDABAD'/><label for='GUNDABAD' id='labelGUNDABAD'><img src='images/cultures/gundabad.png'/></label>"
-            + "<input type='checkbox' id='MIRKWOOD'/><label for='MIRKWOOD' id='labelMIRKWOOD'><img src='images/cultures/mirkwood.png'/></label>"
-            + "<input type='checkbox' id='SMAUG'/><label for='SMAUG' id='labelSMAUG'><img src='images/cultures/smaug.png'/></label>"
-            + "<input type='checkbox' id='SPIDER'/><label for='SPIDER' id='labelSPIDER'><img src='images/cultures/spider.png'/></label>"
-            + "<input type='checkbox' id='TROLL'/><label for='TROLL' id='labelTROLL'><img src='images/cultures/troll.png'/></label>"
+            //+ "<input type='checkbox' id='MIRKWOOD'/><label for='MIRKWOOD' id='labelMIRKWOOD'><img src='images/cultures/mirkwood.png'/></label>"
+            //+ "<input type='checkbox' id='SMAUG'/><label for='SMAUG' id='labelSMAUG'><img src='images/cultures/smaug.png'/></label>"
+            //+ "<input type='checkbox' id='SPIDER'/><label for='SPIDER' id='labelSPIDER'><img src='images/cultures/spider.png'/></label>"
+            //+ "<input type='checkbox' id='TROLL'/><label for='TROLL' id='labelTROLL'><img src='images/cultures/troll.png'/></label>"
             + "</div>");
 
         var combos = $("<div></div>");
@@ -296,7 +296,7 @@ var CardFilter = Class.extend({
         $("#type").change(filterOut);
         
 		//Additional Hobbit Draft labels
-        $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD,#labelMIRKWOOD,#labelSMAUG,#labelSPIDER,#labelTROLL").click(filterOut);
+        $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD").click(filterOut);
     },
 
     layoutUi:function (x, y, width, height) {