Adding boosters for TTT block.

2012-01-11 12:14:55 +00:00
parent ce4382dbdb
commit 89c7143770
8 changed files with 676 additions and 6 deletions
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/packs/DefaultSetRarity.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/packs/DefaultSetRarity.java
@@ -15,11 +15,16 @@ public class DefaultSetRarity implements SetRarity {

    @Override
    public List<String> getCardsOfRarity(String rarity) {
-        return Collections.unmodifiableList(_rarityList.get(rarity));
+        final List<String> list = _rarityList.get(rarity);
+        if (list == null)
+            return Collections.emptyList();
+        return Collections.unmodifiableList(list);
    }

    @Override
    public List<String> getTengwarCards() {
+        if (_tengwarCards == null)
+            return Collections.emptyList();
        return Collections.unmodifiableList(_tengwarCards);
    }
 }
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set4-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set4-rarity.txt
@@ -0,0 +1,379 @@
+4R1
+4R1T
+4C2
+4C3
+4C4
+4C5
+4R6
+4C7
+4U8
+4U9
+4C10
+4U11
+4C12
+4U13
+4C14
+4C15
+4C16
+4C17
+4C18
+4R19
+4R19T
+4R20
+4C21
+4R22
+4R23
+4U24
+4C25
+4C26
+4U27
+4U28
+4R29
+4R30
+4U31
+4R32
+4R33
+4U34
+4R35
+4U36
+4C37
+4U38
+4R39
+4R40
+4R41
+4C42
+4U43
+4C44
+4R45
+4R46
+4U47
+4R48
+4C49
+4C50
+4C51
+4R52
+4U53
+4R54
+4R55
+4C56
+4U57
+4R58
+4U59
+4U60
+4R61
+4U62
+4U63
+4C64
+4R65
+4U66
+4C67
+4C68
+4R69
+4C70
+4C71
+4R72
+4R73
+4R73T
+4C74
+4R75
+4C76
+4U77
+4C78
+4R79
+4U80
+4U81
+4U82
+4C83
+4R84
+4C85
+4U86
+4C87
+4U88
+4R89
+4C90
+4C90T
+4R91
+4R92
+4C93
+4R94
+4R95
+4U96
+4C97
+4C98
+4U99
+4R100
+4R100T
+4U101
+4C102
+4R103
+4R103T
+4C104
+4C105
+4R106
+4R107
+4U108
+4C109
+4U110
+4R111
+4C112
+4C113
+4U114
+4C115
+4R116
+4C117
+4R118
+4R119
+4R120
+4R121
+4C122
+4U123
+4R124
+4R125
+4U126
+4U127
+4C128
+4C129
+4C130
+4C131
+4U132
+4R133
+4C134
+4C135
+4U136
+4C137
+4U138
+4R139
+4R140
+4C141
+4C142
+4U143
+4R144
+4C145
+4R146
+4U147
+4U148
+4R149
+4R150
+4C151
+4U152
+4C153
+4R154
+4R154T
+4U155
+4C156
+4R157
+4R158
+4U159
+4R160
+4U161
+4R162
+4R163
+4R164
+4C165
+4R166
+4R167
+4R168
+4R169
+4U170
+4R171
+4R172
+4R173
+4R173T
+4R174
+4C175
+4R176
+4R176T
+4R177
+4C178
+4R179
+4C180
+4C181
+4U182
+4C183
+4C184
+4C185
+4R186
+4C187
+4U188
+4C189
+4C190
+4C191
+4C192
+4C193
+4U194
+4C195
+4C196
+4C197
+4C198
+4R199
+4R200
+4U201
+4U202
+4R203
+4C204
+4U205
+4C206
+4C207
+4U208
+4R209
+4C210
+4R211
+4C212
+4R213
+4R214
+4R215
+4U216
+4U217
+4R218
+4R219
+4R219T
+4U220
+4C221
+4C222
+4R223
+4C224
+4R225
+4R225T
+4C226
+4C227
+4C228
+4R229
+4U230
+4R231
+4U232
+4U233
+4U234
+4C235
+4U236
+4R237
+4R238
+4C239
+4R240
+4C241
+4U242
+4R243
+4R244
+4R245
+4R246
+4R247
+4C248
+4U249
+4U250
+4R251
+4C252
+4U253
+4C254
+4C255
+4R256
+4R257
+4C258
+4R259
+4C260
+4R261
+4R262
+4U263
+4U264
+4C265
+4C266
+4R267
+4U268
+4R269
+4C270
+4R271
+4R272
+4C273
+4R274
+4U275
+4U276
+4C277
+4C278
+4R279
+4U280
+4C281
+4U282
+4C283
+4R284
+4U285
+4C286
+4C287
+4C288
+4R289
+4R289T
+4R290
+4C291
+4C292
+4R293
+4R294
+4U295
+4U296
+4C297
+4C298
+4R299
+4R300
+4R301
+4R301T
+4C302
+4R303
+4R304
+4U305
+4C306
+4R307
+4C308
+4U309
+4C310
+4R311
+4U312
+4R313
+4C314
+4R315
+4C316
+4R317
+4U318
+4C319
+4U320
+4C321
+4C322
+4U323
+4U324
+4U325
+4U326
+4U327
+4U328
+4U329
+4U330
+4U331
+4U332
+4U333
+4U334
+4U335
+4U336
+4U337
+4U338
+4U339
+4U340
+4U341
+4U342
+4U343
+4U344
+4U345
+4U346
+4U347
+4U348
+4U349
+4U350
+4U351
+4U352
+4U353
+4U354
+4U355
+4U356
+4U357
+4U358
+4U359
+4U360
+4U361
+4U362
+4U363
+4P364
+4P364T
+4P365
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set5-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set5-rarity.txt
@@ -0,0 +1,132 @@
+5U1
+5U2
+5R3
+5R4
+5R5
+5C6
+5R7
+5U8
+5U9
+5U10
+5R11
+5U12
+5U13
+5C14
+5U15
+5R16
+5C17
+5R18
+5R19
+5U20
+5R21
+5U22
+5U23
+5C24
+5R25
+5R25T
+5U26
+5C27
+5C28
+5R29
+5R29T
+5C30
+5R31
+5C32
+5C33
+5U34
+5C35
+5C36
+5C37
+5U38
+5R39
+5C40
+5R41
+5U42
+5C43
+5U44
+5U45
+5R46
+5R47
+5U48
+5R49
+5R50
+5R51
+5C52
+5C53
+5U54
+5U55
+5R56
+5U57
+5R58
+5R59
+5U60
+5C61
+5C62
+5U63
+5U64
+5C65
+5C66
+5C67
+5C68
+5R69
+5R70
+5R71
+5R72
+5C73
+5C74
+5C75
+5C76
+5U77
+5R78
+5U79
+5U80
+5C81
+5R82
+5C83
+5R84
+5C85
+5R86
+5U87
+5C88
+5R89
+5C90
+5C91
+5U92
+5C93
+5R94
+5R95
+5R96
+5C97
+5C98
+5C99
+5R100
+5R100T
+5U101
+5R102
+5R103
+5U104
+5U105
+5C106
+5U107
+5C108
+5C109
+5U110
+5U111
+5R112
+5R113
+5U114
+5U115
+5R116
+5R116T
+5C117
+5U118
+5U119
+5U120
+5P121
+5P122
+5A123
+5A124
+5A125
+5A126
+5A127
+5A128
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set6-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set6-rarity.txt
@@ -0,0 +1,129 @@
+6C1
+6C2
+6C3
+6C4
+6C5
+6R6
+6R7
+6U8
+6U9
+6C10
+6R11
+6C12
+6U13
+6U14
+6R15
+6U16
+6C17
+6R18
+6U19
+6U20
+6C21
+6U22
+6R23
+6U24
+6U25
+6R26
+6C27
+6R28
+6C29
+6R30
+6R31
+6U32
+6C33
+6C34
+6R35
+6U36
+6C37
+6C38
+6R39
+6C40
+6R41
+6C42
+6C43
+6R44
+6C45
+6R46
+6C47
+6C48
+6R49
+6R50
+6U51
+6C52
+6C53
+6U54
+6R55
+6C56
+6R57
+6U58
+6C59
+6R60
+6U61
+6R62
+6U63
+6U64
+6C65
+6U66
+6C67
+6R68
+6C69
+6U70
+6C71
+6C72
+6U73
+6R74
+6U75
+6R76
+6R77
+6R78
+6U79
+6R80
+6C81
+6R82
+6U83
+6U84
+6R85
+6U86
+6U87
+6R88
+6R88T
+6R89
+6U90
+6U91
+6R92
+6U93
+6R94
+6C95
+6R96
+6C97
+6C98
+6C99
+6C100
+6R101
+6C102
+6R103
+6U104
+6U105
+6R106
+6U107
+6C108
+6R109
+6U110
+6C111
+6C112
+6R113
+6R114
+6U115
+6U116
+6U117
+6U118
+6U119
+6U120
+6P121
+6P122
+6A123
+6A124
+6A125
+6A126
+6A127
+6A128
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/RarityPackBox.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/RarityPackBox.java
@@ -25,6 +25,7 @@ public class RarityPackBox implements PackBox {
                List<String> possibleCards = new LinkedList<String>();
                possibleCards.addAll(_setRarity.getCardsOfRarity("R"));
                possibleCards.addAll(_setRarity.getCardsOfRarity("P"));
+                possibleCards.addAll(_setRarity.getCardsOfRarity("A"));
                Collections.shuffle(possibleCards, _random);
                addCards(result, possibleCards.subList(0, 1), true);
            } else if (foilRarity < 4) {
@@ -37,21 +38,31 @@ public class RarityPackBox implements PackBox {
                addCards(result, possibleCards.subList(0, 1), true);
            }
        }
