Scripts/Icecrown Citadel: Added Rotface script

Scripts/Icecrown Citadel: Corrected death speech for Stinky and Festergut
Scripts/Icecrown Citadel: Fixed Boned! achievement conditions

--HG--
branch : trunk
This commit is contained in:
Shauren
2010-10-09 16:50:03 +02:00
parent aae2f3b48e
commit 9a47bc96a1
18 changed files with 979 additions and 25 deletions
@@ -446,6 +446,7 @@ void AddSC_boss_lord_marrowgar(); // Icecrown Citadel
void AddSC_boss_lady_deathwhisper();
void AddSC_boss_deathbringer_saurfang();
void AddSC_boss_festergut();
void AddSC_boss_rotface();
void AddSC_boss_professor_putricide();
void AddSC_icecrown_citadel_teleport();
void AddSC_instance_icecrown_citadel();
@@ -1105,6 +1106,7 @@ void AddNorthrendScripts()
AddSC_boss_lady_deathwhisper();
AddSC_boss_deathbringer_saurfang();
AddSC_boss_festergut();
AddSC_boss_rotface();
AddSC_boss_professor_putricide();
AddSC_icecrown_citadel_teleport();
AddSC_instance_icecrown_citadel();
@@ -2344,9 +2344,18 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const
return;
// Beacon of Light
case 53563:
{
Unit * triggerCaster = (Unit *)(GetBase()->GetOwner());
triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, 0, this,triggerCaster->GetGUID());
triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, 0, this, triggerCaster->GetGUID());
return;
}
// Slime Spray - temporary here until preventing default effect works again
// added on 9.10.2010
case 69508:
{
caster->CastSpell(triggerTarget, triggerSpellId, true, NULL, NULL, caster->GetGUID());
return;
}
}
}
@@ -2356,7 +2365,7 @@ void AuraEffect::TriggerSpell(Unit * target, Unit * caster) const
if (triggeredSpellInfo)
{
Unit * triggerCaster = GetTriggeredSpellCaster(triggeredSpellInfo, caster, triggerTarget);
triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, 0, this);
triggerCaster->CastSpell(triggerTarget, triggeredSpellInfo, true, NULL, this);
sLog.outDebug("AuraEffect::TriggerSpell: Spell %u Trigger %u",GetId(), triggeredSpellInfo->Id);
}
else if (target->GetTypeId() != TYPEID_UNIT || !sScriptMgr.OnDummyEffect(caster, GetId(), SpellEffIndex(GetEffIndex()), triggerTarget->ToCreature()))
+11
View File
@@ -2778,6 +2778,17 @@ void Spell::SelectEffectTargets(uint32 i, uint32 cur)
++itr;
}
break;
case 69782: case 69796: // Ooze Flood
case 69798: case 69801: // Ooze Flood
// get 2 targets except 2 nearest
unitList.sort(Trinity::ObjectDistanceOrderPred(m_caster));
unitList.resize(4);
while (unitList.size() > 2)
unitList.pop_front();
// crashfix
if (unitList.empty())
return;
break;
}
// Death Pact
if (m_spellInfo->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && m_spellInfo->SpellFamilyFlags[0] & 0x00080000)
+3
View File
@@ -3618,6 +3618,9 @@ void SpellMgr::LoadSpellCustomAttr()
case 27820: // Mana Detonation
//case 28062: case 39090: // Positive/Negative Charge
//case 28085: case 39093:
case 69782: case 69796: // Ooze Flood
case 69798: case 69801: // Ooze Flood
case 69538: case 69553: case 69610: // Ooze Combine
mSpellCustomAttr[i] |= SPELL_ATTR_CU_EXCLUDE_SELF;
count++;
break;