FotR block boosters, starters and league.

2011-12-13 00:13:39 +00:00
parent 85383463a2
commit dd11b7d68e
11 changed files with 595 additions and 3 deletions
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set2-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set2-rarity.txt
@@ -0,0 +1,125 @@
+2R1
+2C2
+2U3
+2U4
+2C5
+2C6
+2R7
+2U8
+2C9
+2C10
+2R11
+2R12
+2U13
+2C14
+2R15
+2U16
+2U17
+2U18
+2R19
+2R20
+2C21
+2R22
+2C23
+2C24
+2R25
+2C26
+2R27
+2U28
+2C29
+2U30
+2U31
+2R32
+2U33
+2U34
+2C35
+2R36
+2C37
+2R38
+2R39
+2C40
+2U41
+2C42
+2R43
+2C44
+2R45
+2R46
+2C47
+2U48
+2R49
+2R50
+2C51
+2R52
+2R52T
+2R53
+2U54
+2C55
+2U56
+2R57
+2C58
+2U59
+2C60
+2C61
+2C62
+2C63
+2C64
+2C65
+2R66
+2U67
+2U68
+2C69
+2U70
+2U71
+2U72
+2R73
+2R74
+2R75
+2U76
+2R77
+2U78
+2U79
+2R80
+2U81
+2U82
+2U83
+2R84
+2R85
+2R86
+2U87
+2C88
+2C89
+2C90
+2C91
+2U92
+2R93
+2R94
+2C95
+2U96
+2R97
+2U98
+2C99
+2R100
+2C101
+2C102
+2C102T
+2U103
+2C104
+2R105
+2R105T
+2U106
+2U107
+2R108
+2R109
+2C110
+2U111
+2R112
+2R113
+2C114
+2U115
+2U116
+2C117
+2U118
+2C119
+2U120
+2P121
+2P122
--- a/gemp-lotr/gemp-lotr-cards/src/main/resources/set3-rarity.txt
+++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set3-rarity.txt
@@ -0,0 +1,122 @@
+3R1
+3U2
+3R3
+3U4
+3U5
+3C6
+3U7
+3R8
+3U9
+3U10
+3C11
+3U12
+3R13
+3C14
+3R15
+3C16
+3R17
+3U18
+3R19
+3U20
+3R21
+3C22
+3R23
+3U24
+3U25
+3U26
+3R27
+3C28
+3R29
+3C30
+3C31
+3C32
+3C33
+3R34
+3U35
+3C36
+3C37
+3R38
+3R39
+3R40
+3R41
+3R42
+3C43
+3R44
+3U45
+3U46
+3U47
+3C48
+3C49
+3R50
+3C51
+3R52
+3U53
+3R54
+3C55
+3C56
+3U57
+3U58
+3C59
+3U60
+3U61
+3C62
+3C63
+3R64
+3R65
+3R66
+3R67
+3R68
+3C69
+3C70
+3R71
+3U72
+3U73
+3C74
+3U75
+3C76
+3R77
+3C78
+3U79
+3R80
+3R81
+3U82
+3U83
+3C84
+3R85
+3U86
+3C87
+3U88
+3U89
+3C90
+3R91
+3U92
+3R93
+3C94
+3C95
+3U96
+3U97
+3C98
+3R99
+3U100
+3C101
+3R102
+3R103
+3R104
+3R105
+3U106
+3U107
+3C108
+3C109
+3R110
+3C111
+3C112
+3R113
+3C114
+3U115
+3U116
+3C117
+3C118
+3U119
+3U120
+3P121
+3P122
--- 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
@@ -25,6 +25,8 @@ public class CollectionSerializer {
            }

            loadSet("1");
+            loadSet("2");
+            loadSet("3");
        } catch (IOException exp) {
            throw new RuntimeException("Problem loading collection data", exp);
        }
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/LeagueStarterBox.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/packs/LeagueStarterBox.java
@@ -12,12 +12,23 @@ public class LeagueStarterBox implements PackBox {
    @Override
    public List<CardCollection.Item> openPack() {
        List<CardCollection.Item> result = new LinkedList<CardCollection.Item>();
-        if (_random.nextBoolean()) {
+        int starter = _random.nextInt(6);
+        if (starter == 0) {
            result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, "FotR - Gandalf Starter"));
-        } else {
+        } else if (starter == 1) {
            result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, "FotR - Aragorn Starter"));
