Merge pull request #81 from PhallenCassidy/set40

Hiding set 40

gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/cardFilter.js

@@ -107,10 +107,9 @@ var CardFilter = Class.extend({
 
         this.fullFilterDiv = $("<div></div>");
         this.setSelect = $("<select style='width: 130px; font-size: 80%;'>"
-            + "<option value=''>All Sets</option>"
+            + "<option value='0-32'>All Sets</option>"
             + "<option value='0-19'>Official Sets</option>"
             + "<option value='30-32'>The Hobbit Sets</option>"
-            + "<option value='40'>Second Edition Sets</option>"
             + "<option disabled>----------</option>"
             + "<option value='fotr_block'>Fellowship Block</option>"
             + "<option value='ttt_block'>Towers Block</option>"
@@ -124,7 +123,6 @@ var CardFilter = Class.extend({
             + "<option value='standard'>Standard</option>"
             + "<option value='hobbit_tsr'> The Hobbit: The Short Rest</option>"
             + "<option value='hobbit_tcb'> The Hobbit: The Clouds Burst</option>"
-            + "<option value='2nd_ed'>Second Edition</option>"
             + "<option disabled>----------</option>"
             + "<option value='0'>00 - Promo</option>"
             + "<option value='1'>01 - The Fellowship of the Ring</option>"
@@ -149,7 +147,6 @@ var CardFilter = Class.extend({
             + "<option value='30'>30 - The Hobbit: Main Deck</option>"
             + "<option value='31'>31 - The Hobbit: Expansion 1</option>"
             + "<option value='32'>32 - The Hobbit: Expansion 2</option>"
-            + "<option value='40'>40 - Second Edition</option>"
             + "</select>");
         this.nameInput = $("<input type='text' placeholder='Card name' value='' style='width: 110px; font-size: 70%;'>");
         this.sortSelect = $("<select style='width: 80px; font-size: 80%;'>"

gemp-lotr/gemp-lotr-cards/src/main/resources/setConfig.json

@@ -144,6 +144,7 @@
     "rarityFile": "/set40-rarity.txt",
     "originalSet": false,
     "merchantable": false,
-    "needsLoading": false
+    "needsLoading": false,
+    "playable": false
   }
 ]

gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json

@@ -293,7 +293,7 @@
         "winAtEndOfRegroup":true,
         "ruleOfFour":false,
         "winOnControlling5Sites":true,
-        "hall":true
+        "hall":false
     },
     {
         "name":"Hobbit: The Short Rest",