From f09564b9d01ff372506f76f2345b99e3485738d5 Mon Sep 17 00:00:00 2001
From: Ovahlord <dreadkiller@gmx.de>
Date: Tue, 28 Apr 2020 19:43:03 +0200
Subject: [PATCH] Core/Pets: use TamedPetBaseScale field in CreatureModelData
 to determine additional pet scale values and updated scale calculation based
 on client function

Thanks @warpten for providing the data
---
 src/server/game/DataStores/DBCStructure.h |  2 +-
 src/server/game/DataStores/DBCfmt.h       |  2 +-
 src/server/game/Entities/Pet/Pet.cpp      | 37 +++++++++++++++++------
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index dc9eeace1b..1cec1333af 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -980,7 +980,7 @@ struct CreatureModelDataEntry
     // float MissileCollisionRaise                          // 27
     // float OverrideLootEffectScale                        // 28
     // float OverrideNameScale                              // 29
-    // float TamedPetBaseScale                              // 30
+    float TamedPetBaseScale;                                // 30
 };
 
 struct CreatureSpellDataEntry
diff --git a/src/server/game/DataStores/DBCfmt.h b/src/server/game/DataStores/DBCfmt.h
index 031932e169..0a18dec859 100644
--- a/src/server/game/DataStores/DBCfmt.h
+++ b/src/server/game/DataStores/DBCfmt.h
@@ -47,7 +47,7 @@ char const CinematicCameraEntryfmt[] = "nsiffff";
 char const CinematicSequencesEntryfmt[] = "nxiiiiiiii";
 char const CreatureDisplayInfofmt[] = "nixifxxxxxxxxxxxx";
 char const CreatureDisplayInfoExtrafmt[] = "diixxxxxxxxxxxxxxxxxx";
-char const CreatureModelDatafmt[] = "nisxfxxxxxxxxxxffxxxxxxxxxxxxxx";
+char const CreatureModelDatafmt[] = "nisxfxxxxxxxxxxffxxxxxxxxxxxxxf";
 char const CreatureFamilyfmt[] = "nfifiiiiixsx";
 char const CreatureSpellDatafmt[] = "niiiixxxx";
 char const CreatureTypefmt[] = "nxx";
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 5fab6ab8a2..ad552d3bef 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -1962,17 +1962,34 @@ Player* Pet::GetOwner() const
 float Pet::GetNativeObjectScale() const
 {
     CreatureFamilyEntry const* creatureFamily = sCreatureFamilyStore.LookupEntry(GetCreatureTemplate()->family);
-    if (creatureFamily && creatureFamily->MinScale > 0.0f && getPetType() == HUNTER_PET)
-    {
-        float scale;
-        if (getLevel() >= creatureFamily->MaxScaleLevel)
-            scale = creatureFamily->MaxScale;
-        else if (getLevel() <= creatureFamily->MinScaleLevel)
-            scale = creatureFamily->MinScale;
-        else
-            scale = creatureFamily->MinScale + float(getLevel() - creatureFamily->MinScaleLevel) / creatureFamily->MaxScaleLevel * (creatureFamily->MaxScale - creatureFamily->MinScale);
+    CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId());
 
-        return scale;
+
+    if (creatureFamily && displayInfo && creatureFamily->MinScale > 0.0f && getPetType() == HUNTER_PET)
+    {
+        if (CreatureModelDataEntry const* modelData = sCreatureModelDataStore.LookupEntry(displayInfo->ModelID))
+        {
+            float scale = displayInfo->CreatureModelScale * modelData->ModelScale;
+            if (scale <= 0.f)
+                scale = 1.f;
+
+            float minScaleLevel = creatureFamily->MinScaleLevel;
+            uint8 level = getLevel();
+
+            float minLevelScaleMod = level >= minScaleLevel ? (level / minScaleLevel) : 0.f;
+            float maxScaleMod = creatureFamily->MaxScaleLevel - minScaleLevel;
+
+            if (minLevelScaleMod > maxScaleMod)
+                minLevelScaleMod = maxScaleMod;
+
+            float scaleMod = creatureFamily->MaxScaleLevel != minScaleLevel ? scaleMod = minLevelScaleMod / maxScaleMod : 0.f;
+
+            scale = (creatureFamily->MaxScale - creatureFamily->MinScale) * scaleMod + creatureFamily->MinScale;
+            if (modelData->TamedPetBaseScale > 0.f)
+                scale *= modelData->TamedPetBaseScale;
+
+            return scale;
+        }
     }
 
     return Guardian::GetNativeObjectScale();