From 5eff177512df32782f2375d271c2995dc9c50688 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 16 Jan 2012 12:26:01 +0000 Subject: [PATCH] Adding masterworks cards to "Black Rider" and "Bloodlines". --- .../src/main/resources/blueprintMapping.txt | 29 ++++++++++++++++++- .../lotro/game/LotroCardBlueprintLibrary.java | 8 +++-- .../com/gempukku/lotro/game/LotroServer.java | 2 +- .../src/main/webapp/js/jCards.js | 15 ++++++++++ 4 files changed, 49 insertions(+), 5 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 d0f1c45cf..00dffb433 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt @@ -1,3 +1,4 @@ +# Promo cards 0_1,1_324 0_2,3_106 0_3,3_32 @@ -116,23 +117,27 @@ 0_127,17_93 0_128,17_47 0_129,18_59 +# The Two Towers set 4_2,1_2 4_62,1_41 4_129,1_110 4_207,1_158 4_306,1_299 +# Battle of Helm's Deep set (Alternate-Image cards) 5_123,5_5 5_124,5_11 5_125,5_50 5_126,5_70 5_127,5_89 5_128,5_94 +# Ents of Fangorn set (Alternate-Image cards) 6_123,6_26 6_124,6_35 6_125,6_39 6_126,6_49 6_127,6_68 6_128,6_103 +# Return of the King set 7_1,1_2 7_20,1_37 7_40,4_93 @@ -143,10 +148,12 @@ 7_297,3_94 7_319,1_299 7_322,1_304 +# Shadows set 11_2,1_2 11_153,4_288 11_166,1_299 11_209,1_211 +# Black Rider set 12_5,2_3 12_11,1_23 12_25,3_29 @@ -155,4 +162,24 @@ 12_46,1_103 12_127,1_307 12_128,2_112 -12_165,1_214 \ No newline at end of file +12_165,1_214 +# Masterworks in Black Rider +12_195,12_27 +12_196,12_47 +12_197,12_48 +12_198,12_79 +12_199,12_162 +12_200,12_173 +12_201,12_174 +12_202,12_175 +12_203,12_183 +# Masterworks in Bloodlines +13_195,13_11 +13_196,13_15 +13_197,13_18 +13_198,13_33 +13_199,13_37 +13_200,13_59 +13_201,13_64 +13_202,13_123 +13_203,13_137 diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java index dfeddfa05..a5cd1fb70 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroCardBlueprintLibrary.java @@ -26,9 +26,11 @@ public class LotroCardBlueprintLibrary { String line; while ((line = bufferedReader.readLine()) != null) { - String[] split = line.split(","); - _blueprintMapping.put(split[0], split[1]); - addAlternatives(split[0], split[1]); + if (!line.startsWith("#")) { + String[] split = line.split(","); + _blueprintMapping.put(split[0], split[1]); + addAlternatives(split[0], split[1]); + } } } finally { bufferedReader.close(); 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 d99f477d5..b93e41dfe 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 @@ -49,7 +49,7 @@ public class LotroServer extends AbstractServer { _test = test; _defaultCollection = new DefaultCardCollection(); - final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 194, 194}; + final int[] cardCounts = new int[]{129, 365, 122, 122, 365, 128, 128, 365, 122, 52, 122, 266, 203, 203}; Thread thr = new Thread( new Runnable() { 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 45471af7c..1ba403e5d 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 @@ -150,6 +150,9 @@ var Card = Class.extend({ else cardStr = setNoStr + "" + cardNo; + if (this.isMasterworks(setNo, cardNo)) + cardStr = setNoStr + "O0" + (cardNo - this.getMasterworksOffset(setNo)); + return mainLocation + "LOTR" + cardStr + (this.isTengwar() ? "T" : "") + ".jpg"; }, @@ -160,6 +163,18 @@ var Card = Class.extend({ return "http://lotrtcgdb.com/images/"; }, + getMasterworksOffset: function(setNo) { + return 194; + }, + + isMasterworks: function(setNo, cardNo) { + if (setNo == 12) + return cardNo > 194; + if (setNo == 13) + return cardNo > 194; + return false; + }, + isErrata: function(setNo, cardNo) { if (setNo == 0) return cardNo == 7;