ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sealed League Updates

Browse Source 
- Associated all of the new sealed products with default booster and starter selection images
- Added id field to sealed league definitions which is now how all systems store and refer to unique sealed leagues
- Renamed various product choice products to use a more standardized naming convention
This commit is contained in:
Christian 'ketura' McCarty
2022-10-16 03:08:55 -05:00
parent d87a2b50e8
commit 8a63c737c4
11 changed files with 159 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/AdminRequestHandler.java
View File

@@ -562,7 +562,7 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur
String code = String.valueOf(System.currentTimeMillis());
String parameters = _formatLibrary.GetSealedTemplate(format).GetName() + "," + start + "," + serieDuration + "," + maxMatches + "," + code + "," + name;
String parameters = _formatLibrary.GetSealedTemplate(format).GetID() + "," + start + "," + serieDuration + "," + maxMatches + "," + code + "," + name;
LeagueData leagueData = new NewSealedLeagueData(_cardLibrary, _formatLibrary, parameters);
List<LeagueSerieData> series = leagueData.getSeries();
int leagueStart = series.get(0).getStart();
@@ -573,7 +573,11 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur
_leagueService.clearCache();
responseWriter.writeHtmlResponse("OK");
} finally {
}
catch (RuntimeException ex) {
throw new HttpProcessingException(500);
}
finally {
postDecoder.destroy();
}
}
@@ -650,7 +654,7 @@ public class AdminRequestHandler extends LotroServerRequestHandler implements Ur
try {
String motd = _hallServer.getMOTD();
responseWriter.writeJsonResponse(motd);
responseWriter.writeJsonResponse(motd.replace("\n", "<br>"));
} finally {
postDecoder.destroy();
}

3
gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/leagueAdmin.html
View File

@@ -272,10 +272,11 @@ $(document).ready(
//console.log(prop);
let code = sealed[prop].Format;
let id = sealed[prop].ID;
let serieCount = sealed[prop].SeriesProduct.length;
var item = $("<option/>")
.attr("value", prop)
.attr("value", id)
.text(prop + " - " + serieCount + " Series");
$("#sealed-format").append(item);
}

24
gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js
View File

