Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7411 from Tuxity/4.3.4

Browse Source 
[434] Correct 2 typos
This commit is contained in:
Nay
2012-08-16 04:23:16 -07:00
parent 7dbacc278a 0187644a83
commit 137d973e5d
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Player/Player.cpp
View File

@@ -8167,7 +8167,7 @@ void Player::_ApplyWeaponDamage(uint8 slot, ItemTemplate const* proto, ScalingSt
SetBaseWeaponDamage(attType, MAXDAMAGE, damage);
}
if (proto->Delay)
if (proto->Delay && !IsInFeralForm())
{
if (slot == EQUIPMENT_SLOT_RANGED)
SetAttackTime(RANGED_ATTACK, apply ? proto->Delay: BASE_ATTACK_TIME);

8
src/server/game/Entities/Unit/StatSystem.cpp
View File

@@ -428,13 +428,13 @@ void Player::CalculateMinMaxDamage(WeaponAttackType attType, bool normalized, bo
{
if (GetShapeshiftForm() == FORM_CAT)
{
weapon_mindamage = weapon_mindamage / att_speed;
weapon_maxdamage = weapon_maxdamage / att_speed;
weapon_mindamage = weapon_mindamage / GetWeaponForAttack(BASE_ATTACK, true)->GetTemplate()->Delay / 1000;
weapon_maxdamage = weapon_maxdamage / GetWeaponForAttack(BASE_ATTACK, true)->GetTemplate()->Delay / 1000;
}
else if (GetShapeshiftForm() == FORM_BEAR)
{
weapon_mindamage = weapon_mindamage / att_speed * 2.5f;
weapon_maxdamage = weapon_maxdamage / att_speed * 2.5f;
weapon_mindamage = weapon_mindamage / GetWeaponForAttack(BASE_ATTACK, true)->GetTemplate()->Delay / 1000 + weapon_mindamage / 2.5;
weapon_maxdamage = weapon_mindamage / GetWeaponForAttack(BASE_ATTACK, true)->GetTemplate()->Delay / 1000 + weapon_maxdamage / 2.5;
}
}
else if (!CanUseAttackType(attType)) //check if player not in form but still can't use (disarm case)