diff options
| author | kaelima <kaelima@live.se> | 2012-12-21 00:00:16 +0100 |
|---|---|---|
| committer | kaelima <kaelima@live.se> | 2012-12-21 00:00:16 +0100 |
| commit | 0a88787dfc747437b6278a044a425b6483e61b37 (patch) | |
| tree | 65942c84524890446a79ef67fd1ea2ce622a8544 /src/server/scripts/Kalimdor | |
| parent | 8f27dfda627903997b67cab9ebb4c5b365da201e (diff) | |
| parent | 4116ba75e3bef999c3111943c3b389ffc195b686 (diff) | |
Merge git://github.com/TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Movement/MovementGenerator.h
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
src/server/game/Movement/Spline/MoveSpline.h
Diffstat (limited to 'src/server/scripts/Kalimdor')
51 files changed, 1640 insertions, 1469 deletions
diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp index 9cc515c1b0d..5c46519ab1c 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp @@ -192,8 +192,8 @@ public: enum Morridune { - SAY_MORRIDUNE_1 = -1048003, - SAY_MORRIDUNE_2 = -1048004 + SAY_MORRIDUNE_1 = 0, + SAY_MORRIDUNE_2 = 1 }; class npc_morridune : public CreatureScript @@ -231,7 +231,7 @@ public: { npc_morriduneAI(Creature* creature) : npc_escortAI(creature) { - DoScriptText(SAY_MORRIDUNE_1, creature); + Talk(SAY_MORRIDUNE_1); me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); Start(false, false, 0); } @@ -245,7 +245,7 @@ public: me->SetOrientation(1.775791f); me->SendMovementFlagUpdate(); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - DoScriptText(SAY_MORRIDUNE_2, me); + Talk(SAY_MORRIDUNE_2); break; } } diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp index 1c754b78672..0a4779508e9 100644 --- a/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp +++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/boss_kelris.cpp @@ -21,16 +21,12 @@ enum Spells { - SPELL_MIND_BLAST = 15587, - SPELL_SLEEP = 8399, -}; + SPELL_MIND_BLAST = 15587, + SPELL_SLEEP = 8399, -//Id's from ACID -enum Yells -{ - SAY_AGGRO = -1048002, - SAY_SLEEP = -1048001, - SAY_DEATH = -1048000 + SAY_AGGRO = 0, + SAY_SLEEP = 1, + SAY_DEATH = 2 }; class boss_kelris : public CreatureScript @@ -65,14 +61,14 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(TYPE_KELRIS, IN_PROGRESS); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_KELRIS, DONE); } @@ -92,7 +88,7 @@ public: { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) { - DoScriptText(SAY_SLEEP, me); + Talk(SAY_SLEEP); DoCast(target, SPELL_SLEEP); } sleepTimer = urand(15000, 20000); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index aa41fa992dc..70c5bc8b986 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -619,42 +619,6 @@ uint32 hyjalAI::GetInstanceData(uint32 Event) return 0; } -void hyjalAI::Talk(uint32 id) -{ - std::list<uint8> index; - for (uint8 i = 0; i < 9; ++i) - { - if (Faction == 0) // Alliance - { - if (JainaQuotes[i].id == id) - index.push_back(i); - } - else if (Faction == 1) // Horde - { - if (ThrallQuotes[i].id == id) - index.push_back(i); - } - } - - if (index.empty()) - return; // No quotes found, no use to continue - - uint8 ind = *(index.begin()) + rand()%index.size(); - - int32 YellId = 0; - if (Faction == 0) // Alliance - { - YellId = JainaQuotes[ind].textid; - } - else if (Faction == 1) // Horde - { - YellId = ThrallQuotes[ind].textid; - } - - if (YellId) - DoScriptText(YellId, me); -} - void hyjalAI::Retreat() { if (instance) diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h index 68efa94d98b..5fe724c7845 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.h @@ -132,12 +132,6 @@ enum TargetType // Used in the spell TARGETTYPE_VICTIM = 2, }; -struct Yells -{ - uint32 id; // Used to determine the type of yell (attack, rally, etc) - int32 textid; // The text id to be yelled -}; - enum YellId { ATTACKED = 0, // Used when attacked and set in combat @@ -149,32 +143,6 @@ enum YellId DEATH = 6, // Used on death }; -const Yells JainaQuotes[]= -{ - {ATTACKED, -1534000}, - {ATTACKED, -1534001}, - {INCOMING, -1534002}, - {BEGIN, -1534003}, - {RALLY, -1534004}, - {RALLY, -1534005}, - {FAILURE, -1534006}, - {SUCCESS, -1534007}, - {DEATH, -1534008}, -}; - -const Yells ThrallQuotes[]= -{ - {ATTACKED, -1534009}, - {ATTACKED, -1534010}, - {INCOMING, -1534011}, - {BEGIN, -1534012}, - {RALLY, -1534013}, - {RALLY, -1534014}, - {FAILURE, -1534015}, - {SUCCESS, -1534016}, - {DEATH, -1534017}, -}; - struct hyjalAI : public npc_escortAI { hyjalAI(Creature* creature); @@ -215,8 +183,6 @@ struct hyjalAI : public npc_escortAI uint32 GetInstanceData(uint32 Event); // Gets instance data for this instance, used to check if raid has gotten past a certain point and can access the next phase - void Talk(uint32 id); // Searches for the appropriate yell and sound and uses it to inform the raid of various things - public: InstanceScript* instance; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp index 7b468cb7fe5..17cae714b58 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_epoch.cpp @@ -38,15 +38,11 @@ enum Spells enum Yells { - SAY_INTRO = -1595000, //"Prince Arthas Menethil, on this day, a powerful darkness has taken hold of your soul. The death you are destined to visit upon others will this day be your own." - SAY_AGGRO = -1595001, //"We'll see about that, young prince." - SAY_TIME_WARP_1 = -1595002, //"Tick tock, tick tock..." - SAY_TIME_WARP_2 = -1595003, //"Not quick enough!" - SAY_TIME_WARP_3 = -1595004, //"Let's get this over with. " - SAY_SLAY_1 = -1595005, //"There is no future for you." - SAY_SLAY_2 = -1595006, //"This is the hour of our greatest triumph!" - SAY_SLAY_3 = -1595007, //"You were destined to fail. " - SAY_DEATH = -1595008 //"*gurgles*" + SAY_INTRO = 0, + SAY_AGGRO = 1, + SAY_TIME_WARP = 2, + SAY_SLAY = 3, + SAY_DEATH = 4 }; class boss_epoch : public CreatureScript @@ -91,7 +87,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_EPOCH_EVENT, IN_PROGRESS); @@ -124,7 +120,7 @@ public: if (uiTimeWarpTimer < diff) { - DoScriptText(RAND(SAY_TIME_WARP_1, SAY_TIME_WARP_2, SAY_TIME_WARP_3), me); + Talk(SAY_TIME_WARP); DoCastAOE(SPELL_TIME_WARP); uiTimeWarpTimer = 25300; } else uiTimeWarpTimer -= diff; @@ -134,7 +130,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_EPOCH_EVENT, DONE); @@ -145,7 +141,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp index 56d07a49dc4..2e70081fe87 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_infinite.cpp @@ -27,9 +27,9 @@ enum Spells enum Yells { - SAY_AGGRO = -1595045, - SAY_FAIL = -1595046, - SAY_DEATH = -1595047 + SAY_AGGRO = 0, + SAY_DEATH = 1, + SAY_FAIL = 2 }; class boss_infinite_corruptor : public CreatureScript @@ -59,11 +59,12 @@ public: void EnterCombat(Unit* /*who*/) { + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_INFINITE_EVENT, IN_PROGRESS); } - void UpdateAI(const uint32 /*diff*/) + void UpdateAI(uint32 const /*diff*/) { //Return since we have no target if (!UpdateVictim()) @@ -74,6 +75,7 @@ public: void JustDied(Unit* /*killer*/) { + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_INFINITE_EVENT, DONE); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp index 88b2a766671..b07f4120e97 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_mal_ganis.cpp @@ -42,23 +42,15 @@ enum Spells enum Yells { - SAY_INTRO_1 = -1595009, - SAY_INTRO_2 = -1595010, - SAY_AGGRO = -1595011, - SAY_KILL_1 = -1595012, - SAY_KILL_2 = -1595013, - SAY_KILL_3 = -1595014, - SAY_SLAY_1 = -1595015, - SAY_SLAY_2 = -1595016, - SAY_SLAY_3 = -1595017, - SAY_SLAY_4 = -1595018, - SAY_SLEEP_1 = -1595019, - SAY_SLEEP_2 = -1595020, - SAY_30HEALTH = -1595021, - SAY_15HEALTH = -1595022, - SAY_ESCAPE_SPEECH_1 = -1595023, - SAY_ESCAPE_SPEECH_2 = -1595024, - SAY_OUTRO = -1595025, + SAY_AGGRO = 2, + SAY_KILL = 3, + SAY_SLAY = 4, + SAY_SLEEP = 5, + SAY_30HEALTH = 6, + SAY_15HEALTH = 7, + SAY_ESCAPE_SPEECH_1 = 8, + SAY_ESCAPE_SPEECH_2 = 9, + SAY_OUTRO = 10 }; enum CombatPhases @@ -116,7 +108,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MAL_GANIS_EVENT, IN_PROGRESS); } @@ -138,13 +130,13 @@ public: if (!bYelled && HealthBelowPct(30)) { - DoScriptText(SAY_30HEALTH, me); + Talk(SAY_30HEALTH); bYelled = true; } if (!bYelled2 && HealthBelowPct(15)) { - DoScriptText(SAY_15HEALTH, me); + Talk(SAY_15HEALTH); bYelled2 = true; } @@ -187,7 +179,7 @@ public: if (uiSleepTimer < diff) { - DoScriptText(RAND(SAY_SLEEP_1, SAY_SLEEP_2), me); + Talk(SAY_SLEEP); if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) DoCast(target, SPELL_SLEEP); uiSleepTimer = urand(15000, 20000); @@ -201,7 +193,7 @@ public: switch (uiOutroStep) { case 1: - DoScriptText(SAY_ESCAPE_SPEECH_1, me); + Talk(SAY_ESCAPE_SPEECH_1); me->GetMotionMaster()->MoveTargetedHome(); ++uiOutroStep; uiOutroTimer = 8000; @@ -209,12 +201,12 @@ public: case 2: me->SetTarget(instance ? instance->GetData64(DATA_ARTHAS) : 0); me->HandleEmoteCommand(29); - DoScriptText(SAY_ESCAPE_SPEECH_2, me); + Talk(SAY_ESCAPE_SPEECH_2); ++uiOutroStep; uiOutroTimer = 9000; break; case 3: - DoScriptText(SAY_OUTRO, me); + Talk(SAY_OUTRO); ++uiOutroStep; uiOutroTimer = 16000; break; @@ -250,7 +242,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3, SAY_SLAY_4), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp index 8e80af66379..05d9fe8b5e4 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_meathook.cpp @@ -38,12 +38,10 @@ enum Spells enum Yells { - SAY_AGGRO = -1595026, - SAY_SLAY_1 = -1595027, - SAY_SLAY_2 = -1595028, - SAY_SLAY_3 = -1595029, - SAY_SPAWN = -1595030, - SAY_DEATH = -1595031 + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_SPAWN = 2, + SAY_DEATH = 3 }; class boss_meathook : public CreatureScript @@ -62,7 +60,7 @@ public: { instance = creature->GetInstanceScript(); if (instance) - DoScriptText(SAY_SPAWN, me); + Talk(SAY_SPAWN); } uint32 uiChainTimer; @@ -83,7 +81,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_MEATHOOK_EVENT, IN_PROGRESS); @@ -119,7 +117,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_MEATHOOK_EVENT, DONE); @@ -130,7 +128,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp index d23957ddf81..3a490301e47 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm.cpp @@ -40,19 +40,13 @@ enum Spells enum Yells { - SAY_AGGRO = -1595032, - SAY_SPAWN = -1595033, - SAY_SLAY_1 = -1595034, - SAY_SLAY_2 = -1595035, - SAY_SLAY_3 = -1595036, - SAY_DEATH = -1595037, - SAY_EXPLODE_GHOUL_1 = -1595038, - SAY_EXPLODE_GHOUL_2 = -1595039, - SAY_STEAL_FLESH_1 = -1595040, - SAY_STEAL_FLESH_2 = -1595041, - SAY_STEAL_FLESH_3 = -1595042, - SAY_SUMMON_GHOULS_1 = -1595043, - SAY_SUMMON_GHOULS_2 = -1595044 + SAY_AGGRO = 0, + SAY_SPAWN = 1, + SAY_SLAY = 2, + SAY_DEATH = 3, + SAY_EXPLODE_GHOUL = 4, + SAY_STEAL_FLESH = 5, + SAY_SUMMON_GHOULS = 6 }; class boss_salramm : public CreatureScript @@ -71,7 +65,7 @@ public: { instance = creature->GetInstanceScript(); if (instance) - DoScriptText(SAY_SPAWN, me); + Talk(SAY_SPAWN); } uint32 uiCurseFleshTimer; @@ -96,7 +90,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); if (instance) instance->SetData(DATA_SALRAMM_EVENT, IN_PROGRESS); @@ -126,7 +120,7 @@ public: //Steal Flesh timer if (uiStealFleshTimer <= diff) { - DoScriptText(RAND(SAY_STEAL_FLESH_1, SAY_STEAL_FLESH_2, SAY_STEAL_FLESH_3), me); + Talk(SAY_STEAL_FLESH); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_STEAL_FLESH); uiStealFleshTimer = 10000; @@ -135,7 +129,7 @@ public: //Summon ghouls timer if (uiSummonGhoulsTimer <= diff) { - DoScriptText(RAND(SAY_SUMMON_GHOULS_1, SAY_SUMMON_GHOULS_2), me); + Talk(SAY_SUMMON_GHOULS); if (Unit* random_pTarget = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(random_pTarget, SPELL_SUMMON_GHOULS); uiSummonGhoulsTimer = 10000; @@ -146,7 +140,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(DATA_SALRAMM_EVENT, DONE); @@ -157,7 +151,7 @@ public: if (victim == me) return; - DoScriptText(RAND(SAY_SLAY_1, SAY_SLAY_2, SAY_SLAY_3), me); + Talk(SAY_SLAY); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 365c5dd7300..4887c8adf62 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -26,65 +26,84 @@ enum Says { - //First Act - Uther and Jaina Dialog - SAY_PHASE101 = -1595070, //Arthas - SAY_PHASE102 = -1595071, //Uther - SAY_PHASE103 = -1595072, //Arthas - SAY_PHASE104 = -1595073, //Arthas - SAY_PHASE105 = -1595074, //Uther - SAY_PHASE106 = -1595075, //Arthas - SAY_PHASE107 = -1595076, //Uther - SAY_PHASE108 = -1595077, //Arthas - SAY_PHASE109 = -1595078, //Arthas - SAY_PHASE110 = -1595079, //Uther - SAY_PHASE111 = -1595080, //Arthas - SAY_PHASE112 = -1595081, //Uther - SAY_PHASE113 = -1595082, //Jaina - SAY_PHASE114 = -1595083, //Arthas - SAY_PHASE115 = -1595084, //Uther - SAY_PHASE116 = -1595085, //Arthas - SAY_PHASE117 = -1595086, //Jaina - SAY_PHASE118 = -1595087, //Arthas + //Arthas + //First Act + SAY_PHASE101 = 0, + SAY_PHASE103 = 1, + SAY_PHASE104 = 2, + SAY_PHASE106 = 3, + SAY_PHASE108 = 4, + SAY_PHASE110 = 5, + SAY_PHASE112 = 6, + SAY_PHASE114 = 7, + SAY_PHASE116 = 8, + SAY_PHASE118 = 9, + //Second Act - City Streets - SAY_PHASE201 = -1595088, //Arthas - SAY_PHASE202 = -1595089, //Cityman - SAY_PHASE203 = -1595090, //Arthas - SAY_PHASE204 = -1595091, //Crazyman - SAY_PHASE205 = -1595092, //Arthas - SAY_PHASE206 = -1595009, //Malganis - SAY_PHASE207 = -1595010, //Malganis - SAY_PHASE208 = -1595093, //Arthas - SAY_PHASE209 = -1595094, //Arthas - SAY_PHASE210 = -1595095, //Arthas + SAY_PHASE201 = 10, + SAY_PHASE203 = 11, + SAY_PHASE205 = 12, + SAY_PHASE208 = 13, + SAY_PHASE209 = 14, + SAY_PHASE210 = 15, + //Third Act - Town Hall - SAY_PHASE301 = -1595096, //Arthas - SAY_PHASE302 = -1595097, //Drakonian - SAY_PHASE303 = -1595098, //Arthas - SAY_PHASE304 = -1595099, //Arthas - SAY_PHASE305 = -1595100, //Drakonian - SAY_PHASE306 = -1595101, //Arthas - SAY_PHASE307 = -1595102, //Arthas - SAY_PHASE308 = -1595103, //Arthas - SAY_PHASE309 = -1595104, //Arthas - SAY_PHASE310 = -1595105, //Arthas - SAY_PHASE311 = -1595106, //Arthas - SAY_PHASE312 = -1595107, //Arthas - SAY_PHASE313 = -1595108, //Arthas - SAY_PHASE314 = -1595000, //Epoch - SAY_PHASE315 = -1595109, //Arthas + SAY_PHASE301 = 16, + SAY_PHASE303 = 17, + SAY_PHASE304 = 18, + SAY_PHASE306 = 19, + SAY_PHASE307 = 20, + SAY_PHASE308 = 21, + SAY_PHASE309 = 22, + SAY_PHASE310 = 23, + SAY_PHASE311 = 24, + SAY_PHASE312 = 25, + SAY_PHASE313 = 26, + SAY_PHASE315 = 27, + //Fourth Act - Fire Corridor - SAY_PHASE401 = -1595110, //Arthas - SAY_PHASE402 = -1595111, //Arthas - SAY_PHASE403 = -1595112, //Arthas - SAY_PHASE404 = -1595113, //Arthas - SAY_PHASE405 = -1595114, //Arthas - SAY_PHASE406 = -1595115, //Arthas - SAY_PHASE407 = -1595116, //Arthas + SAY_PHASE401 = 28, + SAY_PHASE402 = 29, + SAY_PHASE403 = 30, + SAY_PHASE404 = 31, + SAY_PHASE405 = 32, + SAY_PHASE406 = 33, + SAY_PHASE407 = 34, + //Fifth Act - Mal'Ganis Fight - SAY_PHASE501 = -1595117, //Arthas - SAY_PHASE502 = -1595118, //Arthas - SAY_PHASE503 = -1595119, //Arthas - SAY_PHASE504 = -1595120, //Arthas + SAY_PHASE501 = 35, + SAY_PHASE502 = 36, + SAY_PHASE503 = 37, + SAY_PHASE504 = 38, + + //Malganis + SAY_PHASE206 = 0, + SAY_PHASE207 = 1, + + //Epoch + SAY_PHASE314 = 0, + + //Uther + SAY_PHASE102 = 0, + SAY_PHASE105 = 1, + SAY_PHASE107 = 2, + SAY_PHASE109 = 3, + SAY_PHASE111 = 4, + SAY_PHASE115 = 5, + + //Jaina + SAY_PHASE113 = 0, + SAY_PHASE117 = 1, + + //Cityman + SAY_PHASE202 = 0, + + //Crazyman + SAY_PHASE204 = 0, + + //Drakonian + SAY_PHASE302 = 0, + SAY_PHASE305 = 1, }; enum NPCs @@ -250,27 +269,27 @@ public: ai->Start(true, true, player->GetGUID(), 0, false, false); ai->SetDespawnAtEnd(false); ai->bStepping = false; - ai->uiStep = 1; + ai->step = 1; break; case GOSSIP_ACTION_INFO_DEF+1: ai->bStepping = true; - ai->uiStep = 24; + ai->step = 24; break; case GOSSIP_ACTION_INFO_DEF+2: ai->SetHoldState(false); ai->bStepping = false; - ai->uiStep = 61; + ai->step = 61; break; case GOSSIP_ACTION_INFO_DEF+3: ai->SetHoldState(false); break; case GOSSIP_ACTION_INFO_DEF+4: ai->bStepping = true; - ai->uiStep = 84; + ai->step = 84; break; case GOSSIP_ACTION_INFO_DEF+5: ai->bStepping = true; - ai->uiStep = 85; + ai->step = 85; break; } player->CLOSE_GOSSIP_MENU(); @@ -285,7 +304,7 @@ public: if (ai && ai->bStepping == false) { - switch (ai->uiGossipStep) + switch (ai->gossipStep) { case 0: //This one is a workaround since the very beggining of the script is wrong. { @@ -339,46 +358,46 @@ public: InstanceScript* instance; bool bStepping; - uint32 uiStep; - uint32 uiPhaseTimer; - uint32 uiGossipStep; - uint32 uiPlayerFaction; - uint32 uiBossEvent; - uint32 uiWave; - - uint64 uiUtherGUID; - uint64 uiJainaGUID; - uint64 uiCitymenGUID[2]; - uint64 uiWaveGUID[ENCOUNTER_WAVES_MAX_SPAWNS]; - uint64 uiInfiniteDraconianGUID[ENCOUNTER_DRACONIAN_NUMBER]; - uint64 uiStalkerGUID; - - uint64 uiBossGUID; //uiMeathookGUID || uiSalrammGUID - uint64 uiEpochGUID; - uint64 uiMalganisGUID; - uint64 uiInfiniteGUID; - - uint32 uiExorcismTimer; + uint32 step; + uint32 phaseTimer; + uint32 gossipStep; + uint32 playerFaction; + uint32 bossEvent; + uint32 wave; + + uint64 utherGUID; + uint64 jainaGUID; + uint64 citymenGUID[2]; + uint64 waveGUID[ENCOUNTER_WAVES_MAX_SPAWNS]; + uint64 infiniteDraconianGUID[ENCOUNTER_DRACONIAN_NUMBER]; + uint64 stalkerGUID; + + uint64 bossGUID; + uint64 epochGUID; + uint64 malganisGUID; + uint64 infiniteGUID; + + uint32 exorcismTimer; void Reset() { - uiUtherGUID = 0; - uiJainaGUID = 0; + utherGUID = 0; + jainaGUID = 0; for (uint8 i = 0; i < 2; ++i) - uiCitymenGUID[i] = 0; + citymenGUID[i] = 0; for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) - uiWaveGUID[i] = 0; + waveGUID[i] = 0; for (uint8 i = 0; i < ENCOUNTER_DRACONIAN_NUMBER; ++i) - uiInfiniteDraconianGUID[i] = 0; + infiniteDraconianGUID[i] = 0; - uiStalkerGUID = 0; - uiBossGUID = 0; - uiEpochGUID = 0; - uiMalganisGUID = 0; - uiInfiniteGUID = 0; + stalkerGUID = 0; + bossGUID = 0; + epochGUID = 0; + malganisGUID = 0; + infiniteGUID = 0; if (instance) { instance->SetData(DATA_ARTHAS_EVENT, NOT_STARTED); @@ -386,15 +405,15 @@ public: { case NOT_STARTED: bStepping = true; - uiStep = 0; + step = 0; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); - uiBossEvent = DATA_MEATHOOK_EVENT; - uiGossipStep = 0; + bossEvent = DATA_MEATHOOK_EVENT; + gossipStep = 0; break; } - uiPhaseTimer = 1000; - uiExorcismTimer = 7300; - uiWave = 0; + phaseTimer = 1000; + exorcismTimer = 7300; + wave = 0; } } @@ -423,7 +442,7 @@ public: temp->SetReactState(REACT_PASSIVE); temp->GetMotionMaster()->MovePoint(0, RiftAndSpawnsLocations[i][1], RiftAndSpawnsLocations[i][2], RiftAndSpawnsLocations[i][3]); if ((uint32)RiftAndSpawnsLocations[i][0] == NPC_EPOCH) - uiEpochGUID = temp->GetGUID(); + epochGUID = temp->GetGUID(); } } } @@ -447,8 +466,8 @@ public: void JumpToNextStep(uint32 uiTimer) { - uiPhaseTimer = uiTimer; - ++uiStep; + phaseTimer = uiTimer; + ++step; } void WaypointReached(uint32 waypointId) @@ -470,74 +489,74 @@ public: bStepping = true; break; case 7: - if (Unit* pCityman0 = me->SummonCreature(NPC_CITY_MAN, 2091.977f, 1275.021f, 140.757f, 0.558f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) - uiCitymenGUID[0] = pCityman0->GetGUID(); - if (Unit* pCityman1 = me->SummonCreature(NPC_CITY_MAN2, 2093.514f, 1275.842f, 140.408f, 3.801f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) - uiCitymenGUID[1] = pCityman1->GetGUID(); + if (Unit* cityman0 = me->SummonCreature(NPC_CITY_MAN, 2091.977f, 1275.021f, 140.757f, 0.558f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) + citymenGUID[0] = cityman0->GetGUID(); + if (Unit* cityman1 = me->SummonCreature(NPC_CITY_MAN2, 2093.514f, 1275.842f, 140.408f, 3.801f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000)) + citymenGUID[1] = cityman1->GetGUID(); break; case 8: - uiGossipStep = 1; + gossipStep = 1; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetHoldState(true); break; case 12: SetRun(true); - DoScriptText(SAY_PHASE210, me); - if (Unit* pDisguised0 = me->SummonCreature(NPC_CITY_MAN3, 2398.14f, 1207.81f, 134.04f, 5.155249f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + Talk(SAY_PHASE210); + if (Unit* disguised0 = me->SummonCreature(NPC_CITY_MAN3, 2398.14f, 1207.81f, 134.04f, 5.155249f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiInfiniteDraconianGUID[0] = pDisguised0->GetGUID(); - if (Unit* pDisguised1 = me->SummonCreature(NPC_CITY_MAN4, 2403.22f, 1205.54f, 134.04f, 3.311264f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + infiniteDraconianGUID[0] = disguised0->GetGUID(); + if (Unit* disguised1 = me->SummonCreature(NPC_CITY_MAN4, 2403.22f, 1205.54f, 134.04f, 3.311264f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiInfiniteDraconianGUID[1] = pDisguised1->GetGUID(); + infiniteDraconianGUID[1] = disguised1->GetGUID(); - if (Unit* pDisguised2 = me->SummonCreature(NPC_CITY_MAN, 2400.82f, 1201.69f, 134.01f, 1.534082f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + if (Unit* disguised2 = me->SummonCreature(NPC_CITY_MAN, 2400.82f, 1201.69f, 134.01f, 1.534082f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiInfiniteDraconianGUID[2] = pDisguised2->GetGUID(); - pDisguised0->SetTarget(uiInfiniteDraconianGUID[1]); - pDisguised1->SetTarget(uiInfiniteDraconianGUID[0]); - pDisguised2->SetTarget(uiInfiniteDraconianGUID[1]); + infiniteDraconianGUID[2] = disguised2->GetGUID(); + disguised0->SetTarget(infiniteDraconianGUID[1]); + disguised1->SetTarget(infiniteDraconianGUID[0]); + disguised2->SetTarget(infiniteDraconianGUID[1]); } } } break; case 20: - uiGossipStep = 2; + gossipStep = 2; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetRun(false); SetHoldState(true); break; case 21: - DoScriptText(SAY_PHASE301, me); + Talk(SAY_PHASE301); break; case 25: SetRun(false); - SpawnTimeRift(0, &uiInfiniteDraconianGUID[0]); - DoScriptText(SAY_PHASE307, me); + SpawnTimeRift(0, &infiniteDraconianGUID[0]); + Talk(SAY_PHASE307); break; case 29: SetRun(false); - SpawnTimeRift(5, &uiInfiniteDraconianGUID[0]); - SpawnTimeRift(8, &uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE309, me); + SpawnTimeRift(5, &infiniteDraconianGUID[0]); + SpawnTimeRift(8, &infiniteDraconianGUID[2]); + Talk(SAY_PHASE309); SetHoldState(true); bStepping = true; break; case 31: SetRun(false); - SpawnTimeRift(11, &uiInfiniteDraconianGUID[0]); - SpawnTimeRift(14, &uiInfiniteDraconianGUID[2]); - DoScriptText(SAY_PHASE311, me); + SpawnTimeRift(11, &infiniteDraconianGUID[0]); + SpawnTimeRift(14, &infiniteDraconianGUID[2]); + Talk(SAY_PHASE311); SetHoldState(true); bStepping = true; break; case 32: - DoScriptText(SAY_PHASE401, me); + Talk(SAY_PHASE401); break; case 34: - DoScriptText(SAY_PHASE402, me); + Talk(SAY_PHASE402); break; case 35: - DoScriptText(SAY_PHASE403, me); + Talk(SAY_PHASE403); break; case 36: if (instance) @@ -547,23 +566,23 @@ public: case 45: SetRun(true); SetDespawnAtFar(false); - uiGossipStep = 4; + gossipStep = 4; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetHoldState(true); break; case 47: SetRun(false); - DoScriptText(SAY_PHASE405, me); + Talk(SAY_PHASE405); break; case 48: SetRun(true); - DoScriptText(SAY_PHASE406, me); + Talk(SAY_PHASE406); break; case 53: - DoScriptText(SAY_PHASE407, me); + Talk(SAY_PHASE407); break; case 54: - uiGossipStep = 5; + gossipStep = 5; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); SetHoldState(true); break; @@ -578,18 +597,18 @@ public: if (bStepping) { - if (uiPhaseTimer <= diff) + if (phaseTimer <= diff) { - switch (uiStep) + switch (step) { //After reset case 0: { - Unit* pJaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f); - if (!pJaina) - pJaina = me->SummonCreature(NPC_JAINA, 1895.48f, 1292.66f, 143.706f, 0.023475f, TEMPSUMMON_DEAD_DESPAWN, 180000); - if (pJaina) - uiJainaGUID = pJaina->GetGUID(); + Unit* jaina = GetClosestCreatureWithEntry(me, NPC_JAINA, 50.0f); + if (!jaina) + jaina = me->SummonCreature(NPC_JAINA, 1895.48f, 1292.66f, 143.706f, 0.023475f, TEMPSUMMON_DEAD_DESPAWN, 180000); + if (jaina) + jainaGUID = jaina->GetGUID(); bStepping = false; JumpToNextStep(0); break; @@ -597,24 +616,24 @@ public: //After waypoint 0 case 1: me->SetWalk(false); - if (Unit* pUther = me->SummonCreature(NPC_UTHER, 1794.357f, 1272.183f, 140.558f, 1.37f, TEMPSUMMON_DEAD_DESPAWN, 180000)) + if (Unit* uther = me->SummonCreature(NPC_UTHER, 1794.357f, 1272.183f, 140.558f, 1.37f, TEMPSUMMON_DEAD_DESPAWN, 180000)) { - uiUtherGUID = pUther->GetGUID(); - pUther->SetWalk(false); - pUther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f); - pUther->SetTarget(me->GetGUID()); - me->SetTarget(uiUtherGUID); + utherGUID = uther->GetGUID(); + uther->SetWalk(false); + uther->GetMotionMaster()->MovePoint(0, 1897.018f, 1287.487f, 143.481f); + uther->SetTarget(me->GetGUID()); + me->SetTarget(utherGUID); } JumpToNextStep(17000); break; case 2: - DoScriptText(SAY_PHASE101, me); + Talk(SAY_PHASE101); JumpToNextStep(2000); break; case 3: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) { - DoScriptText(SAY_PHASE102, pUther); + uther->AI()->Talk(SAY_PHASE102); } JumpToNextStep(8000); break; @@ -622,90 +641,90 @@ public: SetEscortPaused(false); bStepping = false; SetRun(false); - DoScriptText(SAY_PHASE103, me); + Talk(SAY_PHASE103); JumpToNextStep(0); break; //After waypoint 1 case 5: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - pJaina->SetTarget(me->GetGUID()); - DoScriptText(SAY_PHASE104, me); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->SetTarget(me->GetGUID()); + Talk(SAY_PHASE104); JumpToNextStep(10000); break; case 6: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE105, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE105); JumpToNextStep(1000); break; case 7: - DoScriptText(SAY_PHASE106, me); + Talk(SAY_PHASE106); JumpToNextStep(4000); break; case 8: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE107, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE107); JumpToNextStep(6000); break; case 9: - DoScriptText(SAY_PHASE108, me); + Talk(SAY_PHASE108); JumpToNextStep(4000); break; case 10: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE109, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE109); JumpToNextStep(8000); break; case 11: - DoScriptText(SAY_PHASE110, me); + Talk(SAY_PHASE110); JumpToNextStep(4000); break; case 12: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE111, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE111); JumpToNextStep(4000); break; case 13: - DoScriptText(SAY_PHASE112, me); + Talk(SAY_PHASE112); JumpToNextStep(11000); break; case 14: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - DoScriptText(SAY_PHASE113, pJaina); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->AI()->Talk(SAY_PHASE113); JumpToNextStep(3000); break; case 15: - DoScriptText(SAY_PHASE114, me); + Talk(SAY_PHASE114); JumpToNextStep(9000); break; case 16: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - DoScriptText(SAY_PHASE115, pUther); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->AI()->Talk(SAY_PHASE115); JumpToNextStep(4000); break; case 17: - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) { - pUther->SetWalk(true); - pUther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); + uther->SetWalk(true); + uther->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; case 18: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) { - me->SetTarget(uiJainaGUID); - pJaina->SetWalk(true); - pJaina->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); + me->SetTarget(jainaGUID); + jaina->SetWalk(true); + jaina->GetMotionMaster()->MovePoint(0, 1794.357f, 1272.183f, 140.558f); } JumpToNextStep(1000); break; case 19: - DoScriptText(SAY_PHASE116, me); + Talk(SAY_PHASE116); JumpToNextStep(1000); break; case 20: - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - DoScriptText(SAY_PHASE117, pJaina); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->AI()->Talk(SAY_PHASE117); JumpToNextStep(3000); break; case 21: @@ -716,8 +735,8 @@ public: break; //After waypoint 3 case 22: - DoScriptText(SAY_PHASE118, me); - me->SetTarget(uiJainaGUID); + Talk(SAY_PHASE118); + me->SetTarget(jainaGUID); JumpToNextStep(10000); break; case 23: @@ -725,11 +744,11 @@ public: bStepping = false; SetRun(true); - if (Creature* pJaina = Unit::GetCreature(*me, uiJainaGUID)) - pJaina->DisappearAndDie(); + if (Creature* jaina = Unit::GetCreature(*me, jainaGUID)) + jaina->DisappearAndDie(); - if (Creature* pUther = Unit::GetCreature(*me, uiUtherGUID)) - pUther->DisappearAndDie(); + if (Creature* uther = Unit::GetCreature(*me, utherGUID)) + uther->DisappearAndDie(); me->SetTarget(0); JumpToNextStep(0); @@ -738,13 +757,13 @@ public: case 24: if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2026.469f, 1287.088f, 143.596f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 14000)) { - uiStalkerGUID = pStalker->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalker->GetGUID(); + me->SetTarget(stalkerGUID); } JumpToNextStep(1000); break; case 25: - DoScriptText(SAY_PHASE201, me); + Talk(SAY_PHASE201); JumpToNextStep(12000); break; case 26: @@ -756,24 +775,24 @@ public: break; //After waypoint 9 case 27: - me->SetTarget(uiCitymenGUID[0]); - if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) + me->SetTarget(citymenGUID[0]); + if (Creature* cityman = Unit::GetCreature(*me, citymenGUID[0])) { - pCityman->SetTarget(me->GetGUID()); - pCityman->SetWalk(true); - pCityman->GetMotionMaster()->MovePoint(0, 2088.625f, 1279.191f, 140.743f); + cityman->SetTarget(me->GetGUID()); + cityman->SetWalk(true); + cityman->GetMotionMaster()->MovePoint(0, 2088.625f, 1279.191f, 140.743f); } JumpToNextStep(2000); break; case 28: - if (Creature* pCityman = Unit::GetCreature(*me, uiCitymenGUID[0])) - DoScriptText(SAY_PHASE202, pCityman); + if (Creature* cityman = Unit::GetCreature(*me, citymenGUID[0])) + cityman->AI()->Talk(SAY_PHASE202); JumpToNextStep(4000); break; case 29: SetEscortPaused(false); bStepping = false; - DoScriptText(SAY_PHASE203, me); + Talk(SAY_PHASE203); JumpToNextStep(0); break; //After waypoint 10 @@ -784,13 +803,13 @@ public: case 31: SetEscortPaused(false); bStepping = false; - if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) + if (Creature* cityman1 = Unit::GetCreature(*me, citymenGUID[1])) { - DoScriptText(SAY_PHASE204, pCityman1); - pCityman1->SetTarget(me->GetGUID()); - if (Creature* pCityman0 = Unit::GetCreature(*me, uiCitymenGUID[0])) - pCityman0->Kill(pCityman0); - me->SetTarget(uiCitymenGUID[1]); + cityman1->AI()->Talk(SAY_PHASE204); + cityman1->SetTarget(me->GetGUID()); + if (Creature* cityman0 = Unit::GetCreature(*me, citymenGUID[0])) + cityman0->Kill(cityman0); + me->SetTarget(citymenGUID[1]); } JumpToNextStep(0); break; @@ -800,75 +819,75 @@ public: JumpToNextStep(1000); break; case 33: - if (Creature* pCityman1 = Unit::GetCreature(*me, uiCitymenGUID[1])) - pCityman1->Kill(pCityman1); + if (Creature* cityman1 = Unit::GetCreature(*me, citymenGUID[1])) + cityman1->Kill(cityman1); JumpToNextStep(1000); break; case 34: if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { - uiStalkerGUID = pStalker->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalker->GetGUID(); + me->SetTarget(stalkerGUID); } - DoScriptText(SAY_PHASE205, me); + Talk(SAY_PHASE205); JumpToNextStep(3000); break; case 35: if (Unit* pStalkerM = me->SummonCreature(NPC_INVIS_TARGET, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { - uiStalkerGUID = pStalkerM->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalkerM->GetGUID(); + me->SetTarget(stalkerGUID); } JumpToNextStep(1000); break; case 36: - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) + if (Creature* malganis = me->SummonCreature(NPC_MAL_GANIS, 2117.349f, 1288.624f, 136.271f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 60000)) { - if (Creature* pStalkerM = Unit::GetCreature(*me, uiStalkerGUID)) - pMalganis->CastSpell(pStalkerM, 63793, false); + if (Creature* pStalkerM = Unit::GetCreature(*me, stalkerGUID)) + malganis->CastSpell(pStalkerM, 63793, false); - uiMalganisGUID = pMalganis->GetGUID(); - DoScriptText(SAY_PHASE206, pMalganis); - pMalganis->SetTarget(me->GetGUID()); - pMalganis->SetReactState(REACT_PASSIVE); + malganisGUID = malganis->GetGUID(); + malganis->AI()->Talk(SAY_PHASE206); + malganis->SetTarget(me->GetGUID()); + malganis->SetReactState(REACT_PASSIVE); } JumpToNextStep(11000); break; case 37: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) { - Creature* pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN, 100.0f); + Creature* pZombie = GetClosestCreatureWithEntry(malganis, NPC_CITY_MAN, 100.0f); if (!pZombie) - pZombie = GetClosestCreatureWithEntry(pMalganis, NPC_CITY_MAN2, 100.0f); + pZombie = GetClosestCreatureWithEntry(malganis, NPC_CITY_MAN2, 100.0f); if (pZombie) pZombie->UpdateEntry(NPC_ZOMBIE, 0); else //There's no one else to transform - uiStep++; + step++; } else - uiStep++; - uiPhaseTimer = 500; + step++; + phaseTimer = 500; break; case 38: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - DoScriptText(SAY_PHASE207, pMalganis); + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) + malganis->AI()->Talk(SAY_PHASE207); JumpToNextStep(17000); break; case 39: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) - pMalganis->SetVisible(false); - DoScriptText(SAY_PHASE208, me); + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) + malganis->SetVisible(false); + Talk(SAY_PHASE208); JumpToNextStep(7000); break; case 40: if (Unit* pStalker = me->SummonCreature(NPC_INVIS_TARGET, 2081.447f, 1287.770f, 141.3241f, 1.37f, TEMPSUMMON_TIMED_DESPAWN, 10000)) { - uiStalkerGUID = pStalker->GetGUID(); - me->SetTarget(uiStalkerGUID); + stalkerGUID = pStalker->GetGUID(); + me->SetTarget(stalkerGUID); } - DoScriptText(SAY_PHASE209, me); + Talk(SAY_PHASE209); - uiBossEvent = DATA_MEATHOOK_EVENT; + bossEvent = DATA_MEATHOOK_EVENT; if (instance) instance->SetData(DATA_ARTHAS_EVENT, IN_PROGRESS); @@ -884,10 +903,10 @@ public: case 53: case 55: case 57: - if (instance->GetData(uiBossEvent) != DONE) + if (instance->GetData(bossEvent) != DONE) { - SpawnWaveGroup(uiWave, uiWaveGUID); - uiWave++; + SpawnWaveGroup(wave, waveGUID); + wave++; } JumpToNextStep(500); break; @@ -899,16 +918,16 @@ public: case 54: case 56: case 58: - if (instance->GetData(uiBossEvent) != DONE) + if (instance->GetData(bossEvent) != DONE) { uint32 mobCounter = 0; uint32 deadCounter = 0; for (uint8 i = 0; i < ENCOUNTER_WAVES_MAX_SPAWNS; ++i) { - if (uiWaveGUID[i] == 0) + if (waveGUID[i] == 0) break; ++mobCounter; - Unit* temp = Unit::GetCreature(*me, uiWaveGUID[i]); + Unit* temp = Unit::GetCreature(*me, waveGUID[i]); if (!temp || temp->isDead()) ++deadCounter; } @@ -916,24 +935,24 @@ public: if (mobCounter <= deadCounter) //If group is dead JumpToNextStep(1000); else - uiPhaseTimer = 1000; + phaseTimer = 1000; } else JumpToNextStep(500); break; case 49: //Summon Boss case 59: - if (instance->GetData(uiBossEvent) != DONE) + if (instance->GetData(bossEvent) != DONE) { uint32 uiBossID = 0; - if (uiBossEvent == DATA_MEATHOOK_EVENT) + if (bossEvent == DATA_MEATHOOK_EVENT) uiBossID = NPC_MEATHOOK; - else if (uiBossEvent == DATA_SALRAMM_EVENT) + else if (bossEvent == DATA_SALRAMM_EVENT) uiBossID = NPC_SALRAMM; if (Unit* pBoss = me->SummonCreature(uiBossID, 2232.19f, 1331.933f, 126.662f, 3.15f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { - uiBossGUID = pBoss->GetGUID(); + bossGUID = pBoss->GetGUID(); pBoss->SetWalk(true); pBoss->GetMotionMaster()->MovePoint(0, 2194.110f, 1332.00f, 130.00f); } @@ -944,42 +963,42 @@ public: case 60: if (instance) { - if (instance->GetData(uiBossEvent) == DONE) + if (instance->GetData(bossEvent) == DONE) { JumpToNextStep(1000); - if (uiBossEvent == DATA_MEATHOOK_EVENT) - uiBossEvent = DATA_SALRAMM_EVENT; - else if (uiBossEvent == DATA_SALRAMM_EVENT) + if (bossEvent == DATA_MEATHOOK_EVENT) + bossEvent = DATA_SALRAMM_EVENT; + else if (bossEvent == DATA_SALRAMM_EVENT) { SetHoldState(false); bStepping = false; - uiBossEvent = DATA_EPOCH_EVENT; + bossEvent = DATA_EPOCH_EVENT; } } - else if (instance->GetData(uiBossEvent) == FAIL) + else if (instance->GetData(bossEvent) == FAIL) npc_escortAI::EnterEvadeMode(); else - uiPhaseTimer = 10000; + phaseTimer = 10000; } break; //After Gossip 2 (waypoint 22) case 61: me->SetReactState(REACT_AGGRESSIVE); - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - pDisguised0->SetTarget(me->GetGUID()); - if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) - pDisguised1->SetTarget(me->GetGUID()); - if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) - pDisguised2->SetTarget(me->GetGUID()); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->SetTarget(me->GetGUID()); + if (Creature* disguised1 = Unit::GetCreature(*me, infiniteDraconianGUID[1])) + disguised1->SetTarget(me->GetGUID()); + if (Creature* disguised2 = Unit::GetCreature(*me, infiniteDraconianGUID[2])) + disguised2->SetTarget(me->GetGUID()); JumpToNextStep(1000); break; case 62: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE302, pDisguised0); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->AI()->Talk(SAY_PHASE302); JumpToNextStep(7000); break; case 63: - DoScriptText(SAY_PHASE303, me); + Talk(SAY_PHASE303); SetHoldState(false); bStepping = false; JumpToNextStep(0); @@ -990,46 +1009,46 @@ public: JumpToNextStep(1000); break; case 65: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - pDisguised0->HandleEmoteCommand(11); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->HandleEmoteCommand(11); JumpToNextStep(1000); break; case 66: - DoScriptText(SAY_PHASE304, me); + Talk(SAY_PHASE304); JumpToNextStep(2000); break; case 67: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) - DoScriptText(SAY_PHASE305, pDisguised0); + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) + disguised0->AI()->Talk(SAY_PHASE305); JumpToNextStep(1000); break; case 68: - if (Creature* pDisguised2 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[2])) + if (Creature* disguised2 = Unit::GetCreature(*me, infiniteDraconianGUID[2])) { - pDisguised2->UpdateEntry(NPC_INFINITE_HUNTER, 0); + disguised2->UpdateEntry(NPC_INFINITE_HUNTER, 0); //Make them unattackable - pDisguised2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pDisguised2->SetReactState(REACT_PASSIVE); + disguised2->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + disguised2->SetReactState(REACT_PASSIVE); } JumpToNextStep(2000); break; case 69: - if (Creature* pDisguised1 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[1])) + if (Creature* disguised1 = Unit::GetCreature(*me, infiniteDraconianGUID[1])) { - pDisguised1->UpdateEntry(NPC_INFINITE_AGENT, 0); + disguised1->UpdateEntry(NPC_INFINITE_AGENT, 0); //Make them unattackable - pDisguised1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pDisguised1->SetReactState(REACT_PASSIVE); + disguised1->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + disguised1->SetReactState(REACT_PASSIVE); } JumpToNextStep(2000); break; case 70: - if (Creature* pDisguised0 = Unit::GetCreature(*me, uiInfiniteDraconianGUID[0])) + if (Creature* disguised0 = Unit::GetCreature(*me, infiniteDraconianGUID[0])) { - pDisguised0->UpdateEntry(NPC_INFINITE_ADVERSARY, 0); + disguised0->UpdateEntry(NPC_INFINITE_ADVERSARY, 0); //Make them unattackable - pDisguised0->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pDisguised0->SetReactState(REACT_PASSIVE); + disguised0->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + disguised0->SetReactState(REACT_PASSIVE); } JumpToNextStep(2000); break; @@ -1040,7 +1059,7 @@ public: case 77: //Make cratures attackable for (uint32 i = 0; i< ENCOUNTER_DRACONIAN_NUMBER; ++i) - if (Creature* temp = Unit::GetCreature(*me, uiInfiniteDraconianGUID[i])) + if (Creature* temp = Unit::GetCreature(*me, infiniteDraconianGUID[i])) { temp->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); temp->SetReactState(REACT_AGGRESSIVE); @@ -1051,12 +1070,12 @@ public: case 74: case 76: if (me->isInCombat()) - uiPhaseTimer = 1000; + phaseTimer = 1000; else { - if (uiStep == 72) DoScriptText(SAY_PHASE308, me); - if (uiStep == 74) DoScriptText(SAY_PHASE308, me); - if (uiStep == 76) DoScriptText(SAY_PHASE310, me); + if (step == 72) Talk(SAY_PHASE308); + if (step == 74) Talk(SAY_PHASE308); + if (step == 76) Talk(SAY_PHASE310); SetHoldState(false); bStepping = false; SetRun(true); @@ -1065,44 +1084,44 @@ public: break; case 78: if (me->isInCombat()) - uiPhaseTimer = 1000; + phaseTimer = 1000; else { - DoScriptText(SAY_PHASE312, me); + Talk(SAY_PHASE312); JumpToNextStep(5000); } break; case 79: - DoScriptText(SAY_PHASE313, me); + Talk(SAY_PHASE313); JumpToNextStep(1000); break; case 80: if (instance) if (instance->GetData(DATA_EPOCH_EVENT) != DONE) { - SpawnTimeRift(17, &uiEpochGUID); - if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) - DoScriptText(SAY_PHASE314, pEpoch); - me->SetTarget(uiEpochGUID); + SpawnTimeRift(17, &epochGUID); + if (Creature* epoch = Unit::GetCreature(*me, epochGUID)) + epoch->AI()->Talk(SAY_PHASE314); + me->SetTarget(epochGUID); } JumpToNextStep(18000); break; case 81: if (instance) if (instance->GetData(DATA_EPOCH_EVENT) != DONE) - DoScriptText(SAY_PHASE315, me); + Talk(SAY_PHASE315); JumpToNextStep(6000); break; case 82: if (instance) if (instance->GetData(DATA_EPOCH_EVENT) != DONE) { - if (Creature* pEpoch = Unit::GetCreature(*me, uiEpochGUID)) + if (Creature* epoch = Unit::GetCreature(*me, epochGUID)) { //Make Epoch attackable - pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); - pEpoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); - pEpoch->SetReactState(REACT_AGGRESSIVE); + epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC); + epoch->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE); + epoch->SetReactState(REACT_AGGRESSIVE); } } @@ -1113,31 +1132,31 @@ public: { if (instance->GetData(DATA_EPOCH_EVENT) == DONE) { - uiGossipStep = 3; + gossipStep = 3; me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); bStepping = false; - uiBossEvent = DATA_MAL_GANIS_EVENT; + bossEvent = DATA_MAL_GANIS_EVENT; JumpToNextStep(15000); } else if (instance->GetData(DATA_EPOCH_EVENT) == FAIL) npc_escortAI::EnterEvadeMode(); else - uiPhaseTimer = 10000; + phaseTimer = 10000; } break; //After Gossip 4 case 84: - DoScriptText(SAY_PHASE404, me); + Talk(SAY_PHASE404); SetHoldState(false); bStepping = false; break; //After Gossip 5 case 85: - DoScriptText(SAY_PHASE501, me); - if (Creature* pMalganis = me->SummonCreature(NPC_MAL_GANIS, 2296.665f, 1502.362f, 128.362f, 4.961f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) + Talk(SAY_PHASE501); + if (Creature* malganis = me->SummonCreature(NPC_MAL_GANIS, 2296.665f, 1502.362f, 128.362f, 4.961f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 900000)) { - uiMalganisGUID = pMalganis->GetGUID(); - pMalganis->SetReactState(REACT_PASSIVE); + malganisGUID = malganis->GetGUID(); + malganis->SetReactState(REACT_PASSIVE); } if (instance) if (GameObject* pGate = instance->instance->GetGameObject(instance->GetData64(DATA_MAL_GANIS_GATE_1))) @@ -1148,15 +1167,15 @@ public: break; //After waypoint 55 case 86: - DoScriptText(SAY_PHASE502, me); + Talk(SAY_PHASE502); JumpToNextStep(6000); - me->SetTarget(uiMalganisGUID); + me->SetTarget(malganisGUID); break; case 87: - if (Creature* pMalganis = Unit::GetCreature(*me, uiMalganisGUID)) + if (Creature* malganis = Unit::GetCreature(*me, malganisGUID)) { - pMalganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_UNK_6 | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_UNK_15); - pMalganis->SetReactState(REACT_AGGRESSIVE); + malganis->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_UNK_6 | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_UNK_15); + malganis->SetReactState(REACT_AGGRESSIVE); } JumpToNextStep(1000); break; @@ -1171,14 +1190,14 @@ public: else if (instance->GetData(DATA_MAL_GANIS_EVENT) == FAIL) npc_escortAI::EnterEvadeMode(); else - uiPhaseTimer = 10000; + phaseTimer = 10000; } break; //After waypoint 56 case 89: SetRun(true); - me->SetTarget(uiMalganisGUID); - DoScriptText(SAY_PHASE503, me); + me->SetTarget(malganisGUID); + Talk(SAY_PHASE503); JumpToNextStep(7000); break; case 90: @@ -1187,23 +1206,23 @@ public: instance->SetData(DATA_ARTHAS_EVENT, DONE); //Rewards: Achiev & Chest ;D me->SetTarget(instance->GetData64(DATA_MAL_GANIS_GATE_2)); //Look behind } - DoScriptText(SAY_PHASE504, me); + Talk(SAY_PHASE504); bStepping = false; break; } - } else uiPhaseTimer -= diff; + } else phaseTimer -= diff; } //Battling skills if (!me->getVictim()) return; - if (uiExorcismTimer < diff) + if (exorcismTimer < diff) { if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0)) DoCast(target, SPELL_EXORCISM_N); - uiExorcismTimer = 7300; - } else uiExorcismTimer -= diff; + exorcismTimer = 7300; + } else exorcismTimer -= diff; if (HealthBelowPct(40)) DoCast(me, SPELL_HOLY_LIGHT); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp index 161ea4ba8b7..bcf48ccd7be 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_aeonus.cpp @@ -29,13 +29,12 @@ EndScriptData */ enum eEnums { - SAY_ENTER = -1269012, - SAY_AGGRO = -1269013, - SAY_BANISH = -1269014, - SAY_SLAY1 = -1269015, - SAY_SLAY2 = -1269016, - SAY_DEATH = -1269017, - EMOTE_FRENZY = -1269018, + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_BANISH = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + EMOTE_FRENZY = 5, SPELL_CLEAVE = 40504, SPELL_TIME_STOP = 31422, @@ -76,7 +75,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void MoveInLineOfSight(Unit* who) @@ -86,7 +85,7 @@ public: { if (me->IsWithinDistInMap(who, 20.0f)) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } @@ -96,7 +95,7 @@ public: void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) { @@ -107,7 +106,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) @@ -133,7 +132,7 @@ public: //Frenzy if (Frenzy_Timer <= diff) { - DoScriptText(EMOTE_FRENZY, me); + Talk(EMOTE_FRENZY); DoCast(me, SPELL_ENRAGE); Frenzy_Timer = 20000+rand()%15000; } else Frenzy_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp index 8fc7f31e766..244e22149fc 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_chrono_lord_deja.cpp @@ -29,12 +29,11 @@ EndScriptData */ enum eEnums { - SAY_ENTER = -1269006, - SAY_AGGRO = -1269007, - SAY_BANISH = -1269008, - SAY_SLAY1 = -1269009, - SAY_SLAY2 = -1269010, - SAY_DEATH = -1269011, + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_BANISH = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, SPELL_ARCANE_BLAST = 31457, H_SPELL_ARCANE_BLAST = 38538, @@ -78,7 +77,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void MoveInLineOfSight(Unit* who) @@ -88,7 +87,7 @@ public: { if (me->IsWithinDistInMap(who, 20.0f)) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } } @@ -98,12 +97,12 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_RIFT, SPECIAL); @@ -133,7 +132,7 @@ public: //Time Lapse if (TimeLapse_Timer <= diff) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); DoCast(me, SPELL_TIME_LAPSE); TimeLapse_Timer = 15000+rand()%10000; } else TimeLapse_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp index 0256a099580..02a9f4742b3 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/boss_temporus.cpp @@ -29,12 +29,11 @@ EndScriptData */ enum eEnums { - SAY_ENTER = -1269000, - SAY_AGGRO = -1269001, - SAY_BANISH = -1269002, - SAY_SLAY1 = -1269003, - SAY_SLAY2 = -1269004, - SAY_DEATH = -1269005, + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_BANISH = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, SPELL_HASTE = 31458, SPELL_MORTAL_WOUND = 31464, @@ -77,17 +76,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance) instance->SetData(TYPE_RIFT, SPECIAL); @@ -100,7 +99,7 @@ public: { if (me->IsWithinDistInMap(who, 20.0f)) { - DoScriptText(SAY_BANISH, me); + Talk(SAY_BANISH); me->DealDamage(who, who->GetHealth(), NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, false); } diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp index 8ca14d72b94..5d9eaeac7b9 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp @@ -36,29 +36,32 @@ EndContentData */ #include "Player.h" #include "SpellInfo.h" -#define SAY_ENTER -1269020 //where does this belong? -#define SAY_INTRO -1269021 -#define SAY_WEAK75 -1269022 -#define SAY_WEAK50 -1269023 -#define SAY_WEAK25 -1269024 -#define SAY_DEATH -1269025 -#define SAY_WIN -1269026 -#define SAY_ORCS_ENTER -1269027 -#define SAY_ORCS_ANSWER -1269028 +enum MedivhBm +{ + SAY_ENTER = 0, //where does this belong? + SAY_INTRO = 1, + SAY_WEAK75 = 2, + SAY_WEAK50 = 3, + SAY_WEAK25 = 4, + SAY_DEATH = 5, + SAY_WIN = 6, + SAY_ORCS_ENTER = 7, + SAY_ORCS_ANSWER = 8, -#define SPELL_CHANNEL 31556 -#define SPELL_PORTAL_RUNE 32570 //aura(portal on ground effect) + SPELL_CHANNEL = 31556, + SPELL_PORTAL_RUNE = 32570, //aura(portal on ground effect) -#define SPELL_BLACK_CRYSTAL 32563 //aura -#define SPELL_PORTAL_CRYSTAL 32564 //summon + SPELL_BLACK_CRYSTAL = 32563, //aura + SPELL_PORTAL_CRYSTAL = 32564, //summon -#define SPELL_BANISH_PURPLE 32566 //aura -#define SPELL_BANISH_GREEN 32567 //aura + SPELL_BANISH_PURPLE = 32566, //aura + SPELL_BANISH_GREEN = 32567, //aura -#define SPELL_CORRUPT 31326 -#define SPELL_CORRUPT_AEONUS 37853 + SPELL_CORRUPT = 31326, + SPELL_CORRUPT_AEONUS = 37853, -#define C_COUNCIL_ENFORCER 17023 + C_COUNCIL_ENFORCER = 17023 +}; class npc_medivh_bm : public CreatureScript { @@ -111,7 +114,7 @@ public: if (instance->GetData(TYPE_MEDIVH) == IN_PROGRESS || instance->GetData(TYPE_MEDIVH) == DONE) return; - DoScriptText(SAY_INTRO, me); + Talk(SAY_INTRO); instance->SetData(TYPE_MEDIVH, IN_PROGRESS); DoCast(me, SPELL_CHANNEL, false); Check_Timer = 5000; @@ -162,7 +165,7 @@ public: if (killer->GetEntry() == me->GetEntry()) return; - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void UpdateAI(const uint32 diff) @@ -195,17 +198,17 @@ public: if (Life25 && pct <= 25) { - DoScriptText(SAY_WEAK25, me); + Talk(SAY_WEAK25); Life25 = false; } else if (Life50 && pct <= 50) { - DoScriptText(SAY_WEAK50, me); + Talk(SAY_WEAK50); Life50 = false; } else if (Life75 && pct <= 75) { - DoScriptText(SAY_WEAK75, me); + Talk(SAY_WEAK75); Life75 = false; } @@ -220,7 +223,7 @@ public: if (instance->GetData(TYPE_RIFT) == DONE) { - DoScriptText(SAY_WIN, me); + Talk(SAY_WIN); Check_Timer = 0; if (me->HasAura(SPELL_CHANNEL)) @@ -363,11 +366,13 @@ public: }; -#define SAY_SAAT_WELCOME -1269019 +enum Saat +{ + SPELL_CHRONO_BEACON = 34975, + ITEM_CHRONO_BEACON = 24289 +}; #define GOSSIP_ITEM_OBTAIN "[PH] Obtain Chrono-Beacon" -#define SPELL_CHRONO_BEACON 34975 -#define ITEM_CHRONO_BEACON 24289 class npc_saat : public CreatureScript { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp index 96cfba0007b..3398395aca6 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_captain_skarloc.cpp @@ -27,19 +27,25 @@ EndScriptData */ #include "ScriptedCreature.h" #include "old_hillsbrad.h" -#define SAY_ENTER -1560000 -#define SAY_TAUNT1 -1560001 -#define SAY_TAUNT2 -1560002 -#define SAY_SLAY1 -1560003 -#define SAY_SLAY2 -1560004 -#define SAY_DEATH -1560005 - -#define SPELL_HOLY_LIGHT 29427 -#define SPELL_CLEANSE 29380 -#define SPELL_HAMMER_OF_JUSTICE 13005 -#define SPELL_HOLY_SHIELD 31904 -#define SPELL_DEVOTION_AURA 8258 -#define SPELL_CONSECRATION 38385 +/*###################### +# boss_captain_skarloc # +#######################*/ + +enum CaptainSkarloc +{ + SAY_ENTER = 0, + SAY_TAUNT1 = 1, + SAY_TAUNT2 = 2, + SAY_SLAY = 3, + SAY_DEATH = 4, + + SPELL_HOLY_LIGHT = 29427, + SPELL_CLEANSE = 29380, + SPELL_HAMMER_OF_JUSTICE = 13005, + SPELL_HOLY_SHIELD = 31904, + SPELL_DEVOTION_AURA = 8258, + SPELL_CONSECRATION = 38385 +}; class boss_captain_skarloc : public CreatureScript { @@ -80,18 +86,18 @@ public: void EnterCombat(Unit* /*who*/) { //This is not correct. Should taunt Thrall before engage in combat - DoScriptText(SAY_TAUNT1, me); - DoScriptText(SAY_TAUNT2, me); + Talk(SAY_TAUNT1); + Talk(SAY_TAUNT2); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance && instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) instance->SetData(TYPE_THRALL_PART1, DONE); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp index ab0f10bdfe0..00204300a51 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_epoch_hunter.cpp @@ -27,21 +27,23 @@ EndScriptData */ #include "ScriptedCreature.h" #include "old_hillsbrad.h" -#define SAY_ENTER1 -1560013 -#define SAY_ENTER2 -1560014 -#define SAY_ENTER3 -1560015 -#define SAY_AGGRO1 -1560016 -#define SAY_AGGRO2 -1560017 -#define SAY_SLAY1 -1560018 -#define SAY_SLAY2 -1560019 -#define SAY_BREATH1 -1560020 -#define SAY_BREATH2 -1560021 -#define SAY_DEATH -1560022 - -#define SPELL_SAND_BREATH 31914 -#define SPELL_IMPENDING_DEATH 31916 -#define SPELL_MAGIC_DISRUPTION_AURA 33834 -#define SPELL_WING_BUFFET 31475 +/*################### +# boss_epoch_hunter # +####################*/ + +enum EpochHunter +{ + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_BREATH = 3, + SAY_DEATH = 4, + + SPELL_SAND_BREATH = 31914, + SPELL_IMPENDING_DEATH = 31916, + SPELL_MAGIC_DISRUPTION_AURA = 33834, + SPELL_WING_BUFFET = 31475 +}; class boss_epoch_hunter : public CreatureScript { @@ -77,17 +79,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2), me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); if (instance && instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS) instance->SetData(TYPE_THRALL_PART4, DONE); @@ -107,7 +109,7 @@ public: DoCast(me->getVictim(), SPELL_SAND_BREATH); - DoScriptText(RAND(SAY_BREATH1, SAY_BREATH2), me); + Talk(SAY_BREATH); SandBreath_Timer = urand(10000, 20000); } else SandBreath_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp index 534c831814e..22036899d64 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/boss_leutenant_drake.cpp @@ -56,18 +56,20 @@ public: ## boss_lieutenant_drake ######*/ -#define SAY_ENTER -1560006 -#define SAY_AGGRO -1560007 -#define SAY_SLAY1 -1560008 -#define SAY_SLAY2 -1560009 -#define SAY_MORTAL -1560010 -#define SAY_SHOUT -1560011 -#define SAY_DEATH -1560012 - -#define SPELL_WHIRLWIND 31909 -#define SPELL_HAMSTRING 9080 -#define SPELL_MORTAL_STRIKE 31911 -#define SPELL_FRIGHTENING_SHOUT 33789 +enum LieutenantDrake +{ + SAY_ENTER = 0, + SAY_AGGRO = 1, + SAY_SLAY = 2, + SAY_MORTAL = 3, + SAY_SHOUT = 4, + SAY_DEATH = 5, + + SPELL_WHIRLWIND = 31909, + SPELL_HAMSTRING = 9080, + SPELL_MORTAL_STRIKE = 31911, + SPELL_FRIGHTENING_SHOUT = 33789 +}; struct Location { @@ -135,17 +137,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void UpdateAI(const uint32 diff) @@ -171,7 +173,7 @@ public: //Fear if (Fear_Timer <= diff) { - DoScriptText(SAY_SHOUT, me); + Talk(SAY_SHOUT); DoCast(me->getVictim(), SPELL_FRIGHTENING_SHOUT); Fear_Timer = 25000+rand()%10000; } else Fear_Timer -= diff; @@ -179,7 +181,7 @@ public: //Mortal Strike if (MortalStrike_Timer <= diff) { - DoScriptText(SAY_MORTAL, me); + Talk(SAY_MORTAL); DoCast(me->getVictim(), SPELL_MORTAL_STRIKE); MortalStrike_Timer = 20000+rand()%10000; } else MortalStrike_Timer -= diff; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp index 2000d8a52f8..fe41ff521d8 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp @@ -36,12 +36,14 @@ EndContentData */ #include "old_hillsbrad.h" #include "Player.h" -#define QUEST_ENTRY_HILLSBRAD 10282 -#define QUEST_ENTRY_DIVERSION 10283 -#define QUEST_ENTRY_ESCAPE 10284 -#define QUEST_ENTRY_RETURN 10285 -#define ITEM_ENTRY_BOMBS 25853 - +enum Erozion +{ + QUEST_ENTRY_HILLSBRAD = 10282, + QUEST_ENTRY_DIVERSION = 10283, + QUEST_ENTRY_ESCAPE = 10284, + QUEST_ENTRY_RETURN = 10285, + ITEM_ENTRY_BOMBS = 25853 +}; #define GOSSIP_HELLO_EROZION1 "I need a pack of Incendiary Bombs." #define GOSSIP_HELLO_EROZION2 "[PH] Teleport please, i'm tired." @@ -98,97 +100,85 @@ public: ######*/ //Thrall texts -#define SAY_TH_START_EVENT_PART1 -1560023 -#define SAY_TH_ARMORY -1560024 -#define SAY_TH_SKARLOC_MEET -1560025 -#define SAY_TH_SKARLOC_TAUNT -1560026 -#define SAY_TH_START_EVENT_PART2 -1560027 -#define SAY_TH_MOUNTS_UP -1560028 -#define SAY_TH_CHURCH_END -1560029 -#define SAY_TH_MEET_TARETHA -1560030 -#define SAY_TH_EPOCH_WONDER -1560031 -#define SAY_TH_EPOCH_KILL_TARETHA -1560032 -#define SAY_TH_EVENT_COMPLETE -1560033 - -#define SAY_TH_RANDOM_LOW_HP1 -1560034 -#define SAY_TH_RANDOM_LOW_HP2 -1560035 - -#define SAY_TH_RANDOM_DIE1 -1560036 -#define SAY_TH_RANDOM_DIE2 -1560037 - -#define SAY_TH_RANDOM_AGGRO1 -1560038 -#define SAY_TH_RANDOM_AGGRO2 -1560039 -#define SAY_TH_RANDOM_AGGRO3 -1560040 -#define SAY_TH_RANDOM_AGGRO4 -1560041 - -#define SAY_TH_RANDOM_KILL1 -1560042 -#define SAY_TH_RANDOM_KILL2 -1560043 -#define SAY_TH_RANDOM_KILL3 -1560044 - -#define SAY_TH_LEAVE_COMBAT1 -1560045 -#define SAY_TH_LEAVE_COMBAT2 -1560046 -#define SAY_TH_LEAVE_COMBAT3 -1560047 - -//Taretha texts -#define SAY_TA_FREE -1560048 -#define SAY_TA_ESCAPED -1560049 - -//Misc for Thrall -#define SPELL_STRIKE 14516 -#define SPELL_SHIELD_BLOCK 12169 -#define SPELL_SUMMON_EROZION_IMAGE 33954 //if thrall dies during escort? +enum ThrallOldHillsbrad +{ + SAY_TH_START_EVENT_PART1 = 0, + SAY_TH_ARMORY = 1, + SAY_TH_SKARLOC_MEET = 2, + SAY_TH_SKARLOC_TAUNT = 3, + SAY_TH_START_EVENT_PART2 = 4, + SAY_TH_MOUNTS_UP = 5, + SAY_TH_CHURCH_END = 6, + SAY_TH_MEET_TARETHA = 7, + SAY_TH_EPOCH_WONDER = 8, + SAY_TH_EPOCH_KILL_TARETHA = 9, + SAY_TH_EVENT_COMPLETE = 10, + + SAY_TH_RANDOM_LOW_HP = 11, + SAY_TH_RANDOM_DIE = 12, + SAY_TH_RANDOM_AGGRO = 13, + SAY_TH_RANDOM_KILL = 14, + SAY_TH_LEAVE_COMBAT = 15, + + //Taretha texts + SAY_TA_FREE = 0, + SAY_TA_ESCAPED = 1, + + //Misc for Thrall + SPELL_STRIKE = 14516, + SPELL_SHIELD_BLOCK = 12169, + SPELL_SUMMON_EROZION_IMAGE = 33954, //if thrall dies during escort? + + THRALL_WEAPON_ITEM = 927, + THRALL_WEAPON_INFO = 218169346, + THRALL_SHIELD_ITEM = 2129, + THRALL_SHIELD_INFO = 234948100, + THRALL_MODEL_UNEQUIPPED = 17292, + THRALL_MODEL_EQUIPPED = 18165, + + //Misc Creature entries + ENTRY_ARMORER = 18764, + ENTRY_SCARLOC = 17862, + + MOB_ENTRY_RIFLE = 17820, + MOB_ENTRY_WARDEN = 17833, + MOB_ENTRY_VETERAN = 17860, + MOB_ENTRY_WATCHMAN = 17814, + MOB_ENTRY_SENTRY = 17815, + + MOB_ENTRY_BARN_GUARDSMAN = 18092, + MOB_ENTRY_BARN_PROTECTOR = 18093, + MOB_ENTRY_BARN_LOOKOUT = 18094, + + MOB_ENTRY_CHURCH_GUARDSMAN = 23175, + MOB_ENTRY_CHURCH_PROTECTOR = 23179, + MOB_ENTRY_CHURCH_LOOKOUT = 23177, + + MOB_ENTRY_INN_GUARDSMAN = 23176, + MOB_ENTRY_INN_PROTECTOR = 23180, + MOB_ENTRY_INN_LOOKOUT = 23178, + + SKARLOC_MOUNT = 18798, + SKARLOC_MOUNT_MODEL = 18223, + EROZION_ENTRY = 18723, + ENTRY_EPOCH = 18096, + + GOSSIP_ID_START = 9568, + GOSSIP_ID_SKARLOC1 = 9614, //I'm glad Taretha is alive. We now must find a way to free her... + GOSSIP_ID_SKARLOC2 = 9579, //What do you mean by this? Is Taretha in danger? + GOSSIP_ID_SKARLOC3 = 9580, + GOSSIP_ID_TARREN = 9597, //tarren mill is beyond these trees + GOSSIP_ID_COMPLETE = 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her +}; #define SPEED_WALK (0.5f) #define SPEED_RUN (1.0f) #define SPEED_MOUNT (1.6f) -#define THRALL_WEAPON_ITEM 927 -#define THRALL_WEAPON_INFO 218169346 -#define THRALL_SHIELD_ITEM 2129 -#define THRALL_SHIELD_INFO 234948100 -#define THRALL_MODEL_UNEQUIPPED 17292 -#define THRALL_MODEL_EQUIPPED 18165 - -//Misc Creature entries -#define ENTRY_ARMORER 18764 -#define ENTRY_SCARLOC 17862 - -#define MOB_ENTRY_RIFLE 17820 -#define MOB_ENTRY_WARDEN 17833 -#define MOB_ENTRY_VETERAN 17860 -#define MOB_ENTRY_WATCHMAN 17814 -#define MOB_ENTRY_SENTRY 17815 - -#define MOB_ENTRY_BARN_GUARDSMAN 18092 -#define MOB_ENTRY_BARN_PROTECTOR 18093 -#define MOB_ENTRY_BARN_LOOKOUT 18094 - -#define MOB_ENTRY_CHURCH_GUARDSMAN 23175 -#define MOB_ENTRY_CHURCH_PROTECTOR 23179 -#define MOB_ENTRY_CHURCH_LOOKOUT 23177 - -#define MOB_ENTRY_INN_GUARDSMAN 23176 -#define MOB_ENTRY_INN_PROTECTOR 23180 -#define MOB_ENTRY_INN_LOOKOUT 23178 - -#define SKARLOC_MOUNT 18798 -#define SKARLOC_MOUNT_MODEL 18223 -#define EROZION_ENTRY 18723 -#define ENTRY_EPOCH 18096 - //gossip items -#define GOSSIP_ID_START 9568 -#define GOSSIP_ID_SKARLOC1 9614 //I'm glad Taretha is alive. We now must find a way to free her... #define GOSSIP_ITEM_SKARLOC1 "Taretha cannot see you, Thrall." -#define GOSSIP_ID_SKARLOC2 9579 //What do you mean by this? Is Taretha in danger? #define GOSSIP_ITEM_SKARLOC2 "The situation is rather complicated, Thrall. It would be best for you to head into the mountains now, before more of Blackmoore's men show up. We'll make sure Taretha is safe." -#define GOSSIP_ID_SKARLOC3 9580 - -#define GOSSIP_ID_TARREN 9597 //tarren mill is beyond these trees #define GOSSIP_ITEM_TARREN "We're ready, Thrall." - -#define GOSSIP_ID_COMPLETE 9578 //Thank you friends, I owe my freedom to you. Where is Taretha? I hoped to see her - #define GOSSIP_ITEM_WALKING "[PH] Start walking." class npc_thrall_old_hillsbrad : public CreatureScript @@ -215,7 +205,7 @@ public: instance->SetData(TYPE_THRALL_PART1, IN_PROGRESS); } - DoScriptText(SAY_TH_START_EVENT_PART1, creature); + creature->AI()->Talk(SAY_TH_START_EVENT_PART1); if (npc_escortAI* pEscortAI = CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())) pEscortAI->Start(true, true, player->GetGUID()); @@ -236,7 +226,7 @@ public: if (instance) instance->SetData(TYPE_THRALL_PART2, IN_PROGRESS); - DoScriptText(SAY_TH_START_EVENT_PART2, creature); + creature->AI()->Talk(SAY_TH_START_EVENT_PART2); CAST_AI(npc_thrall_old_hillsbrad::npc_thrall_old_hillsbradAI, creature->AI())->StartWP(); break; @@ -311,7 +301,7 @@ public: me->SummonCreature(18764, 2181.87f, 112.46f, 89.45f, 0.26f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 9: - DoScriptText(SAY_TH_ARMORY, me); + Talk(SAY_TH_ARMORY); me->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID, THRALL_WEAPON_ITEM); //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO, THRALL_WEAPON_INFO); //me->SetUInt32Value(UNIT_VIRTUAL_ITEM_INFO+1, 781); @@ -344,7 +334,7 @@ public: me->SummonCreature(MOB_ENTRY_VETERAN, 2104.18f, 194.82f, 65.18f, 5.75f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000); break; case 29: - DoScriptText(SAY_TH_SKARLOC_MEET, me); + Talk(SAY_TH_SKARLOC_MEET); me->SummonCreature(ENTRY_SCARLOC, 2036.48f, 271.22f, 63.43f, 5.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); //temporary, skarloc should rather be triggered to walk up to thrall break; @@ -354,7 +344,7 @@ public: SetRun(false); break; case 31: - DoScriptText(SAY_TH_MOUNTS_UP, me); + Talk(SAY_TH_MOUNTS_UP); DoMount(); SetRun(); break; @@ -400,7 +390,7 @@ public: me->SummonCreature(MOB_ENTRY_CHURCH_GUARDSMAN, 2627.22f, 649.00f, 56.03f, 4.34f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 5000); break; case 84: - DoScriptText(SAY_TH_CHURCH_END, me); + Talk(SAY_TH_CHURCH_END); SetRun(); break; case 91: @@ -416,20 +406,20 @@ public: case 94: if (uint64 TarethaGUID = instance->GetData64(DATA_TARETHA)) { - if (Unit* Taretha = Unit::GetUnit(*me, TarethaGUID)) - DoScriptText(SAY_TA_ESCAPED, Taretha, me); + if (Creature* Taretha = Creature::GetCreature(*me, TarethaGUID)) + Taretha->AI()->Talk(SAY_TA_ESCAPED, me->GetGUID()); } break; case 95: - DoScriptText(SAY_TH_MEET_TARETHA, me); + Talk(SAY_TH_MEET_TARETHA); instance->SetData(TYPE_THRALL_PART3, DONE); SetEscortPaused(true); break; case 96: - DoScriptText(SAY_TH_EPOCH_WONDER, me); + Talk(SAY_TH_EPOCH_WONDER); break; case 97: - DoScriptText(SAY_TH_EPOCH_KILL_TARETHA, me); + Talk(SAY_TH_EPOCH_KILL_TARETHA); SetRun(); break; case 98: @@ -485,7 +475,7 @@ public: } if (HasEscortState(STATE_ESCORT_ESCORTING)) { - DoScriptText(RAND(SAY_TH_LEAVE_COMBAT1, SAY_TH_LEAVE_COMBAT2, SAY_TH_LEAVE_COMBAT3), me); + Talk(SAY_TH_LEAVE_COMBAT); } } void StartWP() @@ -505,7 +495,7 @@ public: } void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_TH_RANDOM_AGGRO1, SAY_TH_RANDOM_AGGRO2, SAY_TH_RANDOM_AGGRO3, SAY_TH_RANDOM_AGGRO4), me); + Talk(SAY_TH_RANDOM_AGGRO); if (me->IsMounted()) { DoUnmount(); @@ -532,7 +522,7 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_TH_RANDOM_KILL1, SAY_TH_RANDOM_KILL2, SAY_TH_RANDOM_KILL3), me); + Talk(SAY_TH_RANDOM_KILL); } void JustDied(Unit* slayer) { @@ -543,7 +533,7 @@ public: if (slayer == me) return; - DoScriptText(RAND(SAY_TH_RANDOM_DIE1, SAY_TH_RANDOM_DIE2), me); + Talk(SAY_TH_RANDOM_DIE); } void UpdateAI(const uint32 diff) @@ -556,7 +546,7 @@ public: //TODO: add his abilities'n-crap here if (!LowHp && HealthBelowPct(20)) { - DoScriptText(RAND(SAY_TH_RANDOM_LOW_HP1, SAY_TH_RANDOM_LOW_HP2), me); + Talk(SAY_TH_RANDOM_LOW_HP); LowHp = true; } } @@ -567,10 +557,13 @@ public: /*###### ## npc_taretha ######*/ +enum Taretha +{ + GOSSIP_ID_EPOCH1 = 9610, //Thank you for helping Thrall escape, friends. Now I only hope + GOSSIP_ID_EPOCH2 = 9613 //Yes, friends. This man was no wizard of +}; -#define GOSSIP_ID_EPOCH1 9610 //Thank you for helping Thrall escape, friends. Now I only hope #define GOSSIP_ITEM_EPOCH1 "Strange wizard?" -#define GOSSIP_ID_EPOCH2 9613 //Yes, friends. This man was no wizard of #define GOSSIP_ITEM_EPOCH2 "We'll get you out. Taretha. Don't worry. I doubt the wizard would wander too far away." class npc_taretha : public CreatureScript @@ -638,7 +631,7 @@ public: switch (waypointId) { case 6: - DoScriptText(SAY_TA_FREE, me); + Talk(SAY_TA_FREE); break; case 7: me->HandleEmoteCommand(EMOTE_ONESHOT_CHEER); diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp index 44f9aa1184a..b3690ab14c7 100644 --- a/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp +++ b/src/server/scripts/Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -26,16 +26,19 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SAY_AGGRO -1129000 -#define SAY_SUMMON60 -1129001 -#define SAY_SUMMON30 -1129002 -#define SAY_HP -1129003 -#define SAY_KILL -1129004 - -#define SPELL_AMNENNARSWRATH 13009 -#define SPELL_FROSTBOLT 15530 -#define SPELL_FROST_NOVA 15531 -#define SPELL_FROST_SPECTRES 12642 +enum AmnennarTheColdbringer +{ + SAY_AGGRO = 0, + SAY_SUMMON60 = 1, + SAY_SUMMON30 = 2, + SAY_HP = 3, + SAY_KILL = 4, + + SPELL_AMNENNARSWRATH = 13009, + SPELL_FROSTBOLT = 15530, + SPELL_FROST_NOVA = 15531, + SPELL_FROST_SPECTRES = 12642 +}; class boss_amnennar_the_coldbringer : public CreatureScript { @@ -70,12 +73,12 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_KILL, me); + Talk(SAY_KILL); } void UpdateAI(const uint32 diff) @@ -105,20 +108,20 @@ public: if (!Spectrals60 && HealthBelowPct(60)) { - DoScriptText(SAY_SUMMON60, me); + Talk(SAY_SUMMON60); DoCast(me->getVictim(), SPELL_FROST_SPECTRES); Spectrals60 = true; } if (!Hp && HealthBelowPct(50)) { - DoScriptText(SAY_HP, me); + Talk(SAY_HP); Hp = true; } if (!Spectrals30 && HealthBelowPct(30)) { - DoScriptText(SAY_SUMMON30, me); + Talk(SAY_SUMMON30); DoCast(me->getVictim(), SPELL_FROST_SPECTRES); Spectrals30 = true; } diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp index 7b3cd9f9900..b0953c73e57 100644 --- a/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp +++ b/src/server/scripts/Kalimdor/RazorfenKraul/razorfen_kraul.cpp @@ -33,20 +33,23 @@ EndContentData */ #include "razorfen_kraul.h" #include "Player.h" -#define SAY_READY -1047000 -#define SAY_POINT -1047001 -#define SAY_AGGRO1 -1047002 -#define SAY_BLUELEAF -1047003 -#define SAY_DANGER -1047004 -#define SAY_BAD -1047005 -#define SAY_THINK -1047006 -#define SAY_SOON -1047007 -#define SAY_FINALY -1047008 -#define SAY_WIN -1047009 -#define SAY_END -1047010 - -#define QUEST_WILLIX_THE_IMPORTER 1144 -#define ENTRY_BOAR 4514 +enum Willix +{ + SAY_READY = 0, + SAY_POINT = 1, + SAY_AGGRO1 = 2, + SAY_BLUELEAF = 3, + SAY_DANGER = 4, + SAY_BAD = 5, + SAY_THINK = 6, + SAY_SOON = 7, + SAY_FINALY = 8, + SAY_WIN = 9, + SAY_END = 10, + + QUEST_WILLIX_THE_IMPORTER = 1144, + ENTRY_BOAR = 4514 +}; class npc_willix : public CreatureScript { @@ -58,7 +61,7 @@ public: if (quest->GetQuestId() == QUEST_WILLIX_THE_IMPORTER) { CAST_AI(npc_escortAI, (creature->AI()))->Start(true, false, player->GetGUID()); - DoScriptText(SAY_READY, creature, player); + creature->AI()->Talk(SAY_READY, player->GetGUID()); creature->setFaction(113); } @@ -84,43 +87,43 @@ public: { case 3: me->HandleEmoteCommand(EMOTE_STATE_POINT); - DoScriptText(SAY_POINT, me, player); + Talk(SAY_POINT, player->GetGUID()); break; case 4: me->SummonCreature(ENTRY_BOAR, 2137.66f, 1843.98f, 48.08f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 8: - DoScriptText(SAY_BLUELEAF, me, player); + Talk(SAY_BLUELEAF, player->GetGUID()); break; case 9: - DoScriptText(SAY_DANGER, me, player); + Talk(SAY_DANGER, player->GetGUID()); break; case 13: - DoScriptText(SAY_BAD, me, player); + Talk(SAY_BAD, player->GetGUID()); break; case 14: me->SummonCreature(ENTRY_BOAR, 2078.91f, 1704.54f, 56.77f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 25: - DoScriptText(SAY_THINK, me, player); + Talk(SAY_THINK, player->GetGUID()); break; case 31: - DoScriptText(SAY_SOON, me, player); + Talk(SAY_SOON, player->GetGUID()); break; case 42: - DoScriptText(SAY_FINALY, me, player); + Talk(SAY_FINALY, player->GetGUID()); break; case 43: me->SummonCreature(ENTRY_BOAR, 1956.43f, 1596.97f, 81.75f, 1.54f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 45: - DoScriptText(SAY_WIN, me, player); + Talk(SAY_WIN, player->GetGUID()); me->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_QUESTGIVER); if (player->GetTypeId() == TYPEID_PLAYER) CAST_PLR(player)->GroupEventHappens(QUEST_WILLIX_THE_IMPORTER, me); break; case 46: - DoScriptText(SAY_END, me, player); + Talk(SAY_END, player->GetGUID()); break; } } @@ -129,7 +132,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO1, me, NULL); + Talk(SAY_AGGRO1); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp index 40d4d5d54b4..7dd395770db 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp @@ -29,7 +29,7 @@ EndScriptData */ enum Yells { - EMOTE_TARGET = -1509002 + EMOTE_TARGET = 0 }; class boss_buru : public CreatureScript diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp index 4abbf99d4ef..5f5b958fb9b 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp @@ -21,8 +21,8 @@ enum Texts { - EMOTE_AGGRO = -1509000, - EMOTE_MANA_FULL = -1509001 + EMOTE_AGGRO = 0, + EMOTE_MANA_FULL = 1 }; enum Spells diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp index da67f93f968..1ffd74eddf3 100644 --- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp +++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -23,22 +23,22 @@ enum Yells { // The time of our retribution is at hand! Let darkness reign in the hearts of our enemies! Sound: 8645 Emote: 35 - SAY_ANDOROV_INTRO = -1509003, // Before for the first wave - SAY_ANDOROV_ATTACK = -1509004, // Beginning the event - SAY_ANDOROV_WAVE_1 = -1509001, // When the first wave comes text: Kill first, ask questions later... Incoming! emote: 45 sound: 8653 - SAY_WAVE3 = -1509005, - SAY_WAVE4 = -1509006, - SAY_WAVE5 = -1509007, - SAY_WAVE6 = -1509008, - SAY_WAVE7 = -1509009, - SAY_INTRO = -1509010, - SAY_UNK1 = -1509011, - SAY_UNK2 = -1509012, - SAY_UNK3 = -1509013, - SAY_DEATH = -1509014, - SAY_CHANGEAGGRO = -1509015, - SAY_KILLS_ANDOROV = -1509016, - SAY_COMPLETE_QUEST = -1509017 // Yell when realm complete quest 8743 for world event + SAY_ANDOROV_INTRO = 0, // Before for the first wave + SAY_ANDOROV_ATTACK = 1, // Beginning the event + + SAY_WAVE3 = 0, + SAY_WAVE4 = 1, + SAY_WAVE5 = 2, + SAY_WAVE6 = 3, + SAY_WAVE7 = 4, + SAY_INTRO = 5, + SAY_UNK1 = 6, + SAY_UNK2 = 7, + SAY_UNK3 = 8, + SAY_DEATH = 9, + SAY_CHANGEAGGRO = 10, + SAY_KILLS_ANDOROV = 11, + SAY_COMPLETE_QUEST = 12 // Yell when realm complete quest 8743 for world event // Warriors, Captains, continue the fight! Sound: 8640 }; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 6b569bbd3e5..c97f8a0495f 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -58,8 +58,6 @@ EndScriptData */ * - the current phase is stored in the instance data to be easily shared between the eye and cthun. */ -#define PI 3.14 - enum Phases { PHASE_NOT_STARTED = 0, @@ -76,24 +74,6 @@ enum Phases PHASE_CTHUN_DONE = 6, }; -enum Creatures -{ - MOB_CTHUN_PORTAL = 15896, - - // ***** Main Phase 1 ******** - BOSS_EYE_OF_CTHUN = 15589, - MOB_CLAW_TENTACLE = 15725, - MOB_EYE_TENTACLE = 15726, - MOB_SMALL_PORTAL = 15904, - - // ***** Main Phase 2 ******** - MOB_BODY_OF_CTHUN = 15809, - MOB_GIANT_CLAW_TENTACLE = 15728, - MOB_GIANT_EYE_TENTACLE = 15334, - MOB_FLESH_TENTACLE = 15802, - MOB_GIANT_PORTAL = 15910, -}; - enum Spells { // ***** Main Phase 1 ******** @@ -142,7 +122,7 @@ enum Actions enum Yells { //Text emote - EMOTE_WEAKENED = -1531011, + EMOTE_WEAKENED = 0, // ****** Out of Combat ****** // Random Wispers - No txt only sound @@ -712,7 +692,7 @@ public: { instance->SetData(DATA_CTHUN_PHASE, PHASE_CTHUN_WEAK); - DoScriptText(EMOTE_WEAKENED, me); + Talk(EMOTE_WEAKENED); PhaseTimer = 45000; DoCast(me, SPELL_PURPLE_COLORATION, true); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp index 83af40c57f2..ab4968e3bf7 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_huhuran.cpp @@ -26,15 +26,18 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define EMOTE_GENERIC_FRENZY_KILL -1000001 -#define EMOTE_GENERIC_BERSERK -1000004 - -#define SPELL_FRENZY 26051 -#define SPELL_BERSERK 26068 -#define SPELL_POISONBOLT 26052 -#define SPELL_NOXIOUSPOISON 26053 -#define SPELL_WYVERNSTING 26180 -#define SPELL_ACIDSPIT 26050 +enum Huhuran +{ + EMOTE_FRENZY_KILL = 0, + EMOTE_BERSERK = 1, + + SPELL_FRENZY = 26051, + SPELL_BERSERK = 26068, + SPELL_POISONBOLT = 26052, + SPELL_NOXIOUSPOISON = 26053, + SPELL_WYVERNSTING = 26180, + SPELL_ACIDSPIT = 26050 +}; class boss_huhuran : public CreatureScript { @@ -87,7 +90,7 @@ public: if (!Frenzy && Frenzy_Timer <= diff) { DoCast(me, SPELL_FRENZY); - DoScriptText(EMOTE_GENERIC_FRENZY_KILL, me); + Talk(EMOTE_FRENZY_KILL); Frenzy = true; PoisonBolt_Timer = 3000; Frenzy_Timer = urand(25000, 35000); @@ -136,7 +139,7 @@ public: if (!Berserk && HealthBelowPct(31)) { me->InterruptNonMeleeSpells(false); - DoScriptText(EMOTE_GENERIC_BERSERK, me); + Talk(EMOTE_BERSERK); DoCast(me, SPELL_BERSERK); Berserk = true; } diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp index 02554bbe6b3..2ac9358b976 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_sartura.cpp @@ -26,17 +26,20 @@ EndScriptData */ #include "ScriptMgr.h" #include "ScriptedCreature.h" -#define SAY_AGGRO -1531008 -#define SAY_SLAY -1531009 -#define SAY_DEATH -1531010 +enum Sartura +{ + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_DEATH = 2, -#define SPELL_WHIRLWIND 26083 -#define SPELL_ENRAGE 28747 //Not sure if right ID. -#define SPELL_ENRAGEHARD 28798 + SPELL_WHIRLWIND = 26083, + SPELL_ENRAGE = 28747, //Not sure if right ID. + SPELL_ENRAGEHARD = 28798, //Guard Spell -#define SPELL_WHIRLWINDADD 26038 -#define SPELL_KNOCKBACK 26027 + SPELL_WHIRLWINDADD = 26038, + SPELL_KNOCKBACK = 26027 +}; class boss_sartura : public CreatureScript { @@ -82,17 +85,17 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(SAY_AGGRO, me); + Talk(SAY_AGGRO); } void JustDied(Unit* /*killer*/) { - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void KilledUnit(Unit* /*victim*/) { - DoScriptText(SAY_SLAY, me); + Talk(SAY_SLAY); } void UpdateAI(const uint32 diff) diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp index 917c790f42b..99a304e3726 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp @@ -29,19 +29,18 @@ EndScriptData */ #include "Group.h" #include "Player.h" -#define SAY_AGGRO1 -1531000 -#define SAY_AGGRO2 -1531001 -#define SAY_AGGRO3 -1531002 -#define SAY_SLAY1 -1531003 -#define SAY_SLAY2 -1531004 -#define SAY_SLAY3 -1531005 -#define SAY_SPLIT -1531006 -#define SAY_DEATH -1531007 - -#define SPELL_ARCANE_EXPLOSION 25679 -#define SPELL_EARTH_SHOCK 26194 -#define SPELL_TRUE_FULFILLMENT 785 -#define SPELL_BLINK 28391 +enum Skeram +{ + SAY_AGGRO = 0, + SAY_SLAY = 1, + SAY_SPLIT = 2, + SAY_DEATH = 3, + + SPELL_ARCANE_EXPLOSION = 25679, + SPELL_EARTH_SHOCK = 26194, + SPELL_TRUE_FULFILLMENT = 785, + SPELL_BLINK = 28391 +}; class ov_mycoordinates { @@ -104,20 +103,20 @@ public: void KilledUnit(Unit* /*victim*/) { - DoScriptText(RAND(SAY_SLAY1, SAY_SLAY2, SAY_SLAY3), me); + Talk(SAY_SLAY); } void JustDied(Unit* /*killer*/) { if (!IsImage) - DoScriptText(SAY_DEATH, me); + Talk(SAY_DEATH); } void EnterCombat(Unit* /*who*/) { if (IsImage || Images75) return; - DoScriptText(RAND(SAY_AGGRO1, SAY_AGGRO2, SAY_AGGRO3), me); + Talk(SAY_AGGRO); } void UpdateAI(const uint32 diff) @@ -209,7 +208,7 @@ public: void DoSplit(int atPercent /* 75 50 25 */) { - DoScriptText(SAY_SPLIT, me); + Talk(SAY_SPLIT); ov_mycoordinates *place1 = new ov_mycoordinates(-8340.782227f, 2083.814453f, 125.648788f, 0); ov_mycoordinates *place2 = new ov_mycoordinates(-8341.546875f, 2118.504639f, 133.058151f, 0); diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp index d0e97bc36c8..c97fd40929a 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_viscidus.cpp @@ -1,6 +1,5 @@ /* * Copyright (C) 2008-2012 TrinityCore <http://www.trinitycore.org/> - * Copyright (C) 2006-2009 ScriptDev2 <https://scriptdev2.svn.sourceforge.net/> * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -16,18 +15,293 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -/* ScriptData -SDName: Boss_Viscidus -SD%Complete: 0 -SDComment: place holder -SDCategory: Temple of Ahn'Qiraj -EndScriptData */ - #include "ScriptMgr.h" #include "ScriptedCreature.h" +#include "SpellInfo.h" +#include "temple_of_ahnqiraj.h" + +enum Spells +{ + SPELL_POISON_SHOCK = 25993, + SPELL_POISONBOLT_VOLLEY = 25991, + SPELL_TOXIN = 26575, + SPELL_VISCIDUS_SLOWED = 26034, + SPELL_VISCIDUS_SLOWED_MORE = 26036, + SPELL_VISCIDUS_FREEZE = 25937, + SPELL_REJOIN_VISCIDUS = 25896, + SPELL_VISCIDUS_EXPLODE = 25938, + SPELL_VISCIDUS_SUICIDE = 26003, + SPELL_VISCIDUS_SHRINKS = 25893, // Removed from client, in world.spell_dbc + + SPELL_MEMBRANE_VISCIDUS = 25994, // damage reduction spell - removed from DBC + SPELL_VISCIDUS_WEAKNESS = 25926, // aura which procs at damage - should trigger the slow spells - removed from DBC + SPELL_VISCIDUS_GROWS = 25897, // removed from DBC + SPELL_SUMMON_GLOBS = 25885, // summons npc 15667 using spells from 25865 to 25884; All spells have target coords - removed from DBC + SPELL_VISCIDUS_TELEPORT = 25904, // removed from DBC +}; + +enum Events +{ + EVENT_POISONBOLT_VOLLEY = 1, + EVENT_POISON_SHOCK = 2, + EVENT_RESET_PHASE = 3 +}; + +enum Phases +{ + PHASE_FROST = 1, + PHASE_MELEE = 2, + PHASE_GLOB = 3 +}; + +enum Emotes +{ + EMOTE_SLOW = 0, + EMOTE_FREEZE = 1, + EMOTE_FROZEN = 2, + + EMOTE_CRACK = 3, + EMOTE_SHATTER = 4, + EMOTE_EXPLODE = 5 +}; + +enum HitCounter +{ + HITCOUNTER_SLOW = 100, + HITCOUNTER_SLOW_MORE = 150, + HITCOUNTER_FREEZE = 200, + + HITCOUNTER_CRACK = 50, + HITCOUNTER_SHATTER = 100, + HITCOUNTER_EXPLODE = 150, +}; + +enum MovePoints +{ + ROOM_CENTER = 1 +}; + +Position const ViscidusCoord = { -7992.36f, 908.19f, -52.62f, 1.68f }; // TODO: Visci isn't in room middle +float const RoomRadius = 40.0f; // TODO: Not sure if its correct + +class boss_viscidus : public CreatureScript +{ + public: + boss_viscidus() : CreatureScript("boss_viscidus") { } + + struct boss_viscidusAI : public BossAI + { + boss_viscidusAI(Creature* creature) : BossAI(creature, DATA_VISCIDUS) { } + + void Reset() + { + _Reset(); + _hitcounter = 0; + _phase = PHASE_FROST; + } + + void DamageTaken(Unit* attacker, uint32& /*damage*/) + { + if (_phase != PHASE_MELEE) + return; + + ++_hitcounter; + + if (attacker->HasUnitState(UNIT_STATE_MELEE_ATTACKING) && _hitcounter >= HITCOUNTER_EXPLODE) + { + Talk(EMOTE_EXPLODE); + events.Reset(); + _phase = PHASE_GLOB; + DoCast(me, SPELL_VISCIDUS_EXPLODE); + me->SetVisible(false); + me->RemoveAura(SPELL_TOXIN); + me->RemoveAura(SPELL_VISCIDUS_FREEZE); + + uint8 NumGlobes = me->GetHealthPct() / 5.0f; + for (uint8 i = 0; i < NumGlobes; ++i) + { + float Angle = i * 2 * M_PI / NumGlobes; + float X = ViscidusCoord.GetPositionX() + std::cos(Angle) * RoomRadius; + float Y = ViscidusCoord.GetPositionY() + std::sin(Angle) * RoomRadius; + float Z = -35.0f; + + if (TempSummon* Glob = me->SummonCreature(NPC_GLOB_OF_VISCIDUS, X, Y, Z)) + { + Glob->UpdateAllowedPositionZ(X, Y, Z); + Glob->NearTeleportTo(X, Y, Z, 0.0f); + Glob->GetMotionMaster()->MovePoint(ROOM_CENTER, ViscidusCoord); + } + } + } + else if (_hitcounter == HITCOUNTER_SHATTER) + Talk(EMOTE_SHATTER); + else if (_hitcounter == HITCOUNTER_CRACK) + Talk(EMOTE_CRACK); + } + + void SpellHit(Unit* /*caster*/, SpellInfo const* spell) + { + if ((spell->GetSchoolMask() & SPELL_SCHOOL_MASK_FROST) && _phase == PHASE_FROST && me->GetHealthPct() > 5.0f) + { + ++_hitcounter; + + if (_hitcounter >= HITCOUNTER_FREEZE) + { + _hitcounter = 0; + Talk(EMOTE_FROZEN); + _phase = PHASE_MELEE; + DoCast(me, SPELL_VISCIDUS_FREEZE); + me->RemoveAura(SPELL_VISCIDUS_SLOWED_MORE); + events.ScheduleEvent(EVENT_RESET_PHASE, 15000); + } + else if (_hitcounter >= HITCOUNTER_SLOW_MORE) + { + Talk(EMOTE_FREEZE); + me->RemoveAura(SPELL_VISCIDUS_SLOWED); + DoCast(me, SPELL_VISCIDUS_SLOWED_MORE); + } + else if (_hitcounter >= HITCOUNTER_SLOW) + { + Talk(EMOTE_SLOW); + DoCast(me, SPELL_VISCIDUS_SLOWED); + } + } + } + + void EnterCombat(Unit* /*who*/) + { + _EnterCombat(); + events.Reset(); + InitSpells(); + } + + void InitSpells() + { + DoCast(me, SPELL_TOXIN); + events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000)); + events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000)); + } + + void EnterEvadeMode() + { + summons.DespawnAll(); + ScriptedAI::EnterEvadeMode(); + } + + void JustDied(Unit* /*killer*/) + { + DoCast(me, SPELL_VISCIDUS_SUICIDE); + summons.DespawnAll(); + } + + void UpdateAI(uint32 const diff) + { + if (!UpdateVictim()) + return; + + if (_phase == PHASE_GLOB && summons.empty()) + { + DoResetThreat(); + me->NearTeleportTo(ViscidusCoord.GetPositionX(), + ViscidusCoord.GetPositionY(), + ViscidusCoord.GetPositionZ(), + ViscidusCoord.GetOrientation()); + + _hitcounter = 0; + _phase = PHASE_FROST; + InitSpells(); + me->SetVisible(true); + } + + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_POISONBOLT_VOLLEY: + DoCast(me, SPELL_POISONBOLT_VOLLEY); + events.ScheduleEvent(EVENT_POISONBOLT_VOLLEY, urand(10000, 15000)); + break; + case EVENT_POISON_SHOCK: + DoCast(me, SPELL_POISON_SHOCK); + events.ScheduleEvent(EVENT_POISON_SHOCK, urand(7000, 12000)); + break; + case EVENT_RESET_PHASE: + _hitcounter = 0; + _phase = PHASE_FROST; + break; + default: + break; + } + } + + if (_phase != PHASE_GLOB) + DoMeleeAttackIfReady(); + } + + private: + uint8 _hitcounter; + Phases _phase; + }; + + CreatureAI* GetAI(Creature* creature) const + { + return new boss_viscidusAI(creature); + } +}; + +class npc_glob_of_viscidus : public CreatureScript +{ + public: + npc_glob_of_viscidus() : CreatureScript("boss_glob_of_viscidus") { } + + struct npc_glob_of_viscidusAI : public ScriptedAI + { + npc_glob_of_viscidusAI(Creature* creature) : ScriptedAI(creature) { } + + void JustDied(Unit* /*killer*/) + { + InstanceScript* Instance = me->GetInstanceScript(); + if (!Instance) + return; + + if (Creature* Viscidus = me->GetMap()->GetCreature(Instance->GetData64(DATA_VISCIDUS))) + { + if (BossAI* ViscidusAI = dynamic_cast<BossAI*>(Viscidus->GetAI())) + ViscidusAI->SummonedCreatureDespawn(me); + + if (Viscidus->isAlive() && Viscidus->GetHealthPct() < 5.0f) + { + Viscidus->SetVisible(true); + Viscidus->getVictim()->Kill(Viscidus); + } + else + { + Viscidus->SetHealth(Viscidus->GetHealth() - Viscidus->GetMaxHealth() / 20); + Viscidus->GetAI()->DoCast(Viscidus, SPELL_VISCIDUS_SHRINKS); + } + } + } -#define SPELL_POISON_SHOCK 25993 -#define SPELL_POISONBOLT_VOLLEY 25991 + void MovementInform(uint32 /*type*/, uint32 id) + { + if (id == ROOM_CENTER) + { + DoCast(me, SPELL_REJOIN_VISCIDUS); + ((TempSummon*)me)->UnSummon(); + } + } + }; -#define SPELL_TOXIN_CLOUD 25989 + CreatureAI* GetAI(Creature* creature) const + { + return new npc_glob_of_viscidusAI(creature); + } +}; +void AddSC_boss_viscidus() +{ + new boss_viscidus(); + new npc_glob_of_viscidus(); +} diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp index c8a1ff63925..3efdcd0dcf6 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp @@ -29,71 +29,86 @@ EndScriptData */ class instance_temple_of_ahnqiraj : public InstanceMapScript { -public: - instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { } + public: + instance_temple_of_ahnqiraj() : InstanceMapScript("instance_temple_of_ahnqiraj", 531) { } - InstanceScript* GetInstanceScript(InstanceMap* map) const - { - return new instance_temple_of_ahnqiraj_InstanceMapScript(map); - } + InstanceScript* GetInstanceScript(InstanceMap* map) const + { + return new instance_temple_of_ahnqiraj_InstanceMapScript(map); + } - struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript - { - instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) {} + struct instance_temple_of_ahnqiraj_InstanceMapScript : public InstanceScript + { + instance_temple_of_ahnqiraj_InstanceMapScript(Map* map) : InstanceScript(map) {} - //If Vem is dead... - bool IsBossDied[3]; + //If Vem is dead... + bool IsBossDied[3]; - //Storing Skeram, Vem and Kri. - uint64 SkeramGUID; - uint64 VemGUID; - uint64 KriGUID; - uint64 VeklorGUID; - uint64 VeknilashGUID; + //Storing Skeram, Vem and Kri. + uint64 SkeramGUID; + uint64 VemGUID; + uint64 KriGUID; + uint64 VeklorGUID; + uint64 VeknilashGUID; + uint64 ViscidusGUID; - uint32 BugTrioDeathCount; + uint32 BugTrioDeathCount; - uint32 CthunPhase; + uint32 CthunPhase; - void Initialize() - { - IsBossDied[0] = false; - IsBossDied[1] = false; - IsBossDied[2] = false; + void Initialize() + { + IsBossDied[0] = false; + IsBossDied[1] = false; + IsBossDied[2] = false; - SkeramGUID = 0; - VemGUID = 0; - KriGUID = 0; - VeklorGUID = 0; - VeknilashGUID = 0; + SkeramGUID = 0; + VemGUID = 0; + KriGUID = 0; + VeklorGUID = 0; + VeknilashGUID = 0; + ViscidusGUID = 0; - BugTrioDeathCount = 0; + BugTrioDeathCount = 0; - CthunPhase = 0; - } + CthunPhase = 0; + } - void OnCreatureCreate(Creature* creature) - { - switch (creature->GetEntry()) + void OnCreatureCreate(Creature* creature) { - case 15263: SkeramGUID = creature->GetGUID(); break; - case 15544: VemGUID = creature->GetGUID(); break; - case 15511: KriGUID = creature->GetGUID(); break; - case 15276: VeklorGUID = creature->GetGUID(); break; - case 15275: VeknilashGUID = creature->GetGUID(); break; + switch (creature->GetEntry()) + { + case NPC_SKERAM: + SkeramGUID = creature->GetGUID(); + break; + case NPC_VEM: + VemGUID = creature->GetGUID(); + break; + case NPC_KRI: + KriGUID = creature->GetGUID(); + break; + case NPC_VEKLOR: + VeklorGUID = creature->GetGUID(); + break; + case NPC_VEKNILASH: + VeknilashGUID = creature->GetGUID(); + break; + case NPC_VISCIDUS: + ViscidusGUID = creature->GetGUID(); + break; + } } - } - bool IsEncounterInProgress() const - { - //not active in AQ40 - return false; - } + bool IsEncounterInProgress() const + { + //not active in AQ40 + return false; + } - uint32 GetData(uint32 type) const - { - switch (type) + uint32 GetData(uint32 type) const { + switch (type) + { case DATA_VEMISDEAD: if (IsBossDied[0]) return 1; @@ -114,14 +129,14 @@ public: case DATA_CTHUN_PHASE: return CthunPhase; + } + return 0; } - return 0; - } - uint64 GetData64(uint32 identifier) const - { - switch (identifier) + uint64 GetData64(uint32 identifier) const { + switch (identifier) + { case DATA_SKERAM: return SkeramGUID; case DATA_VEM: @@ -132,14 +147,16 @@ public: return VeklorGUID; case DATA_VEKNILASH: return VeknilashGUID; - } - return 0; - } // end GetData64 + case DATA_VISCIDUS: + return ViscidusGUID; + } + return 0; + } // end GetData64 - void SetData(uint32 type, uint32 data) - { - switch (type) + void SetData(uint32 type, uint32 data) { + switch (type) + { case DATA_VEM_DEATH: IsBossDied[0] = true; break; @@ -159,9 +176,9 @@ public: case DATA_CTHUN_PHASE: CthunPhase = data; break; + } } - } - }; + }; }; diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h index 13c3d56d14c..f154ccf2c5d 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h @@ -19,19 +19,45 @@ #ifndef DEF_TEMPLE_OF_AHNQIRAJ_H #define DEF_TEMPLE_OF_AHNQIRAJ_H -#define DATA_SKERAM 1 -#define DATA_KRI 2 -#define DATA_VEM 3 -#define DATA_VEMISDEAD 4 -#define DATA_VEM_DEATH 5 -#define DATA_VEKLOR 6 -#define DATA_VEKLORISDEAD 7 -#define DATA_VEKLOR_DEATH 8 -#define DATA_VEKNILASH 9 -#define DATA_VEKNILASHISDEAD 10 -#define DATA_VEKNILASH_DEATH 11 -#define DATA_BUG_TRIO_DEATH 14 +enum DataTypes +{ + DATA_SKERAM = 1, + DATA_KRI = 2, + DATA_VEM = 3, + DATA_VEMISDEAD = 4, + DATA_VEM_DEATH = 5, + DATA_VEKLOR = 6, + DATA_VEKLORISDEAD = 7, + DATA_VEKLOR_DEATH = 8, + DATA_VEKNILASH = 9, + DATA_VEKNILASHISDEAD = 10, + DATA_VEKNILASH_DEATH = 11, + DATA_BUG_TRIO_DEATH = 14, + DATA_CTHUN_PHASE = 20, + DATA_VISCIDUS = 21 +}; -#define DATA_CTHUN_PHASE 20 +enum Creatures +{ + BOSS_EYE_OF_CTHUN = 15589, + MOB_CTHUN_PORTAL = 15896, + MOB_CLAW_TENTACLE = 15725, + MOB_EYE_TENTACLE = 15726, + MOB_SMALL_PORTAL = 15904, + MOB_BODY_OF_CTHUN = 15809, + MOB_GIANT_CLAW_TENTACLE = 15728, + MOB_GIANT_EYE_TENTACLE = 15334, + MOB_FLESH_TENTACLE = 15802, + MOB_GIANT_PORTAL = 15910, + + NPC_VISCIDUS = 15299, + NPC_GLOB_OF_VISCIDUS = 15667, + + NPC_SKERAM = 15263, + NPC_VEM = 15544, + NPC_KRI = 15511, + NPC_VEKLOR = 15276, + NPC_VEKNILASH = 15275 +}; #endif diff --git a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp index e1a3c3aeb45..6cc8d5931d3 100644 --- a/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp +++ b/src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.cpp @@ -37,35 +37,32 @@ EndContentData */ ## npc_disciple_of_naralex ######*/ -enum eEnums +enum Enums { - //say - SAY_MAKE_PREPARATIONS = -1043001, - SAY_TEMPLE_OF_PROMISE = -1043002, - SAY_MUST_CONTINUE = -1043003, - SAY_BANISH_THE_SPIRITS = -1043004, - SAY_CAVERNS_PURIFIED = -1043005, - SAY_BEYOND_THIS_CORRIDOR = -1043006, - SAY_EMERALD_DREAM = -1043007, - SAY_MUTANUS_THE_DEVOURER = -1043012, - SAY_NARALEX_AWAKES = -1043014, - SAY_THANK_YOU = -1043015, - SAY_FAREWELL = -1043016, - SAY_ATTACKED = -1043017, - //yell - SAY_AT_LAST = -1043000, - SAY_I_AM_AWAKE = -1043013, - //emote - EMOTE_AWAKENING_RITUAL = -1043008, - EMOTE_TROUBLED_SLEEP = -1043009, - EMOTE_WRITHE_IN_AGONY = -1043010, - EMOTE_HORRENDOUS_VISION = -1043011, - //spell + SAY_AT_LAST = 0, + SAY_MAKE_PREPARATIONS = 1, + SAY_TEMPLE_OF_PROMISE = 2, + SAY_MUST_CONTINUE = 3, + SAY_BANISH_THE_SPIRITS = 4, + SAY_CAVERNS_PURIFIED = 5, + SAY_BEYOND_THIS_CORRIDOR = 6, + SAY_EMERALD_DREAM = 7, + EMOTE_AWAKENING_RITUAL = 8, + EMOTE_TROUBLED_SLEEP = 0, + EMOTE_WRITHE_IN_AGONY = 1, + EMOTE_HORRENDOUS_VISION = 2, + SAY_MUTANUS_THE_DEVOURER = 9, + SAY_I_AM_AWAKE = 3, + SAY_NARALEX_AWAKES = 10, + SAY_THANK_YOU = 4, + SAY_FAREWELL = 5, + SAY_ATTACKED = 11, + SPELL_MARK_OF_THE_WILD_RANK_2 = 5232, SPELL_SERPENTINE_CLEANSING = 6270, SPELL_NARALEXS_AWAKENING = 6271, SPELL_FLIGHT_FORM = 33943, - //npc entry + NPC_DEVIATE_RAVAGER = 3636, NPC_DEVIATE_VIPER = 5755, NPC_DEVIATE_MOCCASIN = 5762, @@ -76,7 +73,6 @@ enum eEnums #define GOSSIP_ID_START_1 698 //Naralex sleeps again! #define GOSSIP_ID_START_2 699 //The fanglords are dead! #define GOSSIP_ITEM_NARALEX "Let the event begin!" -#define ACHIEVEMENT_WAILING_CAVERNS 630 class npc_disciple_of_naralex : public CreatureScript { @@ -98,7 +94,7 @@ public: if (instance) instance->SetData(TYPE_NARALEX_EVENT, IN_PROGRESS); - DoScriptText(SAY_MAKE_PREPARATIONS, creature); + creature->AI()->Talk(SAY_MAKE_PREPARATIONS); creature->setFaction(250); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); @@ -125,7 +121,7 @@ public: if (!instance->GetData(TYPE_NARALEX_YELLED)) { - DoScriptText(SAY_AT_LAST, creature); + creature->AI()->Talk(SAY_AT_LAST); instance->SetData(TYPE_NARALEX_YELLED, 1); } } @@ -167,7 +163,7 @@ public: instance->SetData(TYPE_NARALEX_PART1, IN_PROGRESS); break; case 5: - DoScriptText(SAY_MUST_CONTINUE, me); + Talk(SAY_MUST_CONTINUE); instance->SetData(TYPE_NARALEX_PART1, DONE); break; case 11: @@ -176,7 +172,7 @@ public: instance->SetData(TYPE_NARALEX_PART2, IN_PROGRESS); break; case 19: - DoScriptText(SAY_BEYOND_THIS_CORRIDOR, me); + Talk(SAY_BEYOND_THIS_CORRIDOR); break; case 24: eventProgress = 1; @@ -193,7 +189,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(SAY_ATTACKED, me, who); + Talk(SAY_ATTACKED, who->GetGUID()); } void JustDied(Unit* /*slayer*/) @@ -230,7 +226,7 @@ public: if (eventProgress == 1) { ++eventProgress; - DoScriptText(SAY_TEMPLE_OF_PROMISE, me); + Talk(SAY_TEMPLE_OF_PROMISE); me->SummonCreature(NPC_DEVIATE_RAVAGER, -82.1763f, 227.874f, -93.3233f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); me->SummonCreature(NPC_DEVIATE_RAVAGER, -72.9506f, 216.645f, -93.6756f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 5000); } @@ -239,7 +235,7 @@ public: if (eventProgress == 1) { ++eventProgress; - DoScriptText(SAY_BANISH_THE_SPIRITS, me); + Talk(SAY_BANISH_THE_SPIRITS); DoCast(me, SPELL_SERPENTINE_CLEANSING); //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); eventTimer = 30000; @@ -251,7 +247,7 @@ public: if (eventProgress == 2) { //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(true); - DoScriptText(SAY_CAVERNS_PURIFIED, me); + Talk(SAY_CAVERNS_PURIFIED); instance->SetData(TYPE_NARALEX_PART2, DONE); if (me->HasAura(SPELL_SERPENTINE_CLEANSING)) me->RemoveAura(SPELL_SERPENTINE_CLEANSING); @@ -263,7 +259,7 @@ public: ++eventProgress; eventTimer = 4000; me->SetStandState(UNIT_STAND_STATE_KNEEL); - DoScriptText(SAY_EMERALD_DREAM, me); + Talk(SAY_EMERALD_DREAM); } else if (eventProgress == 2) @@ -273,7 +269,7 @@ public: //CAST_AI(npc_escort::npc_escortAI, me->AI())->SetCanDefend(false); if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) DoCast(naralex, SPELL_NARALEXS_AWAKENING, true); - DoScriptText(EMOTE_AWAKENING_RITUAL, me); + Talk(EMOTE_AWAKENING_RITUAL); } else if (eventProgress == 3) @@ -281,7 +277,7 @@ public: ++eventProgress; eventTimer = 15000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_TROUBLED_SLEEP, naralex); + naralex->AI()->Talk(EMOTE_TROUBLED_SLEEP); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 135.943f, 199.701f, -103.529f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 151.08f, 221.13f, -103.609f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_DEVIATE_MOCCASIN, 128.007f, 227.428f, -97.421f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -292,7 +288,7 @@ public: ++eventProgress; eventTimer = 30000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_WRITHE_IN_AGONY, naralex); + naralex->AI()->Talk(EMOTE_WRITHE_IN_AGONY); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 133.413f, 207.188f, -102.469f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 142.857f, 218.645f, -102.905f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); me->SummonCreature(NPC_NIGHTMARE_ECTOPLASM, 105.102f, 227.211f, -102.752f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 15000); @@ -306,9 +302,9 @@ public: { ++eventProgress; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(EMOTE_HORRENDOUS_VISION, naralex); + naralex->AI()->Talk(EMOTE_HORRENDOUS_VISION); me->SummonCreature(NPC_MUTANUS_THE_DEVOURER, 150.872f, 262.905f, -103.503f, 0, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 300000); - DoScriptText(SAY_MUTANUS_THE_DEVOURER, me); + Talk(SAY_MUTANUS_THE_DEVOURER); instance->SetData(TYPE_MUTANUS_THE_DEVOURER, IN_PROGRESS); } else @@ -318,23 +314,12 @@ public: eventTimer = 3000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { - AchievementEntry const* AchievWC = sAchievementStore.LookupEntry(ACHIEVEMENT_WAILING_CAVERNS); - if (AchievWC) - { - Map* map = me->GetMap(); - if (map && map->IsDungeon()) - { - Map::PlayerList const &players = map->GetPlayers(); - for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) - itr->getSource()->CompletedAchievement(AchievWC); - } - } if (me->HasAura(SPELL_NARALEXS_AWAKENING)) me->RemoveAura(SPELL_NARALEXS_AWAKENING); naralex->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_I_AM_AWAKE, naralex); + naralex->AI()->Talk(SAY_I_AM_AWAKE); } - DoScriptText(SAY_NARALEX_AWAKES, me); + Talk(SAY_NARALEX_AWAKES); } else if (eventProgress == 7) @@ -342,7 +327,7 @@ public: ++eventProgress; eventTimer = 6000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) - DoScriptText(SAY_THANK_YOU, naralex); + naralex->AI()->Talk(SAY_THANK_YOU); } else if (eventProgress == 8) @@ -351,7 +336,7 @@ public: eventTimer = 8000; if (Creature* naralex = instance->instance->GetCreature(instance->GetData64(DATA_NARALEX))) { - DoScriptText(SAY_FAREWELL, naralex); + naralex->AI()->Talk(SAY_FAREWELL); naralex->AddAura(SPELL_FLIGHT_FORM, naralex); } SetRun(); diff --git a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp index f288db920f4..0a948e4a5f0 100644 --- a/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp +++ b/src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.cpp @@ -242,16 +242,16 @@ private: enum weegliSpells { - SPELL_BOMB = 8858, - SPELL_GOBLIN_LAND_MINE = 21688, - SPELL_SHOOT = 6660, - SPELL_WEEGLIS_BARREL = 10772 + SPELL_BOMB = 8858, + SPELL_GOBLIN_LAND_MINE = 21688, + SPELL_SHOOT = 6660, + SPELL_WEEGLIS_BARREL = 10772 }; enum weegliSays { - SAY_WEEGLI_OHNO = -1209000, - SAY_WEEGLI_OK_I_GO = -1209001 + SAY_WEEGLI_OHNO = 0, + SAY_WEEGLI_OK_I_GO = 1 }; #define GOSSIP_WEEGLI "[PH] Please blow up the door." @@ -363,7 +363,7 @@ public: if (instance->GetData(EVENT_PYRAMID) == PYRAMID_CAGES_OPEN) { instance->SetData(EVENT_PYRAMID, PYRAMID_ARRIVED_AT_STAIR); - DoScriptText(SAY_WEEGLI_OHNO, me); + Talk(SAY_WEEGLI_OHNO); me->SetHomePosition(1882.69f, 1272.28f, 41.87f, 0); } else @@ -388,7 +388,7 @@ public: me->setFaction(FACTION_FRIENDLY); me->GetMotionMaster()->MovePoint(0, 1858.57f, 1146.35f, 14.745f); me->SetHomePosition(1858.57f, 1146.35f, 14.745f, 3.85f); // in case he gets interrupted - DoScriptText(SAY_WEEGLI_OK_I_GO, me); + Talk(SAY_WEEGLI_OK_I_GO); destroyingDoor=true; } } diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/ashenvale.cpp index 0e44da371d6..40ac1609fee 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/ashenvale.cpp @@ -97,7 +97,7 @@ class npc_torek : public CreatureScript me->SummonCreature(ENTRY_SILVERWING_WARRIOR, 1778.73f, -2049.50f, 109.83f, 1.67f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 20: - DoScriptText(SAY_WIN, me, player); + Talk(SAY_WIN, player->GetGUID()); Completed = true; player->GroupEventHappens(QUEST_TOREK_ASSULT, me); break; @@ -269,16 +269,16 @@ class npc_ruul_snowhoof : public CreatureScript enum Muglash { - SAY_MUG_START1 = -1800054, - SAY_MUG_START2 = -1800055, - SAY_MUG_BRAZIER = -1800056, - SAY_MUG_BRAZIER_WAIT = -1800057, - SAY_MUG_ON_GUARD = -1800058, - SAY_MUG_REST = -1800059, - SAY_MUG_DONE = -1800060, - SAY_MUG_GRATITUDE = -1800061, - SAY_MUG_PATROL = -1800062, - SAY_MUG_RETURN = -1800063, + SAY_MUG_START1 = 0, + SAY_MUG_START2 = 1, + SAY_MUG_BRAZIER = 2, + SAY_MUG_BRAZIER_WAIT = 3, + SAY_MUG_ON_GUARD = 4, + SAY_MUG_REST = 5, + SAY_MUG_DONE = 6, + SAY_MUG_GRATITUDE = 7, + SAY_MUG_PATROL = 8, + SAY_MUG_RETURN = 9, QUEST_VORSHA = 6641, @@ -337,10 +337,10 @@ class npc_muglash : public CreatureScript switch (waypointId) { case 0: - DoScriptText(SAY_MUG_START2, me, player); + Talk(SAY_MUG_START2, player->GetGUID()); break; case 24: - DoScriptText(SAY_MUG_BRAZIER, me, player); + Talk(SAY_MUG_BRAZIER, player->GetGUID()); if (GameObject* go = GetClosestGameObjectWithEntry(me, GO_NAGA_BRAZIER, INTERACTION_DISTANCE*2)) { @@ -349,14 +349,14 @@ class npc_muglash : public CreatureScript } break; case 25: - DoScriptText(SAY_MUG_GRATITUDE, me); + Talk(SAY_MUG_GRATITUDE); player->GroupEventHappens(QUEST_VORSHA, me); break; case 26: - DoScriptText(SAY_MUG_PATROL, me); + Talk(SAY_MUG_PATROL); break; case 27: - DoScriptText(SAY_MUG_RETURN, me); + Talk(SAY_MUG_RETURN); break; } } @@ -368,7 +368,7 @@ class npc_muglash : public CreatureScript if (HasEscortState(STATE_ESCORT_PAUSED)) { if (urand(0, 1)) - DoScriptText(SAY_MUG_ON_GUARD, me, player); + Talk(SAY_MUG_ON_GUARD, player->GetGUID()); return; } } @@ -406,7 +406,7 @@ class npc_muglash : public CreatureScript break; case 4: SetEscortPaused(false); - DoScriptText(SAY_MUG_DONE, me); + Talk(SAY_MUG_DONE); break; } } @@ -445,7 +445,7 @@ class npc_muglash : public CreatureScript { if (npc_muglashAI* pEscortAI = CAST_AI(npc_muglashAI, creature->AI())) { - DoScriptText(SAY_MUG_START1, creature); + creature->AI()->Talk(SAY_MUG_START1); creature->setFaction(113); pEscortAI->Start(true, false, player->GetGUID()); @@ -466,7 +466,7 @@ class go_naga_brazier : public GameObjectScript { if (npc_muglash::npc_muglashAI* pEscortAI = CAST_AI(npc_muglash::npc_muglashAI, creature->AI())) { - DoScriptText(SAY_MUG_BRAZIER_WAIT, creature); + creature->AI()->Talk(SAY_MUG_BRAZIER_WAIT); pEscortAI->IsBrazierExtinguished = true; return false; diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp index 213918db338..b38d1ac2c3b 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/azshara.cpp @@ -195,12 +195,10 @@ enum RizzleSprysprocketData SPELL_PERIODIC_DEPTH_CHARGE = 39912, SPELL_GIVE_SOUTHFURY_MOONSTONE = 39886, - SAY_RIZZLE_START = -1000351, - MSG_ESCAPE_NOTICE = -1000352, - SAY_RIZZLE_GRENADE = -1000353, - SAY_RIZZLE_GRENADE_BACKFIRE = -1000354, // Not used - SAY_RIZZLE_FINAL = -1000355, - SAY_RIZZLE_FINAL2 = -1000356, // Not used + SAY_RIZZLE_START = 0, + SAY_RIZZLE_GRENADE = 1, + SAY_RIZZLE_FINAL = 2, + MSG_ESCAPE_NOTICE = 3 }; #define GOSSIP_GET_MOONSTONE "Hand over the Southfury moonstone and I'll let you go." @@ -366,7 +364,7 @@ public: if (!player) return; - SendText(MSG_ESCAPE_NOTICE, player); + Talk(MSG_ESCAPE_NOTICE, player->GetGUID()); DoCast(me, SPELL_PERIODIC_DEPTH_CHARGE); me->SetUnitMovementFlags(MOVEMENTFLAG_HOVER | MOVEMENTFLAG_SWIMMING); me->SetSpeed(MOVE_RUN, 0.85f, true); @@ -389,7 +387,7 @@ public: Player* player = Unit::GetPlayer(*me, PlayerGUID); if (player) { - DoScriptText(SAY_RIZZLE_GRENADE, me, player); + Talk(SAY_RIZZLE_GRENADE, player->GetGUID()); DoCast(player, SPELL_RIZZLE_FROST_GRENADE, true); } GrenadeTimer = 30000; @@ -406,7 +404,7 @@ public: if (me->IsWithinDist(player, 10) && me->GetPositionX() > player->GetPositionX() && !Reached) { - DoScriptText(SAY_RIZZLE_FINAL, me); + Talk(SAY_RIZZLE_FINAL); me->SetUInt32Value(UNIT_NPC_FLAGS, 1); me->setFaction(35); me->GetMotionMaster()->MoveIdle(); @@ -434,7 +432,7 @@ public: if (who->GetTypeId() == TYPEID_PLAYER && CAST_PLR(who)->GetQuestStatus(QUEST_CHASING_THE_MOONSTONE) == QUEST_STATUS_INCOMPLETE) { PlayerGUID = who->GetGUID(); - DoScriptText(SAY_RIZZLE_START, me); + Talk(SAY_RIZZLE_START); DoCast(who, SPELL_RIZZLE_BLACKJACK, false); return; } diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/azuremyst_isle.cpp index 96e67c8de47..3f1ae0fa3bf 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/azuremyst_isle.cpp @@ -47,15 +47,9 @@ EndContentData */ enum draeneiSurvivor { - SAY_HEAL1 = -1000176, - SAY_HEAL2 = -1000177, - SAY_HEAL3 = -1000178, - SAY_HEAL4 = -1000179, + SAY_HEAL = 0, - SAY_HELP1 = -1000180, - SAY_HELP2 = -1000181, - SAY_HELP3 = -1000182, - SAY_HELP4 = -1000183, + SAY_HELP = 1, SPELL_IRRIDATION = 35046, SPELL_STUNNED = 28630 @@ -108,7 +102,7 @@ public: if (CanSayHelp && who->GetTypeId() == TYPEID_PLAYER && me->IsFriendlyTo(who) && me->IsWithinDistInMap(who, 25.0f)) { //Random switch between 4 texts - DoScriptText(RAND(SAY_HELP1, SAY_HELP2, SAY_HELP3, SAY_HELP4), me, who); + Talk(SAY_HELP, who->GetGUID()); SayHelpTimer = 20000; CanSayHelp = false; @@ -140,7 +134,7 @@ public: if (Player* player = Unit::GetPlayer(*me, pCaster)) { - DoScriptText(RAND(SAY_HEAL1, SAY_HEAL2, SAY_HEAL3, SAY_HEAL4), me, player); + Talk(SAY_HEAL, player->GetGUID()); player->TalkedToCreature(me->GetEntry(), me->GetGUID()); } @@ -181,9 +175,9 @@ public: enum Overgrind { - SAY_TEXT = -1000184, - SAY_EMOTE = -1000185, - ATTACK_YELL = -1000186, + SAY_TEXT = 0, + SAY_EMOTE = 1, + ATTACK_YELL = 2, AREA_COVE = 3579, AREA_ISLE = 3639, @@ -257,7 +251,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(ATTACK_YELL, me, who); + Talk(ATTACK_YELL, who->GetGUID()); } void UpdateAI(const uint32 diff) @@ -266,8 +260,8 @@ public: { if (EmoteTimer <= diff) { - DoScriptText(SAY_TEXT, me); - DoScriptText(SAY_EMOTE, me); + Talk(SAY_TEXT); + Talk(SAY_EMOTE); EmoteTimer = urand(120000, 150000); } else EmoteTimer -= diff; } @@ -338,12 +332,12 @@ public: enum Magwin { - SAY_START = -1000111, - SAY_AGGRO = -1000112, - SAY_PROGRESS = -1000113, - SAY_END1 = -1000114, - SAY_END2 = -1000115, - EMOTE_HUG = -1000116, + SAY_START = 0, + SAY_AGGRO = 1, + SAY_PROGRESS = 2, + SAY_END1 = 3, + SAY_END2 = 4, + EMOTE_HUG = 5, QUEST_A_CRY_FOR_SAY_HELP = 9528 }; @@ -380,17 +374,17 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_START, me, player); + Talk(SAY_START, player->GetGUID()); break; case 17: - DoScriptText(SAY_PROGRESS, me, player); + Talk(SAY_PROGRESS, player->GetGUID()); break; case 28: - DoScriptText(SAY_END1, me, player); + Talk(SAY_END1, player->GetGUID()); break; case 29: - DoScriptText(EMOTE_HUG, me, player); - DoScriptText(SAY_END2, me, player); + Talk(EMOTE_HUG, player->GetGUID()); + Talk(SAY_END2, player->GetGUID()); player->GroupEventHappens(QUEST_A_CRY_FOR_SAY_HELP, me); break; } @@ -399,7 +393,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(SAY_AGGRO, me, who); + Talk(SAY_AGGRO, who->GetGUID()); } void Reset() {} @@ -417,15 +411,15 @@ enum Geezle SPELL_TREE_DISGUISE = 30298, - GEEZLE_SAY_1 = -1000629, - SPARK_SAY_2 = -1000630, - SPARK_SAY_3 = -1000631, - GEEZLE_SAY_4 = -1000632, - SPARK_SAY_5 = -1000633, - SPARK_SAY_6 = -1000634, - GEEZLE_SAY_7 = -1000635, + GEEZLE_SAY_1 = 0, + SPARK_SAY_2 = 3, + SPARK_SAY_3 = 4, + GEEZLE_SAY_4 = 1, + SPARK_SAY_5 = 5, + SPARK_SAY_6 = 6, + GEEZLE_SAY_7 = 2, - EMOTE_SPARK = -1000636, + EMOTE_SPARK = 7, MOB_SPARK = 17243, GO_NAGA_FLAG = 181694 @@ -479,41 +473,49 @@ public: uint32 NextStep(uint8 Step) { Creature* Spark = Unit::GetCreature(*me, SparkGUID); + if (!Spark) + return 99999999; switch (Step) { case 0: - if (Spark) - Spark->GetMotionMaster()->MovePoint(0, -5080.70f, -11253.61f, 0.56f); + Spark->GetMotionMaster()->MovePoint(0, -5080.70f, -11253.61f, 0.56f); me->GetMotionMaster()->MovePoint(0, -5092.26f, -11252, 0.71f); - return 9000; // NPCs are walking up to fire + return 9000; case 1: DespawnNagaFlag(true); - DoScriptText(EMOTE_SPARK, Spark); + Spark->AI()->Talk(EMOTE_SPARK); return 1000; case 2: - DoScriptText(GEEZLE_SAY_1, me, Spark); - if (Spark) - { - Spark->SetInFront(me); - me->SetInFront(Spark); - } + Talk(GEEZLE_SAY_1, SparkGUID); + Spark->SetInFront(me); + me->SetInFront(Spark); return 5000; - case 3: DoScriptText(SPARK_SAY_2, Spark); return 7000; - case 4: DoScriptText(SPARK_SAY_3, Spark); return 8000; - case 5: DoScriptText(GEEZLE_SAY_4, me, Spark); return 8000; - case 6: DoScriptText(SPARK_SAY_5, Spark); return 9000; - case 7: DoScriptText(SPARK_SAY_6, Spark); return 8000; - case 8: DoScriptText(GEEZLE_SAY_7, me, Spark); return 2000; + case 3: + Spark->AI()->Talk(SPARK_SAY_2); + return 7000; + case 4: + Spark->AI()->Talk(SPARK_SAY_3); + return 8000; + case 5: + Talk(GEEZLE_SAY_4, SparkGUID); + return 8000; + case 6: + Spark->AI()->Talk(SPARK_SAY_5); + return 9000; + case 7: + Spark->AI()->Talk(SPARK_SAY_6); + return 8000; + case 8: + Talk(GEEZLE_SAY_7, SparkGUID); + return 2000; case 9: me->GetMotionMaster()->MoveTargetedHome(); - if (Spark) - Spark->GetMotionMaster()->MovePoint(0, SparkPos); + Spark->GetMotionMaster()->MovePoint(0, SparkPos); CompleteQuest(); return 9000; case 10: - if (Spark) - Spark->DisappearAndDie(); + Spark->DisappearAndDie(); DespawnNagaFlag(false); me->DisappearAndDie(); default: return 99999999; @@ -658,9 +660,7 @@ enum BristlelimbCage NPC_STILLPINE_CAPITIVE = 17375, GO_BRISTELIMB_CAGE = 181714, - CAPITIVE_SAY_1 = -1000474, - CAPITIVE_SAY_2 = -1000475, - CAPITIVE_SAY_3 = -1000476, + CAPITIVE_SAY = 0, POINT_INIT = 1, EVENT_DESPAWN = 1, @@ -673,9 +673,7 @@ class npc_stillpine_capitive : public CreatureScript struct npc_stillpine_capitiveAI : public ScriptedAI { - npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) - { - } + npc_stillpine_capitiveAI(Creature* creature) : ScriptedAI(creature) {} void Reset() { @@ -693,7 +691,7 @@ class npc_stillpine_capitive : public CreatureScript { if (owner) { - DoScriptText(RAND(CAPITIVE_SAY_1, CAPITIVE_SAY_2, CAPITIVE_SAY_3), me, owner); + Talk(CAPITIVE_SAY, owner->GetGUID()); _player = owner; } Position pos; diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp index 339cd02c2e3..3b77ee34275 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/bloodmyst_isle.cpp @@ -158,7 +158,7 @@ enum Stillpine NPC_PRINCESS_STILLPINE = 17682, GO_PRINCESS_STILLPINES_CAGE = 181928, SPELL_OPENING_PRINCESS_STILLPINE_CREDIT = 31003, - SAY_DIRECTION = -1800074 + SAY_DIRECTION = 0 }; class go_princess_stillpines_cage : public GameObjectScript @@ -191,7 +191,7 @@ public: { if (type == POINT_MOTION_TYPE && id == 1) { - DoScriptText(SAY_DIRECTION, me); + Talk(SAY_DIRECTION); me->DespawnOrUnsummon(); } } diff --git a/src/server/scripts/Kalimdor/boss_azuregos.cpp b/src/server/scripts/Kalimdor/boss_azuregos.cpp index 3b431d55a2c..7bc2e96e0dc 100644 --- a/src/server/scripts/Kalimdor/boss_azuregos.cpp +++ b/src/server/scripts/Kalimdor/boss_azuregos.cpp @@ -28,7 +28,7 @@ EndScriptData */ enum Say { - SAY_TELEPORT = -1000100 + SAY_TELEPORT = 0 }; enum Spells @@ -89,7 +89,7 @@ public: if (TeleportTimer <= diff) { - DoScriptText(SAY_TELEPORT, me); + Talk(SAY_TELEPORT); ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList(); ThreatContainer::StorageType::const_iterator i = threatlist.begin(); for (i = threatlist.begin(); i != threatlist.end(); ++i) diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp index 5d10076c114..921cc6aaf97 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/darkshore.cpp @@ -43,23 +43,12 @@ EndContentData */ enum Kerlonian { - SAY_KER_START = -1000434, - - EMOTE_KER_SLEEP_1 = -1000435, - EMOTE_KER_SLEEP_2 = -1000436, - EMOTE_KER_SLEEP_3 = -1000437, - - SAY_KER_SLEEP_1 = -1000438, - SAY_KER_SLEEP_2 = -1000439, - SAY_KER_SLEEP_3 = -1000440, - SAY_KER_SLEEP_4 = -1000441, - - EMOTE_KER_AWAKEN = -1000445, - - SAY_KER_ALERT_1 = -1000442, - SAY_KER_ALERT_2 = -1000443, - - SAY_KER_END = -1000444, + SAY_KER_START = 0, + EMOTE_KER_SLEEP = 1, + SAY_KER_SLEEP = 2, + SAY_KER_ALERT_1 = 3, + SAY_KER_END = 4, + EMOTE_KER_AWAKEN = 5, SPELL_SLEEP_VISUAL = 25148, SPELL_AWAKEN = 17536, @@ -81,7 +70,7 @@ public: if (npc_kerlonianAI* pKerlonianAI = CAST_AI(npc_kerlonian::npc_kerlonianAI, creature->AI())) { creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_KER_START, creature, player); + creature->AI()->Talk(SAY_KER_START, player->GetGUID()); pKerlonianAI->StartFollow(player, FACTION_KER_ESCORTEE, quest); } } @@ -118,7 +107,7 @@ public: if (player->GetQuestStatus(QUEST_SLEEPER_AWAKENED) == QUEST_STATUS_INCOMPLETE) player->GroupEventHappens(QUEST_SLEEPER_AWAKENED, me); - DoScriptText(SAY_KER_END, me); + Talk(SAY_KER_END); } SetFollowComplete(); @@ -136,9 +125,9 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(EMOTE_KER_SLEEP_1, EMOTE_KER_SLEEP_2, EMOTE_KER_SLEEP_3), me); + Talk(EMOTE_KER_SLEEP); - DoScriptText(RAND(SAY_KER_SLEEP_1, SAY_KER_SLEEP_2, SAY_KER_SLEEP_3, SAY_KER_SLEEP_4), me); + Talk(SAY_KER_SLEEP); me->SetStandState(UNIT_STAND_STATE_SLEEP); DoCast(me, SPELL_SLEEP_VISUAL, false); @@ -149,7 +138,7 @@ public: me->RemoveAurasDueToSpell(SPELL_SLEEP_VISUAL); me->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(EMOTE_KER_AWAKEN, me); + Talk(EMOTE_KER_AWAKEN); SetFollowPaused(false); } @@ -187,19 +176,19 @@ public: enum Remtravel { - SAY_REM_START = -1000327, - SAY_REM_AGGRO = -1000328, - SAY_REM_RAMP1_1 = -1000329, - SAY_REM_RAMP1_2 = -1000330, - SAY_REM_BOOK = -1000331, - SAY_REM_TENT1_1 = -1000332, - SAY_REM_TENT1_2 = -1000333, - SAY_REM_MOSS = -1000334, - EMOTE_REM_MOSS = -1000335, - SAY_REM_MOSS_PROGRESS = -1000336, - SAY_REM_PROGRESS = -1000337, - SAY_REM_REMEMBER = -1000338, - EMOTE_REM_END = -1000339, + SAY_REM_START = 0, + SAY_REM_AGGRO = 1, + SAY_REM_RAMP1_1 = 2, + SAY_REM_RAMP1_2 = 3, + SAY_REM_BOOK = 4, + SAY_REM_TENT1_1 = 5, + SAY_REM_TENT1_2 = 6, + SAY_REM_MOSS = 7, + EMOTE_REM_MOSS = 8, + SAY_REM_MOSS_PROGRESS = 9, + SAY_REM_PROGRESS = 10, + SAY_REM_REMEMBER = 11, + EMOTE_REM_END = 12, FACTION_ESCORTEE = 10, QUEST_ABSENT_MINDED_PT2 = 731, @@ -242,40 +231,40 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_REM_START, me, player); + Talk(SAY_REM_START, player->GetGUID()); break; case 5: - DoScriptText(SAY_REM_RAMP1_1, me, player); + Talk(SAY_REM_RAMP1_1, player->GetGUID()); break; case 6: DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 9: - DoScriptText(SAY_REM_RAMP1_2, me, player); + Talk(SAY_REM_RAMP1_2, player->GetGUID()); break; case 14: //depend quest rewarded? - DoScriptText(SAY_REM_BOOK, me, player); + Talk(SAY_REM_BOOK, player->GetGUID()); break; case 15: - DoScriptText(SAY_REM_TENT1_1, me, player); + Talk(SAY_REM_TENT1_1, player->GetGUID()); break; case 16: DoSpawnCreature(NPC_GRAVEL_SCOUT, -10.0f, 5.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); DoSpawnCreature(NPC_GRAVEL_BONE, -10.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 17: - DoScriptText(SAY_REM_TENT1_2, me, player); + Talk(SAY_REM_TENT1_2, player->GetGUID()); break; case 26: - DoScriptText(SAY_REM_MOSS, me, player); + Talk(SAY_REM_MOSS, player->GetGUID()); break; case 27: - DoScriptText(EMOTE_REM_MOSS, me, player); + Talk(EMOTE_REM_MOSS, player->GetGUID()); break; case 28: - DoScriptText(SAY_REM_MOSS_PROGRESS, me, player); + Talk(SAY_REM_MOSS_PROGRESS, player->GetGUID()); break; case 29: DoSpawnCreature(NPC_GRAVEL_SCOUT, -15.0f, 3.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); @@ -283,13 +272,13 @@ public: DoSpawnCreature(NPC_GRAVEL_GEO, -15.0f, 7.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 31: - DoScriptText(SAY_REM_PROGRESS, me, player); + Talk(SAY_REM_PROGRESS, player->GetGUID()); break; case 41: - DoScriptText(SAY_REM_REMEMBER, me, player); + Talk(SAY_REM_REMEMBER, player->GetGUID()); break; case 42: - DoScriptText(EMOTE_REM_END, me, player); + Talk(EMOTE_REM_END, player->GetGUID()); player->GroupEventHappens(QUEST_ABSENT_MINDED_PT2, me); break; } @@ -301,7 +290,7 @@ public: void EnterCombat(Unit* who) { if (urand(0, 1)) - DoScriptText(SAY_REM_AGGRO, me, who); + Talk(SAY_REM_AGGRO, who->GetGUID()); } void JustSummoned(Creature* /*pSummoned*/) @@ -319,8 +308,8 @@ public: enum Threshwackonator { - EMOTE_START = -1000325, //signed for 4966 - SAY_AT_CLOSE = -1000326, //signed for 4966 + EMOTE_START = 0, + SAY_AT_CLOSE = 1, QUEST_GYROMAST_REV = 2078, NPC_GELKAK = 6667, FACTION_HOSTILE = 14 @@ -342,7 +331,7 @@ public: if (npc_threshwackonatorAI* pThreshAI = CAST_AI(npc_threshwackonator::npc_threshwackonatorAI, creature->AI())) { - DoScriptText(EMOTE_START, creature); + creature->AI()->Talk(EMOTE_START); pThreshAI->StartFollow(player); } } @@ -378,7 +367,7 @@ public: { if (me->IsWithinDistInMap(who, 10.0f)) { - DoScriptText(SAY_AT_CLOSE, who); + Talk(SAY_AT_CLOSE, who->GetGUID()); DoAtEnd(); } } diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp index 30a87ef0197..8c56714e614 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/desolace.cpp @@ -40,9 +40,7 @@ EndContentData */ enum DyingKodo { // signed for 9999 - SAY_SMEED_HOME_1 = -1000348, - SAY_SMEED_HOME_2 = -1000349, - SAY_SMEED_HOME_3 = -1000350, + SAY_SMEED_HOME = 0, QUEST_KODO = 5561, @@ -134,7 +132,8 @@ public: if (me->IsWithinDistInMap(who, 10.0f)) { - DoScriptText(RAND(SAY_SMEED_HOME_1, SAY_SMEED_HOME_2, SAY_SMEED_HOME_3), who); + if (Creature* talker = who->ToCreature()) + talker->AI()->Talk(SAY_SMEED_HOME); //spell have no implemented effect (dummy), so useful to notify spellHit DoCast(me, SPELL_KODO_KOMBO_GOSSIP, true); diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/durotar.cpp index 83111829c9e..04e65693154 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/durotar.cpp @@ -28,7 +28,7 @@ enum LazyPeonYells { - SAY_SPELL_HIT = -1000600 //Ow! OK, I''ll get back to work, $N!' + SAY_SPELL_HIT = 0 }; enum LazyPeon @@ -77,7 +77,7 @@ public: && CAST_PLR(caster)->GetQuestStatus(QUEST_LAZY_PEONS) == QUEST_STATUS_INCOMPLETE) { caster->ToPlayer()->KilledMonsterCredit(me->GetEntry(), me->GetGUID()); - DoScriptText(SAY_SPELL_HIT, me, caster); + Talk(SAY_SPELL_HIT, caster->GetGUID()); me->RemoveAllAuras(); if (GameObject* Lumberpile = me->FindNearestGameObject(GO_LUMBERPILE, 20)) me->GetMotionMaster()->MovePoint(1, Lumberpile->GetPositionX()-1, Lumberpile->GetPositionY(), Lumberpile->GetPositionZ()); diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp index 6ab9b653c5d..018b39c58e8 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp @@ -138,22 +138,16 @@ class mobs_risen_husk_spirit : public CreatureScript enum TheramoreGuard { - SAY_QUEST1 = -1000641, - SAY_QUEST2 = -1000642, - SAY_QUEST3 = -1000643, - SAY_QUEST4 = -1000644, - SAY_QUEST5 = -1000645, - SAY_QUEST6 = -1000646, - SAY_QUEST7 = -1000647, - SAY_QUEST8 = -1000648, - SAY_QUEST9 = -1000649, - - QUEST_DISCREDITING_THE_DESERTERS = 11133, - - NPC_THERAMORE_GUARD = 4979, - - SPELL_DOCTORED_LEAFLET = 42725, - SPELL_PROPAGANDIZED = 42246, + QUEST_DISCREDITING_THE_DESERTERS = 11133, + + NPC_THERAMORE_GUARD = 4979, + + SPELL_DOCTORED_LEAFLET = 42725, + SPELL_PROPAGANDIZED = 42246, + + SAY_QUEST1 = 0, + SAY_QUEST2 = 1, + SAY_QUEST3 = 2 }; #define GOSSIP_ITEM_THERAMORE_GUARD "You look like an intelligent person. Why don't you read one of these leaflets and give it some thought?" @@ -181,7 +175,7 @@ public: { player->CLOSE_GOSSIP_MENU(); player->KilledMonsterCredit(NPC_THERAMORE_GUARD, 0); - DoScriptText(SAY_QUEST1, creature); + creature->AI()->Talk(SAY_QUEST1); creature->CastSpell(creature, SPELL_DOCTORED_LEAFLET, false); creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); CAST_AI(npc_theramore_guard::npc_theramore_guardAI, creature->AI())->YellTimer = 4000; @@ -220,12 +214,12 @@ public: switch (Step) { case 0: - DoScriptText(RAND(SAY_QUEST2, SAY_QUEST3, SAY_QUEST4, SAY_QUEST5, SAY_QUEST6), me); + Talk(SAY_QUEST2); YellTimer = 3000; ++Step; break; case 1: - DoScriptText(RAND(SAY_QUEST7, SAY_QUEST8, SAY_QUEST9), me); + Talk(SAY_QUEST3); me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH); Step = 0; bYellTimer = false; @@ -328,12 +322,11 @@ public: enum Hendel { - // looks like all this text ids are wrong. - SAY_PROGRESS_1_TER = -1000411, // signed for 3568 - SAY_PROGRESS_2_HEN = -1000412, // signed for 3568 - SAY_PROGRESS_3_TER = -1000413, - SAY_PROGRESS_4_TER = -1000414, - EMOTE_SURRENDER = -1000415, + SAY_PROGRESS_1_TER = 0, + SAY_PROGRESS_2_HEN = 1, + SAY_PROGRESS_3_TER = 2, + SAY_PROGRESS_4_TER = 3, + EMOTE_SURRENDER = 4, QUEST_MISSING_DIPLO_PT16 = 1324, FACTION_HOSTILE = 168, //guessed, may be different @@ -391,7 +384,7 @@ public: if (Player* player = pDoneBy->GetCharmerOrOwnerPlayerOrPlayerItself()) player->GroupEventHappens(QUEST_MISSING_DIPLO_PT16, me); - DoScriptText(EMOTE_SURRENDER, me); + Talk(EMOTE_SURRENDER); EnterEvadeMode(); } } @@ -407,8 +400,8 @@ Position const MovePosition = {-2967.030f, -3872.1799f, 35.620f, 0.0f}; enum Zelfrax { - SAY_ZELFRAX = -1000472, - SAY_ZELFRAX_2 = -1000473 + SAY_ZELFRAX1 = 0, + SAY_ZELFRAX2 = 1 }; class npc_zelfrax : public CreatureScript @@ -461,8 +454,8 @@ public: { SetCombatMovement(false); me->GetMotionMaster()->MovePoint(0, MovePosition); - DoScriptText(SAY_ZELFRAX, me); - DoScriptText(SAY_ZELFRAX_2, me); + Talk(SAY_ZELFRAX1); + Talk(SAY_ZELFRAX2); } void UpdateAI(uint32 const /*Diff*/) @@ -484,16 +477,16 @@ enum Stinky { QUEST_STINKYS_ESCAPE_H = 1270, QUEST_STINKYS_ESCAPE_A = 1222, - SAY_QUEST_ACCEPTED = -1000507, - SAY_STAY_1 = -1000508, - SAY_STAY_2 = -1000509, - SAY_STAY_3 = -1000510, - SAY_STAY_4 = -1000511, - SAY_STAY_5 = -1000512, - SAY_STAY_6 = -1000513, - SAY_QUEST_COMPLETE = -1000514, - SAY_ATTACKED_1 = -1000515, - EMOTE_DISAPPEAR = -1000516 + SAY_QUEST_ACCEPTED = 0, + SAY_STAY_1 = 1, + SAY_STAY_2 = 2, + SAY_STAY_3 = 3, + SAY_STAY_4 = 4, + SAY_STAY_5 = 5, + SAY_STAY_6 = 6, + SAY_QUEST_COMPLETE = 7, + SAY_ATTACKED_1 = 8, + EMOTE_DISAPPEAR = 9 }; class npc_stinky : public CreatureScript @@ -514,7 +507,7 @@ public: { creature->setFaction(FACTION_ESCORT_N_NEUTRAL_ACTIVE); creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_QUEST_ACCEPTED, creature); + creature->AI()->Talk(SAY_QUEST_ACCEPTED); pEscortAI->Start(false, false, player->GetGUID()); } } @@ -534,29 +527,29 @@ public: switch (waypointId) { case 7: - DoScriptText(SAY_STAY_1, me, player); + Talk(SAY_STAY_1, player->GetGUID()); break; case 11: - DoScriptText(SAY_STAY_2, me, player); + Talk(SAY_STAY_2, player->GetGUID()); break; case 25: - DoScriptText(SAY_STAY_3, me, player); + Talk(SAY_STAY_3, player->GetGUID()); break; case 26: - DoScriptText(SAY_STAY_4, me, player); + Talk(SAY_STAY_4, player->GetGUID()); break; case 27: - DoScriptText(SAY_STAY_5, me, player); + Talk(SAY_STAY_5, player->GetGUID()); break; case 28: - DoScriptText(SAY_STAY_6, me, player); + Talk(SAY_STAY_6, player->GetGUID()); me->SetStandState(UNIT_STAND_STATE_KNEEL); break; case 29: me->SetStandState(UNIT_STAND_STATE_STAND); break; case 37: - DoScriptText(SAY_QUEST_COMPLETE, me, player); + Talk(SAY_QUEST_COMPLETE, player->GetGUID()); me->SetSpeed(MOVE_RUN, 1.2f, true); me->SetWalk(false); if (player->GetQuestStatus(QUEST_STINKYS_ESCAPE_H)) @@ -565,14 +558,14 @@ public: player->GroupEventHappens(QUEST_STINKYS_ESCAPE_A, me); break; case 39: - DoScriptText(EMOTE_DISAPPEAR, me); + Talk(EMOTE_DISAPPEAR); break; } } void EnterCombat(Unit* who) { - DoScriptText(SAY_ATTACKED_1, me, who); + Talk(SAY_ATTACKED_1, who->GetGUID()); } void Reset() {} diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp index df4345b3aae..148f53c9e57 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/feralas.cpp @@ -75,12 +75,10 @@ public: enum OOX { - //signed for 7806 - SAY_OOX_START = -1000287, - SAY_OOX_AGGRO1 = -1000288, - SAY_OOX_AGGRO2 = -1000289, - SAY_OOX_AMBUSH = -1000290, - SAY_OOX_END = -1000292, + SAY_OOX_START = 0, + SAY_OOX_AGGRO = 1, + SAY_OOX_AMBUSH = 2, + SAY_OOX_END = 3, NPC_YETI = 7848, NPC_GORILLA = 5260, @@ -103,7 +101,7 @@ public: { if (quest->GetQuestId() == QUEST_RESCUE_OOX22FE) { - DoScriptText(SAY_OOX_START, creature); + creature->AI()->Talk(SAY_OOX_START); //change that the npc is not lying dead on the ground creature->SetStandState(UNIT_STAND_STATE_STAND); @@ -135,28 +133,28 @@ public: { // First Ambush(3 Yetis) case 11: - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); me->SummonCreature(NPC_YETI, -4841.01f, 1593.91f, 73.42f, 3.98f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_YETI, -4837.61f, 1568.58f, 78.21f, 3.13f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_YETI, -4841.89f, 1569.95f, 76.53f, 0.68f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Second Ambush(3 Gorillas) case 21: - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); me->SummonCreature(NPC_GORILLA, -4595.81f, 2005.99f, 53.08f, 3.74f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_GORILLA, -4597.53f, 2008.31f, 52.70f, 3.78f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_GORILLA, -4599.37f, 2010.59f, 52.77f, 3.84f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; //Third Ambush(4 Gnolls) case 30: - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); me->SummonCreature(NPC_WOODPAW_REAVER, -4425.14f, 2075.87f, 47.77f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_BRUTE, -4426.68f, 2077.98f, 47.57f, 3.77f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_MYSTIC, -4428.33f, 2080.24f, 47.43f, 3.87f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); me->SummonCreature(NPC_WOODPAW_ALPHA, -4430.04f, 2075.54f, 46.83f, 3.81f, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 10000); break; case 37: - DoScriptText(SAY_OOX_END, me); + Talk(SAY_OOX_END); // Award quest credit if (Player* player = GetPlayerForEscort()) player->GroupEventHappens(QUEST_RESCUE_OOX22FE, me); @@ -174,7 +172,7 @@ public: { //For an small probability the npc says something when he get aggro if (urand(0, 9) > 7) - DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); + Talk(SAY_OOX_AGGRO); } void JustSummoned(Creature* summoned) diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp index 6d93e074e79..f438275b82a 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/moonglade.cpp @@ -37,6 +37,9 @@ EndContentData */ #include "ScriptedGossip.h" #include "Player.h" #include "SpellInfo.h" +#include "Cell.h" +#include "CellImpl.h" +#include "GridNotifiers.h" /*###### ## npc_bunthen_plainswind @@ -275,14 +278,8 @@ enum ClintarSpirit { ASPECT_RAVEN = 22915, - //from -1000292 to -1000287 are signed for 7806. but all this texts ids wrong. - CLINTAR_SPIRIT_SAY_START = -1000286, - CLINTAR_SPIRIT_SAY_UNDER_ATTACK_1 = -1000287, - CLINTAR_SPIRIT_SAY_UNDER_ATTACK_2 = -1000288, - CLINTAR_SPIRIT_SAY_GET_ONE = -1000289, - CLINTAR_SPIRIT_SAY_GET_TWO = -1000290, - CLINTAR_SPIRIT_SAY_GET_THREE = -1000291, - CLINTAR_SPIRIT_SAY_GET_FINAL = -1000292 + // Texts for EnterCombat, the event and the end of the event are missing + CLINTAR_SPIRIT_SAY_START = 0, }; class npc_clintar_spirit : public CreatureScript @@ -325,6 +322,28 @@ public: } } + void IsSummonedBy(Unit* /*summoner*/) + { + std::list<Player*> playerOnQuestList; + Trinity::AnyPlayerInObjectRangeCheck checker(me, 5.0f); + Trinity::PlayerListSearcher<Trinity::AnyPlayerInObjectRangeCheck> searcher(me, playerOnQuestList, checker); + me->VisitNearbyWorldObject(5.0f, searcher); + for (std::list<Player*>::const_iterator itr = playerOnQuestList.begin(); itr != playerOnQuestList.end(); ++itr) + { + // Check if found player target has active quest + if (Player* player = (*itr)) + { + if (player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) + { + StartEvent(player); + break; + } + } + else + break; + } + } + void JustDied(Unit* /*killer*/) { if (!PlayerGUID) @@ -350,15 +369,6 @@ public: npc_escortAI::EnterEvadeMode(); } - void EnterCombat(Unit* who) - { - switch (urand(0, 1)) - { - case 0: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_1, me, who); break; - case 1: DoScriptText(CLINTAR_SPIRIT_SAY_UNDER_ATTACK_2, me, who); break; - } - } - void StartEvent(Player* player) { if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE) @@ -373,7 +383,7 @@ public: return; } - void UpdateAI(const uint32 diff) + void UpdateAI(uint32 const diff) { npc_escortAI::UpdateAI(diff); @@ -410,7 +420,7 @@ public: switch (Step) { case 0: - me->Say(CLINTAR_SPIRIT_SAY_START, 0, PlayerGUID); + Talk(CLINTAR_SPIRIT_SAY_START, PlayerGUID); EventTimer = 8000; Step = 1; break; @@ -429,7 +439,7 @@ public: break; case 1: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0); - DoScriptText(CLINTAR_SPIRIT_SAY_GET_ONE, me, player); + // Needs text EventOnWait = false; break; } @@ -452,7 +462,7 @@ public: switch (Step) { case 0: - DoScriptText(CLINTAR_SPIRIT_SAY_GET_TWO, me, player); + // Needs text EventTimer = 15000; Step = 1; break; @@ -496,7 +506,7 @@ public: switch (Step) { case 0: - DoScriptText(CLINTAR_SPIRIT_SAY_GET_THREE, me, player); + // Needs text EventTimer = 4000; Step = 1; break; @@ -510,7 +520,7 @@ public: { case 0: me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 2); - DoScriptText(CLINTAR_SPIRIT_SAY_GET_FINAL, me, player); + // Needs text player->CompleteQuest(10965); EventTimer = 1500; Step = 1; @@ -548,30 +558,6 @@ public: }; /*#### -# npc_clintar_dreamwalker -####*/ - -enum Clintar -{ - CLINTAR_SPIRIT = 22916 -}; - -class npc_clintar_dreamwalker : public CreatureScript -{ -public: - npc_clintar_dreamwalker() : CreatureScript("npc_clintar_dreamwalker") { } - - bool OnQuestAccept(Player* player, Creature* creature, Quest const* quest) - { - if (quest->GetQuestId() == 10965) - if (Creature* clintar_spirit = creature->SummonCreature(CLINTAR_SPIRIT, ClintarSpiritSummon, TEMPSUMMON_CORPSE_TIMED_DESPAWN, 100000)) - CAST_AI(npc_clintar_spirit::npc_clintar_spiritAI, clintar_spirit->AI())->StartEvent(player); - return true; - } - -}; - -/*#### # npc_omen ####*/ @@ -722,7 +708,6 @@ void AddSC_moonglade() new npc_bunthen_plainswind(); new npc_great_bear_spirit(); new npc_silva_filnaveth(); - new npc_clintar_dreamwalker(); new npc_clintar_spirit(); new npc_omen(); new npc_giant_spotlight(); diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp index 8ed26b8cf38..a86f891c6c0 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/mulgore.cpp @@ -76,10 +76,9 @@ public: enum KyleFrenzied { - //emote signed for 7780 but propably thats wrong id. - EMOTE_SEE_LUNCH = -1000340, - EMOTE_EAT_LUNCH = -1000341, - EMOTE_DANCE = -1000342, + EMOTE_SEE_LUNCH = 0, + EMOTE_EAT_LUNCH = 1, + EMOTE_DANCE = 2, SPELL_LUNCH = 42222, NPC_KYLE_FRENZIED = 23616, @@ -134,7 +133,7 @@ public: } EventActive = true; - DoScriptText(EMOTE_SEE_LUNCH, me); + Talk(EMOTE_SEE_LUNCH); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_CREATURE_SPECIAL); } } @@ -173,7 +172,7 @@ public: } break; case 2: - DoScriptText(EMOTE_EAT_LUNCH, me); + Talk(EMOTE_EAT_LUNCH); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_USE_STANDING); break; case 3: @@ -184,7 +183,7 @@ public: break; case 4: EventTimer = 30000; - DoScriptText(EMOTE_DANCE, me); + Talk(EMOTE_DANCE); me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DANCESPECIAL); break; case 5: diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/silithus.cpp index df7d3b1ee89..f9b16b907eb 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/silithus.cpp @@ -230,56 +230,56 @@ public: ####*/ enum EternalBoard { - QUEST_A_PAWN_ON_THE_ETERNAL_BOARD = 8519, - - FACTION_HOSTILE = 14, - FACTION_FRIENDLY = 35, - - C_ANACHRONOS = 15381, - C_FANDRAL_STAGHELM = 15382, - C_ARYGOS = 15380, - C_MERITHRA = 15378, - C_CAELESTRASZ = 15379, - - ANACHRONOS_SAY_1 = -1350000, - ANACHRONOS_SAY_2 = -1350001, - ANACHRONOS_SAY_3 = -1350002, - ANACHRONOS_SAY_4 = -1350003, - ANACHRONOS_SAY_5 = -1350004, - ANACHRONOS_SAY_6 = -1350005, - ANACHRONOS_SAY_7 = -1350006, - ANACHRONOS_SAY_8 = -1350007, - ANACHRONOS_SAY_9 = -1350008, - ANACHRONOS_SAY_10 = -1350009, - ANACHRONOS_EMOTE_1 = -1350010, - ANACHRONOS_EMOTE_2 = -1350011, - ANACHRONOS_EMOTE_3 = -1350012, - - FANDRAL_SAY_1 = -1350013, - FANDRAL_SAY_2 = -1350014, - FANDRAL_SAY_3 = -1350015, - FANDRAL_SAY_4 = -1350016, - FANDRAL_SAY_5 = -1350017, - FANDRAL_SAY_6 = -1350018, - FANDRAL_EMOTE_1 = -1350019, - FANDRAL_EMOTE_2 = -1350020, - - CAELESTRASZ_SAY_1 = -1350021, - CAELESTRASZ_SAY_2 = -1350022, - CAELESTRASZ_YELL_1 = -1350023, - - ARYGOS_SAY_1 = -1350024, - ARYGOS_YELL_1 = -1350025, - ARYGOS_EMOTE_1 = -1350026, - - MERITHRA_SAY_1 = -1350027, - MERITHRA_SAY_2 = -1350028, - MERITHRA_YELL_1 = -1350029, - MERITHRA_EMOTE_1 = -1350030, - - GO_GATE_OF_AHN_QIRAJ = 176146, - GO_GLYPH_OF_AHN_QIRAJ = 176148, - GO_ROOTS_OF_AHN_QIRAJ = 176147 + QUEST_A_PAWN_ON_THE_ETERNAL_BOARD = 8519, + + FACTION_HOSTILE = 14, + FACTION_FRIENDLY = 35, + + C_ANACHRONOS = 15381, + C_FANDRAL_STAGHELM = 15382, + C_ARYGOS = 15380, + C_MERITHRA = 15378, + C_CAELESTRASZ = 15379, + + ANACHRONOS_SAY_1 = 0, + ANACHRONOS_SAY_2 = 1, + ANACHRONOS_SAY_3 = 2, + ANACHRONOS_SAY_4 = 3, + ANACHRONOS_SAY_5 = 4, + ANACHRONOS_SAY_6 = 5, + ANACHRONOS_SAY_7 = 6, + ANACHRONOS_SAY_8 = 7, + ANACHRONOS_SAY_9 = 8, + ANACHRONOS_SAY_10 = 9, + ANACHRONOS_EMOTE_1 = 10, + ANACHRONOS_EMOTE_2 = 11, + ANACHRONOS_EMOTE_3 = 12, + + FANDRAL_SAY_1 = 0, + FANDRAL_SAY_2 = 1, + FANDRAL_SAY_3 = 2, + FANDRAL_SAY_4 = 3, + FANDRAL_SAY_5 = 4, + FANDRAL_SAY_6 = 5, + FANDRAL_EMOTE_1 = 6, + FANDRAL_EMOTE_2 = 7, + + CAELESTRASZ_SAY_1 = 0, + CAELESTRASZ_SAY_2 = 1, + CAELESTRASZ_YELL_1 = 2, + + ARYGOS_SAY_1 = 0, + ARYGOS_YELL_1 = 1, + ARYGOS_EMOTE_1 = 2, + + MERITHRA_SAY_1 = 0, + MERITHRA_SAY_2 = 1, + MERITHRA_YELL_1 = 2, + MERITHRA_EMOTE_1 = 3, + + GO_GATE_OF_AHN_QIRAJ = 176146, + GO_GLYPH_OF_AHN_QIRAJ = 176148, + GO_ROOTS_OF_AHN_QIRAJ = 176147 }; /*##### # Quest: A Pawn on the Eternal Board @@ -530,10 +530,10 @@ public: if (!player) return; - Unit* Fandral = player->FindNearestCreature(C_FANDRAL_STAGHELM, 100.0f, me); - Unit* Arygos = player->FindNearestCreature(C_ARYGOS, 100.0f, me); - Unit* Caelestrasz = player->FindNearestCreature(C_CAELESTRASZ, 100.0f, me); - Unit* Merithra = player->FindNearestCreature(C_MERITHRA, 100.0f, me); + Creature* Fandral = player->FindNearestCreature(C_FANDRAL_STAGHELM, 100.0f, me); + Creature* Arygos = player->FindNearestCreature(C_ARYGOS, 100.0f, me); + Creature* Caelestrasz = player->FindNearestCreature(C_CAELESTRASZ, 100.0f, me); + Creature* Merithra = player->FindNearestCreature(C_MERITHRA, 100.0f, me); if (!Fandral || !Arygos || !Caelestrasz || !Merithra) return; @@ -544,35 +544,35 @@ public: switch (AnimationCount) { case 0: - DoScriptText(ANACHRONOS_SAY_1, me, Fandral); + Talk(ANACHRONOS_SAY_1,Fandral->GetGUID()); break; case 1: Fandral->SetTarget(me->GetGUID()); - DoScriptText(FANDRAL_SAY_1, Fandral, me); + Fandral->AI()->Talk(FANDRAL_SAY_1, me->GetGUID()); break; case 2: Fandral->SetTarget(0); - DoScriptText(MERITHRA_EMOTE_1, Merithra); + Merithra->AI()->Talk(MERITHRA_EMOTE_1); break; case 3: - DoScriptText(MERITHRA_SAY_1, Merithra); + Merithra->AI()->Talk(MERITHRA_SAY_1); break; case 4: - DoScriptText(ARYGOS_EMOTE_1, Arygos); + Arygos->AI()->Talk(ARYGOS_EMOTE_1); break; case 5: Caelestrasz->SetTarget(Fandral->GetGUID()); - DoScriptText(CAELESTRASZ_SAY_1, Caelestrasz); + Caelestrasz->AI()->Talk(CAELESTRASZ_SAY_1); break; case 6: - DoScriptText(MERITHRA_SAY_2, Merithra); + Merithra->AI()->Talk(MERITHRA_SAY_2); break; case 7: Caelestrasz->SetTarget(0); Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); break; case 8: - DoScriptText(MERITHRA_YELL_1, Merithra); + Merithra->AI()->Talk(MERITHRA_YELL_1); break; case 9: Merithra->CastSpell(Merithra, 25105, true); @@ -591,7 +591,7 @@ public: case 13: break; case 14: - DoScriptText(ARYGOS_SAY_1, Arygos); + Arygos->AI()->Talk(ARYGOS_SAY_1); Merithra->SetVisible(false); break; case 15: @@ -599,7 +599,7 @@ public: Merithra->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 42); break; case 16: - DoScriptText(ARYGOS_YELL_1, Arygos); + Arygos->AI()->Talk(ARYGOS_YELL_1); break; case 17: Arygos->CastSpell(Arygos, 25107, true); @@ -618,7 +618,7 @@ public: case 21: break; case 22: - DoScriptText(CAELESTRASZ_SAY_2, Caelestrasz, Fandral); + Caelestrasz->AI()->Talk(CAELESTRASZ_SAY_2, Fandral->GetGUID()); break; case 23: Caelestrasz->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10); @@ -626,7 +626,7 @@ public: Arygos->GetMotionMaster()->MoveCharge(-8034.535f, 1535.14f, 2.61f, 10); break; case 24: - DoScriptText(CAELESTRASZ_YELL_1, Caelestrasz); + Caelestrasz->AI()->Talk(CAELESTRASZ_YELL_1); break; case 25: Caelestrasz->CastSpell(Caelestrasz, 25106, true); @@ -640,16 +640,16 @@ public: Caelestrasz->CastSpell(Caelestrasz, 54293, false); break; case 28: - DoScriptText(ANACHRONOS_SAY_2, me, Fandral); + Talk(ANACHRONOS_SAY_2, Fandral->GetGUID()); break; case 29: Caelestrasz->GetMotionMaster()->MoveCharge(-8095, 1530, 50, 42); - DoScriptText(FANDRAL_SAY_2, Fandral, me); + Fandral->AI()->Talk(FANDRAL_SAY_2); break; case 30: break; case 31: - DoScriptText(ANACHRONOS_SAY_3, me, Fandral); + Talk(ANACHRONOS_SAY_3, Fandral->GetGUID()); break; case 32: Caelestrasz->SetVisible(false); @@ -658,7 +658,7 @@ public: me->GetMotionMaster()->MoveCharge(-8113, 1525, 2.77f, 8); break;//both run to the gate case 33: - DoScriptText(ANACHRONOS_SAY_4, me); + Talk(ANACHRONOS_SAY_4); Caelestrasz->GetMotionMaster()->MoveCharge(-8050, 1473, 65, 15); break; //Text: sands will stop case 34: @@ -678,43 +678,43 @@ public: me->SummonGameObject(GO_GLYPH_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); break; case 39: - DoScriptText(ANACHRONOS_SAY_5, me, Fandral); + Talk(ANACHRONOS_SAY_5, Fandral->GetGUID()); break; case 40: Fandral->CastSpell(me, 25167, true); break; case 41: Fandral->SummonGameObject(GO_ROOTS_OF_AHN_QIRAJ, -8130, 1525, 17.5f, 0, 0, 0, 0, 0, 0); - DoScriptText(FANDRAL_SAY_3, Fandral); + Fandral->AI()->Talk(FANDRAL_SAY_3); break; case 42: me->CastStop(); - DoScriptText(FANDRAL_EMOTE_1, Fandral); + Fandral->AI()->Talk(FANDRAL_EMOTE_1); break; case 43: Fandral->CastStop(); break; case 44: - DoScriptText(ANACHRONOS_SAY_6, me); + Talk(ANACHRONOS_SAY_6); break; case 45: - DoScriptText(ANACHRONOS_SAY_7, me); + Talk(ANACHRONOS_SAY_7); break; case 46: - DoScriptText(ANACHRONOS_SAY_8, me); + Talk(ANACHRONOS_SAY_8); me->GetMotionMaster()->MoveCharge(-8110, 1527, 2.77f, 4); break; case 47: - DoScriptText(ANACHRONOS_EMOTE_1, me); + Talk(ANACHRONOS_EMOTE_1); break; case 48: - DoScriptText(FANDRAL_SAY_4, Fandral, me); + Fandral->AI()->Talk(FANDRAL_SAY_4, me->GetGUID()); break; case 49: - DoScriptText(FANDRAL_SAY_5, Fandral, me); + Fandral->AI()->Talk(FANDRAL_SAY_5, me->GetGUID()); break; case 50: - DoScriptText(FANDRAL_EMOTE_2, Fandral); + Fandral->AI()->Talk(FANDRAL_EMOTE_2); Fandral->CastSpell(-8127, 1525, 17.5f, 33806, true); break; case 51: @@ -734,19 +734,19 @@ public: } case 52: Fandral->GetMotionMaster()->MoveCharge(-8028.75f, 1538.795f, 2.61f, 4); - DoScriptText(ANACHRONOS_SAY_9, me, Fandral); + Fandral->AI()->Talk(ANACHRONOS_SAY_9, me->GetGUID()); break; case 53: - DoScriptText(FANDRAL_SAY_6, Fandral); + Fandral->AI()->Talk(FANDRAL_SAY_6); break; case 54: - DoScriptText(ANACHRONOS_EMOTE_2, me); + Talk(ANACHRONOS_EMOTE_2); break; case 55: Fandral->SetVisible(false); break; case 56: - DoScriptText(ANACHRONOS_EMOTE_3, me); + Talk(ANACHRONOS_EMOTE_3); me->GetMotionMaster()->MoveCharge(-8116, 1522, 3.65f, 4); break; case 57: @@ -760,7 +760,7 @@ public: break; case 60: if (player) - DoScriptText(ANACHRONOS_SAY_10, me, player); + Talk(ANACHRONOS_SAY_10, player->GetGUID()); me->GetMotionMaster()->MoveCharge(-8113.46f, 1524.16f, 2.89f, 4); break; case 61: @@ -782,7 +782,7 @@ public: me->SetVisible(false); if (Creature* AnachronosQuestTrigger = (Unit::GetCreature(*me, AnachronosQuestTriggerGUID))) { - DoScriptText(ARYGOS_YELL_1, me); + Talk(ARYGOS_YELL_1); AnachronosQuestTrigger->AI()->EnterEvadeMode(); eventEnd=true; } @@ -1054,7 +1054,7 @@ public: { if (!Announced && AnnounceTimer <= diff) { - DoScriptText(WavesInfo[WaveCount].WaveTextId, me); + Talk(WavesInfo[WaveCount].WaveTextId); Announced = true; } else AnnounceTimer -= diff; diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp index 5cf6d141805..033274f8561 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/stonetalon_mountains.cpp @@ -101,9 +101,9 @@ enum Kaya NPC_GRIMTOTEM_BRUTE = 11912, NPC_GRIMTOTEM_SORCERER = 11913, - SAY_START = -1000357, - SAY_AMBUSH = -1000358, - SAY_END = -1000359, + SAY_START = 0, + SAY_AMBUSH = 1, + SAY_END = 2, QUEST_PROTECT_KAYA = 6523 }; @@ -126,14 +126,14 @@ public: switch (waypointId) { case 16: - DoScriptText(SAY_AMBUSH, me); + Talk(SAY_AMBUSH); me->SummonCreature(NPC_GRIMTOTEM_BRUTE, -48.53f, -503.34f, -46.31f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); me->SummonCreature(NPC_GRIMTOTEM_RUFFIAN, -38.85f, -503.77f, -45.90f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); me->SummonCreature(NPC_GRIMTOTEM_SORCERER, -36.37f, -496.23f, -45.71f, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 30000); break; case 18: me->SetInFront(player); - DoScriptText(SAY_END, me, player); + Talk(SAY_END); player->GroupEventHappens(QUEST_PROTECT_KAYA, me); break; } @@ -154,7 +154,7 @@ public: if (npc_escortAI* pEscortAI = CAST_AI(npc_kaya_flathoof::npc_kaya_flathoofAI, creature->AI())) pEscortAI->Start(true, false, player->GetGUID()); - DoScriptText(SAY_START, creature); + creature->AI()->Talk(SAY_START); creature->setFaction(113); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); } diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp index 7341ccb1e2c..b7644395571 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/tanaris.cpp @@ -47,7 +47,7 @@ EndContentData */ enum Aquementas { - AGGRO_YELL_AQUE = -1000350, + AGGRO_YELL_AQUE = 0, SPELL_AQUA_JET = 13586, SPELL_FROST_SHOCK = 15089 @@ -101,7 +101,7 @@ public: void EnterCombat(Unit* who) { - DoScriptText(AGGRO_YELL_AQUE, me, who); + Talk(AGGRO_YELL_AQUE, who->GetGUID()); } void UpdateAI(const uint32 diff) @@ -427,13 +427,11 @@ public: enum Npc00X17 { - //texts are signed for 7806 - SAY_OOX_START = -1000287, - SAY_OOX_AGGRO1 = -1000288, - SAY_OOX_AGGRO2 = -1000289, - SAY_OOX_AMBUSH = -1000290, - SAY_OOX17_AMBUSH_REPLY = -1000291, - SAY_OOX_END = -1000292, + SAY_OOX_START = 0, + SAY_OOX_AGGRO = 1, + SAY_OOX_AMBUSH = 2, + SAY_OOX17_AMBUSH_REPLY = 0, + SAY_OOX_END = 3, Q_OOX17 = 648, SPAWN_FIRST = 7803, @@ -454,7 +452,7 @@ public: creature->SetFullHealth(); creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - DoScriptText(SAY_OOX_START, creature); + creature->AI()->Talk(SAY_OOX_START); if (npc_escortAI* pEscortAI = CAST_AI(npc_OOX17::npc_OOX17AI, creature->AI())) pEscortAI->Start(true, false, player->GetGUID()); @@ -481,18 +479,18 @@ public: me->SummonCreature(SPAWN_FIRST, -8350.96f, -4445.79f, 10.10f, 6.20f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8355.96f, -4447.79f, 10.10f, 6.27f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_FIRST, -8353.96f, -4442.79f, 10.10f, 6.08f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_OOX_AMBUSH, me); + Talk(SAY_OOX_AMBUSH); break; case 56: me->SummonCreature(SPAWN_SECOND_1, -7510.07f, -4795.50f, 9.35f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_SECOND_2, -7515.07f, -4797.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); me->SummonCreature(SPAWN_SECOND_2, -7518.07f, -4792.50f, 9.35f, 6.22f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_OOX_AMBUSH, me); - if (Unit* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) - DoScriptText(SAY_OOX17_AMBUSH_REPLY, scoff); + Talk(SAY_OOX_AMBUSH); + if (Creature* scoff = me->FindNearestCreature(SPAWN_SECOND_2, 30)) + scoff->AI()->Talk(SAY_OOX17_AMBUSH_REPLY); break; case 86: - DoScriptText(SAY_OOX_END, me); + Talk(SAY_OOX_END); player->GroupEventHappens(Q_OOX17, me); break; } @@ -503,7 +501,7 @@ public: void EnterCombat(Unit* /*who*/) { - DoScriptText(RAND(SAY_OOX_AGGRO1, SAY_OOX_AGGRO2), me); + Talk(SAY_OOX_AGGRO); } void JustSummoned(Creature* summoned) @@ -519,14 +517,13 @@ public: enum Tooga { - SAY_TOOG_THIRST = -1000391, - SAY_TOOG_WORRIED = -1000392, - SAY_TOOG_POST_1 = -1000393, - SAY_TORT_POST_2 = -1000394, - SAY_TOOG_POST_3 = -1000395, - SAY_TORT_POST_4 = -1000396, - SAY_TOOG_POST_5 = -1000397, - SAY_TORT_POST_6 = -1000398, + SAY_TOOG_WORRIED = 0, + SAY_TOOG_POST_1 = 1, + SAY_TORT_POST_2 = 0, + SAY_TOOG_POST_3 = 2, + SAY_TORT_POST_4 = 1, + SAY_TOOG_POST_5 = 3, + SAY_TORT_POST_6 = 2, QUEST_TOOGA = 1560, NPC_TORTA = 6015, @@ -617,8 +614,8 @@ public: { PostEventTimer = 5000; - Unit* pTorta = Unit::GetUnit(*me, TortaGUID); - if (!pTorta || !pTorta->isAlive()) + Creature* torta = Creature::GetCreature(*me, TortaGUID); + if (!torta || !torta->isAlive()) { //something happened, so just complete SetFollowComplete(); @@ -628,22 +625,22 @@ public: switch (PhasePostEvent) { case 1: - DoScriptText(SAY_TOOG_POST_1, me); + Talk(SAY_TOOG_POST_1); break; case 2: - DoScriptText(SAY_TORT_POST_2, pTorta); + torta->AI()->Talk(SAY_TORT_POST_2); break; case 3: - DoScriptText(SAY_TOOG_POST_3, me); + Talk(SAY_TOOG_POST_3); break; case 4: - DoScriptText(SAY_TORT_POST_4, pTorta); + torta->AI()->Talk(SAY_TORT_POST_4); break; case 5: - DoScriptText(SAY_TOOG_POST_5, me); + Talk(SAY_TOOG_POST_5); break; case 6: - DoScriptText(SAY_TORT_POST_6, pTorta); + torta->AI()->Talk(SAY_TORT_POST_6); me->GetMotionMaster()->MovePoint(POINT_ID_TO_WATER, ToWaterLoc); break; } @@ -661,7 +658,7 @@ public: CheckSpeechTimer = 5000; if (urand(0, 9) > 8) - DoScriptText(RAND(SAY_TOOG_THIRST, SAY_TOOG_WORRIED), me); + Talk(SAY_TOOG_WORRIED); } else CheckSpeechTimer -= Diff; diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/teldrassil.cpp index 6c1993d6447..dfd42d132d8 100644 --- a/src/server/scripts/Kalimdor/teldrassil.cpp +++ b/src/server/scripts/Kalimdor/teldrassil.cpp @@ -38,8 +38,8 @@ EndContentData */ enum Mist { - SAY_AT_HOME = -1000323, - EMOTE_AT_HOME = -1000324, + SAY_AT_HOME = 0, + EMOTE_AT_HOME = 1, QUEST_MIST = 938, NPC_ARYNIA = 3519, FACTION_DARNASSUS = 79 @@ -78,7 +78,7 @@ public: { if (me->IsWithinDistInMap(who, 10.0f)) { - DoScriptText(SAY_AT_HOME, who); + Talk(SAY_AT_HOME, who->GetGUID()); DoComplete(); } } @@ -86,7 +86,7 @@ public: void DoComplete() { - DoScriptText(EMOTE_AT_HOME, me); + Talk(EMOTE_AT_HOME); Player* player = GetLeaderForFollower(); if (player && player->GetQuestStatus(QUEST_MIST) == QUEST_STATUS_INCOMPLETE) diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp index 8a24f696a23..9417e7993f7 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/the_barrens.cpp @@ -83,17 +83,14 @@ public: enum Gilthares { - SAY_GIL_START = -1000370, - SAY_GIL_AT_LAST = -1000371, - SAY_GIL_PROCEED = -1000372, - SAY_GIL_FREEBOOTERS = -1000373, - SAY_GIL_AGGRO_1 = -1000374, - SAY_GIL_AGGRO_2 = -1000375, - SAY_GIL_AGGRO_3 = -1000376, - SAY_GIL_AGGRO_4 = -1000377, - SAY_GIL_ALMOST = -1000378, - SAY_GIL_SWEET = -1000379, - SAY_GIL_FREED = -1000380, + SAY_GIL_START = 0, + SAY_GIL_AT_LAST = 1, + SAY_GIL_PROCEED = 2, + SAY_GIL_FREEBOOTERS = 3, + SAY_GIL_AGGRO = 4, + SAY_GIL_ALMOST = 5, + SAY_GIL_SWEET = 6, + SAY_GIL_FREED = 7, QUEST_FREE_FROM_HOLD = 898, AREA_MERCHANT_COAST = 391, @@ -112,7 +109,7 @@ public: creature->setFaction(FACTION_ESCORTEE); creature->SetStandState(UNIT_STAND_STATE_STAND); - DoScriptText(SAY_GIL_START, creature, player); + creature->AI()->Talk(SAY_GIL_START, player->GetGUID()); if (npc_giltharesAI* pEscortAI = CAST_AI(npc_gilthares::npc_giltharesAI, creature->AI())) pEscortAI->Start(false, false, player->GetGUID(), quest); @@ -140,22 +137,22 @@ public: switch (waypointId) { case 16: - DoScriptText(SAY_GIL_AT_LAST, me, player); + Talk(SAY_GIL_AT_LAST, player->GetGUID()); break; case 17: - DoScriptText(SAY_GIL_PROCEED, me, player); + Talk(SAY_GIL_PROCEED, player->GetGUID()); break; case 18: - DoScriptText(SAY_GIL_FREEBOOTERS, me, player); + Talk(SAY_GIL_FREEBOOTERS, player->GetGUID()); break; case 37: - DoScriptText(SAY_GIL_ALMOST, me, player); + Talk(SAY_GIL_ALMOST,player->GetGUID()); break; case 47: - DoScriptText(SAY_GIL_SWEET, me, player); + Talk(SAY_GIL_SWEET, player->GetGUID()); break; case 53: - DoScriptText(SAY_GIL_FREED, me, player); + Talk(SAY_GIL_FREED, player->GetGUID()); player->GroupEventHappens(QUEST_FREE_FROM_HOLD, me); break; } @@ -171,7 +168,7 @@ public: if (who->GetTypeId() != TYPEID_PLAYER && me->GetAreaId() == AREA_MERCHANT_COAST) { //appears to be pretty much random (possible only if escorter not in combat with who yet?) - DoScriptText(RAND(SAY_GIL_AGGRO_1, SAY_GIL_AGGRO_2, SAY_GIL_AGGRO_3, SAY_GIL_AGGRO_4), me, who); + Talk(SAY_GIL_AGGRO, who->GetGUID()); } } }; @@ -324,11 +321,11 @@ enum TwiggyFlathead NPC_BIG_WILL = 6238, NPC_AFFRAY_CHALLENGER = 6240, - SAY_BIG_WILL_READY = -1000123, - SAY_TWIGGY_FLATHEAD_BEGIN = -1000124, - SAY_TWIGGY_FLATHEAD_FRAY = -1000125, - SAY_TWIGGY_FLATHEAD_DOWN = -1000126, - SAY_TWIGGY_FLATHEAD_OVER = -1000127, + SAY_BIG_WILL_READY = 0, + SAY_TWIGGY_FLATHEAD_BEGIN = 0, + SAY_TWIGGY_FLATHEAD_FRAY = 1, + SAY_TWIGGY_FLATHEAD_DOWN = 2, + SAY_TWIGGY_FLATHEAD_OVER = 3 }; Position const AffrayChallengerLoc[6] = @@ -412,7 +409,7 @@ public: return; if (!pWarrior->isAlive() && pWarrior->GetQuestStatus(1719) == QUEST_STATUS_INCOMPLETE) { - DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, me); + Talk(SAY_TWIGGY_FLATHEAD_DOWN); pWarrior->FailQuest(1719); for (uint8 i = 0; i < 6; ++i) // unsummon challengers @@ -441,7 +438,7 @@ public: if (x >= -1684 && x <= -1674 && y >= -4334 && y <= -4324) { pWarrior->AreaExploredOrEventHappens(1719); - DoScriptText(SAY_TWIGGY_FLATHEAD_BEGIN, me, pWarrior); + Talk(SAY_TWIGGY_FLATHEAD_BEGIN, pWarrior->GetGUID()); for (uint8 i = 0; i < 6; ++i) { @@ -470,7 +467,7 @@ public: Creature* creature = Unit::GetCreature((*me), AffrayChallenger[i]); if ((!creature || (!creature->isAlive())) && !ChallengerDown[i]) { - DoScriptText(SAY_TWIGGY_FLATHEAD_DOWN, me); + Talk(SAY_TWIGGY_FLATHEAD_DOWN); ChallengerDown[i] = true; } } @@ -482,7 +479,7 @@ public: { if (Wave < 6 && AffrayChallenger[Wave] && !EventBigWill) { - DoScriptText(SAY_TWIGGY_FLATHEAD_FRAY, me); + Talk(SAY_TWIGGY_FLATHEAD_FRAY); Creature* creature = Unit::GetCreature((*me), AffrayChallenger[Wave]); if (creature && (creature->isAlive())) { @@ -512,7 +509,7 @@ public: Creature* creature = Unit::GetCreature((*me), BigWill); if (!creature || !creature->isAlive()) { - DoScriptText(SAY_TWIGGY_FLATHEAD_OVER, me); + Talk(SAY_TWIGGY_FLATHEAD_OVER); Reset(); } } @@ -530,14 +527,14 @@ public: enum Wizzlecrank { - SAY_START = -1000298, - SAY_STARTUP1 = -1000299, - SAY_STARTUP2 = -1000300, - SAY_MERCENARY = -1000301, - SAY_PROGRESS_1 = -1000302, - SAY_PROGRESS_2 = -1000303, - SAY_PROGRESS_3 = -1000304, - SAY_END = -1000305, + SAY_MERCENARY = 0, + SAY_START = 0, + SAY_STARTUP1 = 1, + SAY_STARTUP2 = 2, + SAY_PROGRESS_1 = 3, + SAY_PROGRESS_2 = 4, + SAY_PROGRESS_3 = 5, + SAY_END = 6, QUEST_ESCAPE = 863, FACTION_RATCHET = 637, @@ -581,7 +578,7 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_STARTUP1, me); + Talk(SAY_STARTUP1); break; case 9: SetRun(false); @@ -589,7 +586,7 @@ public: case 17: if (Creature* temp = me->SummonCreature(NPC_MERCENARY, 1128.489f, -3037.611f, 92.701f, 1.472f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000)) { - DoScriptText(SAY_MERCENARY, temp); + temp->AI()->Talk(SAY_MERCENARY); me->SummonCreature(NPC_MERCENARY, 1160.172f, -2980.168f, 97.313f, 3.690f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 120000); } break; @@ -609,10 +606,10 @@ public: switch (PointId) { case 9: - DoScriptText(SAY_STARTUP2, me, player); + Talk(SAY_STARTUP2, player->GetGUID()); break; case 18: - DoScriptText(SAY_PROGRESS_1, me, player); + Talk(SAY_PROGRESS_1, player->GetGUID()); SetRun(); break; } @@ -638,13 +635,13 @@ public: switch (PostEventCount) { case 0: - DoScriptText(SAY_PROGRESS_2, me); + Talk(SAY_PROGRESS_2); break; case 1: - DoScriptText(SAY_PROGRESS_3, me); + Talk(SAY_PROGRESS_3); break; case 2: - DoScriptText(SAY_END, me); + Talk(SAY_END); break; case 3: if (Player* player = GetPlayerForEscort()) diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/thousand_needles.cpp index 7667a8b312c..53751cb8278 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/thousand_needles.cpp @@ -44,7 +44,7 @@ EndContentData */ enum Kanati { - SAY_KAN_START = -1000410, + SAY_KAN_START = 0, QUEST_PROTECT_KANATI = 4966, NPC_GALAK_ASS = 10720 @@ -82,7 +82,7 @@ public: switch (waypointId) { case 0: - DoScriptText(SAY_KAN_START, me); + Talk(SAY_KAN_START); DoSpawnGalak(); break; case 1: @@ -112,11 +112,11 @@ public: enum Lakota { - SAY_LAKO_START = -1000365, - SAY_LAKO_LOOK_OUT = -1000366, - SAY_LAKO_HERE_COME = -1000367, - SAY_LAKO_MORE = -1000368, - SAY_LAKO_END = -1000369, + SAY_LAKO_START = 0, + SAY_LAKO_LOOK_OUT = 1, + SAY_LAKO_HERE_COME = 2, + SAY_LAKO_MORE = 3, + SAY_LAKO_END = 4, QUEST_FREE_AT_LAST = 4904, NPC_GRIM_BANDIT = 10758, @@ -146,7 +146,7 @@ public: { if (quest->GetQuestId() == QUEST_FREE_AT_LAST) { - DoScriptText(SAY_LAKO_START, creature, player); + creature->AI()->Talk(SAY_LAKO_START, player->GetGUID()); creature->setFaction(FACTION_ESCORTEE_LAKO); if (npc_lakota_windsongAI* pEscortAI = CAST_AI(npc_lakota_windsong::npc_lakota_windsongAI, creature->AI())) @@ -171,15 +171,15 @@ public: switch (waypointId) { case 8: - DoScriptText(SAY_LAKO_LOOK_OUT, me); + Talk(SAY_LAKO_LOOK_OUT); DoSpawnBandits(ID_AMBUSH_1); break; case 14: - DoScriptText(SAY_LAKO_HERE_COME, me); + Talk(SAY_LAKO_HERE_COME); DoSpawnBandits(ID_AMBUSH_2); break; case 21: - DoScriptText(SAY_LAKO_MORE, me); + Talk(SAY_LAKO_MORE); DoSpawnBandits(ID_AMBUSH_3); break; case 45: @@ -204,9 +204,9 @@ public: enum Packa { - SAY_START = -1000362, - SAY_WYVERN = -1000363, - SAY_COMPLETE = -1000364, + SAY_START = 0, + SAY_WYVERN = 1, + SAY_COMPLETE = 2, QUEST_HOMEWARD = 4770, NPC_WYVERN = 4107, @@ -229,7 +229,7 @@ public: { if (quest->GetQuestId() == QUEST_HOMEWARD) { - DoScriptText(SAY_START, creature, player); + creature->AI()->Talk(SAY_START, player->GetGUID()); creature->setFaction(FACTION_ESCORTEE); if (npc_paoka_swiftmountainAI* pEscortAI = CAST_AI(npc_paoka_swiftmountain::npc_paoka_swiftmountainAI, creature->AI())) @@ -254,11 +254,11 @@ public: switch (waypointId) { case 15: - DoScriptText(SAY_WYVERN, me); + Talk(SAY_WYVERN); DoSpawnWyvern(); break; case 26: - DoScriptText(SAY_COMPLETE, me); + Talk(SAY_COMPLETE); break; case 27: if (Player* player = GetPlayerForEscort()) diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp index e00ea566c8f..801855e7249 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp @@ -37,12 +37,12 @@ EndContentData */ enum AmeData { - SAY_READY = -1000517, - SAY_AGGRO1 = -1000518, - SAY_SEARCH = -1000519, - SAY_AGGRO2 = -1000520, - SAY_AGGRO3 = -1000521, - SAY_FINISH = -1000522, + SAY_READY = 0, + SAY_AGGRO1 = 1, + SAY_SEARCH = 2, + SAY_AGGRO2 = 3, + SAY_AGGRO3 = 4, + SAY_FINISH = 5, SPELL_DEMORALIZINGSHOUT = 13730, @@ -62,7 +62,7 @@ public: if (quest->GetQuestId() == QUEST_CHASING_AME) { CAST_AI(npc_escortAI, (creature->AI()))->Start(false, false, player->GetGUID()); - DoScriptText(SAY_READY, creature, player); + creature->AI()->Talk(SAY_READY, player->GetGUID()); creature->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); // Change faction so mobs attack creature->setFaction(113); @@ -89,21 +89,21 @@ public: { case 19: me->SummonCreature(ENTRY_STOMPER, -6391.69f, -1730.49f, -272.83f, 4.96f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO1, me, player); + Talk(SAY_AGGRO1, player->GetGUID()); break; case 28: - DoScriptText(SAY_SEARCH, me, player); + Talk(SAY_SEARCH, player->GetGUID()); break; case 38: me->SummonCreature(ENTRY_TARLORD, -6370.75f, -1382.84f, -270.51f, 6.06f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO2, me, player); + Talk(SAY_AGGRO2, player->GetGUID()); break; case 49: me->SummonCreature(ENTRY_TARLORD1, -6324.44f, -1181.05f, -270.17f, 4.34f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); - DoScriptText(SAY_AGGRO3, me, player); + Talk(SAY_AGGRO3, player->GetGUID()); break; case 55: - DoScriptText(SAY_FINISH, me, player); + Talk(SAY_FINISH, player->GetGUID()); player->GroupEventHappens(QUEST_CHASING_AME, me); break; } @@ -147,27 +147,20 @@ public: enum Ringo { - SAY_RIN_START_1 = -1000416, - SAY_RIN_START_2 = -1000417, - - SAY_FAINT_1 = -1000418, - SAY_FAINT_2 = -1000419, - SAY_FAINT_3 = -1000420, - SAY_FAINT_4 = -1000421, - - SAY_WAKE_1 = -1000422, - SAY_WAKE_2 = -1000423, - SAY_WAKE_3 = -1000424, - SAY_WAKE_4 = -1000425, - - SAY_RIN_END_1 = -1000426, - SAY_SPR_END_2 = -1000427, - SAY_RIN_END_3 = -1000428, - EMOTE_RIN_END_4 = -1000429, - EMOTE_RIN_END_5 = -1000430, - SAY_RIN_END_6 = -1000431, // signed for 6784 - SAY_SPR_END_7 = -1000432, - EMOTE_RIN_END_8 = -1000433, + SAY_RIN_START = 0, + + SAY_FAINT = 1, + + SAY_WAKE = 2, + + SAY_RIN_END_1 = 3, + SAY_SPR_END_2 = 0, + SAY_RIN_END_3 = 4, + EMOTE_RIN_END_4 = 5, + EMOTE_RIN_END_5 = 6, + SAY_RIN_END_6 = 7, + SAY_SPR_END_7 = 1, + EMOTE_RIN_END_8 = 8, SPELL_REVIVE_RINGO = 15591, QUEST_A_LITTLE_HELP = 4491, @@ -184,10 +177,10 @@ public: { if (quest->GetQuestId() == QUEST_A_LITTLE_HELP) { - if (npc_ringoAI* pRingoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI())) + if (npc_ringoAI* ringoAI = CAST_AI(npc_ringo::npc_ringoAI, creature->AI())) { creature->SetStandState(UNIT_STAND_STATE_STAND); - pRingoAI->StartFollow(player, FACTION_ESCORTEE, quest); + ringoAI->StartFollow(player, FACTION_ESCORTEE, quest); } } @@ -249,7 +242,7 @@ public: { SetFollowPaused(true); - DoScriptText(RAND(SAY_FAINT_1, SAY_FAINT_2, SAY_FAINT_3, SAY_FAINT_4), me); + Talk(SAY_FAINT); } //what does actually happen here? Emote? Aura? @@ -263,7 +256,7 @@ public: if (HasFollowState(STATE_FOLLOW_POSTEVENT)) return; - DoScriptText(RAND(SAY_WAKE_1, SAY_WAKE_2, SAY_WAKE_3, SAY_WAKE_4), me); + Talk(SAY_WAKE); SetFollowPaused(false); } @@ -276,8 +269,8 @@ public: { if (EndEventTimer <= Diff) { - Unit* pSpraggle = Unit::GetUnit(*me, SpraggleGUID); - if (!pSpraggle || !pSpraggle->isAlive()) + Creature* spraggle = Creature::GetCreature(*me, SpraggleGUID); + if (!spraggle || !spraggle->isAlive()) { SetFollowComplete(); return; @@ -286,37 +279,37 @@ public: switch (EndEventProgress) { case 1: - DoScriptText(SAY_RIN_END_1, me); + Talk(SAY_RIN_END_1); EndEventTimer = 3000; break; case 2: - DoScriptText(SAY_SPR_END_2, pSpraggle); + spraggle->AI()->Talk(SAY_SPR_END_2); EndEventTimer = 5000; break; case 3: - DoScriptText(SAY_RIN_END_3, me); + Talk(SAY_RIN_END_3); EndEventTimer = 1000; break; case 4: - DoScriptText(EMOTE_RIN_END_4, me); + Talk(EMOTE_RIN_END_4); SetFaint(); EndEventTimer = 9000; break; case 5: - DoScriptText(EMOTE_RIN_END_5, me); + Talk(EMOTE_RIN_END_5); ClearFaint(); EndEventTimer = 1000; break; case 6: - DoScriptText(SAY_RIN_END_6, me); + Talk(SAY_RIN_END_6); EndEventTimer = 3000; break; case 7: - DoScriptText(SAY_SPR_END_7, pSpraggle); + spraggle->AI()->Talk(SAY_SPR_END_7); EndEventTimer = 10000; break; case 8: - DoScriptText(EMOTE_RIN_END_8, me); + Talk(EMOTE_RIN_END_8); EndEventTimer = 5000; break; case 9: |