mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-19 00:48:56 +01:00
Merge
--HG-- branch : trunk
This commit is contained in:
@@ -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);
|
||||
|
||||
@@ -60,7 +60,6 @@ enum PlayerSkills
|
||||
SPELL_PLAYER_PHASE2_TOUCH_OF_LIFE = 49617
|
||||
};
|
||||
*/
|
||||
//not in db
|
||||
enum Yells
|
||||
{
|
||||
SAY_AGGRO = -1600011,
|
||||
|
||||
@@ -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,
|
||||
|
||||
Reference in New Issue
Block a user