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

Fixing foil versions of aliased cards not being usable in limited formats. Fixed sealed collection double-counting.

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2023-08-05 12:54:37 -05:00
parent b49aab9b61
commit e182a87615
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -488,13 +488,14 @@ public class DefaultLotroFormat implements LotroFormat {
public String applyErrata(String original) {
var base = _library.getBaseBlueprintId(original);
var errata = _errataCardMap.getOrDefault(base, base);
if (original.endsWith("*") && !errata.endsWith("*")) {
errata += "*";
}
if(errata.equals(base))
return original;
if (original.endsWith("*") && !errata.endsWith("*")) {
errata += "*";
}
return errata;
}

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

@@ -704,8 +704,15 @@ public class HallServer extends AbstractServer {
Map<String, Integer> deckCardCounts = CollectionUtils.getTotalCardCountForDeck(lotroDeck);
for (Map.Entry<String, Integer> cardCount : deckCardCounts.entrySet()) {
int collectionCount = collection.getItemCount(cardCount.getKey()) +
collection.getItemCount(format.applyErrata(cardCount.getKey()));
String overtID = cardCount.getKey();
String errataID = format.applyErrata(cardCount.getKey());
var baseIDs = format.findBaseCards(cardCount.getKey());
int collectionCount = collection.getItemCount(cardCount.getKey());
if(!errataID.equals(overtID)) {
collection.getItemCount(errataID);
}
var alts = _library.getAllAlternates(cardCount.getKey());
if(alts != null) {
@@ -714,10 +721,6 @@ public class HallServer extends AbstractServer {
}
}
// for(String id : format.findBaseCards(cardCount.getKey())) {
// collectionCount += collection.getItemCount(id);
// }
if (collectionCount < cardCount.getValue()) {
String cardName = null;
try {