diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java index 34db51e5225..13ade6765a1 100644 --- a/Mage.Common/src/main/java/mage/view/CardView.java +++ b/Mage.Common/src/main/java/mage/view/CardView.java @@ -706,7 +706,7 @@ public class CardView extends SimpleCardView { this.frameStyle = FrameStyle.M15_NORMAL; this.expansionSetCode = emblem.getExpansionSetCode(); this.cardNumber = ""; - this.imageNumber = 0; + this.imageNumber = emblem.getImageNumber(); this.rarity = Rarity.COMMON; this.playableStats = emblem.playableStats.copy(); diff --git a/Mage.Common/src/main/java/mage/view/CommandObjectView.java b/Mage.Common/src/main/java/mage/view/CommandObjectView.java index 96fe4b25fed..66519a32304 100644 --- a/Mage.Common/src/main/java/mage/view/CommandObjectView.java +++ b/Mage.Common/src/main/java/mage/view/CommandObjectView.java @@ -14,5 +14,7 @@ public interface CommandObjectView extends SelectableObjectView { UUID getId(); + int getImageNumber(); + List getRules(); } diff --git a/Mage.Common/src/main/java/mage/view/DungeonView.java b/Mage.Common/src/main/java/mage/view/DungeonView.java index fa4dbfe1736..4818c70dc09 100644 --- a/Mage.Common/src/main/java/mage/view/DungeonView.java +++ b/Mage.Common/src/main/java/mage/view/DungeonView.java @@ -14,6 +14,7 @@ public class DungeonView implements CommandObjectView, Serializable { protected UUID id; protected String name; + protected int imageNum; protected String expansionSetCode; protected List rules; protected PlayableObjectStats playableStats = new PlayableObjectStats(); @@ -21,6 +22,7 @@ public class DungeonView implements CommandObjectView, Serializable { public DungeonView(Dungeon dungeon) { this.id = dungeon.getId(); this.name = dungeon.getName(); + this.imageNum = dungeon.getImageNumber(); this.expansionSetCode = dungeon.getExpansionSetCode(); this.rules = dungeon.getRules(); } @@ -40,6 +42,11 @@ public class DungeonView implements CommandObjectView, Serializable { return id; } + @Override + public int getImageNumber() { + return imageNum; + } + @Override public List getRules() { return rules; diff --git a/Mage.Common/src/main/java/mage/view/EmblemView.java b/Mage.Common/src/main/java/mage/view/EmblemView.java index 774d6078425..58dc7c89dbe 100644 --- a/Mage.Common/src/main/java/mage/view/EmblemView.java +++ b/Mage.Common/src/main/java/mage/view/EmblemView.java @@ -15,6 +15,7 @@ public class EmblemView implements CommandObjectView, Serializable { protected UUID id; protected String name; + protected int imageNum; protected String expansionSetCode; protected List rules; protected PlayableObjectStats playableStats = new PlayableObjectStats(); @@ -22,6 +23,7 @@ public class EmblemView implements CommandObjectView, Serializable { public EmblemView(Emblem emblem) { this.id = emblem.getId(); this.name = emblem.getName(); + this.imageNum = emblem.getImageNumber(); this.expansionSetCode = emblem.getExpansionSetCode(); this.rules = emblem.getAbilities().getRules(emblem.getName()); } @@ -41,6 +43,11 @@ public class EmblemView implements CommandObjectView, Serializable { return id; } + @Override + public int getImageNumber() { + return imageNum; + } + @Override public List getRules() { return rules; diff --git a/Mage.Common/src/main/java/mage/view/PlaneView.java b/Mage.Common/src/main/java/mage/view/PlaneView.java index 4698c33f141..0372f5b364d 100644 --- a/Mage.Common/src/main/java/mage/view/PlaneView.java +++ b/Mage.Common/src/main/java/mage/view/PlaneView.java @@ -15,6 +15,7 @@ public class PlaneView implements CommandObjectView, Serializable { protected UUID id; protected String name; + protected int imageNum; protected String expansionSetCode; protected List rules; protected PlayableObjectStats playableStats = new PlayableObjectStats(); @@ -22,6 +23,7 @@ public class PlaneView implements CommandObjectView, Serializable { public PlaneView(Plane plane) { this.id = plane.getId(); this.name = plane.getName(); + this.imageNum = plane.getImageNumber(); this.expansionSetCode = plane.getExpansionSetCode(); this.rules = plane.getAbilities().getRules(plane.getName()); } @@ -41,6 +43,11 @@ public class PlaneView implements CommandObjectView, Serializable { return id; } + @Override + public int getImageNumber() { + return imageNum; + } + @Override public List getRules() { return rules;