merge

--HG--
branch : trunk

1 files changed, 10 insertions, 0 deletions

diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 894a3b37f32..3bce66a631a 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -940,6 +940,16 @@ bool Guardian::InitStatsForLevel(uint32 petlevel)
                     }
                     break;
                 }
+                case 27829: // Ebon Gargoyle
+                {
+                    SetBonusDamage( int32(m_owner->GetTotalAttackPowerValue(BASE_ATTACK) * 0.4f));
+                    if(!pInfo)
+                    {
+                        SetCreateMana(28 + 10*petlevel);
+                        SetCreateHealth(28 + 30*petlevel);
+                    }
+                    break;
+                }
                 default:
                 {
                     if(!pInfo)