From 7a35c253cb0e5db1065715fd22ba347fb180b3d6 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sun, 12 Feb 2017 19:43:10 +0800
Subject: [PATCH] refine display

---
 projects/mtg/src/ActionStack.cpp  | 24 ++++++++++++++++++------
 projects/mtg/src/AllAbilities.cpp |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp
index 3b6433519..58d60bf8c 100644
--- a/projects/mtg/src/ActionStack.cpp
+++ b/projects/mtg/src/ActionStack.cpp
@@ -118,7 +118,7 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
             {
                 if(k > 10)
                     break;
-                xnadj+=3;
+                xnadj+=4;
             }
         }
 
@@ -126,13 +126,13 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
             aa << action << " " << "(" << count << ")";
 
             if(count > 1)
-                xnadj -= 3;
+                xnadj -= 4;
 
-            renderer->FillRect(x-1.8f,y-16 + GetVerticalTextOffset(), 73 + xnadj, 43, ARGB(235,10,10,10));//box
+            //renderer->FillRect(x-1.8f,y-16 + GetVerticalTextOffset(), 73 + xnadj, 43, ARGB(235,10,10,10));//box
 
-            mFont->SetColor(ARGB(255,128,255,0));//recolor
+            //mFont->SetColor(ARGB(255,128,255,128));//recolor
             mFont->DrawString(">", x + 32, y + GetVerticalTextOffset(), JGETEXT_LEFT);
-            mFont->SetColor(ARGB(255,255,255,255));//reset color
+            //mFont->SetColor(ARGB(255,255,255,255));//reset color
 
             if(count > 1)
             {
@@ -143,12 +143,19 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
     }
 
     JQuadPtr quad = observer->getResourceManager()->RetrieveCard(source, CACHE_THUMB);
+    JQuadPtr fakeborder = observer->getResourceManager()->GetQuad("white");
     if (!quad.get())
         quad = CardGui::AlternateThumbQuad(source);
     if (quad.get())
     {
         quad->SetColor(ARGB(255,255,255,255));
         float scale = mHeight / quad->mHeight;
+        if (fakeborder.get())
+        {
+            fakeborder->SetColor(ARGB(255,15,15,15));
+            renderer->RenderQuad(fakeborder.get(), x + (quad->mWidth * scale / 2), y + (quad->mHeight * scale / 2), 0, (29 * actZ + 1) / 16, 42 * actZ / 16);
+        }
+        
         renderer->RenderQuad(quad.get(), x + (quad->mWidth * scale / 2), y + (quad->mHeight * scale / 2), 0, scale, scale);
     }
     else if (alt1.size())
@@ -191,9 +198,14 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
                 multiQ->SetColor(ARGB(255,255,255,255));
                 multiQ->SetHotSpot(multiQ->mWidth / 2, multiQ->mHeight / 2);
                 float scale = mHeight / multiQ->mHeight;
+                if (fakeborder.get())
+                {
+                    fakeborder->SetColor(ARGB(255,15,15,15));
+                    renderer->RenderQuad(fakeborder.get(), x + 55 + xadj, y + ((mHeight - multiQ->mHeight) / 2) + multiQ->mHotSpotY, 0, (29 * actZ + 1) / 16, 42 * actZ / 16);
+                }
                 renderer->RenderQuad(multiQ.get(), x + 55 + xadj, y + ((mHeight - multiQ->mHeight) / 2) + multiQ->mHotSpotY, 0, scale, scale);
                 multiQ->SetHotSpot(backupX, backupY);
-                xadj+=3;
+                xadj+=4;
             }
         }
     }
diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp
index 9d5d3030d..6277fd3a6 100644
--- a/projects/mtg/src/AllAbilities.cpp
+++ b/projects/mtg/src/AllAbilities.cpp
@@ -4402,7 +4402,7 @@ AAMover::AAMover(GameObserver* observer, int _id, MTGCardInstance * _source, MTG
         else if(destination.find("graveyard") != string::npos)
             named = "Put in Graveyard";
         else if(destination.find("previous") != string::npos)
-            named = "Put in Battlefield";
+            named = "Previous Zone";
         else if(destination.find("inplay") != string::npos)
             named = "Put in Play";
         else if(destination.find("battlefield") != string::npos)