From b0cde1cd2e39b7c144e3016772dcde361b3b4747 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Mon, 17 Apr 2023 21:01:43 +0800
Subject: [PATCH] enable option to zoom view rotated battle cards

---
 forge-gui-mobile/src/forge/card/CardImageRenderer.java | 2 +-
 forge-gui-mobile/src/forge/card/CardRenderer.java      | 2 +-
 forge-gui/res/languages/en-US.properties               | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
index e55dd3f79a7..72a89af6a9e 100644
--- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
@@ -802,7 +802,7 @@ public class CardImageRenderer {
                 croppedArea = 0.975f;
                 minusxy = 0.135f * radius;
             }
-            if (rotatePlane && (card.getCurrentState().isPhenomenon() || card.getCurrentState().isPlane())) {
+            if (rotatePlane && (card.getCurrentState().isPhenomenon() || card.getCurrentState().isPlane() || (card.getCurrentState().isBattle() && !altState) || (card.getAlternateState() != null && card.getAlternateState().isBattle() && altState))) {
                 if (Forge.enableUIMask.equals("Full")) {
                     if (image.toString().contains(".fullborder."))
                         g.drawCardRoundRect(image, new_x, new_y, new_w, new_h, new_x + new_w / 2, new_y + new_h / 2, -90);
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index 9387ef759fe..8fd37c2f3f2 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -637,7 +637,7 @@ public class CardRenderer {
                     g.drawCardImage(image, crack_overlay, x, y, w, h, card.wasDestroyed(), magnify ? false : card.getDamage() > 0);
             } else {
                 if (FModel.getPreferences().getPrefBoolean(ForgePreferences.FPref.UI_ROTATE_PLANE_OR_PHENOMENON)
-                        && (card.getCurrentState().isPhenomenon() || card.getCurrentState().isPlane()) && rotate) {
+                        && (card.getCurrentState().isPhenomenon() || card.getCurrentState().isPlane() || (card.getCurrentState().isBattle() && !showAltState) || (card.getAlternateState() != null && card.getAlternateState().isBattle() && showAltState)) && rotate) {
                     if (Forge.enableUIMask.equals("Full")) {
                         if (image.toString().contains(".fullborder."))
                             g.drawCardRoundRect(image, x, y, w, h, x + w / 2, y + h / 2, -90);
diff --git a/forge-gui/res/languages/en-US.properties b/forge-gui/res/languages/en-US.properties
index b5e49a87152..6098a611e21 100644
--- a/forge-gui/res/languages/en-US.properties
+++ b/forge-gui/res/languages/en-US.properties
@@ -1020,7 +1020,7 @@ lblMinimizeScreenLock=Minimize on Screen Lock
 lblOrderGraveyard=Order Graveyard
 lblRestartForge=Restart Forge
 lblRestartForgeDescription=You must restart Forge for this change to take effect.
-lblRotateZoomPlanesPhenomena=Rotate Zoom Image of Planes/Phenomena
+lblRotateZoomPlanesPhenomena=Rotate Zoom Image of Battle/Planes/Phenomena
 lblRotateZoomSplit=Rotate Zoom Image of Split Cards
 lblShowAbilityIconsOverlays=Show Ability Icons
 lblShowCardIDOverlays=Show Card ID Overlays
@@ -1043,7 +1043,7 @@ nlHotSeatMode=When starting a game with 2 human players, use single prompt to co
 nlLandscapeMode=Use landscape (horizontal) orientation for app instead of portrait (vertical).
 nlMinimizeScreenLock=Minimize Forge when screen is locked (enable if you experience graphic glitches after locking your screen).
 nlOrderGraveyard=Determines when to allow to order cards going to graveyard (never/always/only with relevant cards).
-nlRotateZoomPlanesPhenomena=Rotates the zoomed image of Plane or Phenomenon cards.
+nlRotateZoomPlanesPhenomena=Rotates the zoomed image of Battle, Plane or Phenomenon cards.
 nlRotateZoomSplit=Rotates the zoomed image of split cards.
 nlShowAbilityIconsOverlays=Show ability icons for cards, otherwise they''re hidden.
 nlShowCardIDOverlays=Show id overlays for cards, otherwise they''re hidden.