External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 04:52:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Basic lands with multiple art not showing up #2430

Browse source
This commit is contained in:
JOAC69 2016-10-28 21:01:35 -05:00
parent 5ae33f1d54
commit 8191a9cba0
105 changed files with 770 additions and 641 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Mage/src/main/java/mage/cards/ExpansionSet.java
View file

@ -52,7 +52,6 @@ public abstract class ExpansionSet implements Serializable {
private final String cardNumber;
private final Rarity rarity;
private final Class<?> cardClass;
private final boolean usesVariousArt;
private final CardGraphicInfo graphicInfo;
public SetCardInfo(String name, int cardNumber, Rarity rarity, Class<?> cardClass) {
@ -72,11 +71,6 @@ public abstract class ExpansionSet implements Serializable {
this.cardNumber = cardNumber;
this.rarity = rarity;
this.cardClass = cardClass;
if (graphicInfo != null) {
this.usesVariousArt = graphicInfo.getUsesVariousArt();
} else {
usesVariousArt = false;
}
this.graphicInfo = graphicInfo;
}
@ -96,10 +90,6 @@ public abstract class ExpansionSet implements Serializable {
return this.cardClass;
}
public boolean getUsesVariousArt() {
return this.usesVariousArt;
}
public CardGraphicInfo getGraphicInfo() {
return this.graphicInfo;
}

9
Mage/src/main/java/mage/cards/repository/CardInfo.java
View file

@ -101,6 +101,8 @@ public class CardInfo {
@DatabaseField
protected String frameStyle;
@DatabaseField
protected boolean variousArt;
@DatabaseField
protected boolean splitCard;
@DatabaseField
protected boolean splitCardHalf;
@ -141,6 +143,7 @@ public class CardInfo {
this.frameStyle = card.getFrameStyle().toString();
this.frameColor = card.getFrameColor(null).toString();
this.variousArt = card.getUsesVariousArt();
this.blue = card.getColor(null).isBlue();
this.black = card.getColor(null).isBlack();
this.green = card.getColor(null).isGreen();
@ -211,11 +214,7 @@ public class CardInfo {
}
}
public boolean usesVariousArt() {
return getRarity().equals(Rarity.LAND)
|| Character.isDigit(className.charAt(className.length() - 1))
|| !Character.isDigit(cardNumber.charAt(cardNumber.length() - 1));
}
public boolean usesVariousArt() { return variousArt; }
public ObjectColor getColor() {
ObjectColor color = new ObjectColor();

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -62,7 +62,7 @@ public enum CardRepository {
private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE";
private static final String VERSION_ENTITY_NAME = "card";
// raise this if db structure was changed
private static final long CARD_DB_VERSION = 47;
private static final long CARD_DB_VERSION = 48;
// raise this if new cards were added to the server
private static final long CARD_CONTENT_VERSION = 64;