From 2d383e237fdd7c16c2347c85f2fdfa5c4ec75338 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 14 Feb 2017 05:09:28 +0800
Subject: [PATCH] hiddenview

if the target is in library and the source has the hiddenface ability
then hide it
---
 projects/mtg/include/GameObserver.h |  1 +
 projects/mtg/include/MTGAbility.h   |  1 +
 projects/mtg/src/ActionStack.cpp    | 23 ++++++++++++++++++++---
 projects/mtg/src/GameObserver.cpp   | 11 +++++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/projects/mtg/include/GameObserver.h b/projects/mtg/include/GameObserver.h
index 2f520043c..a658f4396 100644
--- a/projects/mtg/include/GameObserver.h
+++ b/projects/mtg/include/GameObserver.h
@@ -134,6 +134,7 @@ class GameObserver{
   int isInGrave(MTGCardInstance *  card);
   int isInExile(MTGCardInstance *  card);
   int isInHand(MTGCardInstance *  card);
+  int isInLibrary(MTGCardInstance *  card);
   virtual void Update(float dt);
   void Render();
   void ButtonPressed(PlayGuiObject*);
diff --git a/projects/mtg/include/MTGAbility.h b/projects/mtg/include/MTGAbility.h
index 7c90ae847..a95643059 100644
--- a/projects/mtg/include/MTGAbility.h
+++ b/projects/mtg/include/MTGAbility.h
@@ -221,6 +221,7 @@ public:
         BLOCK_COST = 37,
         GRANTEDFLASHBACK_COST = 38,
         FORCED_TOKEN_CREATOR = 39,
+        HIDDENVIEW = 40,
     };
 };
 
diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp
index f0f57af6b..827769701 100644
--- a/projects/mtg/src/ActionStack.cpp
+++ b/projects/mtg/src/ActionStack.cpp
@@ -94,7 +94,7 @@ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string
     mFont->SetColor(ARGB(255,255,255,255));
     mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
     JRenderer * renderer = JRenderer::GetInstance();
-    bool hiddenview = source->has(Constants::HIDDENFACE)?true:false;
+    bool hiddenview = aType == MTGAbility::HIDDENVIEW?true:false;
 
     if (!targetQuad)
     {
@@ -241,6 +241,8 @@ void StackAbility::Render()
     MTGCardInstance * source = ability->source;
     string alt1 = source->getName();
     vector<JQuadPtr> mytargetQuads;
+    int fmLibrary = 0;
+    int force = 0;
 
     Targetable * _target = ability->target;
     if (ability->getActionTc())
@@ -257,7 +259,19 @@ void StackAbility::Render()
             {
                 Targetable * tt = ability->getActionTc()->getTargetsFrom()[i];
                 if(tt)
-                    mytargetQuads.push_back( ((Damageable *)(tt))->getIcon() );
+                {
+                    if( ((Damageable *)(tt))->type_as_damageable == Damageable::DAMAGEABLE_MTGCARDINSTANCE )
+                    {
+                        if( source->has(Constants::HIDDENFACE) && !observer->isInLibrary(((MTGCardInstance *)(tt))) )
+                            mytargetQuads.push_back( ((Damageable *)(tt))->getIcon() );
+                        else if ( !source->has(Constants::HIDDENFACE) )
+                            mytargetQuads.push_back( ((Damageable *)(tt))->getIcon() );
+                        else
+                            fmLibrary++;
+                    }
+                    else
+                        mytargetQuads.push_back( ((Damageable *)(tt))->getIcon() );
+                }
             }
         }
     //end
@@ -279,10 +293,13 @@ void StackAbility::Render()
         }
     }
 
+    if(source->has(Constants::HIDDENFACE) && fmLibrary)
+        force = MTGAbility::HIDDENVIEW;
+
     if(observer->gameType() == GAME_TYPE_MOMIR)
         Interruptible::Render(source, quad.get(), alt1, alt2, action, true, ability->aType, mytargetQuads);
     else
-        Interruptible::Render(source, quad.get(), alt1, alt2, action, false, 0, mytargetQuads);
+        Interruptible::Render(source, quad.get(), alt1, alt2, action, false, force, mytargetQuads);
 }
 StackAbility::StackAbility(GameObserver* observer, int id, MTGAbility * _ability) :
 Interruptible(observer, id), ability(_ability)
diff --git a/projects/mtg/src/GameObserver.cpp b/projects/mtg/src/GameObserver.cpp
index 05f8f7344..413319edd 100644
--- a/projects/mtg/src/GameObserver.cpp
+++ b/projects/mtg/src/GameObserver.cpp
@@ -1630,6 +1630,17 @@ int GameObserver::isInHand(MTGCardInstance * card)
     }
     return 0;
 }
+int GameObserver::isInLibrary(MTGCardInstance * card)
+{
+
+    for (int i = 0; i < 2; i++)
+    {
+        MTGGameZone * library = players[i]->game->library;
+        if (players[i]->game->isInZone(card, library))
+            return 1;
+    }
+    return 0;
+}
 void GameObserver::cleanupPhase()
 {
     currentPlayer->cleanupPhase();