diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D1.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D1.png new file mode 100644 index 000000000..17d12439c Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D1.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D2.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D2.png new file mode 100644 index 000000000..756aff045 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D2.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D3.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D3.png new file mode 100644 index 000000000..e194f185f Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS1D3.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D1.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D1.png new file mode 100644 index 000000000..a1500a61f Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D1.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D2.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D2.png new file mode 100644 index 000000000..18d2c4c5d Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D2.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D3.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D3.png new file mode 100644 index 000000000..75266a14c Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS2D3.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D1.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D1.png new file mode 100644 index 000000000..f68437094 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D1.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D2.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D2.png new file mode 100644 index 000000000..626dced71 Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D2.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D3.png b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D3.png new file mode 100644 index 000000000..49d23b1eb Binary files /dev/null and b/gemp-lotr/gemp-lotr-async/src/main/web/images/boosters/TSS3D3.png differ diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/jCards.js index b84485919..9ba5ffd31 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/jCards.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/jCards.js @@ -36,6 +36,7 @@ var packBlueprints = { "(S)Booster Choice":"/gemp-lotr/images/boosters/booster_selection.png", "(S)Movie Booster Choice":"/gemp-lotr/images/boosters/booster_selection.png", + "(S)TSBoosterChoice":"/gemp-lotr/images/boosters/booster_selection.png", "FotR - League Starter":"/gemp-lotr/images/boosters/fotr_league_starter.png", "Random FotR Foil Common":"/gemp-lotr/images/boosters/random_foil.png", @@ -119,6 +120,20 @@ var packBlueprints = { "(S)Special-4-6":"/gemp-lotr/images/boosters/starter_selection.png", "(S)Special-7-9":"/gemp-lotr/images/boosters/starter_selection.png", + "TSSealedS1D1":"/gemp-lotr/images/boosters/TSS1D1.png", + "TSSealedS1D2":"/gemp-lotr/images/boosters/TSS1D2.png", + "TSSealedS1D3":"/gemp-lotr/images/boosters/TSS1D3.png", + "TSSealedS2D1":"/gemp-lotr/images/boosters/TSS2D1.png", + "TSSealedS2D2":"/gemp-lotr/images/boosters/TSS2D2.png", + "TSSealedS2D3":"/gemp-lotr/images/boosters/TSS2D3.png", + "TSSealedS3D1":"/gemp-lotr/images/boosters/TSS3D1.png", + "TSSealedS3D2":"/gemp-lotr/images/boosters/TSS3D2.png", + "TSSealedS3D3":"/gemp-lotr/images/boosters/TSS3D3.png", + + "(S)TSSealed-S1":"/gemp-lotr/images/boosters/starter_selection.png", + "(S)TSSealed-S2":"/gemp-lotr/images/boosters/starter_selection.png", + "(S)TSSealed-S3":"/gemp-lotr/images/boosters/starter_selection.png", + "Expanded":"/gemp-lotr/images/boosters/expanded.png", "Wraith":"/gemp-lotr/images/boosters/wraith.png", "AgesEnd":"/gemp-lotr/images/boosters/ages_end.png" diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html index f7c9db251..a1bb68f69 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/leagueAdmin.html @@ -179,6 +179,7 @@ +
Series duration in days:
Maximum matches in series:
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java index 578a1f6c0..0a38f7280 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java @@ -18,6 +18,7 @@ public class SealedLeagueProduct { createMovieBlock(); createWarOfTheRingBlock(); createMovieSpecialBlock(); + createTSSpecialBlock(); } private void createFellowshipBlock() { @@ -144,6 +145,37 @@ public class SealedLeagueProduct { _collections.put(SealedLeagueType.MOVIE_SPECIAL_BLOCK.getSealedCode(), movieSpecialBlock); } + private void createTSSpecialBlock() { + List tsSpecialBlock = new ArrayList(); + + MutableCardCollection firstWeek = new DefaultCardCollection(); + firstWeek.addItem("(S)TSSealed-S1", 1); + firstWeek.addItem("FotR - Booster", 2); + firstWeek.addItem("TTT - Booster", 2); + firstWeek.addItem("(S)TSBoosterChoice", 2); + tsSpecialBlock.add(firstWeek); + + MutableCardCollection secondWeek = new DefaultCardCollection(); + secondWeek.addItem("(S)TSSealed-S2", 1); + secondWeek.addItem("MoM - Booster", 1); + secondWeek.addItem("BoHD - Booster", 1); + secondWeek.addItem("(S)TSBoosterChoice", 1); + tsSpecialBlock.add(secondWeek); + + MutableCardCollection thirdWeek = new DefaultCardCollection(); + thirdWeek.addItem("(S)TSSealed-S3", 1); + thirdWeek.addItem("RotEL - Booster", 1); + thirdWeek.addItem("EoF - Booster", 1); + thirdWeek.addItem("(S)TSBoosterChoice", 1); + tsSpecialBlock.add(thirdWeek); + + MutableCardCollection fourthWeek = new DefaultCardCollection(); + fourthWeek.addItem("(S)TSBoosterChoice", 6); + tsSpecialBlock.add(fourthWeek); + + _collections.put(SealedLeagueType.TS_SPECIAL_BLOCK.getSealedCode(), tsSpecialBlock); + } + private void createWarOfTheRingBlock() { List warOfTheRingBlock = new ArrayList(); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java index e197dd6fc..5324054c3 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueType.java @@ -5,7 +5,8 @@ public enum SealedLeagueType { TTT_BLOCK("ttt_block", "limited_ttt"), MOVIE_BLOCK("movie", "limited_king"), WAR_BLOCK("war_block", "limited_shadows"), - MOVIE_SPECIAL_BLOCK("movie_special", "limited_king"); + MOVIE_SPECIAL_BLOCK("movie_special", "limited_king"), + TS_SPECIAL_BLOCK("ts_special", "limited_ttt"); public static SealedLeagueType getLeagueType(String sealedCode) { for (SealedLeagueType sealedLeagueType : SealedLeagueType.values()) { diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSBoosterChoice.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSBoosterChoice.pack new file mode 100644 index 000000000..50bd109b6 --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSBoosterChoice.pack @@ -0,0 +1,6 @@ +1xFotR - Booster +1xMoM - Booster +1xRotEL - Booster +1xTTT - Booster +1xBoHD - Booster +1xEoF - Booster \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S1.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S1.pack new file mode 100644 index 000000000..783a32649 --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S1.pack @@ -0,0 +1,3 @@ +1xTSSealedS1D1 +1xTSSealedS1D2 +1xTSSealedS1D3 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S2.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S2.pack new file mode 100644 index 000000000..03f673a5c --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S2.pack @@ -0,0 +1,3 @@ +1xTSSealedS2D1 +1xTSSealedS2D2 +1xTSSealedS2D3 \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S3.pack b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S3.pack new file mode 100644 index 000000000..9fc36cf9b --- /dev/null +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/(S)TSSealed-S3.pack @@ -0,0 +1,3 @@ +1xTSSealedS3D1 +1xTSSealedS3D2 +1xTSSealedS3D3 \ No newline at end of file diff --git a/TS Sealed - Serie 1 - Deck 1 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D1.pack similarity index 100% rename from TS Sealed - Serie 1 - Deck 1 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D1.pack diff --git a/TS Sealed - Serie 1 - Deck 2 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D2.pack similarity index 100% rename from TS Sealed - Serie 1 - Deck 2 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D2.pack diff --git a/TS Sealed - Serie 1 - Deck 3 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D3.pack similarity index 100% rename from TS Sealed - Serie 1 - Deck 3 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS1D3.pack diff --git a/TS Sealed - Serie 2 - Deck 1 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D1.pack similarity index 100% rename from TS Sealed - Serie 2 - Deck 1 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D1.pack diff --git a/TS Sealed - Serie 2 - Deck 2 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D2.pack similarity index 100% rename from TS Sealed - Serie 2 - Deck 2 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D2.pack diff --git a/TS Sealed - Serie 2 - Deck 3 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D3.pack similarity index 100% rename from TS Sealed - Serie 2 - Deck 3 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS2D3.pack diff --git a/TS Sealed - Serie 3 - Deck 1 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D1.pack similarity index 100% rename from TS Sealed - Serie 3 - Deck 1 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D1.pack diff --git a/TS Sealed - Serie 3 - Deck 2 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D2.pack similarity index 100% rename from TS Sealed - Serie 3 - Deck 2 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D2.pack diff --git a/TS Sealed - Serie 3 - Deck 3 b/gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D3.pack similarity index 100% rename from TS Sealed - Serie 3 - Deck 3 rename to gemp-lotr/gemp-lotr-server/src/main/resources/TSSealedS3D3.pack 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 8d714a580..10387d733 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt +++ b/gemp-lotr/gemp-lotr-server/src/main/resources/packs.txt @@ -76,4 +76,17 @@ Special-09 (S)Movie Booster Choice Expanded Wraith -AgesEnd \ No newline at end of file +AgesEnd +TSSealedS1D1 +TSSealedS1D2 +TSSealedS1D3 +TSSealedS2D1 +TSSealedS2D2 +TSSealedS2D3 +TSSealedS3D1 +TSSealedS3D2 +TSSealedS3D3 +(S)TSSealed-S1 +(S)TSSealed-S2 +(S)TSSealed-S3 +(S)TSBoosterChoice \ No newline at end of file