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

Adding missing mappings between packs and their contents.

Browse Source
This commit is contained in:
MarcinSc
2015-09-07 18:11:35 -07:00
parent 817b61ad25
commit abf27f98fb
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/builder/PacksStorageBuilder.java
View File

@@ -97,6 +97,21 @@ public class PacksStorageBuilder {
packStorage.addPackBox("Special-08", new FixedPackBox("Special-08"));
packStorage.addPackBox("Special-09", new FixedPackBox("Special-09"));
packStorage.addPackBox("(S)TSSealed-S1", new FixedPackBox("(S)TSSealed-S1"));
packStorage.addPackBox("TSSealedS1D1", new FixedPackBox("TSSealedS1D1"));
packStorage.addPackBox("TSSealedS1D2", new FixedPackBox("TSSealedS1D2"));
packStorage.addPackBox("TSSealedS1D3", new FixedPackBox("TSSealedS1D3"));
packStorage.addPackBox("(S)TSSealed-S2", new FixedPackBox("(S)TSSealed-S2"));
packStorage.addPackBox("TSSealedS2D1", new FixedPackBox("TSSealedS2D1"));
packStorage.addPackBox("TSSealedS2D2", new FixedPackBox("TSSealedS2D2"));
packStorage.addPackBox("TSSealedS2D3", new FixedPackBox("TSSealedS2D3"));
packStorage.addPackBox("(S)TSSealed-S3", new FixedPackBox("(S)TSSealed-S3"));
packStorage.addPackBox("TSSealedS3D1", new FixedPackBox("TSSealedS3D1"));
packStorage.addPackBox("TSSealedS3D2", new FixedPackBox("TSSealedS3D2"));
packStorage.addPackBox("TSSealedS3D3", new FixedPackBox("TSSealedS3D3"));
packStorage.addPackBox("FotR - Booster", new RarityPackBox(cardSets.getSetDefinitions().get("1")));
packStorage.addPackBox("MoM - Booster", new RarityPackBox(cardSets.getSetDefinitions().get("2")));
packStorage.addPackBox("RotEL - Booster", new RarityPackBox(cardSets.getSetDefinitions().get("3")));

12
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/DefaultCardCollection.java
View File

@@ -2,7 +2,13 @@ package com.gempukku.lotro.game;
import com.gempukku.lotro.packs.PacksStorage;
import java.util.*;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class DefaultCardCollection implements MutableCardCollection {
private Map<String, Item> _counts = new LinkedHashMap<String, Item>();
@@ -76,8 +82,8 @@ public class DefaultCardCollection implements MutableCardCollection {
return null;
if (count.getCount() > 0) {
List<Item> packContents = null;
if (selection != null && packId.startsWith("(S)")) {
if (hasSelection(packId, selection, packsStorage)) {
if (packId.startsWith("(S)")) {
if (selection != null && hasSelection(packId, selection, packsStorage)) {
packContents = new LinkedList<Item>();
packContents.add(Item.createItem(selection, 1));
}