rework-face-down-cards

Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java

@@ -150,32 +150,7 @@ public void focusLost(FocusEvent e) {
 
         // Both card rendering implementations have a transform button
         if (this.getGameCard().canTransform()) {
-            // Create the day night button
-            dayNightButton = new JButton("");
-            dayNightButton.setSize(32, 32);
-            dayNightButton.setToolTipText("This permanent is a double faced card. To see the card's other face, push this button or move mouse wheel down while hovering over it.");
-            BufferedImage day = ImageManagerImpl.instance.getDayImage();
-            dayNightButton.setIcon(new ImageIcon(day));
-            dayNightButton.addActionListener(e -> {
-                // if card is rotating then ignore it
-                if (animationInProgress) {
-                    return;
-                }
-
-                // if card is tapped then no visual transforming is possible, so switch it immediately
-                if (isTapped()) {
-                    // toggle without animation
-                    this.getTopPanelRef().toggleTransformed();
-                    this.getTopPanelRef().repaint();
-                    return;
-                }
-
-                // normal animation
-                Animation.transformCard(this);
-            });
-
-            // Add it
-            buttonPanel.add(dayNightButton);
+            createDayNightButton();
         }
 
         // Both card rendering implementations have a view copy source button
@@ -217,6 +192,35 @@ public void focusLost(FocusEvent e) {
         setFlippedAngle(isFlipped() ? CardPanel.FLIPPED_ANGLE : 0);
     }
 
+    private void createDayNightButton() {
+        // Create the day night button
+        dayNightButton = new JButton("");
+        dayNightButton.setSize(32, 32);
+        dayNightButton.setToolTipText("This permanent is a double faced card. To see the card's other face, push this button or move mouse wheel down while hovering over it.");
+        BufferedImage day = ImageManagerImpl.instance.getDayImage();
+        dayNightButton.setIcon(new ImageIcon(day));
+        dayNightButton.addActionListener(e -> {
+            // if card is rotating then ignore it
+            if (animationInProgress) {
+                return;
+            }
+
+            // if card is tapped then no visual transforming is possible, so switch it immediately
+            if (isTapped()) {
+                // toggle without animation
+                this.getTopPanelRef().toggleTransformed();
+                this.getTopPanelRef().repaint();
+                return;
+            }
+
+            // normal animation
+            Animation.transformCard(this);
+        });
+
+        // Add it
+        buttonPanel.add(dayNightButton);
+    }
+
     @Override
     public void doLayout() {
         // Position transform and show source buttons
@@ -585,6 +589,14 @@ public void update(CardView card) {
             dayNightButton.setVisible(true); // show T button for any cards and permanents
             dayNightButton.setIcon(new ImageIcon(transformIcon));
         }
+        // Card became transformable
+        if (card.canTransform() && dayNightButton == null) {
+            createDayNightButton();
+        }
+        // Card became non-transformable
+        if (!card.canTransform() && !this.cardSideMain.canTransform() && dayNightButton != null) {
+            dayNightButton.setVisible(false);
+        }
     }
 
     @Override
@@ -944,7 +956,9 @@ private void setGameCardSides(CardView gameCard) {
             this.cardSideOther = gameCard.getSecondCardFace();
         } else {
             // updated card
-            if (this.cardSideMain.getName().equals(gameCard.getName())) {
+            if (this.cardSideMain.getName().equals(gameCard.getName())
+                    || (!(this.cardSideMain instanceof PermanentView) && !gameCard.getName().equals(this.cardSideMain.getName()) && gameCard.getSecondCardFace() != null)
+                    || (gameCard instanceof PermanentView && !(gameCard.getName().equals(this.cardSideMain.getName())))) {
                 // from main side
                 this.cardSideMain = gameCard;
                 this.cardSideOther = gameCard.getSecondCardFace();