Scripts/Forge of Souls: Revisited Bronjahm script, removed ugly hacks and fixed spells properly

--HG--
branch : trunk
This commit is contained in:
Shauren
2010-10-18 13:19:04 +02:00
parent b4c62b9646
commit 09260ee6c1
10 changed files with 409 additions and 319 deletions
@@ -5792,9 +5792,6 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo
if (aurApp->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
target->CastSpell(target, 58601, true);
break;
case 68839: // Corrupt Soul
target->CastSpell(target, 68846, true, NULL, this, GetCasterGUID());
break;
}
break;
case SPELLFAMILY_MAGE:
+1 -1
View File
@@ -1098,7 +1098,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const * aurApp, Unit * caster,
if (*itr < 0)
target->RemoveAurasDueToSpell(-(*itr));
else if (removeMode != AURA_REMOVE_BY_DEFAULT)
target->CastSpell(target, *itr, true, 0, 0, GetCasterGUID());
target->CastSpell(target, *itr, true, NULL, NULL, GetCasterGUID());
}
}
if (customAttr & SPELL_ATTR_CU_LINK_AURA)
+12 -1
View File
@@ -2776,7 +2776,7 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
case 72444:
case 72445:
case 72446:
for (std::list<Unit*>::iterator itr = unitList.begin() ; itr != unitList.end();)
for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end();)
{
if (!(*itr)->HasAura(72293))
itr = unitList.erase(itr);
@@ -2795,6 +2795,17 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
if (unitList.empty())
return;
break;
case 68921: case 69049: // Soulstorm
for (std::list<Unit*>::iterator itr = unitList.begin(); itr != unitList.end();)
{
Position pos;
(*itr)->GetPosition(&pos);
if (m_caster->GetExactDist2d(&pos) <= 10.0f)
itr = unitList.erase(itr);
else
++itr;
}
break;
}
// Death Pact
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] & 0x00080000)