Adding last missing packs and rarity.

2012-03-10 17:02:22 +00:00
parent e32fb0562e
commit 4b8a24a0de
17 changed files with 616 additions and 6 deletions
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set14-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set14-rarity.txt
@@ -0,0 +1,15 @@
+14R1
+14R2
+14R3
+14R4
+14R5
+14R6
+14R7
+14R8
+14R9
+14R10
+14R11
+14R12
+14R13
+14R14
+14R15
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set15-rarity.txt
@@ -0,0 +1,205 @@
+15R1
+15S2
+15U3
+15U4
+15C5
+15R6
+15U7
+15C8
+15R9
+15C10
+15R11
+15R12
+15C13
+15C14
+15C15
+15U16
+15U17
+15S18
+15R19
+15U20
+15U21
+15R22
+15C23
+15R24
+15C25
+15U26
+15U27
+15C28
+15R29
+15R30
+15U31
+15U32
+15R33
+15R34
+15U35
+15R36
+15U37
+15R38
+15U39
+15R40
+15U41
+15R42
+15R43
+15U44
+15C45
+15C46
+15R47
+15C48
+15R49
+15U50
+15U51
+15U52
+15R53
+15S54
+15R55
+15R56
+15U57
+15R58
+15C59
+15U61
+15C62
+15U63
+15R64
+15C65
+15U66
+15U67
+15C68
+15C69
+15R70
+15C71
+15R72
+15C73
+15R74
+15C75
+15R76
+15C77
+15U78
+15U79
+15C80
+15U81
+15C82
+15C83
+15R84
+15U85
+15R86
+15R87
+15U88
+15U89
+15U90
+15C91
+15U92
+15C93
+15U94
+15S95
+15S96
+15C97
+15U98
+15R99
+15C100
+15C101
+15U102
+15C103
+15R104
+15C105
+15U106
+15C107
+15C108
+15R109
+15C110
+15U111
+15R112
+15U113
+15U114
+15U115
+15C116
+15R117
+15U118
+15R119
+15C120
+15C121
+15R122
+15R123
+15R124
+15C125
+15S126
+15C127
+15U128
+15U129
+15C130
+15C131
+15U132
+15C133
+15U134
+15R135
+15C136
+15U137
+15S138
+15U139
+15U140
+15R141
+15U142
+15C143
+15C144
+15C145
+15R146
+15C147
+15R148
+15C149
+15C150
+15C151
+15R152
+15U153
+15R154
+15R155
+15C156
+15C157
+15C158
+15U159
+15U160
+15C161
+15R162
+15R163
+15S164
+15R165
+15U166
+15C167
+15U168
+15C169
+15R170
+15S171
+15R172
+15R173
+15R174
+15U175
+15C176
+15U177
+15C178
+15C179
+15R180
+15U181
+15R182
+15U183
+15R184
+15R185
+15R186
+15U187
+15U188
+15S189
+15U190
+15U191
+15U192
+15R193
+15U194
+15A195
+15A196
+15A197
+15A198
+15A199
+15A200
+15A201
+15A202
+15A203
+15C204
+15C205
+15C206
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set16-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set16-rarity.txt
@@ -0,0 +1,6 @@
+16R1
+16R2
+16R3
+16R4
+16R5
+16R6
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set17-rarity.txt
@@ -0,0 +1,157 @@
+17U1
+17R2
+17U3
+17R4
+17U5
+17R6
+17S7
+17U8
+17U9
+17U10
+17S11
+17S12
+17R13
+17U14
+17U15
+17U16
+17R17
+17R18
+17U19
+17R20
+17U21
+17U22
+17R23
+17R24
+17U25
+17U26
+17R27
+17R28
+17R29
+17S30
+17R31
+17U32
+17S33
+17U34
+17S35
+17R36
+17R37
+17R38
+17R39
+17U40
+17R41
+17U42
+17R43
+17R44
+17R45
+17C46
+17U47
+17S48
+17R49
+17U50
+17C51
+17R52
+17C53
+17C54
+17C55
+17R56
+17C57
+17R58
+17C59
+17C60
+17R61
+17C62
+17C63
+17C64
+17R65
+17C66
+17R67
+17C68
+17C69
+17C70
+17R71
+17C72
+17R73
+17R74
+17C75
+17R76
+17C77
+17C78
+17R79
+17C80
+17C81
+17R82
+17C83
+17R84
+17C85
+17R86
+17R87
+17U88
+17R89
+17U90
+17U91
+17C92
+17R93
+17U94
+17R95
+17R96
+17U97
+17R98
+17R99
+17U100
+17U101
+17R102
+17U103
+17U104
+17R105
+17U106
+17U107
+17U108
+17U109
+17U110
+17U111
+17U112
+17C113
+17R114
+17S115
+17R116
+17U117
+17C118
+17C119
+17C120
+17R121
+17C122
+17R123
+17R124
+17C125
+17C126
+17C127
+17C128
+17R129
+17C130
+17C131
+17R132
+17C133
+17C134
+17R135
+17C136
+17R137
+17U138
+17R139
+17R140
+17R141
+17R142
+17R143
+17R144
+17U145
+17U146
+17U147
+17U148
+17A149
+17A150
+17A151
+17A152
+17A153
+17A154
+17A155
+17A156
+17A157
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set18-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set18-rarity.txt
@@ -0,0 +1,149 @@
+18R1
+18U2
+18C3
+18R4
+18R5
+18R6
+18R7
+18U8
+18C9
+18U10
+18R11
+18R12
+18R13
+18R14
+18R15
+18C16
+18C17
+18R18
+18C19
+18C20
+18U21
+18C22
+18U23
+18R24
+18U25
+18R26
+18U27
+18R28
+18R29
+18U30
+18R31
+18R32
+18U33
+18R34
+18R35
+18C36
+18U37
+18R38
+18C39
+18R40
+18R41
+18R42
+18R43
+18C44
+18U45
+18U46
+18R47
+18R48
+18C49
+18R50
+18C51
+18R52
+18R53
+18R54
+18R55
+18C56
+18C57
+18U58
+18R59
+18U60
+18U61
+18U62
+18U63
+18U64
+18C65
+18R66
+18R67
+18C68
+18R69
+18C70
+18R71
+18C72
+18C73
+18C74
+18U75
+18R76
+18C77
+18U78
+18U79
+18R80
+18R81
+18R82
+18R83
+18C84
+18C85
+18U86
+18C87
+18C88
+18C89
+18C90
+18C91
+18U92
+18U93
+18C94
+18R95
+18R96
+18R97
+18R98
+18R99
+18R100
+18C101
+18R102
+18C103
+18U104
+18R105
+18C106
+18R107
+18U108
+18C109
+18U110
+18U111
+18R112
+18R113
+18R114
+18R115
+18C116
+18C117
+18R118
+18R119
+18U120
+18U121
+18R122
+18U123
+18C124
+18C125
+18R126
+18R127
+18C128
+18C129
+18U130
+18C131
+18U132
+18R133
+18U134
+18U135
+18U136
+18U137
+18U138
+18U139
+18U140
+18A141
+18A142
+18A143
+18A144
+18A145
+18A146
+18A147
+18A148
+18A149
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set19-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set19-rarity.txt
@@ -0,0 +1,40 @@
+19P1
+19P2
+19P3
+19P4
+19P5
+19P6
+19P7
+19P8
+19P9
+19P10
+19P11
+19P12
+19P13
+19P14
+19P15
+19P16
+19P17
+19P18
+19P19
+19P20
+19P21
+19P22
+19P23
+19P24
+19P25
+19P26
+19P27
+19P28
+19P29
+19P30
+19P31
+19P32
+19P33
+19P34
+19P35
+19P36
+19P37
+19P38
+19P39
+19P40
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/collection/CollectionSerializer.java
@@ -38,6 +38,13 @@ public class CollectionSerializer {
            loadSet("11");
            loadSet("12");
            loadSet("13");
+            loadSet("14");
+            loadSet("15");
+            loadSet("16");
+            loadSet("17");
+            loadSet("18");
+            loadSet("19");
+
        } catch (IOException exp) {
            throw new RuntimeException("Problem loading collection data", exp);
        }
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
@@ -98,8 +98,6 @@ public class SortAndFilterCards {
    private boolean isRarity(String blueprintId, String rarity, LotroCardBlueprintLibrary library, Map<String, SetRarity> rarities) {
        if (blueprintId.contains("_")) {
            SetRarity setRarity = rarities.get(blueprintId.substring(0, blueprintId.indexOf("_")));
-            if (setRarity == null && rarity.equals("unknown"))
-                return true;
            if (setRarity != null && setRarity.getCardRarity(library.stripBlueprintModifiers(blueprintId)).equals(rarity))
                return true;
            return false;
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Booster
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)Booster
@@ -3,4 +3,13 @@
 1xRotEL - Booster
 1xTTT - Booster
 1xBoHD - Booster
-1xEoF - Booster
+1xEoF - Booster
+1xRotK - Booster
+1xSoG - Booster
+1xMD - Booster
+1xSH - Booster
+1xBR - Booster
+1xBL - Booster
+1xHU - Booster
+1xRoS - Booster
+1xTaD - Booster
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
@@ -35,4 +35,7 @@ MD - Booster
 SH - Booster
 BR - Booster
 BL - Booster
-(S)SH - Tengwar
+(S)SH - Tengwar
+HU - Booster
+RoS - Booster
+TaD - Booster
--- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java
+++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/CollectionResource.java
@@ -67,6 +67,12 @@ public class CollectionResource extends AbstractResource {
        _rarities.put("11", reader.getSetRarity("11"));
        _rarities.put("12", reader.getSetRarity("12"));
        _rarities.put("13", reader.getSetRarity("13"));
+        _rarities.put("14", reader.getSetRarity("14"));
+        _rarities.put("15", reader.getSetRarity("15"));
+        _rarities.put("16", reader.getSetRarity("16"));
+        _rarities.put("17", reader.getSetRarity("17"));
+        _rarities.put("18", reader.getSetRarity("18"));
+        _rarities.put("19", reader.getSetRarity("19"));
    }

    @Path("/{collectionType}")
--- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/PacksStorageProvider.java
+++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/PacksStorageProvider.java
@@ -85,6 +85,10 @@ public class PacksStorageProvider implements Injectable<PacksStorage>, Injectabl
            packStorage.addPackBox("BR - Booster", new RarityPackBox(12));
            packStorage.addPackBox("BL - Booster", new RarityPackBox(13));

+            packStorage.addPackBox("HU - Booster", new RarityPackBox(15));
+            packStorage.addPackBox("RoS - Booster", new RarityPackBox(17));
+            packStorage.addPackBox("TaD - Booster", new RarityPackBox(18));
+
            return packStorage;
        } catch (IOException exp) {
            _logger.error("Error while creating resource", exp);
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/hu_booster.png
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/hu_booster.png
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/ros_booster.jpg
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/ros_booster.jpg
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/tad_booster.jpg
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/tad_booster.jpg
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js
@@ -156,7 +156,6 @@ var CardFilter = Class.extend({
                + "<option value='P'>Promo</option>"
                + "<option value='X'>Rare+</option>"
                + "<option value='S'>Fixed</option>"
-                + "<option value='unknown'>Unknown</option>"
                + "</select>");

        this.fullFilterDiv.append(this.setSelect);
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
@@ -73,7 +73,19 @@ var packBlueprints = {

    "BL - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
    "BL - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
-    "BL - Booster": "/gemp-lotr/images/boosters/bl_booster.png"
+    "BL - Booster": "/gemp-lotr/images/boosters/bl_booster.png",
+
+    "HU - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
+    "HU - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
+    "HU - Booster": "/gemp-lotr/images/boosters/hu_booster.png",
+
+    "RoS - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
+    "RoS - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
+    "RoS - Booster": "/gemp-lotr/images/boosters/ros_booster.jpg",
+
+    "TaD - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png",
+    "TaD - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png",
+    "TaD - Booster": "/gemp-lotr/images/boosters/tad_booster.jpg"
 };

 var Card = Class.extend({