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

Merge branch 'master' into 303

Browse source 
Conflicts:
	src/game/Player.cpp
	src/game/Spell.cpp
This commit is contained in:
tomrus88 2008-11-08 16:52:28 +03:00
commit 7974d1cb94
67 changed files with 939 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/game/SpellEffects.cpp
View file

@ -714,7 +714,7 @@ void Spell::EffectDummy(uint32 i)
}
case 13567: // Dummy Trigger
{
// can be used for different aura triggreing, so select by aura
// can be used for different aura triggering, so select by aura
if(!m_triggeredByAuraSpell || !unitTarget)
return;
@ -2646,31 +2646,31 @@ void Spell::EffectEnergize(uint32 i)
return;
// Some level depends spells
int multipler = 0;
int multiplier = 0;
int level_diff = 0;
switch (m_spellInfo->Id)
{
// Restore Energy
case 9512:
level_diff = m_caster->getLevel() - 40;
multipler = 2;
multiplier = 2;
break;
// Blood Fury
case 24571:
level_diff = m_caster->getLevel() - 60;
multipler = 10;
multiplier = 10;
break;
// Burst of Energy
case 24532:
level_diff = m_caster->getLevel() - 60;
multipler = 4;
multiplier = 4;
break;
default:
break;
}
if (level_diff > 0)
damage -= multipler * level_diff;
damage -= multiplier * level_diff;
if(damage < 0)
return;