diff options
| author | Xanadu <none@none> | 2010-02-05 19:16:03 +0100 |
|---|---|---|
| committer | Xanadu <none@none> | 2010-02-05 19:16:03 +0100 |
| commit | 45002f590e27e2b48ae64d6d83bc4415e232ef33 (patch) | |
| tree | 74ffacc8ee39834d7ce9fa9c99c31d9e7f5a10aa /src/scripts | |
| parent | f8d1920fa591d2aba16bf70023c64f4379c0114d (diff) | |
| parent | 4674dec37bafefb5a1d62a4ff33c1da8ed5dd0c0 (diff) | |
Merge
--HG--
branch : trunk
Diffstat (limited to 'src/scripts')
| -rw-r--r-- | src/scripts/northrend/draktharon_keep/boss_novos.cpp | 3 | ||||
| -rw-r--r-- | src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp | 1 | ||||
| -rw-r--r-- | src/scripts/northrend/draktharon_keep/boss_trollgore.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/scripts/northrend/draktharon_keep/boss_novos.cpp b/src/scripts/northrend/draktharon_keep/boss_novos.cpp index 17e1c022abf..2ea61e0dc92 100644 --- a/src/scripts/northrend/draktharon_keep/boss_novos.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_novos.cpp @@ -159,7 +159,7 @@ struct boss_novosAI : public Scripted_NoMovementAI } else uiTimer -= diff; if (uiCrystalHandlerTimer <= diff) { - //TODO: say + DoScriptText(SAY_NECRO_ADD, m_creature); Creature *pCrystalHandler = m_creature->SummonCreature(CREATURE_CRYSTAL_HANDLER, CrystalHandlerSpawnPoint.x, CrystalHandlerSpawnPoint.y , CrystalHandlerSpawnPoint.z, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN,20000); pCrystalHandler->GetMotionMaster()->MovePoint(0, AddDestinyPoint.x, AddDestinyPoint.y, AddDestinyPoint.z); uiCrystalHandlerTimer = urand(20000,30000); @@ -178,6 +178,7 @@ struct boss_novosAI : public Scripted_NoMovementAI } void JustDied(Unit* killer) { + DoScriptText(SAY_DEATH, m_creature); if (pInstance) { pInstance->SetData(DATA_NOVOS_EVENT, DONE); diff --git a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp index f374dc761b9..57e1bea1f70 100644 --- a/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_tharon_ja.cpp @@ -60,7 +60,6 @@ enum PlayerSkills SPELL_PLAYER_PHASE2_TOUCH_OF_LIFE = 49617 }; */ -//not in db enum Yells { SAY_AGGRO = -1600011, diff --git a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp index 00f72318ba1..8bea8bda8dc 100644 --- a/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp +++ b/src/scripts/northrend/draktharon_keep/boss_trollgore.cpp @@ -42,7 +42,6 @@ enum Spells H_SPELL_CONSUME = SPELL_CONSUME_59803, H_SPELL_CONSUME_AURA = SPELL_CONSUME_59805, }; -//not in db enum Yells { SAY_AGGRO = -1600006, |