external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct how collectorNumber is located

Browse Source 
The existing logic will always return the first match for a given card
name, even if there are multiple different printings of the same card
name within a set. This change aligns the collectorNumber with the
alternate art index.

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
This commit is contained in:
Jamin W. Collins
2020-03-03 21:18:38 -07:00
parent e325f42ca8
commit ff31718839
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-core/src/main/java/forge/card/CardDb.java
View File

@@ -312,16 +312,20 @@ public final class CardDb implements ICardDatabase, IDeckGenPool {
return tryGetCard(request); return tryGetCard(request);
} }
public String getCardCollectorNumber(String cardName, String reqEdition) { public String getCardCollectorNumber(String cardName, String reqEdition, int artIndex) {
cardName = getName(cardName); cardName = getName(cardName);
CardEdition edition = editions.get(reqEdition); CardEdition edition = editions.get(reqEdition);
if (edition == null) if (edition == null)
return null; return null;
int numMatches = 0;
for (CardInSet card : edition.getCards()) { for (CardInSet card : edition.getCards()) {
if (card.name.equalsIgnoreCase(cardName)) { if (card.name.equalsIgnoreCase(cardName)) {
numMatches += 1;
if (numMatches == artIndex) {
return card.collectorNumber; return card.collectorNumber;
} }
} }
}
return null; return null;
} }

3
forge-gui/src/main/java/forge/util/ImageFetcher.java
View File

@@ -50,8 +50,9 @@ public abstract class ImageFetcher {
setDownload.append(ImageUtil.getDownloadUrl(paperCard, backFace)); setDownload.append(ImageUtil.getDownloadUrl(paperCard, backFace));
downloadUrls.add(setDownload.toString()); downloadUrls.add(setDownload.toString());
int artIndex = Integer.parseInt(imageKey.split("\\|")[2]);
final StaticData data = StaticData.instance(); final StaticData data = StaticData.instance();
final String cardNum = data.getCommonCards().getCardCollectorNumber(paperCard.getName(), paperCard.getEdition()); final String cardNum = data.getCommonCards().getCardCollectorNumber(paperCard.getName(), paperCard.getEdition(), artIndex);
if (cardNum != null) { if (cardNum != null) {
String suffix = ""; String suffix = "";
if (paperCard.getRules().getOtherPart() != null) { if (paperCard.getRules().getOtherPart() != null) {