ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Added set 18 (Treachery & Deceit)

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-03-08 18:04:57 +00:00
parent 6e49c19ad5
commit 7c9fab67bf
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gemp-lotr/gemp-lotr-cards/src/main/resources/blueprintMapping.txt
View File

@@ -209,4 +209,13 @@
17_156,17_142
17_157,17_143
# Treachery & Deceit set
18_58,17_35
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

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/LotroServer.java
View File

@@ -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 {

3
gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html
View File

@@ -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.

6
gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
View File

@@ -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;
},