From 6e1ed95a63b12d7eb94bfb06b9e2569c4f15e5d2 Mon Sep 17 00:00:00 2001 From: Giacomo Pozzoni Date: Wed, 2 Oct 2019 13:59:52 +0200 Subject: Core/Pet: Fix guardians low damage (#23840) Fix guardians low damage for unhandled cases in Guardian::InitStatsForLevel() (cherry picked from commit b3b8ec811daab65d4b94cad950a460240b02390b) --- src/server/game/Entities/Pet/Pet.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src') diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index a33bc288698..dbc017024d7 100644 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -1008,6 +1008,20 @@ bool Guardian::InitStatsForLevel(uint8 petlevel) SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, float(petlevel - 30 - (petlevel / 4))); SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, float(petlevel - 30 + (petlevel / 4))); } + default: + { + /* ToDo: Check what 5f5d2028 broke/fixed and how much of Creature::UpdateLevelDependantStats() + * should be copied here (or moved to another method or if that function should be called here + * or not just for this default case) + */ + float basedamage = GetBaseDamageForLevel(petlevel); + + float weaponBaseMinDamage = basedamage; + float weaponBaseMaxDamage = basedamage * 1.5f; + + SetBaseWeaponDamage(BASE_ATTACK, MINDAMAGE, weaponBaseMinDamage); + SetBaseWeaponDamage(BASE_ATTACK, MAXDAMAGE, weaponBaseMaxDamage); + } } break; } -- cgit v1.2.3