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

Packs are in order.

Browse Source
This commit is contained in:
marcins78@gmail.com
2012-01-11 20:36:04 +00:00
parent 393ed9530e
commit a98bfa9be8
8 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-server/src/main/resources/EoF - Faramir Starter.pack
View File

@@ -42,7 +42,7 @@
1x6_49
1x6_38
1x6_39
2x5_121
2x6_121
1x6_52
3x4_306
1x6_54

3
gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
View File

@@ -17,4 +17,5 @@ TTT - Theoden Starter
BoHD - Eowyn Starter
BoHD - Legolas Starter
EoF - Faramir Starter
EoF - Witch-king Starter
EoF - Witch-king Starter
(S)TTT - Starter

11
gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java
View File

@@ -22,6 +22,7 @@ import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import java.util.List;
import java.util.Map;
@Singleton
@Path("/collection")
@@ -179,11 +180,11 @@ public class CollectionResource extends AbstractResource {
Element collectionElem = doc.createElement("pack");
doc.appendChild(collectionElem);
for (CardCollection.Item item : packContents.getItems(null, _library)) {
String blueprintId = item.getBlueprintId();
if (item.getType() == CardCollection.Item.Type.CARD) {
for (Map.Entry<String, Integer> itemCount : packContents.getAll().entrySet()) {
String blueprintId = itemCount.getKey();
if (blueprintId.contains("_")) {
Element card = doc.createElement("card");
card.setAttribute("count", String.valueOf(item.getCount()));
card.setAttribute("count", String.valueOf(itemCount.getValue()));
card.setAttribute("blueprintId", blueprintId);
Side side = _library.getLotroCardBlueprint(blueprintId).getSide();
if (side != null)
@@ -191,7 +192,7 @@ public class CollectionResource extends AbstractResource {
collectionElem.appendChild(card);
} else {
Element pack = doc.createElement("pack");
pack.setAttribute("count", String.valueOf(item.getCount()));
pack.setAttribute("count", String.valueOf(itemCount.getValue()));
pack.setAttribute("blueprintId", blueprintId);
collectionElem.appendChild(pack);
}

10
gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/DeliveryResource.java
View File

@@ -45,16 +45,16 @@ public class DeliveryResource extends AbstractResource {
Element collectionTypeElem = doc.createElement("collectionType");
collectionTypeElem.setAttribute("name", collectionType);
for (CardCollection.Item item : items.getItems(null, _library)) {
String blueprintId = item.getBlueprintId();
if (item.getType() == CardCollection.Item.Type.CARD) {
for (Map.Entry<String, Integer> itemCount : items.getAll().entrySet()) {
String blueprintId = itemCount.getKey();
if (blueprintId.contains("_")) {
Element card = doc.createElement("card");
card.setAttribute("count", String.valueOf(item.getCount()));
card.setAttribute("count", String.valueOf(itemCount.getValue()));
card.setAttribute("blueprintId", blueprintId);
collectionTypeElem.appendChild(card);
} else {
Element pack = doc.createElement("pack");
pack.setAttribute("count", String.valueOf(item.getCount()));
pack.setAttribute("count", String.valueOf(itemCount.getValue()));
pack.setAttribute("blueprintId", blueprintId);
collectionTypeElem.appendChild(pack);
}

BIN
gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/fotr_tengwar_selection.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 82 KiB

BIN
gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/ttt_starter_selection.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 76 KiB

2
gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCardGroup.js
View File

@@ -6,7 +6,7 @@ var CardGroup = Class.extend({
height: null,
belongTestFunc: null,
padding: 5,
maxCardHeight: null,
maxCardHeight: 497,
descDiv: null,
init: function(container, belongTest, createDiv) {

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

@@ -1,6 +1,9 @@
var cardCache = {};
var cardScale = 357 / 497;
var packBlueprints = {
"(S)FotR - Tengwar": "/gemp-lotr/images/boosters/fotr_tengwar_selection.png",
"(S)TTT - Starter": "/gemp-lotr/images/boosters/ttt_starter_selection.png",
"FotR - League Starter": "/gemp-lotr/images/boosters/fotr_league_starter.png",
"FotR - Gandalf Starter": "/gemp-lotr/images/boosters/fotr_gandalf_starter.png",
@@ -25,7 +28,7 @@ var packBlueprints = {
"EoF - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
"EoF - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
"EoF - Booster": "/gemp-lotr/images/boosters/eof_booster.png",
"EoF - Booster": "/gemp-lotr/images/boosters/eof_booster.png"
};
var Card = Class.extend({
@@ -121,8 +124,6 @@ var Card = Class.extend({
},
getUrlByBlueprintId: function(blueprintId) {
if (blueprintId.substr(0, 3) == "(S)")
return "/gemp-lotr/images/boosters/selection.png";
if (packBlueprints[blueprintId] != null)
return packBlueprints[blueprintId];