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

Adjusting prod candidate to include Latest PC Errata

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-12-06 00:03:06 -06:00
parent d9e45cc41d
commit 7e64375a56
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gemp-lotr/gemp-lotr-cards/src/main/resources/lotrFormats.hjson
View File

@@ -66,7 +66,7 @@
fotr_block
Player's Council V-sets|V1 - Shadow of the Past:101
Player's Council Errata|The Fellowship of the Ring Errata:51,Mines of Moria Errata:52,Realms of the Elf-lords Errata:53
PC New Playtest Errata|New Playtest Errata:pc_errata
Latest PC Errata|Latest PC Errata:pc_errata
]
sets: [
1, 2, 3, 101
@@ -115,22 +115,38 @@
Additional Sets|Promotional:0,Reflections:9
Player's Council V-sets|V1 - Shadow of the Past:101,V2 - King of the Golden Hall:102
Player's Council Errata|The Fellowship of the Ring Errata:51,Mines of Moria Errata:52,Realms of the Elf-lords Errata:53,The Two Towers Errata:54,Battle of Helm's Deep Errata:55,Ents of Fangorn Errata:56,Return of the King Errata:57,Siege of Gondor Errata:58,Reflections Errata:59,Mount Doom Errata:60
PC New Playtest Errata|New Playtest Errata:pc_errata
Latest PC Errata|Latest PC Errata:pc_errata
]
errataSets: [
51,52,53,54,55,56,57,58,59,60
]
}
{
name: PC New Playtest Errata
name: Latest PC Errata
code: pc_errata
sites: MULTIPATH
hall: false
# Fill this up with the current batch of errata for it to show up on the playtest server.
valid: [
"101_19", "101_20", "101_31", "101_33", "101_34", "101_52", "101_54", "101_61", "51_303", "51_310", "51_50", "51_63", "52_104", "52_110", "52_76", "52_85", "53_103", "53_14", "53_20", "53_25", "53_50", "53_7", "53_8", "53_80", "53_85", "54_276", "55_121", "55_7", "58_20", "59_32", "59_35", "60_28", "60_8"
"0_56", "0_57", "0_58", "0_59", "0_60",
"51_50", "51_63", "51_303", "51_310",
"52_76", "52_85", "52_104", "52_110",
"54_7", "54_8", "54_14", "54_20", "54_25", "54_50", "54_80", "54_85", "54_103",
"54_65", "54_67", "54_68", "54_71", "54_76", "54_78", "54_80", "54_81", "54_85", "54_86", "54_245", "54_276", "54_280", "54_289",
"55_7", "55_10", "55_13", "55_50", "55_85", "55_86", "55_92", "55_121",
"56_22", "56_23",
"57_236",
"58_20",
"59_32", "59_35",
"60_28", "60_8",
"63_20", "63_23",
"65_14", "65_17",
"67_7",
"68_9", "68_14",
"101_19", "101_20", "101_31", "101_33", "101_34", "101_52", "101_54", "101_61", "101_65", "101_66"
]
sets: [
71
100
]
}
{
@@ -157,6 +173,7 @@
war_block
hunter_block
Additional Sets|Reflections:9,Expanded Middle-earth:14,The Wraith Collection:16,Age's End:19
Latest PC Errata|Latest PC Errata:pc_errata
]
}
{

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/SortAndFilterCards.java
View File

@@ -265,7 +265,6 @@ public class SortAndFilterCards {
private boolean isInSetOrFormat(String blueprintId, LotroCardBlueprint card, List<String> setFilters,
LotroFormat currentFormat, LotroCardBlueprintLibrary library, LotroFormatLibrary formatLibrary) {
boolean isInAnySet = false;
for (String set : setFilters) {
if(isJSInvalidString(set))
@@ -283,7 +282,7 @@ public class SortAndFilterCards {
}
if(StringUtils.isEmpty(invalid)) {
isInAnySet = true;
return true;
}
continue;
}
@@ -305,18 +304,18 @@ public class SortAndFilterCards {
for (int setNo = min; setNo <= max; setNo++) {
if (blueprintId.startsWith(setNo + "_") || library.hasAlternateInSet(blueprintId, String.valueOf(setNo))) {
isInAnySet = true;
return true;
}
else if (currentFormat != null && currentFormat.hasErrata()) {
int errataSetNo = library.getErrataSet(setNo);
if (blueprintId.startsWith(errataSetNo + "_") || library.hasAlternateInSet(blueprintId, String.valueOf(errataSetNo))) {
isInAnySet = true;
return true;
}
}
}
}
return isInAnySet;
return false;
}
private List<String> getWords(List<String> params, boolean sanitize) {