diff options
| -rw-r--r-- | src/game/Creature.cpp | 3 | ||||
| -rw-r--r-- | src/game/StatSystem.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index a9b4aa0bec5..dda642c9504 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -724,6 +724,7 @@ bool Creature::Create(uint32 guidlow, Map *map, uint32 phaseMask, uint32 Entry, } LoadCreaturesAddon(); } + SetDisplayId(GetCreatureInfo()->GetRandomValidModelId()); return bResult; } @@ -1843,6 +1844,8 @@ void Creature::Respawn(bool force) else setDeathState( JUST_ALIVED ); + SetDisplayId(cinfo->GetRandomValidModelId()); + //Call AI respawn virtual function AI()->JustRespawned(); diff --git a/src/game/StatSystem.cpp b/src/game/StatSystem.cpp index 744be0e26eb..74d790de1a4 100644 --- a/src/game/StatSystem.cpp +++ b/src/game/StatSystem.cpp @@ -870,8 +870,8 @@ void Creature::UpdateDamagePhysical(WeaponAttackType attType) weapon_maxdamage = 0; } - float mindamage = ((base_value * dmg_multiplier + weapon_mindamage) * base_pct + total_value) * total_pct; - float maxdamage = ((base_value * dmg_multiplier + weapon_maxdamage) * base_pct + total_value) * total_pct; + float mindamage = ((base_value + weapon_mindamage) * dmg_multiplier * base_pct + total_value) * total_pct; + float maxdamage = ((base_value + weapon_maxdamage) * dmg_multiplier * base_pct + total_value) * total_pct; switch(attType) { |