public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-09 08:17:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Pets): Correct Pet size for bigger pets 2 (#18867)

Browse Source 
* scale displayInfo, cap scale to maxScale

* prevent scaling with displayInfo if scale is already increasing the size
This commit is contained in:
Jelle Meeus
2024-07-04 21:34:14 +02:00
committed by GitHub
parent 2cfe665a53
commit 37431cd7a6
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Entities/Pet/Pet.cpp
View File

@@ -2499,11 +2499,6 @@ float Pet::GetNativeObjectScale() const
{ {
uint8 ctFamily = GetCreatureTemplate()->family; uint8 ctFamily = GetCreatureTemplate()->family;
// hackfix: Edge case where DBC scale values for DEVILSAUR pets make them too small.
// Therefore we take data from spirit beast instead.
if (ctFamily && ctFamily == CREATURE_FAMILY_DEVILSAUR)
ctFamily = CREATURE_FAMILY_SPIRIT_BEAST;
CreatureFamilyEntry const* creatureFamily = sCreatureFamilyStore.LookupEntry(ctFamily); CreatureFamilyEntry const* creatureFamily = sCreatureFamilyStore.LookupEntry(ctFamily);
if (creatureFamily && creatureFamily->minScale > 0.0f && getPetType() & HUNTER_PET) if (creatureFamily && creatureFamily->minScale > 0.0f && getPetType() & HUNTER_PET)
{ {
@@ -2520,6 +2515,13 @@ float Pet::GetNativeObjectScale() const
float scale = (creatureFamily->maxScale - creatureFamily->minScale) * scaleMod + creatureFamily->minScale; float scale = (creatureFamily->maxScale - creatureFamily->minScale) * scaleMod + creatureFamily->minScale;
scale = std::min(scale, creatureFamily->maxScale);
if (CreatureDisplayInfoEntry const* displayInfo = sCreatureDisplayInfoStore.LookupEntry(GetNativeDisplayId()))
{
if (scale < 1.f && displayInfo->scale > 1.f)
scale *= displayInfo->scale;
}
return scale; return scale;
} }