External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

images: fixed miss token image in some use cases (if it was created from a card and a set contains multiple images);

Browse source
This commit is contained in:
Oleg Agafonov 2024-05-26 12:56:03 +04:00
parent 8e2ff2db0f
commit 0e39d6a833
18 changed files with 82 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Mage.Client/src/main/java/org/mage/plugins/card/utils/CardImageUtils.java
View file

@ -155,9 +155,15 @@ public final class CardImageUtils {
return "ERROR: empty image file name, object type - " + card.getMageObjectType();
}
if (card.getMageObjectType().isUseTokensRepository()
|| card.getExpansionSetCode().equals(TokenRepository.XMAGE_TOKENS_SET_CODE)) {
// token images or inner cards like face down
boolean isTokenRepository = card.getMageObjectType().isUseTokensRepository()
|| card.getExpansionSetCode().equals(TokenRepository.XMAGE_TOKENS_SET_CODE);
// if token from a card then must use card repository instead
if (isTokenRepository && !card.getCardNumber().isEmpty()) {
isTokenRepository = false;
}
if (isTokenRepository) {
// images from tokens repository (token + xmage token)
CardDownloadData cardData = new CardDownloadData(
imageFileName.replace(" Token", ""),
card.getExpansionSetCode(),
@ -167,18 +173,7 @@ public final class CardImageUtils {
cardData.setToken(true);
imageFile = CardImageUtils.buildImagePathToCardOrToken(cardData);
} else {
// card images
// workaround to find various art settings first
// TODO: no needs in workaround?! ?!
boolean usesVariousArt = false;
CardInfo cardInfo = CardRepository.instance.findCardWithPreferredSetAndNumber(
card.getName(),
card.getExpansionSetCode(),
card.getCardNumber()
);
if (cardInfo != null) {
usesVariousArt = cardInfo.usesVariousArt();
}
// images from cards repository (card + token from cards)
CardDownloadData cardData = new CardDownloadData(
imageFileName,
card.getExpansionSetCode(),