+        } else if (starter == 2) {
+            result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, "MoM - Gandalf Starter"));
+        } else if (starter == 3) {
+            result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, "MoM - Gimli Starter"));
+        } else if (starter == 4) {
+            result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, "RotEL - Boromir Starter"));
+        } else if (starter == 5) {
+            result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 1, "RotEL - Legolas Starter"));
        }
        result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 2, "FotR - Booster"));
+        result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 2, "MoM - Booster"));
+        result.add(new CardCollection.Item(CardCollection.Item.Type.PACK, 2, "RotEL - Booster"));
        return result;
    }
 }
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/MoM
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/MoM
@@ -0,0 +1,74 @@
+#Ring-bearer (2 cards)
+#    Frodo, Reluctant Adventurer
+#    The One Ring, The Ruling Ring
+1x2_102
+1x1_2
+#Adventure Deck (9 cards)
+#    Farmer Maggot's Fields
+1x1_321
+#    Trollshaw Forest
+1x1_334
+#    Frodo's Bedroom
+1x1_339
+#    Moria Lake
+1x1_346
+#    The Bridge of Khazad-dum
+1x1_349
+#    Dimrill Dale
+1x1_350
+#    Anduin Confluence
+1x1_353
+#    Shores of Nen Hithoel
+1x1_359
+#    Summit of Amon Hen
+1x1_362
+#Free Peoples (30 cards)
+#    Gandalf, The Grey Pilgrim x2
+2x2_122
+#    Merry, From O'er the Brandywine x2
+2x1_303
+#    Legolas, Prince of Mirkwood x2
+2x1_51
+#    Boromir, Son of Denethor x2
+2x1_97
+#    Barliman Butterbur, Prancing Pony Proprietor
+1x1_70
+#    Wizard Staff x2
+2x2_29
+#    Hobbit Intuition x2
+2x1_296
+#    Hobbit Sword x2
+2x1_299
+#    Strength of Spirit x4
+4x1_85
+#    Intimidate x3
+3x1_76
+#    Mysterious Wizard x4
+4x1_78
+#    Stand Against Darkness
+1x1_63
+#    Swordarm of the White Tower x2
+2x1_116
+#    Elendil's Valor
+1x1_103
+#Shadow (30 cards)
+#    Goblin Flankers x3
+3x2_61
+#    Goblin Pursuer x4
+4x2_62
+#    Goblin Spearman x4
+4x2_65
+#    Goblin Runner x3
+3x1_178
+#    Goblin Scavengers x4
+4x1_179
+#    Goblin Spear x4
+4x1_182
+#    The Long Dark x2
+2x1_188
+#    Old Differences x2
+2x2_69
+#    Drums in the Deep x2
+2x1_168
+#    Host of Thousands x2
+2x1_187
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/MoM
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/MoM
@@ -0,0 +1,76 @@
+#Ring-bearer (2 cards)
+#    Frodo, Reluctant Adventurer
+#    The One Ring, The Ruling Ring
+1x2_102
+1x1_2
+#Adventure Deck (9 cards) 
+#    Westfarthing
+1x1_326
+#    Ettenmoors
+1x1_331
+#    Council Courtyard
+1x1_337
+#    Dwarrowdelf Chamber
+1x1_344
+#    The Bridge of Khazad-dum
+1x1_349
+#    Lothlorien Woods
+1x1_352
+#    Anduin Wilderland
+1x1_354
+#    Anduin Banks
+1x1_356
+#    Tol Brandir
+1x1_363
+#Free Peoples (30 cards)
+#    Gimli, Dwarf of the Mountain-race x2
+2x2_121
+#    Farin, Dwarven Emissary x2
+2x1_11
+#    Dwarf Guard x3
+3x1_7
+#    Thrarin, Dwarven Smith
+1x1_27
+#    Hand Axe x2
+2x2_10
+#    Hobbit Intuition x2
+2x1_296
+#    Hobbit Sword
+1x1_299
+#    Dwarven Axe x2
+2x1_9
+#    Dwarven Armor
+1x1_8
+#    Stairs of Khazad-dum x2
+2x1_24
+#    Flurry of Blows x4
+4x2_5
+#    Lord of Moria
+1x1_21
+#    Axe Strike x3
+3x1_3
+#    Still Draws Breath x2
+2x1_25
+#    Here Lies Balin, Son of Fundin x2
+2x1_19
+#Shadow (30 cards)
+#    Orc Scout x4
+4x2_89
+#    Orc Ambusher x4
+4x1_261
+#    Orc Assassin x4
+4x1_262
+#    Orc Chieftain x3
+3x1_266
+#    Orc Hunters x2
+2x1_267
+#    Orc Inquisitor x2
+2x1_268
+#    Vile Blade x4
+4x2_95
+#    Spies of Mordor x2
+2x2_92
+#    Mordor's Strength x3
+3x1_255
+#    Under the Watching Eye x2
+2x1_281
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL
@@ -0,0 +1,80 @@
+#Ring-bearer (2 cards)
+#    Frodo, Reluctant Adventurer
+#    The One Ring, The Ruling Ring
+1x2_102
+1x1_2
+#Adventure Deck (9 cards)
+#    Hobbiton Woods
+1x2_116
+#    Bree Gate
+1x1_327
+#    Rivendell Terrace
+1x1_340
+#    Eregion Hills
+1x3_116
+#    The Bridge of Khazad-dûm
+1x1_349
+#    Galadriel's Glade
+1x1_351
+#    Anduin Wilderland
+1x1_354
+#    Pillars of the Kings
+1x1_358
+#    Emyn Muil
+1x1_360
+#Free Peoples (30 cards)
+#    Boromir, Defender of Minas Tirith x2 (starting)
+2x3_122
+#    Boromir's Cloak
+1x1_98
+#    Coat of Mail
+1x1_101
+#    Flee in Terror
+1x2_33
+#    Foes of Mordor x2
+2x1_105
+#    Gimli, Dwarf of Erebor x2
+2x1_12
+#    Hobbit Sword x2
+2x1_299
+#    Hobbit Intuition x2
+2x1_296
+#    Legolas, Prince of Mirkwood x2
+2x1_51
+#    Merry, From O'er the Brandywine (starting)
+1x1_303
+#    No Stranger to the Shadows
+1x1_108
+#    Answering the Cries x2
+2x3_37
+#    Seek and Hide
+1x3_112
+#    Sentinels of Númenor x3
+3x2_37
+#    Swordsman of the Northern Kingdom x3
+3x1_117
+#    Might of Númenor x2
+2x3_43
+#    What Are They? x2
+2x1_119
+#Shadow (30 cards)
+#    Massing in the East x3
+3x3_92
+#    Mordor's Strength x3
+3x1_255
+#    Orc Butcher x4
+4x3_94
+#    Orc Scimitar x4
+4x1_269
+#    Orc Soldier x3
+3x1_271
+#    Orc Swordsman x4
+4x3_98
+#    Orc Warrior x4
+4x3_101
+#    Spies of Mordor
+1x2_92
+#    Strength Born of Fear x2
+2x1_278
+#    Tower Lieutenant x2
+2x1_280
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/RotEL
@@ -0,0 +1,76 @@
+#Ring-bearer (2 cards)
+#    Frodo, Son of Drogo
+1x1_290
+#    The One Ring, The Ruling Ring
+1x1_2
+#Adventure Deck (9 cards)
+#    Westfarthing
+1x1_326
+#    Breeland Forest
+1x1_329
+#    House of Elrond
+1x3_119
+#    Pass of Caradhras
+1x1_348
+#    The Bridge of Khazad-dûm
+1x1_349
+#    Lothlórien Woods
+1x1_352
+#    Silverlode Banks
+1x1_355
+#    Anduin Banks
+1x1_356
+#    Tol Brandir
+1x1_363
+#Free Peoples (30 cards)
+#    Border Defenses x2
+2x1_32
+#    Boromir, Son of Denethor x2
+2x1_97
+#    Defiance x3
+3x1_37
+#    Far-seeing Eyes x2
+2x1_43
+#    Fryin Pan
+1x3_108
+#    Foul Creation x3
+3x1_44
+#    Galdor
+1x3_18
+#    Gimli, Dwarf of Erebor x2 (starting)
+2x1_12
+#    Golradir, Councilor of Imladris x2
+2x3_20
+#    Haldir x2
+2x1_48
+#    Hobbit Intuition x2
+2x1_296
+#    Hosts of the Last Alliance x4
+4x2_18
+#    Legolas, Son of Thranduil x2 (starting)
+2x3_121
+#    Saelbeth, Elven Councilor x2
+2x3_25
+#Shadow (30 cards)
+#    Abandoning Reason for Madness x2
+2x3_49
+#    Bred for Battle x2
+2x1_121
+#    Isengard Forger x3
+3x3_56
+#    One of You Must Do This x2
+2x3_63
+#    Saruman's Snows
+1x1_138
+#    Uruk Raider x3
+3x3_74
+#    Uruk Rager x2
+2x1_150
+#    Uruk Savage x4
+4x1_151
+#    Uruk Scout x4
+4x2_47
+#    Uruk-hai Raiding Party x4
+4x1_158
+#    Uruk-hai Sword x3
+3x1_160
--- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
+++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt
@@ -1,4 +1,10 @@
 FotR - League Starter
 FotR - Gandalf Starter
 FotR - Aragorn Starter
