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

Updated collection checking to account for errata in sealed leagues

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2023-01-05 00:02:35 -06:00
parent fa056d80ba
commit a19d060938
3 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/LotroFormat.java
View File

@@ -51,6 +51,10 @@ public interface LotroFormat {
public Map<String,String> getErrataCardMap();
public String applyErrata(String bpID);
public String findBaseCard(String bpID);
public SitesBlock getSiteBlock();
public String getSurveyUrl();

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

@@ -479,6 +479,16 @@ public class DefaultLotroFormat implements LotroFormat {
return deckWithErrata;
}
@Override
public String applyErrata(String bpID) {
return _errataCardMap.getOrDefault(bpID, bpID);
}
@Override
public String findBaseCard(String bpID) {
return _library.getBaseBlueprintId(bpID);
}
private String validateDeckStructure(LotroDeck deck) {
String result = "";
if (deck.getAdventureCards().size() < _minimumDeckSize) {

5
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -689,7 +689,10 @@ public class HallServer extends AbstractServer {
Map<String, Integer> deckCardCounts = CollectionUtils.getTotalCardCountForDeck(lotroDeck);
for (Map.Entry<String, Integer> cardCount : deckCardCounts.entrySet()) {
final int collectionCount = collection.getItemCount(cardCount.getKey());
final int collectionCount = collection.getItemCount(cardCount.getKey()) +
collection.getItemCount(format.findBaseCard(cardCount.getKey())) +
collection.getItemCount(format.applyErrata(cardCount.getKey()));
if (collectionCount < cardCount.getValue()) {
String cardName = null;
try {