mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9696] Fix 16972 and ranks.

Browse source 
Thanks to vdpqtc and darkstalker.

Signed-off-by: hunuza <hunuza@gmail.com>
This commit is contained in:
Sarjuuk 2010-04-08 10:31:20 +02:00 • committed by hunuza
parent 23da1a86d1
commit ca07446e63
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/game/StatSystem.cpp
View file

@ -293,7 +293,8 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
case CLASS_DRUID: case CLASS_DRUID:
{ {
//Check if Predatory Strikes is skilled //Check if Predatory Strikes is skilled
float mLevelMult = 0.0; float mLevelBonus = 0.0f;
float mBonusWeaponAtt = 0.0f;
switch(m_form) switch(m_form)
{ {
case FORM_CAT: case FORM_CAT:
@ -304,13 +305,19 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
Unit::AuraList const& mDummy = GetAurasByType(SPELL_AURA_DUMMY); Unit::AuraList const& mDummy = GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr) for(Unit::AuraList::const_iterator itr = mDummy.begin(); itr != mDummy.end(); ++itr)
{ {
if((*itr)->GetSpellProto()->SpellIconID != 1563)
continue;
// Predatory Strikes (effect 0) // Predatory Strikes (effect 0)
if ((*itr)->GetEffIndex() == EFFECT_INDEX_0 && (*itr)->GetSpellProto()->SpellIconID == 1563) if ((*itr)->GetEffIndex() == EFFECT_INDEX_0 && IsInFeralForm())
{ mLevelBonus = getLevel() * (*itr)->GetModifier()->m_amount / 100.0f;
mLevelMult = (*itr)->GetModifier()->m_amount / 100.0f; // Predatory Strikes (effect 1)
else if ((*itr)->GetEffIndex() == EFFECT_INDEX_1)
mBonusWeaponAtt = (*itr)->GetModifier()->m_amount * m_baseFeralAP / 100.0f;
if (mLevelBonus != 0.0f && mBonusWeaponAtt != 0.0f)
break; break;
} }
}
break; break;
} }
default: break; default: break;
@ -319,12 +326,12 @@ void Player::UpdateAttackPowerAndDamage(bool ranged )
switch(m_form) switch(m_form)
{ {
case FORM_CAT: case FORM_CAT:
val2 = getLevel()*(mLevelMult+2.0f) + GetStat(STAT_STRENGTH)*2.0f + GetStat(STAT_AGILITY) - 20.0f + m_baseFeralAP; break; val2 = GetStat(STAT_STRENGTH)*2.0f + GetStat(STAT_AGILITY) - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break;
case FORM_BEAR: case FORM_BEAR:
case FORM_DIREBEAR: case FORM_DIREBEAR:
val2 = getLevel()*(mLevelMult+3.0f) + GetStat(STAT_STRENGTH)*2.0f - 20.0f + m_baseFeralAP; break; val2 = GetStat(STAT_STRENGTH)*2.0f - 20.0f + mLevelBonus + m_baseFeralAP + mBonusWeaponAtt; break;
case FORM_MOONKIN: case FORM_MOONKIN:
val2 = getLevel()*(mLevelMult+1.5f) + GetStat(STAT_STRENGTH)*2.0f - 20.0f + m_baseFeralAP; break; val2 = GetStat(STAT_STRENGTH)*2.0f - 20.0f + m_baseFeralAP + mBonusWeaponAtt; break;
default: default:
val2 = GetStat(STAT_STRENGTH)*2.0f - 20.0f; break; val2 = GetStat(STAT_STRENGTH)*2.0f - 20.0f; break;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9695" #define REVISION_NR "9696"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__