From 1ecb00ab85317983458010c850e48a09c28a417c Mon Sep 17 00:00:00 2001
From: Sol <zenchristo@gmail.com>
Date: Sat, 14 Jan 2017 21:14:00 +0000
Subject: [PATCH] - Display PT for nonCreature Vehicles in Mobile where they
 were previously not visible

---
 .../src/forge/card/CardImageRenderer.java             | 10 +++++++++-
 forge-gui-mobile/src/forge/card/CardRenderer.java     | 11 +++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
index f0e3bfddb51..c39320a2374 100644
--- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java
@@ -120,7 +120,7 @@ public class CardImageRenderer {
         float typeBoxHeight = 2 * TYPE_FONT.getCapHeight();
         float ptBoxHeight = 0;
         float textBoxHeight = h - headerHeight - artHeight - typeBoxHeight - outerBorderThickness - artInset;
-        if (state.isCreature() || state.isPlaneswalker()) {
+        if (state.isCreature() || state.isPlaneswalker() || state.getType().hasSubtype("Vehicle")) {
             //if P/T box needed, make room for it
             ptBoxHeight = 2 * PT_FONT.getCapHeight();
             textBoxHeight -= ptBoxHeight;
@@ -287,6 +287,14 @@ public class CardImageRenderer {
         else if (state.isPlaneswalker()) {
             pieces.add(String.valueOf(state.getLoyalty()));
         }
+        else if (state.getType().hasSubtype("Vehicle")) {
+            // TODO Invert color box for Vehicles?
+            pieces.add("[");
+            pieces.add(String.valueOf(state.getPower()));
+            pieces.add("/");
+            pieces.add(String.valueOf(state.getToughness()));
+            pieces.add("]");
+        }
         else { return; }
 
         float padding = Math.round(PT_FONT.getCapHeight() / 4);
diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java
index ba2fdb3fa11..8ce34c7f726 100644
--- a/forge-gui-mobile/src/forge/card/CardRenderer.java
+++ b/forge-gui-mobile/src/forge/card/CardRenderer.java
@@ -244,6 +244,9 @@ public class CardRenderer {
         else if (card.getCurrentState().isPlaneswalker()) {
             type += " (" + loyalty + ")";
         }
+        else if (card.getCurrentState().getType().hasSubtype("Vehicle")) {
+            type += String.format(" [%s / %s]", power, toughness);
+        }
         g.drawText(type, typeFont, foreColor, x, y, availableTypeWidth, lineHeight, false, HAlignment.LEFT, true);
     }
 
@@ -424,6 +427,13 @@ public class CardRenderer {
             pieces.add("/");
             pieces.add(String.valueOf(details.getToughness()));
         }
+        else if (details.getType().hasSubtype("Vehicle")) {
+            pieces.add("[");
+            pieces.add(String.valueOf(details.getPower()));
+            pieces.add("/");
+            pieces.add(String.valueOf(details.getToughness()));
+            pieces.add("]");
+        }
         if (details.isPlaneswalker()) {
             if (pieces.isEmpty()) {
                 pieces.add(String.valueOf(details.getLoyalty()));
@@ -432,6 +442,7 @@ public class CardRenderer {
                 pieces.add("(" + details.getLoyalty() + ")");
             }
         }
+
         if (pieces.isEmpty()) { return; }
 
         FSkinFont font = FSkinFont.forHeight(h * 0.15f);