diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js index 3d5b460ce..b4ad389bf 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-016/jCards.js @@ -117,7 +117,11 @@ var packBlueprints = { "(S)Special-1-3":"/gemp-lotr/images/boosters/starter_selection.png", "(S)Special-4-6":"/gemp-lotr/images/boosters/starter_selection.png", - "(S)Special-7-9":"/gemp-lotr/images/boosters/starter_selection.png" + "(S)Special-7-9":"/gemp-lotr/images/boosters/starter_selection.png", + + "Expanded":"/gemp-lotr/images/boosters/expended.png", + "Wraith":"/gemp-lotr/images/boosters/wraith.png", + "AgesEnd":"/gemp-lotr/images/boosters/ages_end.png" }; var Card = Class.extend({ @@ -150,7 +154,7 @@ var Card = Class.extend({ bareBlueprint = bareBlueprint.substring(0, len - 1); this.hasWiki = fixedImages[imageBlueprint] == null - && packBlueprints[imageBlueprint] == null; + && packBlueprints[imageBlueprint] == null; this.zone = zone; this.cardId = cardId; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java index 1ffdcf110..9622172b4 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java @@ -78,6 +78,10 @@ public class PacksStorageBuilder { packStorage.addPackBox("BL - Arwen Starter", new FixedPackBox("BL - Arwen Starter")); packStorage.addPackBox("BL - Boromir Starter", new FixedPackBox("BL - Boromir Starter")); + packStorage.addPackBox("Expanded", new FixedPackBox("Expanded")); + packStorage.addPackBox("Wraith", new FixedPackBox("Wraith")); + packStorage.addPackBox("AgesEnd", new FixedPackBox("AgesEnd")); + packStorage.addPackBox("(S)Special-1-3", new FixedPackBox("(S)Special-1-3")); packStorage.addPackBox("(S)Special-4-6", new FixedPackBox("(S)Special-4-6")); packStorage.addPackBox("(S)Special-7-9", new FixedPackBox("(S)Special-7-9")); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java index de83a205c..77043557b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/MerchantService.java @@ -101,6 +101,10 @@ public class MerchantService { addFixedItem("BR - Saruman Starter", 2500); addFixedItem("BL - Arwen Starter", 2500); addFixedItem("BL - Boromir Starter", 2500); + + addFixedItem("Expanded", 1000*15); + addFixedItem("Wraith", 1000*5); + addFixedItem("AgesEnd", 1000*40); } private void addFixedItem(String blueprintId, int price) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/AgesEnd.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/AgesEnd.pack new file mode 100644 index 000000000..6986d2dd1 --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/AgesEnd.pack @@ -0,0 +1,40 @@ +1x19_1 +1x19_2 +1x19_3 +1x19_4 +1x19_5 +1x19_6 +1x19_7 +1x19_8 +1x19_9 +1x19_10 +1x19_11 +1x19_12 +1x19_13 +1x19_14 +1x19_15 +1x19_16 +1x19_17 +1x19_18 +1x19_19 +1x19_20 +1x19_21 +1x19_22 +1x19_23 +1x19_24 +1x19_25 +1x19_26 +1x19_27 +1x19_28 +1x19_29 +1x19_30 +1x19_31 +1x19_32 +1x19_33 +1x19_34 +1x19_35 +1x19_36 +1x19_37 +1x19_38 +1x19_39 +1x19_40 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Expanded.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/Expanded.pack new file mode 100644 index 000000000..8779cfd9b --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/Expanded.pack @@ -0,0 +1,15 @@ +1x14_1 +1x14_2 +1x14_3 +1x14_4 +1x14_5 +1x14_6 +1x14_7 +1x14_8 +1x14_9 +1x14_10 +1x14_11 +1x14_12 +1x14_13 +1x14_14 +1x14_15 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/Wraith.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/Wraith.pack new file mode 100644 index 000000000..b5de007be --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/Wraith.pack @@ -0,0 +1,6 @@ +1x16_1 +1x16_2 +1x16_3 +1x16_4 +1x16_5 +1x16_6 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt index 21d446797..8d714a580 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt @@ -73,4 +73,7 @@ Special-09 (S)Special-1-3 (S)Special-4-6 (S)Special-7-9 -(S)Movie Booster Choice \ No newline at end of file +(S)Movie Booster Choice +Expanded +Wraith +AgesEnd \ No newline at end of file