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

[6998] Add new formula for warlock 1454 and ranks

Browse source 
Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
DiSlord 2009-01-02 00:08:02 +03:00
parent 2441c2a69f
commit 59f5472e3a
2 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/game/SpellEffects.cpp
View file

@ -1296,39 +1296,56 @@ void Spell::EffectDummy(uint32 i)
} }
break; break;
case SPELLFAMILY_WARLOCK: case SPELLFAMILY_WARLOCK:
//Life Tap (only it have this with dummy effect) // Life Tap
if (m_spellInfo->SpellFamilyFlags == 0x40000) if (m_spellInfo->SpellFamilyFlags & 0x0000000000040000LL)
{ {
float cost = m_currentBasePoints[0]+1; // In 303 exist spirit depend
uint32 spirit = m_caster->GetStat(STAT_SPIRIT);
if(Player* modOwner = m_caster->GetSpellModOwner()) switch (m_spellInfo->Id)
modOwner->ApplySpellMod(m_spellInfo->Id, SPELLMOD_COST, cost,this); {
case 1454: damage+=spirit; break;
int32 dmg = m_caster->SpellDamageBonus(m_caster, m_spellInfo,uint32(cost > 0 ? cost : 0), SPELL_DIRECT_DAMAGE); case 1455: damage+=spirit*15/10; break;
case 1456: damage+=spirit*2; break;
if(int32(m_caster->GetHealth()) > dmg) case 11687: damage+=spirit*25/10; break;
case 11688:
case 11689:
case 27222:
case 57946: damage+=spirit*3; break;
default:
sLog.outError("Spell::EffectDummy: Life Tap need set spirit multipler",m_triggeredByAuraSpell->Id);
return;
}
// Think its not need (also need remove Life Tap from SpellDamageBonus or add new value)
// damage = m_caster->SpellDamageBonus(m_caster, m_spellInfo,uint32(damage > 0 ? damage : 0), SPELL_DIRECT_DAMAGE);
if(int32(unitTarget->GetHealth()) > damage)
{ {
// Shouldn't Appear in Combat Log // Shouldn't Appear in Combat Log
m_caster->ModifyHealth(-dmg); unitTarget->ModifyHealth(-damage);
int32 mana = dmg;
int32 mana = damage;
// Improved Life Tap mod
Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY); Unit::AuraList const& auraDummy = m_caster->GetAurasByType(SPELL_AURA_DUMMY);
for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr) for(Unit::AuraList::const_iterator itr = auraDummy.begin(); itr != auraDummy.end(); ++itr)
{ {
// only Imp. Life Tap have this in combination with dummy aura
if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (*itr)->GetSpellProto()->SpellIconID == 208) if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (*itr)->GetSpellProto()->SpellIconID == 208)
mana = ((*itr)->GetModifier()->m_amount + 100)* mana / 100; mana = ((*itr)->GetModifier()->m_amount + 100)* mana / 100;
} }
m_caster->CastCustomSpell(unitTarget, 31818, &mana, NULL, NULL, true);
m_caster->CastCustomSpell(m_caster,31818,&mana,NULL,NULL,true,NULL);
// Mana Feed // Mana Feed
int32 manaFeedVal = m_caster->CalculateSpellDamage(m_spellInfo,1, m_spellInfo->EffectBasePoints[1],m_caster); int32 manaFeedVal = 0;
manaFeedVal = manaFeedVal * mana / 100; Unit::AuraList const& mod = m_caster->GetAurasByType(SPELL_AURA_ADD_FLAT_MODIFIER);
for(Unit::AuraList::const_iterator itr = mod.begin(); itr != mod.end(); ++itr)
{
if((*itr)->GetSpellProto()->SpellFamilyName==SPELLFAMILY_WARLOCK && (*itr)->GetSpellProto()->SpellIconID == 1982)
manaFeedVal+= (*itr)->GetModifier()->m_amount;
}
if(manaFeedVal > 0) if(manaFeedVal > 0)
{
manaFeedVal = manaFeedVal * mana / 100;
m_caster->CastCustomSpell(m_caster, 32553, &manaFeedVal, NULL, NULL, true, NULL); m_caster->CastCustomSpell(m_caster, 32553, &manaFeedVal, NULL, NULL, true, NULL);
} }
}
else else
SendCastResult(SPELL_FAILED_FIZZLE); SendCastResult(SPELL_FAILED_FIZZLE);
return; return;

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 "6997" #define REVISION_NR "6998"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__