*Implement stealth detection for traps.

--HG--
branch : trunk

2 files changed, 24 insertions, 3 deletions

diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index ade00dd4d8f..6b7b2046adf 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -718,12 +718,11 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const
             return false;
 
         // special invisibility cases
-        /* TODO: implement trap stealth, take look at spell 2836
         if(GetGOInfo()->type == GAMEOBJECT_TYPE_TRAP && GetGOInfo()->trap.stealthed && u->IsHostileTo(GetOwner()))
         {
-            if(check stuff here)
+            if(!canDetectTrap(u, GetDistance(u)))
                 return false;
-        }*/
+        }
 
         // Smuggled Mana Cell required 10 invisibility type detection/state
         if(GetEntry()==187039 && ((u->m_detectInvisibilityMask | u->m_invisibilityMask) & (1<<10))==0)
@@ -735,6 +734,27 @@ bool GameObject::isVisibleForInState(Player const* u, bool inVisibleList) const
         (inVisibleList ? World::GetVisibleObjectGreyDistance() : 0.0f), false);
 }
 
+bool GameObject::canDetectTrap(Player const* u, float distance) const
+{
+    if(u->hasUnitState(UNIT_STAT_STUNNED))
+        return false;
+    if(distance < GetGOInfo()->size) //collision
+        return true;
+    if(!u->HasInArc(M_PI, this)) //behind
+        return false;
+    if(u->HasAuraType(SPELL_AURA_DETECT_STEALTH))
+        return true;
+
+    //Visible distance is modified by -Level Diff (every level diff = 0.25f in visible distance)
+    float visibleDistance = (int32(u->getLevel()) - int32(GetOwner()->getLevel()))* 0.25f;
+    //GetModifier for trap (miscvalue 1)
+    //35y for aura 2836
+    //WARNING: these values are guessed, may be not blizzlike
+    visibleDistance += u->GetTotalAuraModifierByMiscValue(SPELL_AURA_MOD_DETECT, 1)* 0.5f;
+
+    return distance < visibleDistance;
+}
+
 void GameObject::Respawn()
 {
     if(m_spawnedByDefault && m_respawnTime > 0)
diff --git a/src/game/GameObject.h b/src/game/GameObject.h
index afeaba98cc9..3b837a0550c 100644
--- a/src/game/GameObject.h
+++ b/src/game/GameObject.h
@@ -571,6 +571,7 @@ class TRINITY_DLL_SPEC GameObject : public WorldObject
         void TriggeringLinkedGameObject( uint32 trapEntry, Unit* target);
 
         bool isVisibleForInState(Player const* u, bool inVisibleList) const;
+        bool canDetectTrap(Player const* u, float distance) const;
 
         GameObject* LookupFishingHoleAround(float range);