diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/LeagueDAO.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/LeagueDAO.java index eee9c78da..9dfc69d40 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/LeagueDAO.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/db/LeagueDAO.java @@ -44,7 +44,6 @@ public class LeagueDAO { PreparedStatement statement = conn.prepareStatement("select id, name, type, class, parameters, status, cost from league where end>=? order by start desc"); try { statement.setInt(1, currentTime); - statement.setInt(2, currentTime); ResultSet rs = statement.executeQuery(); try { List activeLeagues = new ArrayList(); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01003.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01003.png new file mode 100644 index 000000000..719bf0baa Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01003.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01012.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01012.png new file mode 100644 index 000000000..b1dcb6b71 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01012.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01046.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01046.png new file mode 100644 index 000000000..1fceaaec6 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01046.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01055.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01055.png new file mode 100644 index 000000000..bdb951a75 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01055.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01113.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01113.png new file mode 100644 index 000000000..7e18dbc31 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01113.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01235.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01235.png new file mode 100644 index 000000000..fa9af51c4 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01235.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01318.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01318.png new file mode 100644 index 000000000..9eb0264a5 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR01318.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR03048.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR03048.png new file mode 100644 index 000000000..b5b90b5d7 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR03048.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR04236.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR04236.png new file mode 100644 index 000000000..7164eee62 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR04236.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR04237.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR04237.png new file mode 100644 index 000000000..a402ae55c Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR04237.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18008.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18008.png new file mode 100644 index 000000000..fbf33faea Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18008.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18012.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18012.png new file mode 100644 index 000000000..005d723f4 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18012.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18025.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18025.png new file mode 100644 index 000000000..d4f573490 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18025.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18035.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18035.png new file mode 100644 index 000000000..1732a5e5a Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18035.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18048.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18048.png new file mode 100644 index 000000000..63022afd9 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18048.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18050.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18050.png new file mode 100644 index 000000000..0b599605b Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18050.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18077.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18077.png new file mode 100644 index 000000000..6c3ad4847 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18077.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18078.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18078.png new file mode 100644 index 000000000..96670c5dd Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18078.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18079.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18079.png new file mode 100644 index 000000000..dc45da5f8 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18079.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18080.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18080.png new file mode 100644 index 000000000..3e31a2868 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18080.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18094.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18094.png new file mode 100644 index 000000000..45426f08b Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18094.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18097.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18097.png new file mode 100644 index 000000000..049b3b3a9 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/erratas/LOTR18097.png differ 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 6ebc4b274..65930c0a0 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 @@ -203,13 +203,33 @@ var Card = Class.extend({ var setNo = parseInt(blueprintId.substr(0, separator)); var cardNo = parseInt(blueprintId.substr(separator + 1)); + var errata = this.getErrata(setNo, cardNo); + if (errata != null) + return errata; + var mainLocation = this.getMainLocation(setNo, cardNo); + var cardStr; + + if (this.isMasterworks(setNo, cardNo)) + cardStr = this.formatSetNo(setNo) + "O0" + (cardNo - this.getMasterworksOffset(setNo)); + else + cardStr = this.formatCardNo(setNo, cardNo); + + return mainLocation + "LOTR" + cardStr + (this.isTengwar() ? "T" : "") + ".jpg"; + }, + + formatSetNo: function(setNo) { var setNoStr; if (setNo < 10) setNoStr = "0" + setNo; else setNoStr = setNo; + return setNoStr; + }, + + formatCardNo: function(setNo, cardNo) { + var setNoStr = this.formatSetNo(setNo); var cardStr; if (cardNo < 10) @@ -219,17 +239,11 @@ 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"; + return cardStr; }, getMainLocation: function(setNo, cardNo) { - if (this.isErrata(setNo, cardNo)) - return "/gemp-lotr/images/erratas/"; - else - return "http://lotrtcgdb.com/images/"; + return "http://lotrtcgdb.com/images/"; }, getMasterworksOffset: function(setNo) { @@ -254,13 +268,22 @@ var Card = Class.extend({ return false; }, - isErrata: function(setNo, cardNo) { - if (setNo == 0) - return cardNo == 7; - else if (setNo == 1) - return cardNo == 12 || cardNo == 43 || cardNo == 46; - else - return false; + pngErratas: { + "1":[3,55,113,235,318], + "3":[48], + "4":[236,237], + "18":[8,12,25,35,48,50,77,78,79,80,94,97] + }, + + getErrata: function(setNo, cardNo) { + if (setNo == 0 && cardNo == 7) + return "/gemp-lotr/images/erratas/LOTR00007.jpg"; + if (setNo == 1 && (cardNo == 12 || cardNo == 43 || cardNo == 46)) + return "/gemp-lotr/images/erratas/LOTR010" + cardNo + ".jpg"; + + if (this.pngErratas["" + setNo] != null && $.inArray(cardNo, this.pngErratas["" + setNo]) != -1) + return "/gemp-lotr/images/erratas/LOTR" + this.formatCardNo(setNo, cardNo) + ".png"; + return null; }, getHeightForWidth: function(width) {