From 7c9fab67bfd6b424afb63e657244e6fd8fd4022d Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Thu, 8 Mar 2012 18:04:57 +0000
Subject: [PATCH] - Added set 18 (Treachery & Deceit)

---
 .../src/main/resources/blueprintMapping.txt           | 11 ++++++++++-
 .../java/com/gempukku/lotro/game/LotroServer.java     |  4 ++--
 .../src/main/webapp/includes/changeLog.html           |  3 +++
 gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js  |  6 ++++++
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
index 5d7f78d31..52ffc9d32 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
@@ -209,4 +209,13 @@
 17_156,17_142
 17_157,17_143
 # Treachery & Deceit set
-18_58,17_35
\ No newline at end of file
+18_58,17_35
+18_141,18_18
+18_142,18_26
+18_143,18_41
+18_144,18_43
+18_145,18_59
+18_146,18_96
+18_147,18_97
+18_148,18_102
+18_149,18_133
\ No newline at end of file
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
index bdb8a5f2c..b7c286391 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
@@ -51,12 +51,12 @@ public class LotroServer extends AbstractServer {
 
         // Hunters have 1-194 normal cards, 9 "O" cards, and 3 extra to cover the different culture versions of 15_60
 
-        final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 203, 203, 15, 206, 6, 157};
+        final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 203, 203, 15, 206, 6, 157, 149};
 
         Thread thr = new Thread(
                 new Runnable() {
                     public void run() {
-                        for (int i = 0; i <= 17; i++) {
+                        for (int i = 0; i <= 18; i++) {
                             for (int j = 1; j <= cardCounts[i]; j++) {
                                 String blueprintId = i + "_" + j;
                                 try {
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 80ee06bf7..8a2990e4b 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>8 Mar. 2012</b>
+- Added set 18 (Treachery & Deceit)
+
 <b>7 Mar. 2012</b>
 - "Throne of Minas Tirith" should only trigger once now, when a minion is killed.
 
diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
index c5b15a08e..dff827326 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
@@ -144,6 +144,8 @@ var Card = Class.extend({
             return (cardNo >= 187 && cardNo <= 194);
         if (setNo == 17)
             return (cardNo >= 145 && cardNo <= 148);
+        if (setNo == 18)
+            return (cardNo >= 134 && cardNo <= 140);
         return false;
     },
 
@@ -190,6 +192,8 @@ var Card = Class.extend({
     getMasterworksOffset: function(setNo) {
         if (setNo == 17)
             return 148;
+        if (setNo == 18)
+            return 140;
         return 194;
     },
 
@@ -202,6 +206,8 @@ var Card = Class.extend({
             return cardNo > 194 && cardNo < 204;
         if (setNo == 17)
             return cardNo > 148;
+        if (setNo == 18)
+            return cardNo > 140;
         return false;
     },