josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-12 17:21:33 -06:00
parent 6aee5fcbe7 2bb81747e0
commit e0cb2a8db6
12 changed files with 213 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/SpellAuras.cpp
+6
View File
@@ -3878,6 +3878,12 @@ void Aura::HandlePeriodicTriggerSpell(bool apply, bool Real)
void Aura::HandlePeriodicTriggerSpellWithValue(bool apply, bool Real)
{
m_isPeriodic = apply;
// Wrath of the Astromancer
if(!apply && m_spellProto->Id == 42783)
{
m_target->CastSpell(m_target, 42787, true, 0, this);
}
}
void Aura::HandlePeriodicEnergize(bool apply, bool Real)
src/game/SpellEffects.cpp
+37
View File
@@ -682,6 +682,28 @@ void Spell::EffectDummy(uint32 i)
{
switch(m_spellInfo->Id )
{
// Wrath of the Astromancer
case 42784:
{
uint32 count = 0;
for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
if(ihit->effectMask & (1<<i))
++count;
damage = 12000; // maybe wrong value
damage /= count;
SpellEntry const *spellInfo = sSpellStore.LookupEntry(42784);
// now deal the damage
for(std::list<TargetInfo>::iterator ihit= m_UniqueTargetInfo.begin();ihit != m_UniqueTargetInfo.end();++ihit)
if(ihit->effectMask & (1<<i))
{
Unit* casttarget = Unit::GetUnit((*unitTarget), ihit->targetGUID);
if(casttarget)
m_caster->DealDamage(casttarget, damage, NULL, SPELL_DIRECT_DAMAGE, SPELL_SCHOOL_MASK_ARCANE, spellInfo, false);
}
}
// Encapsulate Voidwalker
case 29364:
{
@@ -5005,6 +5027,21 @@ void Spell::EffectScriptEffect(uint32 effIndex)
unitTarget->CastSpell(m_caster, 40903, true);
break;
}
case 48025: // Headless Horseman's Mount
{
if(!unitTarget)
return;
switch(((Player*)unitTarget)->GetBaseSkillValue(762))
{
case 75: unitTarget->CastSpell(unitTarget, 51621, true); break;;
case 150: unitTarget->CastSpell(unitTarget, 48024, true); break;
case 225: unitTarget->CastSpell(unitTarget, 51617, true); break;
case 300: unitTarget->CastSpell(unitTarget, 48023, true); break;
default: break;
}
break;
}
case 41931:
{
if(m_caster->GetTypeId() != TYPEID_PLAYER)