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

[8915] Fixed rage calculation for spell 5308 and ranks.

Browse source
This commit is contained in:
VladimirMangos 2009-12-04 04:45:36 +03:00
parent 12d6c33d86
commit f8d0496407
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/game/SpellEffects.cpp
View file

@ -1441,14 +1441,14 @@ void Spell::EffectDummy(uint32 i)
uint32 rage = m_caster->GetPower(POWER_RAGE); uint32 rage = m_caster->GetPower(POWER_RAGE);
// up to max 30 rage cost // up to max 30 rage cost
if(rage > 30) if(rage > 300)
rage = 30; rage = 300;
// Glyph of Execution bonus // Glyph of Execution bonus
uint32 rage_modified = rage; uint32 rage_modified = rage;
if (Aura *aura = m_caster->GetDummyAura(58367)) if (Aura *aura = m_caster->GetDummyAura(58367))
rage_modified += aura->GetModifier()->m_amount; rage_modified += aura->GetModifier()->m_amount*10;
int32 basePoints0 = damage+int32(rage_modified * m_spellInfo->DmgMultiplier[i] + int32 basePoints0 = damage+int32(rage_modified * m_spellInfo->DmgMultiplier[i] +
m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f); m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
@ -1465,7 +1465,7 @@ void Spell::EffectDummy(uint32 i)
if ((*itr)->GetSpellProto()->SpellIconID == 1989) if ((*itr)->GetSpellProto()->SpellIconID == 1989)
{ {
// saved rage top stored in next affect // saved rage top stored in next affect
uint32 lastrage = (*itr)->GetSpellProto()->CalculateSimpleValue(1); uint32 lastrage = (*itr)->GetSpellProto()->CalculateSimpleValue(1)*10;
if(lastrage < rage) if(lastrage < rage)
rage -= lastrage; rage -= lastrage;
break; 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 "8914" #define REVISION_NR "8915"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__