@@ -139,7 +139,29 @@ var packBlueprints = {
"Expanded": "/gemp-lotr/images/boosters/expanded.png",
"Wraith": "/gemp-lotr/images/boosters/wraith.png",
"AgesEnd": "/gemp-lotr/images/boosters/ages_end.png"
"AgesEnd": "/gemp-lotr/images/boosters/ages_end.png",
"(S)FotR Block Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)TTT Block Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)RotK Block Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)SoG/MD Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)WotR Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)HU Block Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)Expanded Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)BR/HU/RoS Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png",
"(S)Movie Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)Reflections Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)Hobbits Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)Expanded Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)Evil Characters Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)FotR Block Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)TTT Block Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)RotK Block Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)TS Special Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)Movie Special Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)WotR Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
"(S)HU Block Choice - Starter": "/gemp-lotr/images/boosters/starter_selection.png",
};
var Card = Class.extend({

22
gemp-lotr/gemp-lotr-cards/src/main/resources/product/Booster-Selections.hjson
View File

@@ -1,7 +1,7 @@
[
{
name: (S)TSBoosterChoice
name: (S)TS Choice - Booster
type: selection
items: [
1xFotR - Booster
@@ -13,7 +13,7 @@
]
}
{
name: (S)Movie Booster Choice
name: (S)Movie Choice - Booster
type: selection
items: [
1xFotR - Booster
@@ -28,7 +28,7 @@
]
}
{
name: (S)Booster Choice
name: (S)All Decipher Choice - Booster
type: selection
items: [
1xFotR - Booster
@@ -49,7 +49,7 @@
]
}
{
name: (S)FotRChoice
name: (S)FotR Block Choice - Booster
type: selection
items: [
1xFotR - Booster
@@ -59,7 +59,7 @@
}
{
name: (S)TTTChoice
name: (S)TTT Block Choice - Booster
type: selection
items: [
1xTTT - Booster
@@ -69,7 +69,7 @@
}
{
name: (S)RotKChoice
name: (S)RotK Block Choice - Booster
type: selection
items: [
1xRotK - Booster
@@ -79,7 +79,7 @@
}
{
name: (S)8and10Choice
name: (S)SoG/MD Choice - Booster
type: selection
items: [
1xSoG - Booster
@@ -88,7 +88,7 @@
}
{
name: (S)WotRChoice
name: (S)WotR Choice - Booster
type: selection
items: [
1xSH - Booster
@@ -98,7 +98,7 @@
}
{
name: (S)HUChoice
name: (S)HU Block Choice - Booster
type: selection
items: [
1xHU - Booster
@@ -108,7 +108,7 @@
}
{
name: (S)Expanded Choice
name: (S)Expanded Choice - Booster
type: selection
items: [
1xSH - Booster
@@ -121,7 +121,7 @@
}
{
name: (S)BRHURoS Choice
name: (S)BR/HU/RoS Choice - Booster
type: selection
items: [
1xBR - Booster

24
gemp-lotr/gemp-lotr-cards/src/main/resources/product/Starter-Selections.hjson
View File

@@ -190,7 +190,7 @@
]
}
{
name: (S)Multipath - Starter
name: (S)Movie Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -216,7 +216,7 @@
}
{
name: (S)Reflections - Starter
name: (S)Reflections Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -240,7 +240,7 @@
}
{
name: (S)Hobbits - Starter
name: (S)Hobbits Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -252,7 +252,7 @@
}
{
name: (S)Expanded - Starter
name: (S)Expanded Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -272,7 +272,7 @@
}
{
name: (S)Evil Characters - Starter
name: (S)Evil Characters Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -285,7 +285,7 @@
}
{
name: (S)FotR Block - Starter
name: (S)FotR Block Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -299,7 +299,7 @@
}
{
name: (S)TTT Block - Starter
name: (S)TTT Block Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -313,7 +313,7 @@
}
{
name: (S)RotK Block - Starter
name: (S)RotK Block Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -327,7 +327,7 @@
}
{
name: (S)TS Block - Starter
name: (S)TS Special Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -344,7 +344,7 @@
}
{
name: (S)Movie Block - Starter
name: (S)Movie Special Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -361,7 +361,7 @@
}
{
name: (S)WotR Block - Starter
name: (S)WotR Choice - Starter
type: selection
selectionCount: 1
items: [
@@ -377,7 +377,7 @@
}
{
name: (S)HU Block - Starter
name: (S)HU Block Choice - Starter
type: selection
selectionCount: 1
items: [

105
gemp-lotr/gemp-lotr-cards/src/main/resources/sealed/sealed_formats.hjson
View File

@@ -1,6 +1,7 @@
[
{
name: 01 Fellowship Block Sealed
id: fotr_block_sealed
format: limited_fotr
seriesProduct: [
[
@@ -28,6 +29,7 @@
}
{
name: 02 Towers Block Sealed
id: ttt_block_sealed
format: limited_ttt
seriesProduct: [
[
@@ -56,34 +58,36 @@
{
name: 03 Towers Standard Special Sealed
id: ts_special_sealed
format: limited_ttt
seriesProduct: [
[
1x(S)TSSealed-S1
2xFotR - Booster
2xTTT - Booster
2x(S)TSBoosterChoice
2x(S)TS Choice - Booster
],
[
1x(S)TSSealed-S2
1xMoM - Booster
1xBoHD - Booster
1x(S)TSBoosterChoice
1x(S)TS Choice - Booster
]
[
1x(S)TSSealed-S3
1xRotEL - Booster
1xEoF - Booster
1x(S)TSBoosterChoice
1x(S)TS Choice - Booster
]
[
6x(S)TSBoosterChoice
6x(S)TS Choice - Booster
]
]
}
{
name: 04 King Block Sealed
id: rotk_block_sealed
format: limited_king
seriesProduct: [
[
@@ -120,6 +124,7 @@
{
name: 05 Movie Special Sealed
id: movie_special_sealed
format: limited_king
seriesProduct: [
[
@@ -127,7 +132,7 @@
1xFotR - Booster
1xTTT - Booster
1xRotK - Booster
3x(S)Movie Booster Choice
3x(S)Movie Choice - Booster
],
[
1x(S)Special-4-6
@@ -143,13 +148,14 @@
]
[
1xREF - Booster
5x(S)Movie Booster Choice
5x(S)Movie Choice - Booster
]
]
}
{
name: 06 War of the Ring Block Sealed
id: wotr_block_sealed
format: limited_shadows
seriesProduct: [
[
@@ -182,6 +188,7 @@
{
name: 07 Hunters Block Sealed
id: th_block_sealed
format: limited_hunters
seriesProduct: [
[
@@ -223,6 +230,7 @@
{
name: 08 Reverse Fellowship Block Sealed
id: reverse_fotr_block_sealed
format: limited_fotr
seriesProduct: [
[
@@ -257,6 +265,7 @@
{
name: 09 Reverse Towers Block Sealed
id: reverse_ttt_block_sealed
format: limited_ttt
seriesProduct: [
[
@@ -291,34 +300,36 @@
{
name: 10 Reverse Towers Standard Special Sealed
id: reverse_ts_special_sealed
format: limited_ttt
seriesProduct: [
[
1x(S)TSSealed-S3
2xRotEL - Booster
2xEoF - Booster
2x(S)TSBoosterChoice
2x(S)TS Choice - Booster
],
[
1x(S)TSSealed-S2
2xMoM - Booster
2xBoHD - Booster
1x(S)TSBoosterChoice
1x(S)TS Choice - Booster
]
[
1x(S)TSSealed-S1
2xFotR - Booster
2xTTT - Booster
1x(S)TSBoosterChoice
1x(S)TS Choice - Booster
]
[
6x(S)TSBoosterChoice
6x(S)TS Choice - Booster
]
]
}
{
name: 11 Reverse King Block Sealed
id: reverse_rotk_block_sealed
format: limited_king
seriesProduct: [
[
@@ -361,6 +372,7 @@
{
name: 12 Reverse Movie Special Sealed
id: reverse_movie_special_sealed
format: limited_king
seriesProduct: [
[
@@ -368,7 +380,7 @@
1xRotEL - Booster
1xEoF - Booster
1xMD - Booster
3x(S)Movie Booster Choice
3x(S)Movie Choice - Booster
],
[
1x(S)Special-4-6
@@ -384,13 +396,14 @@
]
[
1xREF - Booster
5x(S)Movie Booster Choice
5x(S)Movie Choice - Booster
]
]
}
{
name: 13 Reverse War of the Ring Block Sealed
id: reverse_wotr_block_sealed
format: limited_shadows
seriesProduct: [
[
@@ -429,6 +442,7 @@
{
name: 14 Reverse Hunters Block Sealed
id: reverse_th_block_sealed
format: limited_hunters
seriesProduct: [
[
@@ -476,14 +490,15 @@
{
name: 15 Single Series Fellowship Block Sealed
id: single_fotr_block_sealed
format: limited_fotr
seriesProduct: [
[
1x(S)FotR Block - Starter
1x(S)FotR Block Choice - Starter
1xFotR - Booster
1xMoM - Booster
1xRotEL - Booster
10x(S)FotRChoice
10x(S)FotR Block Choice - Booster
#Shotgun Enquea
2x1_231
],
@@ -492,14 +507,15 @@
{
name: 16 Single Series Towers Block Sealed
id: single_ttt_block_sealed
format: limited_ttt
seriesProduct: [
[
1x(S)TTT Block - Starter
1x(S)TTT Block Choice - Starter
1xTTT - Booster
1xBoHD - Booster
1xEoF - Booster
10x(S)TTTChoice
10x(S)TTT Block Choice - Booster
#Southron Commander
2x4_249
],
@@ -508,31 +524,33 @@
{
name: 17 Single Series Towers Standard Sealed
id: single_ts_sealed
format: limited_ttt
seriesProduct: [
[
1x(S)TS Block - Starter
1x(S)TS Special Choice - Starter
1xFotR - Booster
1xMoM - Booster
1xRotEL - Booster
1xTTT - Booster
1xBoHD - Booster
1xEoF - Booster
10x(S)TSBoosterChoice
10x(S)TS Choice - Booster
],
]
}
{
name: 18 Single Series King Block Sealed
id: single_rotk_block_sealed
format: limited_king
seriesProduct: [
[
1x(S)RotK Block - Starter
1x(S)RotK Block Choice - Starter
1xRotK - Booster
1xSoG - Booster
1xMD - Booster
10x(S)RotKChoice
10x(S)RotK Block Choice - Booster
#Ulaire Enquea, Faster Than Winds
1x7_212
#Shotgun Enquea
@@ -547,10 +565,11 @@
{
name: 19 Single Series Movie Sealed
id: single_movie_sealed
format: limited_king
seriesProduct: [
[
1x(S)Movie Block - Starter
1x(S)Movie Special Choice - Starter
1xFotR - Booster
1xMoM - Booster
1xRotEL - Booster
@@ -560,21 +579,22 @@
1xRotK - Booster
1xSoG - Booster
1xMD - Booster
6x(S)Movie Booster Choice
6x(S)Movie Choice - Booster
],
]
}
{
name: 20 Single Series War of the Ring Block Sealed
id: single_wotr_block_sealed
format: limited_shadows
seriesProduct: [
[
1x(S)WotR Block - Starter
1x(S)WotR Choice - Starter
1xSH - Booster
1xBR - Booster
1xBL - Booster
10x(S)WotRChoice
10x(S)WotR Choice - Booster
#Shingle in a Storm
1x12_145
#Unending Life
@@ -589,14 +609,15 @@
{
name: 21 Single Series Hunters Block Sealed
id: single_th_block_sealed
format: limited_hunters
seriesProduct: [
[
1x(S)HU Block - Starter
1x(S)HU Block Choice - Starter
1xHU - Booster
1xRoS - Booster
1xTaD - Booster
10x(S)HUChoice
10x(S)HU Block Choice - Booster
#Hemmed In
1x12_70
#Great Cost
@@ -609,6 +630,7 @@
{
name: 22 Fellowship Booster Box Sealed
id: fotr_box_sealed
format: limited_fotr
seriesProduct: [
[
@@ -713,6 +735,7 @@
{
name: 23 Fellowship Block Booster Box Sealed
id: fotr_block_box_sealed
format: limited_fotr
seriesProduct: [
[
@@ -845,6 +868,7 @@
{
name: 24 Towers Booster Box Sealed
id: ttt_box_sealed
format: limited_ttt
seriesProduct: [
[
@@ -941,6 +965,7 @@
{
name: 25 Towers Block Booster Box Sealed
id: ttt_block_box_sealed
format: limited_ttt
seriesProduct: [
[
@@ -1059,6 +1084,7 @@
{
name: 26 King Booster Box Sealed
id: rotk_box_sealed
format: limited_king
seriesProduct: [
[
@@ -1143,6 +1169,7 @@
{
name: 27 King Block Booster Box Sealed
id: rotk_block_box_sealed
format: limited_king
seriesProduct: [
[
@@ -1245,6 +1272,7 @@
{
name: 28 Shadows Booster Box Sealed
id: sh_box_sealed
format: limited_shadows
seriesProduct: [
[
@@ -1339,6 +1367,7 @@
{
name: 29 War of the Ring Block Booster Box Sealed
id: wotr_block_box_sealed
format: limited_shadows
seriesProduct: [
[
@@ -1475,6 +1504,7 @@
{
name: 30 Hunters Block Booster Box Sealed
id: th_block_box_sealed
format: limited_hunters
seriesProduct: [
[
@@ -1529,10 +1559,11 @@
{
name: 31 Multipath Movie Sealed
id: multipath_movie_sealed
format: limited_multipath
seriesProduct: [
[
1x(S)Multipath - Starter
1x(S)Movie Special Choice - Starter
1xFotR - Booster
1xMoM - Booster
1xRotEL - Booster
@@ -1543,7 +1574,7 @@
1xSoG - Booster
1xREF - Booster
1xMD - Booster
6x(S)Movie Booster Choice
6x(S)Movie Choice - Booster
#Shotgun Enquea
2x1_231
],
@@ -1552,10 +1583,11 @@
{
name: 32 Reflections Sealed
id: ref_sealed
format: limited_multipath
seriesProduct: [
[
1x(S)Reflections - Starter
1x(S)Reflections Choice - Starter
12xREF - Booster
#Shotgun Enquea
2x1_231
@@ -1565,17 +1597,18 @@
{
name: 33 Expanded Sealed
id: expanded_sealed
format: limited_hunters
seriesProduct: [
[
1x(S)Expanded - Starter
1x(S)Expanded Choice - Starter
1xSH - Booster
1xBR - Booster
1xBL - Booster
1xHU - Booster
1xRoS - Booster
1xTaD - Booster
6x(S)Expanded Choice
6x(S)Expanded Choice - Booster
#Shotgun Enquea
2x1_231
],
@@ -1584,13 +1617,14 @@
{
name: 34 Four Hobbits Sealed
id: four_hobbits_sealed
format: limited_king
seriesProduct: [
[
1x(S)Hobbits - Starter
1x(S)Hobbits Choice - Starter
4xSoG - Booster
4xMD - Booster
4x(S)8and10Choice
4x(S)SoG/MD Choice - Booster
#Ulaire Enquea, Faster Than Winds
1x7_212
#Shotgun Enquea
@@ -1601,14 +1635,15 @@
{
name: 35 Evil Characters Sealed
id: evil_sealed
format: limited_hunters
seriesProduct: [
[
1x(S)Evil Characters - Starter
1x(S)Evil Characters Choice - Starter
3xBR - Booster
3xHU - Booster
3xRoS - Booster
3x(S)BRHURoS Choice
3x(S)BR/HU/RoS Choice - Booster
#Shotgun Enquea
2x1_231
],

1
gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/JSONDefs.java
View File

@@ -16,6 +16,7 @@ public class JSONDefs {
public static class SealedTemplate {
public String Name;
public String ID;
public String Format;
public List<List<String>> SeriesProduct;
}

26
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/formats/LotroFormatLibrary.java
View File

@@ -92,12 +92,12 @@ public class LotroFormatLibrary {
for (var def : defs) {
if(def == null)
continue;
var sealed = new SealedLeagueDefinition(def.Name, _allFormats.get(def.Format), def.SeriesProduct);
var sealed = new SealedLeagueDefinition(def.Name, def.ID, _allFormats.get(def.Format), def.SeriesProduct);
if(_sealedTemplates.containsKey(def.Name)) {
System.out.println("Overwriting existing sealed definition '" + def.Name + "'!");
if(_sealedTemplates.containsKey(def.ID)) {
System.out.println("Overwriting existing sealed definition '" + def.ID + "'!");
}
_sealedTemplates.put(def.Name, sealed);
_sealedTemplates.put(def.ID, sealed);
}
} catch (IOException e) {
@@ -185,13 +185,13 @@ public class LotroFormatLibrary {
}
private Map<String, String> legacyCodeMapping = new HashMap<>() {{
put("fotr_block", "Fellowship Block Sealed");
put("ttt_block", "Towers Block Sealed");
put("movie", "King Block Sealed");
put("war_block", "War of the Ring Block Sealed");
put("hunters_block", "Hunters Block Sealed");
put("movie_special", "Movie Special Sealed");
put("ts_special", "Towers Standard Special Sealed");
put("fotr_block", "fotr_block_sealed");
put("ttt_block", "ttt_block_sealed");
put("movie", "rotk_block_sealed");
put("war_block", "wotr_block_sealed");
put("hunters_block", "th_block_sealed");
put("movie_special", "movie_special_sealed");
put("ts_special", "ts_special_sealed");
}};
public SealedLeagueDefinition GetSealedTemplate(String leagueName) {
@@ -201,6 +201,10 @@ public class LotroFormatLibrary {
if(data == null) {
data = _sealedTemplates.get(legacyCodeMapping.get(leagueName));
}
if(data == null) {
collectionReady.release();
throw new RuntimeException("Could not find league definition for '" + leagueName + "'.");
}
collectionReady.release();
return data;
}

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueDefinition.java
View File

@@ -11,11 +11,13 @@ import java.util.stream.Collectors;
public class SealedLeagueDefinition {
private final String _name;
private final String _id;
private final LotroFormat _format;
private final List<List<CardCollection.Item>> _seriesProduct = new ArrayList<>();
public SealedLeagueDefinition(String name, LotroFormat format, List<List<String>> product) {
public SealedLeagueDefinition(String name, String id, LotroFormat format, List<List<String>> product) {
_name = name;
_id = id;
_format = format;
for(var serie : product) {
@@ -32,6 +34,7 @@ public class SealedLeagueDefinition {
public int GetSerieCount() { return _seriesProduct.size(); }
public String GetName() { return _name; }
public String GetID() { return _id; }
public LotroFormat GetFormat() { return _format; }
public List<List<CardCollection.Item>> GetAllSeriesProducts() { return Collections.unmodifiableList(_seriesProduct); }
public List<CardCollection.Item> GetProductForSerie(int serie) { return Collections.unmodifiableList(_seriesProduct.get(serie)); }
@@ -39,6 +42,7 @@ public class SealedLeagueDefinition {
public JSONDefs.SealedTemplate Serialize() {
return new JSONDefs.SealedTemplate() {{
Name = _name;
ID = _id;
Format = _format.getCode();
SeriesProduct = _seriesProduct.stream()
.map(x->x.stream().map(CardCollection.Item::toString).collect(Collectors.toList()))

12
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/league/SealedLeagueDataTest.java
View File

@@ -24,7 +24,7 @@ public class SealedLeagueDataTest extends AbstractAtTest {
@Test
public void testJoinLeagueFirstWeek() {
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block,20120101,test,Test Collection");
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block_sealed,20120101,test,Test Collection");
CollectionType collectionType = new CollectionType("test", "Test Collection");
for (int i = 20120101; i < 20120108; i++) {
CollectionsManager collectionsManager = Mockito.mock(CollectionsManager.class);
@@ -58,7 +58,7 @@ public class SealedLeagueDataTest extends AbstractAtTest {
@Test
public void testJoinLeagueSecondWeek() {
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block,20120101,test,Test Collection");
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block_sealed,20120101,test,Test Collection");
CollectionType collectionType = new CollectionType("test", "Test Collection");
for (int i = 20120108; i < 20120115; i++) {
CollectionsManager collectionsManager = Mockito.mock(CollectionsManager.class);
@@ -97,7 +97,7 @@ public class SealedLeagueDataTest extends AbstractAtTest {
@Test
public void testSwitchToFirstWeek() {
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block,20120101,test,Test Collection");
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block_sealed,20120101,test,Test Collection");
for (int i = 20120101; i < 20120108; i++) {
CollectionsManager collectionsManager = Mockito.mock(CollectionsManager.class);
Mockito.when(collectionsManager.getPlayersCollection("test")).thenReturn(new HashMap<>());
@@ -110,7 +110,7 @@ public class SealedLeagueDataTest extends AbstractAtTest {
@Test
public void testProcessMidFirstWeek() {
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block,20120101,test,Test Collection");
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block_sealed,20120101,test,Test Collection");
for (int i = 20120101; i < 20120108; i++) {
CollectionsManager collectionsManager = Mockito.mock(CollectionsManager.class);
Mockito.when(collectionsManager.getPlayersCollection("test")).thenReturn(new HashMap<>());
@@ -122,7 +122,7 @@ public class SealedLeagueDataTest extends AbstractAtTest {
@Test
public void testSwitchToSecondWeek() {
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block,20120101,test,Test Collection");
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block_sealed,20120101,test,Test Collection");
CollectionType collectionType = new CollectionType("test", "Test Collection");
for (int i = 20120108; i < 20120115; i++) {
CollectionsManager collectionsManager = Mockito.mock(CollectionsManager.class);
@@ -157,7 +157,7 @@ public class SealedLeagueDataTest extends AbstractAtTest {
@Test
public void testProcessMidSecondWeek() {
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block,20120101,test,Test Collection");
SealedLeagueData data = new SealedLeagueData(_cardLibrary, _formatLibrary, "fotr_block_sealed,20120101,test,Test Collection");
for (int i = 20120108; i < 20120115; i++) {
CollectionsManager collectionsManager = Mockito.mock(CollectionsManager.class);
Mockito.when(collectionsManager.getPlayersCollection("test")).thenReturn(new HashMap<>());

14
gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/library/FormatLibraryTests.java
View File

@@ -21,13 +21,13 @@ public class FormatLibraryTests extends AbstractAtTest {
@ParameterizedTest(name = "{0} in LotroFormatLibrary matches SealedLeagueProduct.")
@CsvSource(value = {
"Fellowship Block Sealed,fotr_block",
"Towers Block Sealed,ttt_block",
"Towers Standard Special Sealed,ts_special",
"King Block Sealed,movie",
"Movie Special Sealed,movie_special",
"War of the Ring Block Sealed,war_block",
"Hunters Block Sealed,hunters_block",
"fotr_block_sealed,fotr_block",
"ttt_block_sealed,ttt_block",
"ts_special_sealed,ts_special",
"rotk_block_sealed,movie",
"movie_special_sealed,movie_special",
"wotr_block_sealed,war_block",
"th_block_sealed,hunters_block",
})
public void SealedLeagueProductComparison(String sealedName, String formatCode) {
var oldDef = _sealedLeagueProduct.getAllSeriesForLeague(formatCode);