-        addRandomCardsOfRarity(result, 1, "R");
+        addRandomRareCard(result, 1);
        addRandomCardsOfRarity(result, 3, "U");
        addRandomCardsOfRarity(result, hasFoil ? 6 : 7, "C");
        return result;
    }

+    private void addRandomRareCard(List<CardCollection.Item> result, int count) {
+        List<String> possibleCards = new LinkedList<String>(_setRarity.getCardsOfRarity("R"));
+        possibleCards.addAll(_setRarity.getCardsOfRarity("R"));
+        possibleCards.addAll(_setRarity.getCardsOfRarity("R"));
+        possibleCards.addAll(_setRarity.getCardsOfRarity("A"));
+        Collections.shuffle(possibleCards, _random);
+        addCards(result, possibleCards.subList(0, count), false);
+    }
+
    private void addRandomCardsOfRarity(List<CardCollection.Item> result, int count, String rarity) {
-        List<String> possibleRares = new LinkedList<String>(_setRarity.getCardsOfRarity(rarity));
-        Collections.shuffle(possibleRares, _random);
-        addCards(result, possibleRares.subList(0, count), false);
+        List<String> possibleCards = new LinkedList<String>(_setRarity.getCardsOfRarity(rarity));
+        Collections.shuffle(possibleCards, _random);
+        addCards(result, possibleCards.subList(0, count), false);
    }

    private void addCards(List<CardCollection.Item> result, Collection<String> cards, boolean foil) {
        for (String card : cards) {
            card = card.replace("P", "_");
+            card = card.replace("A", "_");
            card = card.replace("R", "_");
            card = card.replace("U", "_");
            card = card.replace("C", "_");
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
@@ -8,4 +8,7 @@ MoM - Booster
 RotEL - Boromir Starter
 RotEL - Legolas Starter
 RotEL - Booster
-(S)FotR - Tengwar
+(S)FotR - Tengwar
+TTT - Booster
+BoHD - Booster
+EoF - Booster
--- 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
@@ -48,6 +48,11 @@ public class PacksStorageProvider implements Injectable<PacksStorage>, Injectabl
            packStorage.addPackBox("FotR - Booster", new RarityPackBox(1));
            packStorage.addPackBox("MoM - Booster", new RarityPackBox(2));
            packStorage.addPackBox("RotEL - Booster", new RarityPackBox(3));
+
+            packStorage.addPackBox("TTT - Booster", new RarityPackBox(4));
+            packStorage.addPackBox("BoHD - Booster", new RarityPackBox(5));
+            packStorage.addPackBox("EoF - Booster", new RarityPackBox(6));
+
            return packStorage;
        } catch (IOException exp) {
            _logger.error("Error while creating resource", exp);
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js
@@ -112,6 +112,12 @@ var Card = Class.extend({
            return "/gemp-lotr/images/boosters/rotel_legolas_starter.png";
        if (blueprintId == "RotEL - Booster")
            return "/gemp-lotr/images/boosters/rotel_booster.png";
+        if (blueprintId == "TTT - Booster")
+            return "/gemp-lotr/images/boosters/ttt_booster.png";
+        if (blueprintId == "BoHD - Booster")
+            return "/gemp-lotr/images/boosters/bohd_booster.png";
+        if (blueprintId == "EoF - Booster")
+            return "/gemp-lotr/images/boosters/eof_booster.png";

        var separator = blueprintId.indexOf("_");
        var setNo = parseInt(blueprintId.substr(0, separator));