Skip to content

Commit

Permalink
[8915] Fixed rage calculation for spell 5308 and ranks.
Browse files Browse the repository at this point in the history
  • Loading branch information
VladimirMangos committed Dec 4, 2009
1 parent a3d3fe4 commit bc7316d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/game/SpellEffects.cpp
Expand Up @@ -1441,14 +1441,14 @@ void Spell::EffectDummy(uint32 i)
uint32 rage = m_caster->GetPower(POWER_RAGE);

// up to max 30 rage cost
if(rage > 30)
rage = 30;
if(rage > 300)
rage = 300;

// Glyph of Execution bonus
uint32 rage_modified = rage;

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] +
m_caster->GetTotalAttackPowerValue(BASE_ATTACK)*0.2f);
Expand All @@ -1465,7 +1465,7 @@ void Spell::EffectDummy(uint32 i)
if ((*itr)->GetSpellProto()->SpellIconID == 1989)
{
// saved rage top stored in next affect
uint32 lastrage = (*itr)->GetSpellProto()->CalculateSimpleValue(1);
uint32 lastrage = (*itr)->GetSpellProto()->CalculateSimpleValue(1)*10;
if(lastrage < rage)
rage -= lastrage;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "8914"
#define REVISION_NR "8915"
#endif // __REVISION_NR_H__

0 comments on commit bc7316d

Please sign in to comment.