mirror of
https://github.com/magefree/mage.git
synced 2025-12-25 04:52:07 -08:00
Implemented Split cards, not yet finished. Fuse does not work. Comparation for e.g. converterted mana (708.6a) does also not work correctly.
This commit is contained in:
parent
3ba4dbc515
commit
25948e089e
10 changed files with 361 additions and 5 deletions
|
|
@ -6,7 +6,7 @@ package org.mage.plugins.card.dl.sources;
|
|||
*/
|
||||
public interface CardImageSource {
|
||||
|
||||
String generateURL(Integer collectorId, String cardName, String cardSet, boolean twoFacedCard, boolean secondFace, boolean isFlipCard, boolean flippedView) throws Exception;
|
||||
String generateURL(Integer collectorId, String cardName, String cardSet, boolean twoFacedCard, boolean secondFace, boolean isFlipCard, boolean isSplitCard, boolean flippedView) throws Exception;
|
||||
String generateTokenUrl(String name, String set);
|
||||
Float getAverageSize();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class MagicCardsImageSource implements CardImageSource {
|
|||
}
|
||||
|
||||
@Override
|
||||
public String generateURL(Integer collectorId, String cardName, String cardSet, boolean twoFacedCard, boolean secondSide, boolean isFlipCard, boolean flippedView) throws Exception {
|
||||
public String generateURL(Integer collectorId, String cardName, String cardSet, boolean twoFacedCard, boolean secondSide, boolean isFlipCard, boolean isSplitCard, boolean flippedView) throws Exception {
|
||||
if (collectorId == null || cardSet == null) {
|
||||
throw new Exception("Wrong parameters for image: collector id: " + collectorId + ",card set: " + cardSet);
|
||||
}
|
||||
|
|
@ -74,6 +74,9 @@ public class MagicCardsImageSource implements CardImageSource {
|
|||
if (twoFacedCard) {
|
||||
url.append(secondSide ? "b" : "a");
|
||||
}
|
||||
if (isSplitCard) {
|
||||
url.append("a");
|
||||
}
|
||||
if (isFlipCard) {
|
||||
if (flippedView) { // download rotated by 180 degree image
|
||||
url.append("b");
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ public class WizardCardsImageSource implements CardImageSource {
|
|||
}
|
||||
|
||||
@Override
|
||||
public String generateURL(Integer collectorId, String cardName, String cardSet, boolean twoFacedCard, boolean secondSide, boolean isFlipCard, boolean flippedView) throws Exception {
|
||||
public String generateURL(Integer collectorId, String cardName, String cardSet, boolean twoFacedCard, boolean secondSide, boolean isFlipCard, boolean isSplitCard, boolean flippedView) throws Exception {
|
||||
if (collectorId == null || cardSet == null) {
|
||||
throw new Exception("Wrong parameters for image: collector id: " + collectorId + ",card set: " + cardSet);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,7 @@ public class CardInfo {
|
|||
private boolean secondSide;
|
||||
private boolean flipCard;
|
||||
private boolean flippedSide;
|
||||
private boolean splitCard;
|
||||
private boolean usesVariousArt;
|
||||
|
||||
public CardInfo(String name, String set, Integer collectorId, boolean usesVariousArt, Integer type) {
|
||||
|
|
@ -147,6 +148,14 @@ public class CardInfo {
|
|||
this.flipCard = flipCard;
|
||||
}
|
||||
|
||||
public boolean isSplitCard() {
|
||||
return splitCard;
|
||||
}
|
||||
|
||||
public void setSplitCard(boolean splitCard) {
|
||||
this.splitCard = splitCard;
|
||||
}
|
||||
|
||||
public Integer getType() {
|
||||
return type;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -244,6 +244,9 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
|
|||
if (card.isFlipCard()) {
|
||||
url.setFlipCard(true);
|
||||
}
|
||||
if (card.isSplitCard()) {
|
||||
url.setSplitCard(true);
|
||||
}
|
||||
allCardsUrls.add(url);
|
||||
if (card.canTransform()) {
|
||||
// add second side for downloading
|
||||
|
|
@ -417,7 +420,7 @@ public class DownloadPictures extends DefaultBoundedRangeModel implements Runnab
|
|||
url = cardImageSource.generateTokenUrl(card.getName(), card.getSet());
|
||||
} else {
|
||||
url = cardImageSource.generateURL(card.getCollectorId(), card.getDownloadName(), card.getSet(),
|
||||
card.isTwoFacedCard(), card.isSecondSide(), card.isFlipCard(), card.isFlippedSide());
|
||||
card.isTwoFacedCard(), card.isSecondSide(), card.isFlipCard(), card.isSplitCard(), card.isFlippedSide());
|
||||
}
|
||||
|
||||
if (url != null) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue