diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set11-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set11-rarity.txt new file mode 100644 index 000000000..fc6fa7cdf --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set11-rarity.txt @@ -0,0 +1,272 @@ +11R1 +11R1T +11S2 +11U3 +11C4 +11C5 +11U6 +11C7 +11U8 +11R9 +11R10 +11R11 +11U12 +11C13 +11R14 +11U15 +11U16 +11R17 +11S18 +11C19 +11S20 +11S21 +11R22 +11R23 +11R24 +11U25 +11U26 +11C27 +11U28 +11U29 +11R30 +11C31 +11S32 +11S33 +11S33T +11R34 +11R35 +11C36 +11U37 +11U38 +11C39 +11U40 +11U41 +11R42 +11R43 +11R44 +11U45 +11C46 +11U47 +11R48 +11U49 +11R50 +11R51 +11U52 +11S53 +11R54 +11R54T +11U55 +11S56 +11R57 +11R57T +11U58 +11U59 +11R60 +11U61 +11C62 +11C63 +11S64 +11S65 +11R66 +11U67 +11R68 +11U69 +11R70 +11C71 +11C72 +11C73 +11U74 +11R75 +11C76 +11S77 +11R78 +11C79 +11U80 +11R81 +11S82 +11C83 +11S84 +11C85 +11C86 +11U87 +11C88 +11C89 +11S90 +11R91 +11S92 +11C93 +11C94 +11S95 +11R96 +11S97 +11C98 +11U99 +11R100 +11C101 +11C102 +11C103 +11U104 +11U105 +11U106 +11C107 +11R108 +11U109 +11U110 +11C111 +11S112 +11C113 +11U114 +11S115 +11S116 +11S117 +11U118 +11R119 +11C120 +11C121 +11C122 +11R123 +11R123T +11U124 +11C125 +11S126 +11C127 +11C128 +11C129 +11S130 +11C131 +11C132 +11R133 +11R134 +11R135 +11C136 +11U137 +11S138 +11U139 +11C140 +11R141 +11S142 +11R143 +11U144 +11U145 +11S146 +11R147 +11C148 +11U149 +11S150 +11U151 +11S152 +11S153 +11R154 +11C155 +11U156 +11C157 +11R158 +11U159 +11S160 +11S161 +11C162 +11U163 +11S164 +11R165 +11S166 +11C167 +11C168 +11C169 +11R170 +11R171 +11U172 +11R173 +11S174 +11U175 +11S176 +11R177 +11S178 +11R179 +11S180 +11R181 +11U182 +11S183 +11R184 +11U185 +11R186 +11S187 +11S188 +11U189 +11S190 +11U191 +11C192 +11S193 +11R194 +11C195 +11C196 +11U197 +11C198 +11C199 +11C200 +11C201 +11C202 +11C203 +11C204 +11R205 +11C206 +11R207 +11U208 +11S209 +11U210 +11R211 +11U212 +11S213 +11R214 +11S215 +11R216 +11R217 +11U218 +11R219 +11S220 +11S221 +11S222 +11S223 +11R224 +11S225 +11R226 +11R226T +11U227 +11S228 +11S229 +11S230 +11S231 +11S232 +11S233 +11S234 +11U235 +11S236 +11S237 +11S238 +11S239 +11S240 +11S241 +11S242 +11S243 +11U244 +11S245 +11U246 +11S247 +11S248 +11S249 +11S250 +11S251 +11S252 +11S253 +11S254 +11S255 +11S256 +11S257 +11S258 +11S259 +11S260 +11S261 +11S262 +11S263 +11S264 +11S265 +11S266 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set12-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set12-rarity.txt new file mode 100644 index 000000000..778c5f481 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set12-rarity.txt @@ -0,0 +1,209 @@ +12U1 +12U2 +12U3 +12C4 +12U5 +12C6 +12C7 +12C8 +12R9 +12R10 +12U11 +12U12 +12U13 +12U14 +12U15 +12C16 +12R17 +12R17T +12R18 +12R19 +12C20 +12U21 +12C22 +12U23 +12U24 +12U25 +12R26 +12R27 +12R28 +12U29 +12R30 +12C31 +12C32 +12C33 +12C34 +12R35 +12R35T +12U36 +12R37 +12R38 +12U39 +12C40 +12U41 +12R42 +12U43 +12C44 +12C45 +12C46 +12R47 +12R48 +12U49 +12U50 +12U51 +12C52 +12C53 +12R54 +12R54T +12S55 +12R56 +12R57 +12U58 +12C59 +12C60 +12C61 +12U62 +12U63 +12C64 +12S65 +12U66 +12C67 +12R68 +12R69 +12C70 +12U71 +12R72 +12S73 +12S73T +12R74 +12R75 +12U76 +12C77 +12C78 +12R79 +12U79T +12R80 +12R81 +12R82 +12R83 +12C84 +12R85 +12R86 +12C87 +12C88 +12U89 +12U90 +12R91 +12C92 +12C93 +12U94 +12C95 +12C96 +12U97 +12C98 +12U99 +12R100 +12R101 +12C102 +12U103 +12U104 +12R105 +12C106 +12C107 +12R108 +12C109 +12C110 +12R111 +12U112 +12S113 +12C114 +12C115 +12R116 +12U117 +12R118 +12R119 +12R120 +12C121 +12C122 +12C123 +12R124 +12S125 +12S126 +12R127 +12R128 +12R129 +12U130 +12U131 +12U132 +12S133 +12C134 +12U135 +12U136 +12C137 +12U138 +12R139 +12U140 +12R141 +12C142 +12C143 +12S144 +12C145 +12C146 +12U147 +12U148 +12C149 +12R150 +12S151 +12S152 +12C153 +12R154 +12R155 +12R156 +12R157 +12U158 +12C159 +12C160 +12U161 +12R162 +12R163 +12C164 +12U165 +12U166 +12U167 +12C168 +12R169 +12U170 +12R171 +12C172 +12R173 +12R174 +12R174T +12R175 +12U176 +12C177 +12C178 +12R179 +12U180 +12C181 +12C182 +12R183 +12U184 +12U185 +12U186 +12S187 +12S188 +12S189 +12S190 +12U191 +12U192 +12U193 +12U194 +12A195 +12A196 +12A197 +12A198 +12A199 +12A200 +12A201 +12A202 +12A203 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/set13-rarity.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/set13-rarity.txt new file mode 100644 index 000000000..dddf68bc7 --- /dev/null +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/set13-rarity.txt @@ -0,0 +1,209 @@ +13R1 +13C2 +13U3 +13U4 +13R5 +13R5T +13C6 +13C7 +13R8 +13S9 +13R10 +13R11 +13C12 +13C13 +13C14 +13R15 +13C16 +13U17 +13R18 +13U19 +13S20 +13C21 +13R22 +13C23 +13C24 +13C25 +13R26 +13U27 +13U28 +13C29 +13C30 +13U31 +13C32 +13R33 +13U34 +13C35 +13R36 +13R37 +13R38 +13C39 +13R40 +13C41 +13R42 +13U43 +13R44 +13U45 +13R46 +13R46T +13C47 +13R48 +13R49 +13U50 +13C51 +13U52 +13U53 +13C54 +13U55 +13U56 +13R57 +13R58 +13R59 +13U60 +13U61 +13S62 +13R63 +13R64 +13R65 +13C66 +13U67 +13C68 +13C69 +13U70 +13U71 +13U72 +13C73 +13S74 +13U75 +13R76 +13C77 +13R78 +13U79 +13R80 +13R81 +13C82 +13C83 +13R84 +13S85 +13R86 +13C87 +13U88 +13U89 +13C90 +13U91 +13U92 +13R93 +13U94 +13U95 +13C96 +13C97 +13U98 +13S99 +13S100 +13R101 +13C102 +13U103 +13R104 +13U105 +13U106 +13C107 +13R108 +13S109 +13U110 +13C111 +13R112 +13R112T +13C113 +13S114 +13R115 +13C116 +13R117 +13S118 +13C119 +13C120 +13C121 +13U122 +13R123 +13U124 +13C125 +13R126 +13C127 +13U128 +13C129 +13U130 +13U131 +13C132 +13C133 +13C134 +13U135 +13R136 +13R137 +13R137T +13R138 +13R139 +13R140 +13R141 +13R142 +13R143 +13U144 +13C145 +13U146 +13C147 +13U148 +13R149 +13U150 +13U151 +13R152 +13R153 +13U154 +13R155 +13R156 +13R156T +13C157 +13R158 +13C159 +13C160 +13C161 +13C162 +13C163 +13C164 +13U165 +13U166 +13U167 +13C168 +13R169 +13U170 +13R171 +13C172 +13C173 +13R174 +13R174T +13C175 +13C176 +13U177 +13R178 +13U179 +13R180 +13U181 +13R182 +13U183 +13C184 +13U185 +13S186 +13U187 +13U188 +13S189 +13U190 +13S191 +13S192 +13U193 +13U194 +13A195 +13A196 +13A197 +13A198 +13A199 +13A200 +13A201 +13A202 +13A203 \ No newline at end of file diff --git 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 index 51b7faf6a..d3dfa7121 100644 --- 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 @@ -35,6 +35,9 @@ public class CollectionSerializer { loadSet("8"); loadSet("9"); loadSet("10"); + loadSet("11"); + loadSet("12"); + loadSet("13"); } catch (IOException exp) { throw new RuntimeException("Problem loading collection data", exp); } diff --git 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 index 772234a50..a0b337831 100644 --- 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 @@ -29,7 +29,9 @@ public class RarityPackBox implements PackBox { Collections.shuffle(possibleCards, _random); addCards(result, possibleCards.subList(0, 1), true); } else if (foilRarity < 4) { - List possibleCards = new LinkedList(_setRarity.getCardsOfRarity("U")); + List possibleCards = new LinkedList(); + possibleCards.addAll(_setRarity.getCardsOfRarity("U")); + possibleCards.addAll(_setRarity.getCardsOfRarity("S")); Collections.shuffle(possibleCards, _random); addCards(result, possibleCards.subList(0, 1), true); } else { @@ -45,7 +47,8 @@ public class RarityPackBox implements PackBox { } private void addRandomRareCard(List result, int count) { - List possibleCards = new LinkedList(_setRarity.getCardsOfRarity("R")); + List possibleCards = new LinkedList(); + possibleCards.addAll(_setRarity.getCardsOfRarity("R")); possibleCards.addAll(_setRarity.getCardsOfRarity("R")); possibleCards.addAll(_setRarity.getCardsOfRarity("R")); possibleCards.addAll(_setRarity.getCardsOfRarity("A")); diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt index 111931900..746a929f0 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt @@ -31,4 +31,8 @@ Random FotR Foil Uncommon (S)RotK - Tengwar RotK - Booster SoG - Booster -MD - Booster \ No newline at end of file +MD - Booster +SH - Booster +BR - Booster +BL - Booster +(S)SH - Tengwar \ No newline at end of file diff --git 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 index c189d81a5..5beb88956 100644 --- 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 @@ -64,6 +64,9 @@ public class CollectionResource extends AbstractResource { _rarities.put("8", reader.getSetRarity("8")); _rarities.put("9", reader.getSetRarity("9")); _rarities.put("10", reader.getSetRarity("10")); + _rarities.put("11", reader.getSetRarity("11")); + _rarities.put("12", reader.getSetRarity("12")); + _rarities.put("13", reader.getSetRarity("13")); } @Path("/{collectionType}") diff --git 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 index dcf44b737..25aeefd59 100644 --- 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 @@ -47,6 +47,7 @@ public class PacksStorageProvider implements Injectable, Injectabl packStorage.addPackBox("(S)FotR - Tengwar", new TengwarPackBox(new int[]{1, 2, 3})); packStorage.addPackBox("(S)TTT - Tengwar", new TengwarPackBox(new int[]{4, 5, 6})); packStorage.addPackBox("(S)RotK - Tengwar", new TengwarPackBox(new int[]{7, 8, 10})); + packStorage.addPackBox("(S)SH - Tengwar", new TengwarPackBox(new int[]{11, 12, 13})); packStorage.addPackBox("(S)Booster Choice", new FixedPackBox("(S)Booster Choice")); @@ -80,6 +81,10 @@ public class PacksStorageProvider implements Injectable, Injectabl packStorage.addPackBox("SoG - Booster", new RarityPackBox(8)); packStorage.addPackBox("MD - Booster", new RarityPackBox(10)); + packStorage.addPackBox("SH - Booster", new RarityPackBox(11)); + packStorage.addPackBox("BR - Booster", new RarityPackBox(12)); + packStorage.addPackBox("BL - Booster", new RarityPackBox(13)); + return packStorage; } catch (IOException exp) { _logger.error("Error while creating resource", exp); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/bl_booster.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/bl_booster.png new file mode 100644 index 000000000..0efcfd156 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/bl_booster.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/br_booster.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/br_booster.png new file mode 100644 index 000000000..8eedd145a Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/br_booster.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/sh_booster.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/sh_booster.png new file mode 100644 index 000000000..cca7ce9f6 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/sh_booster.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/sh_tengwar_selection.png b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/sh_tengwar_selection.png new file mode 100644 index 000000000..59cef3a42 Binary files /dev/null and b/gemp-lotr/gemp-lotr-web/src/main/webapp/images/boosters/sh_tengwar_selection.png differ diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js index b9c035ee4..23e84f3fd 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/cardFilter.js @@ -155,6 +155,7 @@ var CardFilter = Class.extend({ + "" + "" + "" + + "" + "" + ""); diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js index 1b18ec55a..d70e6c81b 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/jCards.js @@ -19,6 +19,7 @@ var packBlueprints = { "(S)FotR - Tengwar": "/gemp-lotr/images/boosters/fotr_tengwar_selection.png", "(S)TTT - Tengwar": "/gemp-lotr/images/boosters/ttt_tengwar_selection.png", "(S)RotK - Tengwar": "/gemp-lotr/images/boosters/rotk_tengwar_selection.png", + "(S)SH - Tengwar": "/gemp-lotr/images/boosters/sh_tengwar_selection.png", "(S)Booster Choice": "/gemp-lotr/images/boosters/booster_selection.png", @@ -60,7 +61,19 @@ var packBlueprints = { "MD - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png", "MD - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png", - "MD - Booster": "/gemp-lotr/images/boosters/md_booster.png" + "MD - Booster": "/gemp-lotr/images/boosters/md_booster.png", + + "SH - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png", + "SH - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png", + "SH - Booster": "/gemp-lotr/images/boosters/sh_booster.png", + + "BR - Faramir Starter": "/gemp-lotr/images/boosters/eof_faramir_starter.png", + "BR - Witch-king Starter": "/gemp-lotr/images/boosters/eof_witch_king_starter.png", + "BR - Booster": "/gemp-lotr/images/boosters/br_booster.png", + + "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" }; var Card = Class.extend({