-FotR - Booster
+FotR - Booster
+MoM - Gandalf Starter
+MoM - Gimli Starter
+MoM - Booster
+RotEL - Boromir Starter
+RotEL - Legolas Starter
+RotEL - 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
@@ -36,9 +36,17 @@ public class PacksStorageProvider implements Injectable<PacksStorage>, Injectabl
        try {
            PacksStorage packStorage = new PacksStorage();
            packStorage.addPackBox("FotR - League Starter", new LeagueStarterBox());
+
            packStorage.addPackBox("FotR - Gandalf Starter", new FixedPackBox("FotR - Gandalf Starter"));
            packStorage.addPackBox("FotR - Aragorn Starter", new FixedPackBox("FotR - Aragorn Starter"));
+            packStorage.addPackBox("MoM - Gandalf Starter", new FixedPackBox("MoM - Gandalf Starter"));
+            packStorage.addPackBox("MoM - Gimli Starter", new FixedPackBox("MoM - Gimli Starter"));
+            packStorage.addPackBox("RotEL - Boromir Starter", new FixedPackBox("RotEL - Boromir Starter"));
+            packStorage.addPackBox("RotEL - Legolas Starter", new FixedPackBox("RotEL - Legolas Starter"));
+
            packStorage.addPackBox("FotR - Booster", new RarityPackBox(1));
+            packStorage.addPackBox("MoM - Booster", new RarityPackBox(2));
+            packStorage.addPackBox("RotEL - Booster", new RarityPackBox(3));
            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
@@ -94,6 +94,18 @@ var Card = Class.extend({
                return "/gemp-lotr/images/boosters/fotr_aragorn_starter.png";
            else if (blueprintId == "FotR - Booster")
                    return "/gemp-lotr/images/boosters/fotr_booster.png";
+                else if (blueprintId == "MoM - Gandalf Starter")
+                        return "/gemp-lotr/images/boosters/mom_gandalf_starter.png";
+                    else if (blueprintId == "MoM - Gimli Starter")
+                            return "/gemp-lotr/images/boosters/mom_gimli_starter.png";
+                        else if (blueprintId == "MoM - Booster")
+                                return "/gemp-lotr/images/boosters/mom_booster.png";
+                            else if (blueprintId == "RotEL - Boromir Starter")
+                                    return "/gemp-lotr/images/boosters/rotel_boromir_starter.png";
+                                else if (blueprintId == "RotEL - Legolas Starter")
+                                        return "/gemp-lotr/images/boosters/rotel_legolas_starter.png";
+                                    else if (blueprintId == "RotEL - Booster")
+                                            return "/gemp-lotr/images/boosters/rotel_booster.png";

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