diff --git a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java index d8386887681..bea5f97b111 100644 --- a/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java +++ b/Mage.Client/src/main/java/mage/client/deckeditor/collection/viewer/MageBook.java @@ -398,18 +398,6 @@ public class MageBook extends JComponent { cardImg.setCardCaptionTopOffset(8); // card caption below real card caption to see full name even with mana icons - boolean implemented = card.getRarity() != Rarity.NA; - - // implemented label - // old code, nowadays app load only implemented cards (JayDi85, 23.11.2017) - /* - GlowText label = new GlowText(); - label.setGlow(implemented ? Color.green : NOT_IMPLEMENTED, 12, 0.0f); - label.setText(implemented ? "Implemented" : "Not implemented"); - int dx = implemented ? 15 : 5; - label.setBounds(rectangle.x + dx, rectangle.y + cardDimensions.frameHeight + 7, 110, 30); - jLayeredPane.add(label); - */ // card number label JLabel cardNumber = new JLabel(); int dy = -5; // image panel have empty space in bottom (bug?), need to move label up diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java index 6f55636670f..c8a403dc3d1 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/card/CardPluginImpl.java @@ -121,16 +121,14 @@ public class CardPluginImpl implements CardPlugin { @Override public MagePermanent getMagePermanent(PermanentView permanent, Dimension dimension, UUID gameId, ActionCallback callback, boolean canBeFoil, boolean loadImage) { CardPanel cardPanel = makePanel(permanent, gameId, loadImage, callback, false, dimension); - boolean implemented = permanent.getRarity() != Rarity.NA; - cardPanel.setShowCastingCost(implemented); + cardPanel.setShowCastingCost(true); return cardPanel; } @Override public MagePermanent getMageCard(CardView cardView, Dimension dimension, UUID gameId, ActionCallback callback, boolean canBeFoil, boolean loadImage) { CardPanel cardPanel = makePanel(cardView, gameId, loadImage, callback, false, dimension); - boolean implemented = cardView.getRarity() != null && cardView.getRarity() != Rarity.NA; - cardPanel.setShowCastingCost(implemented); + cardPanel.setShowCastingCost(true); return cardPanel; } diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java index 077f7938dd9..cdd9b22e66c 100644 --- a/Mage.Common/src/main/java/mage/view/CardView.java +++ b/Mage.Common/src/main/java/mage/view/CardView.java @@ -512,7 +512,7 @@ public class CardView extends SimpleCardView { } if (this.rarity == null && object instanceof StackAbility) { StackAbility stackAbility = (StackAbility) object; - this.rarity = Rarity.NA; + this.rarity = Rarity.SPECIAL; this.rules = new ArrayList<>(); this.rules.add(stackAbility.getRule()); if (stackAbility.getZone() == Zone.COMMAND) { @@ -644,7 +644,7 @@ public class CardView extends SimpleCardView { this.frameColor = token.getFrameColor(null); this.frameStyle = token.getFrameStyle(); this.manaCost = token.getManaCost().getSymbols(); - this.rarity = Rarity.NA; + this.rarity = Rarity.SPECIAL; this.type = token.getTokenType(); this.tokenDescriptor = token.getTokenDescriptor(); this.tokenSetCode = token.getOriginalExpansionSetCode(); diff --git a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java index e3943352f94..6a1b3c449e6 100644 --- a/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/MorphAbility.java @@ -283,7 +283,7 @@ public class MorphAbility extends StaticAbility implements AlternativeSourceCost mageObject.getManaCost().clear(); if (mageObject instanceof Permanent) { ((Permanent) mageObject).setExpansionSetCode(""); - ((Permanent) mageObject).setRarity(Rarity.NA); + ((Permanent) mageObject).setRarity(Rarity.SPECIAL); } } diff --git a/Mage/src/main/java/mage/constants/Rarity.java b/Mage/src/main/java/mage/constants/Rarity.java index d57ff3636c9..b8fbf3259e2 100644 --- a/Mage/src/main/java/mage/constants/Rarity.java +++ b/Mage/src/main/java/mage/constants/Rarity.java @@ -6,7 +6,6 @@ package mage.constants; */ public enum Rarity { - NA ("na", "na", "N", 0), LAND ("Land", "common", "C", 1), COMMON ("Common", "common", "C", 1), UNCOMMON ("Uncommon", "uncommon", "U", 2),