From 9ca48a3d638ef6eb4e8148abb40bd6037a923892 Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 14 Feb 2013 16:00:09 +0000
Subject: [PATCH] Making Second Edition visible (but not playable yet).

---
 .../gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js      | 1 +
 gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js
index 1539a0e34..6aaf467e1 100644
--- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js
+++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/cardFilter.js
@@ -134,6 +134,7 @@ var CardFilter = Class.extend({
             + "<option value='17'>17 - Rise of Saruman</option>"
             + "<option value='18'>18 - Treachery & Deceit</option>"
             + "<option value='19'>19 - Ages End</option>"
+            + "<option value='20'>20 - Second Edition</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%;'>"
diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
index f5188271b..249e4d8ef 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/lotrFormats.json
@@ -258,6 +258,6 @@
         "winAtEndOfRegroup":true,
         "ruleOfFour":false,
         "winOnControlling5Sites":true,
-        "hall":false
+        "hall":true
     }
 ]
\ No newline at end of file