diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java index 9f9fbec7f49..d43377b31a5 100644 --- a/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java +++ b/Mage.Client/src/main/java/org/mage/card/arcane/ModernCardRenderer.java @@ -20,6 +20,7 @@ import java.awt.font.LineBreakMeasurer; import java.awt.font.TextAttribute; import java.awt.font.TextLayout; import java.awt.font.TextMeasurer; +import java.awt.geom.Rectangle2D; import java.awt.geom.RoundRectangle2D; import java.awt.image.BufferedImage; import java.io.IOException; @@ -32,6 +33,7 @@ import java.util.Collection; import java.util.List; import javax.swing.ImageIcon; import mage.ObjectColor; +import mage.cards.FrameStyle; import mage.client.dialog.PreferencesDialog; import mage.constants.CardType; import mage.view.CardView; @@ -159,6 +161,7 @@ public class ModernCardRenderer extends CardRenderer { // How far down the card is the type line placed? protected static float TYPE_LINE_Y_FRAC = 0.57f; // x cardHeight protected static float TYPE_LINE_Y_FRAC_TOKEN = 0.70f; + protected static float TYPE_LINE_Y_FRAC_FULL_ART = 0.74f; protected int typeLineY; // How large is the box text, and how far is it down the boxes @@ -203,11 +206,7 @@ public class ModernCardRenderer extends CardRenderer { BOX_HEIGHT_FRAC * cardHeight); // Type line at - if (cardView.isToken()) { - typeLineY = (int) (TYPE_LINE_Y_FRAC_TOKEN * cardHeight); - } else { - typeLineY = (int) (TYPE_LINE_Y_FRAC * cardHeight); - } + typeLineY = (int)(getTypeLineYFrac() * cardHeight); // Box text height boxTextHeight = getTextHeightForBoxHeight(boxHeight); @@ -235,7 +234,7 @@ public class ModernCardRenderer extends CardRenderer { borderColor = new Color(250, 250, 0, 230); } else if (cardView.isPlayable()) { borderColor = new Color(153, 102, 204, 200); - } else if (cardView instanceof PermanentView && ((PermanentView) cardView).isCanAttack()) { + } else if (cardView.isCanAttack()) { borderColor = new Color(0, 0, 255, 230); } else { borderColor = Color.BLACK; @@ -292,18 +291,58 @@ public class ModernCardRenderer extends CardRenderer { } } + /** + * Get the region to slice out of a source art image for the card + * @return + */ + private Rectangle2D getArtRect() { + Rectangle2D rect; + if (cardView.getFrameStyle().isFullArt()) { + rect = new Rectangle2D.Float(.079f, .11f, .84f, .63f); + } else { + rect = new Rectangle2D.Float(.079f, .11f, .84f, .42f); + } + return rect; + } + + private float getTypeLineYFrac() { + if (cardView.isToken()) { + return TYPE_LINE_Y_FRAC; + } else if (cardView.getFrameStyle().isFullArt()) { + return TYPE_LINE_Y_FRAC_FULL_ART; + } else { + return TYPE_LINE_Y_FRAC; + } + } + @Override protected void drawArt(Graphics2D g) { if (artImage != null && !cardView.isFaceDown()) { - int imgWidth = artImage.getWidth(); - int imgHeight = artImage.getHeight(); + Rectangle2D artRect = getArtRect(); + + // Perform a process to make sure that the art is scaled uniformly to fill the frame, cutting + // off the minimum amount necessary to make it completely fill the frame without "squashing" it. + double fullCardImgWidth = artImage.getWidth(); + double fullCardImgHeight = artImage.getHeight(); + double artWidth = artRect.getWidth() * fullCardImgWidth; + double artHeight = artRect.getHeight() * fullCardImgHeight; + double targetWidth = contentWidth - 2; + double targetHeight = typeLineY - totalContentInset - boxHeight; + double targetAspect = targetWidth / targetHeight; + if (targetAspect * artHeight < artWidth) { + // Trim off some width + artWidth = targetAspect * artHeight; + } else { + // Trim off some height + artHeight = artWidth / targetAspect; + } BufferedImage subImg = artImage.getSubimage( - (int) (.079 * imgWidth), (int) (.11 * imgHeight), - (int) (.84 * imgWidth), (int) (.42 * imgHeight)); + (int)(artRect.getX() * fullCardImgWidth), (int)(artRect.getY() * fullCardImgHeight), + (int)artWidth, (int)artHeight); g.drawImage(subImg, totalContentInset + 1, totalContentInset + boxHeight, - contentWidth - 2, typeLineY - totalContentInset - boxHeight, + (int)targetWidth, (int)targetHeight, null); } } @@ -664,7 +703,6 @@ public class ModernCardRenderer extends CardRenderer { attributedRules.add(attributed); remaining -= drawSingleRule(g, attributed, rule, 0, 0, w, remaining, false); if (remaining < 0) { - useSmallFont = true; break; } } @@ -676,7 +714,7 @@ public class ModernCardRenderer extends CardRenderer { if (remaining <= 0) { spacing = 0; } else { - spacing = (int) (remaining / (hasKeywords + spacing = (int) (((float)remaining) / (hasKeywords ? (textboxRules.size() + 2) : (textboxRules.size() + 1))); } diff --git a/Mage.Common/src/mage/view/CardView.java b/Mage.Common/src/mage/view/CardView.java index 18ef48839e9..aadc38d4ca7 100644 --- a/Mage.Common/src/mage/view/CardView.java +++ b/Mage.Common/src/mage/view/CardView.java @@ -36,6 +36,7 @@ import mage.abilities.Mode; import mage.abilities.SpellAbility; import mage.abilities.costs.mana.ManaCosts; import mage.cards.Card; +import mage.cards.FrameStyle; import mage.cards.SplitCard; import mage.constants.AbilityType; import mage.constants.CardType; @@ -74,6 +75,7 @@ public class CardView extends SimpleCardView { protected List superTypes; protected ObjectColor color; protected ObjectColor frameColor; + protected FrameStyle frameStyle; protected List manaCost; protected int convertedManaCost; protected Rarity rarity; @@ -334,7 +336,10 @@ public class CardView extends SimpleCardView { } // Frame color - this.frameColor = card.getFrameColor(game); + this.frameColor = card.getFrameColor(game); + + // Frame style + this.frameStyle = card.getFrameStyle(); // Get starting loyalty this.startingLoyalty = "" + card.getStartingLoyalty(); @@ -384,6 +389,8 @@ public class CardView extends SimpleCardView { } // Frame color this.frameColor = object.getFrameColor(null); + // Frame style + this.frameStyle = object.getFrameStyle(); // Starting loyalty. Must be extracted from an ability this.startingLoyalty = "" + object.getStartingLoyalty(); } @@ -401,6 +408,7 @@ public class CardView extends SimpleCardView { this.displayName = name; this.rules = emblem.getRules(); // emblem images are always with common (black) symbol + this.frameStyle = FrameStyle.M15_NORMAL; this.expansionSetCode = emblem.getExpansionSetCode(); this.rarity = Rarity.COMMON; } @@ -426,6 +434,7 @@ public class CardView extends SimpleCardView { this.superTypes = new ArrayList<>(); this.color = new ObjectColor(); this.frameColor = new ObjectColor(); + this.frameStyle = FrameStyle.M15_NORMAL; this.manaCost = new ArrayList<>(); this.convertedManaCost = 0; @@ -472,6 +481,7 @@ public class CardView extends SimpleCardView { this.superTypes = token.getSupertype(); this.color = token.getColor(null); this.frameColor = token.getFrameColor(null); + this.frameStyle = token.getFrameStyle(); this.manaCost = token.getManaCost().getSymbols(); this.rarity = Rarity.NA; this.type = token.getTokenType(); @@ -559,6 +569,10 @@ public class CardView extends SimpleCardView { return frameColor; } + public FrameStyle getFrameStyle() { + return frameStyle; + } + public List getManaCost() { return manaCost; } diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java index 23bcb9ceaf6..26591a9a751 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest10.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Forest10 extends mage.cards.basiclands.Forest { public Forest10(UUID ownerId) { super(ownerId, "274b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Forest10(final Forest10 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java index 071eb8bd523..0c43ccd9b94 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest6.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Forest6 extends mage.cards.basiclands.Forest { public Forest6(UUID ownerId) { super(ownerId, "270b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Forest6(final Forest6 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java index e29564f4de8..bce2002c3e1 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest7.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Forest7 extends mage.cards.basiclands.Forest { public Forest7(UUID ownerId) { super(ownerId, "271b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Forest7(final Forest7 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java index 2d94070106b..e868b1aa790 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest8.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Forest8 extends mage.cards.basiclands.Forest { public Forest8(UUID ownerId) { super(ownerId, "272b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Forest8(final Forest8 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java index a705c9921e9..f573b6c4fd9 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Forest9.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Forest9 extends mage.cards.basiclands.Forest { public Forest9(UUID ownerId) { super(ownerId, "273b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Forest9(final Forest9 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island10.java index 05f385c2b9a..5f0256baaca 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Island10.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island10.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Island10 extends mage.cards.basiclands.Island { public Island10(UUID ownerId) { super(ownerId, "259b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Island10(final Island10 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island6.java index 1119555f32b..f290b4f236c 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Island6.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island6.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Island6 extends mage.cards.basiclands.Island { public Island6(UUID ownerId) { super(ownerId, "255b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Island6(final Island6 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island7.java index 7547fa7be83..bb4a6550b5f 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Island7.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island7.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Island7 extends mage.cards.basiclands.Island { public Island7(UUID ownerId) { super(ownerId, "256b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Island7(final Island7 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island8.java index b8aad3f54ef..67011f5b88a 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Island8.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island8.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Island8 extends mage.cards.basiclands.Island { public Island8(UUID ownerId) { super(ownerId, "257b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Island8(final Island8 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Island9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Island9.java index 522a3b4e37c..cb30559c286 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Island9.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Island9.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Island9 extends mage.cards.basiclands.Island { public Island9(UUID ownerId) { super(ownerId, "258b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Island9(final Island9 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java index 1a62598d04e..a24673020c4 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain10.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Mountain10 extends mage.cards.basiclands.Mountain { public Mountain10(UUID ownerId) { super(ownerId, "269b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Mountain10(final Mountain10 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java index 921cbeaf36f..a87ab4f8763 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain6.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Mountain6 extends mage.cards.basiclands.Mountain { public Mountain6(UUID ownerId) { super(ownerId, "265b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Mountain6(final Mountain6 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java index 1c23f5e64e6..736c1c89727 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain7.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Mountain7 extends mage.cards.basiclands.Mountain { public Mountain7(UUID ownerId) { super(ownerId, "266b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Mountain7(final Mountain7 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java index 755f49ea6cb..993a7eda3a4 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain8.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Mountain8 extends mage.cards.basiclands.Mountain { public Mountain8(UUID ownerId) { super(ownerId, "267b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Mountain8(final Mountain8 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java index 8713dfa46f2..8a84c352743 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Mountain9.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Mountain9 extends mage.cards.basiclands.Mountain { public Mountain9(UUID ownerId) { super(ownerId, "268b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Mountain9(final Mountain9 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java index ac9c617c3cf..fd7da2141f2 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains10.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Plains10 extends mage.cards.basiclands.Plains { public Plains10(UUID ownerId) { super(ownerId, "254b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Plains10(final Plains10 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java index ed3ec52d2bc..ea8c621347e 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains6.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Plains6 extends mage.cards.basiclands.Plains { public Plains6(UUID ownerId) { super(ownerId, "250b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Plains6(final Plains6 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java index a054d77cd4e..18dc050daf1 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains7.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Plains7 extends mage.cards.basiclands.Plains { public Plains7(UUID ownerId) { super(ownerId, "251b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Plains7(final Plains7 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java index 6487b287144..593eed20866 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains8.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Plains8 extends mage.cards.basiclands.Plains { public Plains8(UUID ownerId) { super(ownerId, "252b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Plains8(final Plains8 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java index 4ee62071825..74e3a5f1ffe 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Plains9.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Plains9 extends mage.cards.basiclands.Plains { public Plains9(UUID ownerId) { super(ownerId, "253b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Plains9(final Plains9 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java index 60b17fd3189..8985a774f69 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp10.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Swamp10 extends mage.cards.basiclands.Swamp { public Swamp10(UUID ownerId) { super(ownerId, "264b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Swamp10(final Swamp10 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java index 165f8ae6065..f9807246c45 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp6.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Swamp6 extends mage.cards.basiclands.Swamp { public Swamp6(UUID ownerId) { super(ownerId, "260b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Swamp6(final Swamp6 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java index e54203cdc35..38a79c536b7 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp7.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Swamp7 extends mage.cards.basiclands.Swamp { public Swamp7(UUID ownerId) { super(ownerId, "261b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Swamp7(final Swamp7 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java index 0bfd1222dd1..8cf2d4c9095 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp8.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Swamp8 extends mage.cards.basiclands.Swamp { public Swamp8(UUID ownerId) { super(ownerId, "262b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Swamp8(final Swamp8 card) { diff --git a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java index 93d9cb9b3c2..40e71315231 100644 --- a/Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java +++ b/Mage.Sets/src/mage/sets/battleforzendikar/Swamp9.java @@ -27,6 +27,8 @@ */ package mage.sets.battleforzendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Swamp9 extends mage.cards.basiclands.Swamp { public Swamp9(UUID ownerId) { super(ownerId, "263b"); this.expansionSetCode = "BFZ"; + this.frameStyle = FrameStyle.BFZ_FULL_ART_BASIC; } public Swamp9(final Swamp9 card) { diff --git a/Mage.Sets/src/mage/sets/unglued/Forest.java b/Mage.Sets/src/mage/sets/unglued/Forest.java index 0a2e9c6efcd..af36707085d 100644 --- a/Mage.Sets/src/mage/sets/unglued/Forest.java +++ b/Mage.Sets/src/mage/sets/unglued/Forest.java @@ -28,6 +28,8 @@ package mage.sets.unglued; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Forest extends mage.cards.basiclands.Forest { public Forest(UUID ownerId) { super(ownerId, 88); this.expansionSetCode = "UGL"; + this.frameStyle = FrameStyle.UGL_FULL_ART_BASIC; } public Forest(final Forest card) { diff --git a/Mage.Sets/src/mage/sets/unglued/Island.java b/Mage.Sets/src/mage/sets/unglued/Island.java index 920b04f02fb..41fc841572b 100644 --- a/Mage.Sets/src/mage/sets/unglued/Island.java +++ b/Mage.Sets/src/mage/sets/unglued/Island.java @@ -28,6 +28,8 @@ package mage.sets.unglued; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Island extends mage.cards.basiclands.Island { public Island(UUID ownerId) { super(ownerId, 85); this.expansionSetCode = "UGL"; + this.frameStyle = FrameStyle.UGL_FULL_ART_BASIC; } public Island(final Island card) { diff --git a/Mage.Sets/src/mage/sets/unglued/Mountain.java b/Mage.Sets/src/mage/sets/unglued/Mountain.java index d5d44f093d2..bbae44704a7 100644 --- a/Mage.Sets/src/mage/sets/unglued/Mountain.java +++ b/Mage.Sets/src/mage/sets/unglued/Mountain.java @@ -28,6 +28,8 @@ package mage.sets.unglued; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Mountain extends mage.cards.basiclands.Mountain { public Mountain(UUID ownerId) { super(ownerId, 87); this.expansionSetCode = "UGL"; + this.frameStyle = FrameStyle.UGL_FULL_ART_BASIC; } public Mountain(final Mountain card) { diff --git a/Mage.Sets/src/mage/sets/unglued/Plains.java b/Mage.Sets/src/mage/sets/unglued/Plains.java index 227e3382501..8d2d55c6e11 100644 --- a/Mage.Sets/src/mage/sets/unglued/Plains.java +++ b/Mage.Sets/src/mage/sets/unglued/Plains.java @@ -28,6 +28,8 @@ package mage.sets.unglued; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Plains extends mage.cards.basiclands.Plains { public Plains(UUID ownerId) { super(ownerId, 84); this.expansionSetCode = "UGL"; + this.frameStyle = FrameStyle.UGL_FULL_ART_BASIC; } public Plains(final Plains card) { diff --git a/Mage.Sets/src/mage/sets/unglued/Swamp.java b/Mage.Sets/src/mage/sets/unglued/Swamp.java index 9b697185af2..93ddbcddb88 100644 --- a/Mage.Sets/src/mage/sets/unglued/Swamp.java +++ b/Mage.Sets/src/mage/sets/unglued/Swamp.java @@ -28,6 +28,8 @@ package mage.sets.unglued; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Swamp extends mage.cards.basiclands.Swamp { public Swamp(UUID ownerId) { super(ownerId, 86); this.expansionSetCode = "UGL"; + this.frameStyle = FrameStyle.UGL_FULL_ART_BASIC; } public Swamp(final Swamp card) { diff --git a/Mage.Sets/src/mage/sets/unhinged/Forest.java b/Mage.Sets/src/mage/sets/unhinged/Forest.java index f13f00a0689..790991118b5 100644 --- a/Mage.Sets/src/mage/sets/unhinged/Forest.java +++ b/Mage.Sets/src/mage/sets/unhinged/Forest.java @@ -28,6 +28,8 @@ package mage.sets.unhinged; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -38,6 +40,7 @@ public class Forest extends mage.cards.basiclands.Forest { public Forest(UUID ownerId) { super(ownerId, 140); this.expansionSetCode = "UNH"; + this.frameStyle = FrameStyle.UNH_FULL_ART_BASIC; } public Forest(final Forest card) { diff --git a/Mage.Sets/src/mage/sets/unhinged/Island.java b/Mage.Sets/src/mage/sets/unhinged/Island.java index 9890a84206e..24c3163b25e 100644 --- a/Mage.Sets/src/mage/sets/unhinged/Island.java +++ b/Mage.Sets/src/mage/sets/unhinged/Island.java @@ -28,6 +28,8 @@ package mage.sets.unhinged; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Island extends mage.cards.basiclands.Island { public Island(UUID ownerId) { super(ownerId, 137); this.expansionSetCode = "UNH"; + this.frameStyle = FrameStyle.UNH_FULL_ART_BASIC; } public Island(final Island card) { diff --git a/Mage.Sets/src/mage/sets/unhinged/Mountain.java b/Mage.Sets/src/mage/sets/unhinged/Mountain.java index 38b666a6ac7..a75fd46a4e4 100644 --- a/Mage.Sets/src/mage/sets/unhinged/Mountain.java +++ b/Mage.Sets/src/mage/sets/unhinged/Mountain.java @@ -28,6 +28,8 @@ package mage.sets.unhinged; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Mountain extends mage.cards.basiclands.Mountain { public Mountain(UUID ownerId) { super(ownerId, 139); this.expansionSetCode = "UNH"; + this.frameStyle = FrameStyle.UNH_FULL_ART_BASIC; } public Mountain(final Mountain card) { diff --git a/Mage.Sets/src/mage/sets/unhinged/Plains.java b/Mage.Sets/src/mage/sets/unhinged/Plains.java index 95299023e48..a6d7a8c2953 100644 --- a/Mage.Sets/src/mage/sets/unhinged/Plains.java +++ b/Mage.Sets/src/mage/sets/unhinged/Plains.java @@ -28,6 +28,8 @@ package mage.sets.unhinged; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Plains extends mage.cards.basiclands.Plains { public Plains(UUID ownerId) { super(ownerId, 136); this.expansionSetCode = "UNH"; + this.frameStyle = FrameStyle.UNH_FULL_ART_BASIC; } public Plains(final Plains card) { diff --git a/Mage.Sets/src/mage/sets/unhinged/Swamp.java b/Mage.Sets/src/mage/sets/unhinged/Swamp.java index 046793432c6..3d834dddb21 100644 --- a/Mage.Sets/src/mage/sets/unhinged/Swamp.java +++ b/Mage.Sets/src/mage/sets/unhinged/Swamp.java @@ -28,6 +28,8 @@ package mage.sets.unhinged; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Swamp extends mage.cards.basiclands.Swamp { public Swamp(UUID ownerId) { super(ownerId, 138); this.expansionSetCode = "UNH"; + this.frameStyle = FrameStyle.UNH_FULL_ART_BASIC; } public Swamp(final Swamp card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest1.java b/Mage.Sets/src/mage/sets/zendikar/Forest1.java index e652ff9ecc2..6c27a7c2058 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest1.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Forest1 extends mage.cards.basiclands.Forest { public Forest1(UUID ownerId) { super(ownerId, 246); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Forest1(final Forest1 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest2.java b/Mage.Sets/src/mage/sets/zendikar/Forest2.java index 85e7a205ce5..71aa0d39b60 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest2.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Forest2 extends mage.cards.basiclands.Forest { public Forest2(UUID ownerId) { super(ownerId, 247); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Forest2(final Forest2 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest3.java b/Mage.Sets/src/mage/sets/zendikar/Forest3.java index 945157ad0c2..bff8bb8b79b 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest3.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Forest3 extends mage.cards.basiclands.Forest { public Forest3(UUID ownerId) { super(ownerId, 248); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Forest3(final Forest3 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Forest4.java b/Mage.Sets/src/mage/sets/zendikar/Forest4.java index d27e5503d85..2b649c0a816 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Forest4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Forest4.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Forest4 extends mage.cards.basiclands.Forest { public Forest4(UUID ownerId) { super(ownerId, 249); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Forest4(final Forest4 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Island1.java b/Mage.Sets/src/mage/sets/zendikar/Island1.java index 07cae71f787..2c6fc05c0bb 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island1.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Island1 extends mage.cards.basiclands.Island { public Island1(UUID ownerId) { super(ownerId, 234); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Island1(final Island1 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Island2.java b/Mage.Sets/src/mage/sets/zendikar/Island2.java index e048d0a5c0b..b2a8ebd5552 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island2.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Island2 extends mage.cards.basiclands.Island { public Island2(UUID ownerId) { super(ownerId, 235); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Island2(final Island2 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Island3.java b/Mage.Sets/src/mage/sets/zendikar/Island3.java index 927af5ca216..dfe83bc105a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island3.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Island3 extends mage.cards.basiclands.Island { public Island3(UUID ownerId) { super(ownerId, 236); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Island3(final Island3 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Island4.java b/Mage.Sets/src/mage/sets/zendikar/Island4.java index 7d8fca5d2e9..85958159a43 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Island4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Island4.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Island4 extends mage.cards.basiclands.Island { public Island4(UUID ownerId) { super(ownerId, 237); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Island4(final Island4 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain1.java b/Mage.Sets/src/mage/sets/zendikar/Mountain1.java index db56ae4753c..11c3fd8752a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain1.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Mountain1 extends mage.cards.basiclands.Mountain { public Mountain1(UUID ownerId) { super(ownerId, 242); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Mountain1(final Mountain1 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain2.java b/Mage.Sets/src/mage/sets/zendikar/Mountain2.java index 481fd4a3d51..14d8ca24b2d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain2.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Mountain2 extends mage.cards.basiclands.Mountain { public Mountain2(UUID ownerId) { super(ownerId, 243); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Mountain2(final Mountain2 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain3.java b/Mage.Sets/src/mage/sets/zendikar/Mountain3.java index 84127eee56a..56afde0702e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain3.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Mountain3 extends mage.cards.basiclands.Mountain { public Mountain3(UUID ownerId) { super(ownerId, 244); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Mountain3(final Mountain3 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Mountain4.java b/Mage.Sets/src/mage/sets/zendikar/Mountain4.java index 7cc370f32a7..099dd3f474e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Mountain4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Mountain4.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Mountain4 extends mage.cards.basiclands.Mountain { public Mountain4(UUID ownerId) { super(ownerId, 245); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Mountain4(final Mountain4 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains1.java b/Mage.Sets/src/mage/sets/zendikar/Plains1.java index 54057b9cd0d..80bbbe61a8a 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains1.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Plains1 extends mage.cards.basiclands.Plains { public Plains1(UUID ownerId) { super(ownerId, 230); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Plains1(final Plains1 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains2.java b/Mage.Sets/src/mage/sets/zendikar/Plains2.java index 4411aa944f0..f0c7c15c029 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains2.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Plains2 extends mage.cards.basiclands.Plains { public Plains2(UUID ownerId) { super(ownerId, 231); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Plains2(final Plains2 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains3.java b/Mage.Sets/src/mage/sets/zendikar/Plains3.java index 61dcf9a75c4..837d14d639f 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains3.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Plains3 extends mage.cards.basiclands.Plains { public Plains3(UUID ownerId) { super(ownerId, 232); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Plains3(final Plains3 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Plains4.java b/Mage.Sets/src/mage/sets/zendikar/Plains4.java index 550a8724195..67e4a4cb6c8 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Plains4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Plains4.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Plains4 extends mage.cards.basiclands.Plains { public Plains4(UUID ownerId) { super(ownerId, 233); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Plains4(final Plains4 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp1.java b/Mage.Sets/src/mage/sets/zendikar/Swamp1.java index 4c874ddcdf1..391e4886720 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp1.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp1.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Swamp1 extends mage.cards.basiclands.Swamp { public Swamp1(UUID ownerId) { super(ownerId, 238); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Swamp1(final Swamp1 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp2.java b/Mage.Sets/src/mage/sets/zendikar/Swamp2.java index db4208b5758..c4653c9831c 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp2.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp2.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Swamp2 extends mage.cards.basiclands.Swamp { public Swamp2(UUID ownerId) { super(ownerId, 239); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Swamp2(final Swamp2 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp3.java b/Mage.Sets/src/mage/sets/zendikar/Swamp3.java index 4f347cdcbbd..123bd36470d 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp3.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp3.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Swamp3 extends mage.cards.basiclands.Swamp { public Swamp3(UUID ownerId) { super(ownerId, 240); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Swamp3(final Swamp3 card) { diff --git a/Mage.Sets/src/mage/sets/zendikar/Swamp4.java b/Mage.Sets/src/mage/sets/zendikar/Swamp4.java index ffa875496b6..5cd24edba4e 100644 --- a/Mage.Sets/src/mage/sets/zendikar/Swamp4.java +++ b/Mage.Sets/src/mage/sets/zendikar/Swamp4.java @@ -28,6 +28,8 @@ package mage.sets.zendikar; +import mage.cards.FrameStyle; + import java.util.UUID; /** @@ -39,6 +41,7 @@ public class Swamp4 extends mage.cards.basiclands.Swamp { public Swamp4(UUID ownerId) { super(ownerId, 241); this.expansionSetCode = "ZEN"; + this.frameStyle = FrameStyle.ZEN_FULL_ART_BASIC; } public Swamp4(final Swamp4 card) { diff --git a/Mage/src/main/java/mage/cards/FrameStyle.java b/Mage/src/main/java/mage/cards/FrameStyle.java index 4a8c4f4962b..52573fe4491 100644 --- a/Mage/src/main/java/mage/cards/FrameStyle.java +++ b/Mage/src/main/java/mage/cards/FrameStyle.java @@ -18,12 +18,33 @@ public enum FrameStyle { /** * Battle for Zendkiar full art basic lands */ - BFZ_FULL_ART_BASIC(BorderType.M15, true); + BFZ_FULL_ART_BASIC(BorderType.M15, true), + + /** + * Zenkikar full art lands + */ + ZEN_FULL_ART_BASIC(BorderType.MOD, true), + + /** + * Unhinged full art lands + */ + UNH_FULL_ART_BASIC(BorderType.SPC, true), + + /** + * Unglued full art lands + */ + UGL_FULL_ART_BASIC(BorderType.SPC, true); /** * General type of card */ public enum BorderType { + /** + * Various specialty borders + * EG: Unhinged, Unglued + */ + SPC, + /** * Old border cards */ diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index 855323a3d5d..3513f0d6ba6 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -64,7 +64,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 47; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 58; + private static final long CARD_CONTENT_VERSION = 59; private Dao cardDao; private Set classNames;