From 98dbde6c97ec3b01de4e11fca6a08b6a51915d6b Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sun, 30 Oct 2011 13:37:57 +0000
Subject: [PATCH] - Added two new pseudo card types "Items" (Possessions and
 Artifacts) and "Characters" (Companions, Allies and Minions).

---
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html      | 3 +++
 gemp-lotr/gemp-lotr-web/src/main/webapp/js/deckBuildingUi.js   | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
index 1d6bc68be..16abab270 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
@@ -1,4 +1,7 @@
 <pre style="font-size:80%">
+<b>30 Oct. 2011</b>
+- Added two new pseudo card types "Items" (Possessions and Artifacts) and "Characters" (Companions, Allies and Minions).
+
 <b>29 Oct. 2011</b>
 - Added Game History tab allowing to watch your old games.
 - "Nan Curunir" now correctly allows to prevent damage only to mounted minions and does not crash the game when used.
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 8dcbf0485..5a64dd80d 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
@@ -175,6 +175,8 @@ var GempLotrDeckBuildingUI = Class.extend({
                 + "<option value='ARTIFACT'>Artifacts</option>"
                 + "<option value='EVENT'>Events</option>"
                 + "<option value='CONDITION'>Conditions</option>"
+                + "<option value='POSSESSION,ARTIFACT'>Items</option>"
+                + "<option value='COMPANION,ALLY,MINION'>Characters</option>"
                 + "</select>");
         this.filterDiv.append(combos);