diff options
10 files changed, 219 insertions, 121 deletions
diff --git a/sql/updates/955_world_scripts.sql b/sql/updates/955_world_scripts.sql new file mode 100644 index 00000000000..7c389377433 --- /dev/null +++ b/sql/updates/955_world_scripts.sql @@ -0,0 +1,59 @@ +DELETE FROM script_texts WHERE entry BETWEEN -1000333 and -1000306; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000306, 'Follow me, stranger. This won\'t take long.', 0, 'npc_kservant - SAY1'), +(-1000307, 'Shattrath was once the draenei capital of this world. Its name means \"dwelling of light.\"', 4, 'npc_kservant - WHISP1'), +(-1000308, 'When the Burning Legion turned the orcs against the draenei, the fiercest battle was fought here. The draenei fought tooth and nail, but in the end the city fell.', 4, 'npc_kservant - WHISP2'), +(-1000309, 'The city was left in ruins and darkness... until the Sha\'tar arrived.', 4, 'npc_kservant - WHISP3'), +(-1000310, 'Let us go into the Lower City. I will warn you that as one of the only safe havens in Outland, Shattrath has attracted droves of refugees from all wars, current and past.', 4, 'npc_kservant - WHISP4'), +(-1000311, 'The Sha\'tar, or \"born from light\" are the naaru that came to Outland to fight the demons of the Burning Legion.', 4, 'npc_kservant - WHISP5'), +(-1000312, 'They were drawn to the ruins of Shattrath City where a small remnant of the draenei priesthood conducted its rites inside a ruined temple on this very spot.', 4, 'npc_kservant - WHISP6'), +(-1000313, 'The priesthood, known as the Aldor, quickly regained its strength as word spread that the naaru had returned and reconstruction soon began. The ruined temple is now used as an infirmary for injured refugees.', 4, 'npc_kservant - WHISP7'), +(-1000314, 'It wouldn\'t be long, however, before the city came under attack once again. This time, the attack came from Illidan\'s armies. A large regiment of blood elves had been sent by Illidan\'s ally, Kael\'thas Sunstrider, to lay waste to the city.', 4, 'npc_kservant - WHISP8'), +(-1000315, 'As the regiment of blood elves crossed this very bridge, the Aldor\'s exarchs and vindicators lined up to defend the Terrace of Light. But then the unexpected happened.', 4, 'npc_kservant - WHISP9'), +(-1000316, 'The blood elves laid down their weapons in front of the city\'s defenders; their leader, a blood elf elder known as Voren\'thal, stormed into the Terrace of Light and demanded to speak to A\'dal.', 4, 'npc_kservant - WHISP10'), +(-1000317, 'As the naaru approached him, Voren\'thal kneeled before him and uttered the following words: \"I\'ve seen you in a vision, naaru. My race\'s only hope for survival lies with you. My followers and I are here to serve you.\"', 4, 'npc_kservant - WHISP11'), +(-1000318, 'The defection of Voren\'thal and his followers was the largest loss ever incurred by Kael\'s forces. And these weren\'t just any blood elves. Many of the best and brightest amongst Kael\'s scholars and magisters had been swayed by Voren\'thal\'s influence.', 4, 'npc_kservant - WHISP12'), +(-1000319, 'The naaru accepted the defectors, who would become known as the Scryers; their dwelling lies in the platform above. Only those initiated with the Scryers are allowed there.', 4, 'npc_kservant - WHISP13'), +(-1000320, 'The Aldor are followers of the Light and forgiveness and redemption are values they understand. However, they found hard to forget the deeds of the blood elves while under Kael\'s command.', 4, 'npc_kservant - WHISP14'), +(-1000321, 'Many of the priesthood had been slain by the same magisters who now vowed to serve the naaru. They were not happy to share the city with their former enemies.', 4, 'npc_kservant - WHISP15'), +(-1000322, 'The Aldor\'s most holy temple and its surrounding dwellings lie on the terrace above. As a holy site, only the initiated are welcome inside.', 4, 'npc_kservant - WHISP16'), +(-1000323, 'The attacks against Shattrath continued, but the city did not fall, as you can see. On the contrary, the naaru known as Xi\'ri led a successful incursion into Shadowmoon Valley - Illidan\'s doorstep.', 4, 'npc_kservant - WHISP17'), +(-1000324, 'There he continues to wage war on Illidan with the assistance of the Aldor and the Scryers. The two factions have not given up on their old feuds, though.', 4, 'npc_kservant - WHISP18'), +(-1000325, 'Such is their animosity that they vie for the honor of being sent to assist the naaru there. Each day, that decision is made here by A\'dal. The armies gather here to receive A\'dal\'s blessing before heading to Shadowmoon.', 4, 'npc_kservant - WHISP19'), +(-1000326, 'Khadgar should be ready to see you again. Just remember that to serve the Sha\'tar you will most likely have to ally with the Aldor or the Scryers. And seeking the favor of one group will cause the others\' dislike.', 4, 'npc_kservant - WHISP20'), +(-1000327, 'Good luck stranger, and welcome to Shattrath City.', 4, 'npc_kservant - WHISP21'), + + +(-1000328, 'Time to teach you a lesson in manners, little boy!', 0, ''), +(-1000329, 'Now I\'m gonna give you to the count of \'3\' to get out of here before I sick the dogs on you.', 0, ''), +(-1000330, '1...', 0, ''), +(-1000331, '2...', 0, ''), +(-1000332, 'Time to meet your maker!', 0, ''), +(-1000333, 'Alright, we give up! Don\'t hurt us!', 0, ''); + +DELETE FROM script_texts WHERE entry=-1000334; +INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES +(-1000334, 'Thank you, dear Paladin, you just saved my life.', 0, 10, 'stillblade - SAY_HEAL'); + +DELETE FROM script_texts WHERE entry BETWEEN -1000349 and -1000335; +INSERT INTO script_texts (entry, content_default, type, comment) VALUES +(-1000335, 'Let\'s get to the others, and keep an eye open for those wolves cutside...', 0, 'npc_deathstalker_erland +- SAY_QUESTACCEPT'), +(-1000336, 'Be careful, $N. Those wolves like to hide among the trees.', 0, 'npc_deathstalker_erland - SAY_START'), +(-1000337, 'A $C attacks!', 0, 'npc_deathstalker_erland - SAY_AGGRO_1'), +(-1000338, 'Beware! I am under attack!', 0, 'npc_deathstalker_erland - SAY_AGGRO_2'), +(-1000339, 'We\'re almost there!', 0, 'npc_deathstalker_erland - SAY_LAST'), +(-1000340, 'We made it! Thanks, $N. I couldn\'t have gotten without you.', 0, 'npc_deathstalker_erland - +SAY_THANKS'), +(-1000341, 'It\'s good to see you again, Erland. What is your report?', 0, 'npc_deathstalker_erland - SAY_RANE'), +(-1000342, 'Masses of wolves are to the east, and whoever lived at Malden\'s Orchard is gone.', 0, +'npc_deathstalker_erland - SAY_ANSWER'), +(-1000343, 'If I am excused, then I\'d like to check on Quinn...', 0, 'npc_deathstalker_erland - SAY_MOVE_QUINN'), +(-1000344, 'Hello, Quinn. How are you faring?', 0, 'npc_deathstalker_erland - SAY_GREETINGS'), +(-1000345, 'I\'ve been better. Ivar the Foul got the better of me...', 0, 'npc_deathstalker_erland - SAY_QUINN'), +(-1000346, 'Try to take better care of yourself, Quinn. You were lucky this time.', 0, 'npc_deathstalker_erland - +SAY_ON_BYE'), + +(-1000347, 'Let\'s go before they find out I\'m free!', 0, 'npc_kaya_flathoof - SAY_START'), +(-1000348, 'Look out! We\'re under attack!', 0, 'npc_kaya_flathoof - SAY_AMBUSH'), +(-1000349, 'Thank you for helping me. I know my way back from here.', 0, 'npc_kaya_flathoof - SAY_END');
\ No newline at end of file diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt index 6ce60c51804..df51b03190a 100644 --- a/sql/updates/CMakeLists.txt +++ b/sql/updates/CMakeLists.txt @@ -154,4 +154,5 @@ INSTALL(FILES 952_world_scripts.sql 953_world_scripts.sql 954_world_scripts.sql +955_world_scripts.sql DESTINATION share/trinity/sql/updates) diff --git a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp index 55b3a3a17df..8c70e1bd501 100644 --- a/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp +++ b/src/bindings/scripts/scripts/zone/orgrimmar/orgrimmar.cpp @@ -35,13 +35,15 @@ EndContentData */ #define QUEST_5727 5727 +#define GOSSIP_HNF "You may speak frankly, Neeru..." +#define GOSSIP_SNF "[PH] ..." bool GossipHello_npc_neeru_fireblade(Player *player, Creature *_Creature) { if (_Creature->isQuestGiver()) player->PrepareQuestMenu( _Creature->GetGUID() ); if (player->GetQuestStatus(QUEST_5727) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM(0, "You may speak frankly, Neeru...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(0, GOSSIP_HNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(4513, _Creature->GetGUID()); return true; @@ -52,7 +54,7 @@ bool GossipSelect_npc_neeru_fireblade(Player *player, Creature *_Creature, uint3 switch (action) { case GOSSIP_ACTION_INFO_DEF+1: - player->ADD_GOSSIP_ITEM(0, "[PH] ...", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(0, GOSSIP_SNF, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(4513, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: @@ -150,6 +152,14 @@ bool ReciveEmote_npc_shenthul(Player *player, Creature *_Creature, uint32 emote) #define SPELL_CHAIN_LIGHTNING 16033 #define SPELL_SHOCK 16034 +#define GOSSIP_HTW "Please share your wisdom with me, Warchief." +#define GOSSIP_STW1 "What discoveries?" +#define GOSSIP_STW2 "Usurper?" +#define GOSSIP_STW3 "With all due respect, Warchief - why not allow them to be destroyed? Does this not strengthen our position?" +#define GOSSIP_STW4 "I... I did not think of it that way, Warchief." +#define GOSSIP_STW5 "I live only to serve, Warchief! My life is empty and meaningless without your guidance." +#define GOSSIP_STW6 "Of course, Warchief!" + //TODO: verify abilities/timers struct TRINITY_DLL_DECL npc_thrall_warchiefAI : public ScriptedAI { @@ -197,7 +207,7 @@ bool GossipHello_npc_thrall_warchief(Player *player, Creature *_Creature) player->PrepareQuestMenu( _Creature->GetGUID() ); if (player->GetQuestStatus(QUEST_6566) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM(0, "Please share your wisdom with me, Warchief.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(0, GOSSIP_HTW, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); return true; @@ -208,27 +218,27 @@ bool GossipSelect_npc_thrall_warchief(Player *player, Creature *_Creature, uint3 switch (action) { case GOSSIP_ACTION_INFO_DEF+1: - player->ADD_GOSSIP_ITEM(0, "What discoveries?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(0, GOSSIP_STW1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(5733, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - player->ADD_GOSSIP_ITEM(0, "Usurper?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + player->ADD_GOSSIP_ITEM(0, GOSSIP_STW2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->SEND_GOSSIP_MENU(5734, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - player->ADD_GOSSIP_ITEM(0, "With all due respect, Warchief - why not allow them to be destroyed? Does this not strengthen our position?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + player->ADD_GOSSIP_ITEM(0, GOSSIP_STW3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->SEND_GOSSIP_MENU(5735, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: - player->ADD_GOSSIP_ITEM(0, "I... I did not think of it that way, Warchief.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); + player->ADD_GOSSIP_ITEM(0, GOSSIP_STW4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); player->SEND_GOSSIP_MENU(5736, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: - player->ADD_GOSSIP_ITEM(0, "I live only to serve, Warchief! My life is empty and meaningless without your guidance.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); + player->ADD_GOSSIP_ITEM(0, GOSSIP_STW5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); player->SEND_GOSSIP_MENU(5737, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+6: - player->ADD_GOSSIP_ITEM(0, "Of course, Warchief!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); + player->ADD_GOSSIP_ITEM(0, GOSSIP_STW6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+7); player->SEND_GOSSIP_MENU(5738, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+7: diff --git a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp index aceb69a7966..b4596fb8a90 100644 --- a/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp +++ b/src/bindings/scripts/scripts/zone/shadowmoon_valley/shadowmoon_valley.cpp @@ -417,12 +417,15 @@ bool GossipSelect_npc_drake_dealer_hurlunk(Player *player, Creature *_Creature, ## npc_flanis_swiftwing_and_kagrosh ######*/ +#define GOSSIP_HSK1 "Take Flanis's Pack" +#define GOSSIP_HSK2 "Take Kagrosh's Pack" + bool GossipHello_npcs_flanis_swiftwing_and_kagrosh(Player *player, Creature *_Creature) { if (player->GetQuestStatus(10583) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30658,1,true)) - player->ADD_GOSSIP_ITEM( 0, "Take Flanis's Pack", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HSK1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); if (player->GetQuestStatus(10601) == QUEST_STATUS_INCOMPLETE && !player->HasItemCount(30659,1,true)) - player->ADD_GOSSIP_ITEM( 0, "Take Kagrosh's Pack", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HSK2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -460,10 +463,17 @@ bool GossipSelect_npcs_flanis_swiftwing_and_kagrosh(Player *player, Creature *_C #define QUEST_11082 11082 +#define GOSSIP_HMO "I am here for you, overseer." +#define GOSSIP_SMO1 "How dare you question an overseer of the Dragonmaw!" +#define GOSSIP_SMO2 "Who speaks of me? What are you talking about, broken?" +#define GOSSIP_SMO3 "Continue please." +#define GOSSIP_SMO4 "Who are these bidders?" +#define GOSSIP_SMO5 "Well... yes." + bool GossipHello_npc_murkblood_overseer(Player *player, Creature *_Creature) { if (player->GetQuestStatus(QUEST_11082) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM( 0, "I am here for you, overseer.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HMO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); return true; @@ -474,27 +484,27 @@ bool GossipSelect_npc_murkblood_overseer(Player *player, Creature *_Creature, ui switch (action) { case GOSSIP_ACTION_INFO_DEF+1: - player->ADD_GOSSIP_ITEM(0, "How dare you question an overseer of the Dragonmaw!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM(0, GOSSIP_SMO1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); //correct id not known player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - player->ADD_GOSSIP_ITEM(0, "Who speaks of me? What are you talking about, broken?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + player->ADD_GOSSIP_ITEM(0, GOSSIP_SMO2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); //correct id not known player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - player->ADD_GOSSIP_ITEM(0, "Continue please.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + player->ADD_GOSSIP_ITEM(0, GOSSIP_SMO3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); //correct id not known player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: - player->ADD_GOSSIP_ITEM(0, "Who are these bidders?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); + player->ADD_GOSSIP_ITEM(0, GOSSIP_SMO4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5); //correct id not known player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+5: - player->ADD_GOSSIP_ITEM(0, "Well... yes.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); + player->ADD_GOSSIP_ITEM(0, GOSSIP_SMO5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+6); //correct id not known player->SEND_GOSSIP_MENU(10940, _Creature->GetGUID()); break; @@ -512,13 +522,18 @@ bool GossipSelect_npc_murkblood_overseer(Player *player, Creature *_Creature, ui ## npc_neltharaku ######*/ +#define GOSSIP_HN "I am listening, dragon" +#define GOSSIP_SN1 "But you are dragons! How could orcs do this to you?" +#define GOSSIP_SN2 "Your mate?" +#define GOSSIP_SN3 "I have battled many beasts, dragon. I will help you." + bool GossipHello_npc_neltharaku(Player *player, Creature *_Creature) { if (_Creature->isQuestGiver()) player->PrepareQuestMenu( _Creature->GetGUID() ); if (player->GetQuestStatus(10814) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM( 0, "I am listening, dragon", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(10613, _Creature->GetGUID()); @@ -530,15 +545,15 @@ bool GossipSelect_npc_neltharaku(Player *player, Creature *_Creature, uint32 sen switch (action) { case GOSSIP_ACTION_INFO_DEF+1: - player->ADD_GOSSIP_ITEM( 0, "But you are dragons! How could orcs do this to you?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_SN1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); player->SEND_GOSSIP_MENU(10614, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+2: - player->ADD_GOSSIP_ITEM( 0, "Your mate?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_SN2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3); player->SEND_GOSSIP_MENU(10615, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+3: - player->ADD_GOSSIP_ITEM( 0, "I have battled many beasts, dragon. I will help you.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_SN3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4); player->SEND_GOSSIP_MENU(10616, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF+4: diff --git a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp index 839c6ab1fe8..339f8450c92 100644 --- a/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp +++ b/src/bindings/scripts/scripts/zone/shattrath/shattrath_city.cpp @@ -225,10 +225,12 @@ bool GossipSelect_npc_shattrathflaskvendors(Player *player, Creature *_Creature, # npc_zephyr ######*/ +#define GOSSIP_HZ "Take me to the Caverns of Time." + bool GossipHello_npc_zephyr(Player *player, Creature *_Creature) { if( player->GetReputationRank(989) >= REP_REVERED ) - player->ADD_GOSSIP_ITEM(0, "Take me to the Caverns of Time.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM(0, GOSSIP_HZ, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID()); @@ -247,28 +249,28 @@ bool GossipSelect_npc_zephyr(Player *player, Creature *_Creature, uint32 sender, # npc_kservant ######*/ -#define SAY1 "Follow me, stranger. This won't take long." -#define WHISP1 "Shattrath was once the draenei capital of this world. Its name means \"dwelling of light.\"" -#define WHISP2 "When the Burning Legion turned the orcs against the draenei, the fiercest battle was fought here. The draenei fought tooth and nail, but in the end the city fell." -#define WHISP3 "The city was left in ruins and darkness... until the Sha'tar arrived." -#define WHISP4 "Let us go into the Lower City. I will warn you that as one of the only safe havens in Outland, Shattrath has attracted droves of refugees from all wars, current and past. " -#define WHISP5 "The Sha'tar, or \"born from light\" are the naaru that came to Outland to fight the demons of the Burning Legion." -#define WHISP6 "They were drawn to the ruins of Shattrath City where a small remnant of the draenei priesthood conducted its rites inside a ruined temple on this very spot." -#define WHISP7 "The priesthood, known as the Aldor, quickly regained its strength as word spread that the naaru had returned and reconstruction soon began. The ruined temple is now used as an infirmary for injured refugees." -#define WHISP8 "It wouldn't be long, however, before the city came under attack once again. This time, the attack came from Illidan's armies. A large regiment of blood elves had been sent by Illidan's ally, Kael'thas Sunstrider, to lay waste to the city." -#define WHISP9 "As the regiment of blood elves crossed this very bridge, the Aldor's exarchs and vindicators lined up to defend the Terrace of Light. But then the unexpected happened. " -#define WHISP10 "The blood elves laid down their weapons in front of the city's defenders; their leader, a blood elf elder known as Voren'thal, stormed into the Terrace of Light and demanded to speak to A'dal." -#define WHISP11 "As the naaru approached him, Voren'thal kneeled before him and uttered the following words: \"I've seen you in a vision, naaru. My race's only hope for survival lies with you. My followers and I are here to serve you.\"" -#define WHISP12 "The defection of Voren'thal and his followers was the largest loss ever incurred by Kael's forces. And these weren't just any blood elves. Many of the best and brightest amongst Kael's scholars and magisters had been swayed by Voren'thal's influence." -#define WHISP13 "The naaru accepted the defectors, who would become known as the Scryers; their dwelling lies in the platform above. Only those initiated with the Scryers are allowed there." -#define WHISP14 "The Aldor are followers of the Light and forgiveness and redemption are values they understand. However, they found hard to forget the deeds of the blood elves while under Kaell's command." -#define WHISP15 "Many of the priesthood had been slain by the same magisters who now vowed to serve the naaru. They were not happy to share the city with their former enemies." -#define WHISP16 "The Aldor's most holy temple and its surrounding dwellings lie on the terrace above. As a holy site, only the initiated are welcome inside." -#define WHISP17 "The attacks against Shattrath continued, but the city did not fall, as you can see. On the contrary, the naaru known as Xi'ri led a successful incursion into Shadowmoon Valley - Illidan's doorstep." -#define WHISP18 "There he continues to wage war on Illidan with the assistance of the Aldor and the Scryers. The two factions have not given up on their old feuds, though." -#define WHISP19 "Such is their animosity that they vie for the honor of being sent to assist the naaru there. Each day, that decision is made here by A'dal. The armies gather here to receive A'dal's blessing before heading to Shadowmoon." -#define WHISP20 "Khadgar should be ready to see you again. Just remember that to serve the Sha'tar you will most likely have to ally with the Aldor or the Scryers. And seeking the favor of one group will cause the others' dislike." -#define WHISP21 "Good luck stranger, and welcome to Shattrath City." +#define SAY1 -1000306 +#define WHISP1 -1000307 +#define WHISP2 -1000308 +#define WHISP3 -1000309 +#define WHISP4 -1000310 +#define WHISP5 -1000311 +#define WHISP6 -1000312 +#define WHISP7 -1000313 +#define WHISP8 -1000314 +#define WHISP9 -1000315 +#define WHISP10 -1000316 +#define WHISP11 -1000317 +#define WHISP12 -1000318 +#define WHISP13 -1000319 +#define WHISP14 -1000320 +#define WHISP15 -1000321 +#define WHISP16 -1000322 +#define WHISP17 -1000323 +#define WHISP18 -1000324 +#define WHISP19 -1000325 +#define WHISP20 -1000326 +#define WHISP21 -1000327 struct TRINITY_DLL_DECL npc_kservantAI : public npc_escortAI { @@ -279,33 +281,34 @@ public: void WaypointReached(uint32 i) { Unit *pTemp = Unit::GetUnit(*m_creature,PlayerGUID); + if( !pTemp ) return; switch(i) { - case 0: DoSay(SAY1, LANG_UNIVERSAL, pTemp); break; - case 4: DoWhisper(WHISP1, pTemp); break; - case 6: DoWhisper(WHISP2, pTemp); break; - case 7: DoWhisper(WHISP3, pTemp); break; - case 8: DoWhisper(WHISP4, pTemp); break; - case 17: DoWhisper(WHISP5, pTemp); break; - case 18: DoWhisper(WHISP6, pTemp); break; - case 19: DoWhisper(WHISP7, pTemp); break; - case 33: DoWhisper(WHISP8, pTemp); break; - case 34: DoWhisper(WHISP9, pTemp); break; - case 35: DoWhisper(WHISP10, pTemp); break; - case 36: DoWhisper(WHISP11, pTemp); break; - case 43: DoWhisper(WHISP12, pTemp); break; - case 44: DoWhisper(WHISP13, pTemp); break; - case 49: DoWhisper(WHISP14, pTemp); break; - case 50: DoWhisper(WHISP15, pTemp); break; - case 51: DoWhisper(WHISP16, pTemp); break; - case 52: DoWhisper(WHISP17, pTemp); break; - case 53: DoWhisper(WHISP18, pTemp); break; - case 54: DoWhisper(WHISP19, pTemp); break; - case 55: DoWhisper(WHISP20, pTemp); break; - case 56: DoWhisper(WHISP21, pTemp); + case 0: DoScriptText(SAY1, m_creature, pTemp); break; + case 4: DoScriptText(WHISP1, m_creature, pTemp); break; + case 6: DoScriptText(WHISP2, m_creature, pTemp); break; + case 7: DoScriptText(WHISP3, m_creature, pTemp); break; + case 8: DoScriptText(WHISP4, m_creature, pTemp); break; + case 17: DoScriptText(WHISP5, m_creature, pTemp); break; + case 18: DoScriptText(WHISP6, m_creature, pTemp); break; + case 19: DoScriptText(WHISP7, m_creature, pTemp); break; + case 33: DoScriptText(WHISP8, m_creature, pTemp); break; + case 34: DoScriptText(WHISP9, m_creature, pTemp); break; + case 35: DoScriptText(WHISP10, m_creature, pTemp); break; + case 36: DoScriptText(WHISP11, m_creature, pTemp); break; + case 43: DoScriptText(WHISP12, m_creature, pTemp); break; + case 44: DoScriptText(WHISP13, m_creature, pTemp); break; + case 49: DoScriptText(WHISP14, m_creature, pTemp); break; + case 50: DoScriptText(WHISP15, m_creature, pTemp); break; + case 51: DoScriptText(WHISP16, m_creature, pTemp); break; + case 52: DoScriptText(WHISP17, m_creature, pTemp); break; + case 53: DoScriptText(WHISP18, m_creature, pTemp); break; + case 54: DoScriptText(WHISP19, m_creature, pTemp); break; + case 55: DoScriptText(WHISP20, m_creature, pTemp); break; + case 56: DoScriptText(WHISP21, m_creature, pTemp); if( PlayerGUID ) { Unit* player = ((Creature*)Unit::GetUnit((*m_creature), PlayerGUID)); @@ -414,12 +417,13 @@ CreatureAI* GetAI_npc_kservantAI(Creature *_Creature) ######*/ #define GOSSIP_BOOK "Ezekiel said that you might have a certain book..." -#define SAY_1 "Time to teach you a lesson in manners, little boy!" -#define SAY_2 "Now I'm gonna give you to the count of '3' to get out of here before I sick the dogs on you." -#define SAY_3 "1..." -#define SAY_4 "2..." -#define SAY_5 "Time to meet your maker!" -#define SAY_GIVEUP "Alright, we give up! Don't hurt us!" + +#define SAY_1 -1000328 +#define SAY_2 -1000329 +#define SAY_3 -1000330 +#define SAY_4 -1000331 +#define SAY_5 -1000332 +#define SAY_GIVEUP -1000333 #define QUEST_WBI 10231 #define NPC_CREEPJACK 19726 @@ -477,11 +481,11 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI if(Malone) Malone->SetUInt32Value(UNIT_FIELD_BYTES_1, 0); m_creature->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); }return 2000; - case 1: DoSay(SAY_1, LANG_UNIVERSAL, player); return 3000; - case 2: DoSay(SAY_2, LANG_UNIVERSAL, player, true); return 5000; - case 3: DoSay(SAY_3, LANG_UNIVERSAL, player); return 2000; - case 4: DoSay(SAY_4, LANG_UNIVERSAL, player); return 2000; - case 5: DoSay(SAY_5, LANG_UNIVERSAL, player); return 2000; + case 1: DoScriptText(SAY_1, m_creature, player); return 3000; + case 2: DoScriptText(SAY_2, m_creature, player); return 5000; + case 3: DoScriptText(SAY_3, m_creature, player); return 2000; + case 4: DoScriptText(SAY_4, m_creature, player); return 2000; + case 5: DoScriptText(SAY_5, m_creature, player); return 2000; case 6: Attack = true; return 2000; default: return 0; } @@ -494,7 +498,7 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI if(SayTimer < diff) { if(Event) - SayTimer = NextStep(Step++); + SayTimer = NextStep(++Step); }else SayTimer -= diff; if(Attack) @@ -541,7 +545,7 @@ struct TRINITY_DLL_DECL npc_dirty_larryAI : public ScriptedAI } m_creature->setFaction(1194); Done = true; - DoSay(SAY_GIVEUP, LANG_UNIVERSAL, NULL); + DoScriptText(SAY_GIVEUP, m_creature, NULL); m_creature->DeleteThreatList(); m_creature->CombatStop(); m_creature->GetMotionMaster()->MoveTargetedHome(); diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp index 53bc93c46a6..fb15929cda9 100644 --- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp @@ -31,7 +31,7 @@ EndContentData */ # npc_blood_knight_stillblade #######*/ -#define SAY_HEAL "Thank you, dear Paladin, you just saved my life." +#define SAY_HEAL -1000334 #define QUEST_REDEEMING_THE_DEAD 9685 #define SPELL_SHIMMERING_VESSEL 31225 @@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); //m_creature->RemoveAllAuras(); - DoSay(SAY_HEAL,LANG_THALASSIAN,NULL); + DoScriptText(SAY_HEAL, m_creature); spellHit = true; } } diff --git a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp index fa03fe37add..a350594d860 100644 --- a/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp +++ b/src/bindings/scripts/scripts/zone/silverpine_forest/silverpine_forest.cpp @@ -33,6 +33,8 @@ EndContentData */ ## npc_astor_hadren ######*/ +#define GOSSIP_HAH "You're Astor Hadren, right?" +#define GOSSIP_SAH "You've got something I need, Astor. And I'll be taking it now." struct TRINITY_DLL_DECL npc_astor_hadrenAI : public ScriptedAI { npc_astor_hadrenAI(Creature *c) : ScriptedAI(c) {Reset();} @@ -60,7 +62,7 @@ CreatureAI* GetAI_npc_astor_hadren(Creature *_creature) bool GossipHello_npc_astor_hadren(Player *player, Creature *_Creature) { if (player->GetQuestStatus(1886) == QUEST_STATUS_INCOMPLETE) - player->ADD_GOSSIP_ITEM( 0, "You're Astor Hadren, right?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); player->SEND_GOSSIP_MENU(623, _Creature->GetGUID()); @@ -72,7 +74,7 @@ bool GossipSelect_npc_astor_hadren(Player *player, Creature *_Creature, uint32 s switch (action) { case GOSSIP_ACTION_INFO_DEF + 1: - player->ADD_GOSSIP_ITEM( 0, "You've got something I need, Astor. And I'll be taking it now.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_SAH, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); player->SEND_GOSSIP_MENU(624, _Creature->GetGUID()); break; case GOSSIP_ACTION_INFO_DEF + 2: @@ -89,20 +91,20 @@ bool GossipSelect_npc_astor_hadren(Player *player, Creature *_Creature, uint32 s ## npc_deathstalker_erland ######*/ -#define SAY_QUESTACCEPT "Let's get to the others, and keep an eye open for those wolves cutside..." -#define SAY_START "Be careful, $N. Those wolves like to hide among the trees." -#define SAY_AGGRO_1 "A Mottled Worg attacks!" -#define SAY_AGGRO_2 "Beware! I am under attack!" -#define SAY_LAST "We're almost there!" +#define SAY_QUESTACCEPT -1000335 +#define SAY_START -1000336 +#define SAY_AGGRO_1 -1000337 +#define SAY_AGGRO_2 -1000338 +#define SAY_LAST -1000339 -#define SAY_THANKS "We made it! Thanks, $N. I couldn't have gotten without you." -#define SAY_RANE "It's good to see you again, Erland. What is your report?" -#define SAY_ANSWER "Masses of wolves are to the east, and whoever lived at Malden's Orchard is gone." -#define SAY_MOVE_QUINN "If I am excused, then I'd like to check on Quinn..." +#define SAY_THANKS -1000340 +#define SAY_RANE -1000341 +#define SAY_ANSWER -1000342 +#define SAY_MOVE_QUINN -1000343 -#define SAY_GREETINGS "Hello, Quinn. How are you faring?" -#define SAY_QUINN "I've been better. Ivar the Foul got the better of me..." -#define SAY_ON_BYE "Try to take better care of yourself, Quinn. You were lucky this time." +#define SAY_GREETINGS -1000344 +#define SAY_QUINN -1000345 +#define SAY_ON_BYE -1000346 #define QUEST_ESCORTING 435 #define NPC_RANE 1950 @@ -121,25 +123,26 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI switch(i) { - case 1: DoSay(SAY_START, LANG_UNIVERSAL, player);break; + case 1: DoScriptText(SAY_START, m_creature, player);break; case 13: - DoSay(SAY_LAST, LANG_UNIVERSAL, player); - ((Player*)player)->GroupEventHappens(QUEST_ESCORTING, m_creature);break; - case 14: DoSay(SAY_THANKS, LANG_UNIVERSAL, player);break; + DoScriptText(SAY_LAST, m_creature, player); + if(player) + ((Player*)player)->GroupEventHappens(QUEST_ESCORTING, m_creature);break; + case 14: DoScriptText(SAY_THANKS, m_creature, player);break; case 15: { Unit* Rane = FindCreature(NPC_RANE, 20); if(Rane) - ((Creature*)Rane)->Say(SAY_RANE, LANG_UNIVERSAL, NULL); + DoScriptText(SAY_RANE, Rane); break;} - case 16: DoSay(SAY_ANSWER, LANG_UNIVERSAL, NULL);break; - case 17: DoSay(SAY_MOVE_QUINN, LANG_UNIVERSAL, NULL); break; - case 24: DoSay(SAY_GREETINGS, LANG_UNIVERSAL, NULL);break; + case 16: DoScriptText(SAY_ANSWER, m_creature);break; + case 17: DoScriptText(SAY_MOVE_QUINN, m_creature); break; + case 24: DoScriptText(SAY_GREETINGS, m_creature);break; case 25: { Unit* Quinn = FindCreature(NPC_QUINN, 20); if(Quinn) - ((Creature*)Quinn)->Say(SAY_QUINN, LANG_GUTTERSPEAK, NULL); + DoScriptText(SAY_QUINN, Quinn); break;} - case 26: DoSay(SAY_ON_BYE, LANG_UNIVERSAL, NULL);break; + case 26: DoScriptText(SAY_ON_BYE, m_creature, NULL);break; } } @@ -150,8 +153,8 @@ struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI { switch(rand()%2) { - case 0: DoSay(SAY_AGGRO_1, LANG_UNIVERSAL, who);break; - case 1: DoSay(SAY_AGGRO_2, LANG_UNIVERSAL, who);break; + case 0: DoScriptText(SAY_AGGRO_1, m_creature, who);break; + case 1: DoScriptText(SAY_AGGRO_2, m_creature, who);break; } } @@ -165,7 +168,7 @@ bool QuestAccept_npc_deathstalker_erland(Player* player, Creature* creature, Que { if (quest->GetQuestId() == QUEST_ESCORTING) { - creature->Say(SAY_QUESTACCEPT, LANG_UNIVERSAL, player->GetGUID()); + DoScriptText(SAY_QUESTACCEPT, creature, player); ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID()); } diff --git a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp index a5ea8dd2226..40d3a5c7b9d 100644 --- a/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp +++ b/src/bindings/scripts/scripts/zone/stonetalon_mountains/stonetalon_mountains.cpp @@ -33,6 +33,12 @@ EndContentData */ ## npc_braug_dimspirit ######*/ +#define GOSSIP_HBD1 "Ysera" +#define GOSSIP_HBD2 "Neltharion" +#define GOSSIP_HBD3 "Nozdormu" +#define GOSSIP_HBD4 "Alexstrasza" +#define GOSSIP_HBD5 "Malygos" + bool GossipHello_npc_braug_dimspirit(Player *player, Creature *_Creature) { if (_Creature->isQuestGiver()) @@ -40,11 +46,11 @@ bool GossipHello_npc_braug_dimspirit(Player *player, Creature *_Creature) if (player->GetQuestStatus(6627) == QUEST_STATUS_INCOMPLETE) { - player->ADD_GOSSIP_ITEM( 0, "Ysera", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - player->ADD_GOSSIP_ITEM( 0, "Neltharion", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); - player->ADD_GOSSIP_ITEM( 0, "Nozdormu", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - player->ADD_GOSSIP_ITEM( 0, "Alexstrasza", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); - player->ADD_GOSSIP_ITEM( 0, "Malygos", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HBD1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HBD2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HBD3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HBD4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); + player->ADD_GOSSIP_ITEM( 0, GOSSIP_HBD5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1); player->SEND_GOSSIP_MENU(5820, _Creature->GetGUID()); } @@ -74,9 +80,9 @@ bool GossipSelect_npc_braug_dimspirit(Player *player, Creature *_Creature, uint3 ## npc_kaya_flathoof ######*/ -#define SAY_START "Let's go before they find out I'm free!" -#define SAY_AMBUSH "Look out! We're under attack!" -#define SAY_END "Thank you for helping me. I know my way back from here." +#define SAY_START -1000347 +#define SAY_AMBUSH -1000348 +#define SAY_END -1000349 #define QUEST_PK 6523 #define MOB_GB 11912 @@ -97,13 +103,13 @@ struct TRINITY_DLL_DECL npc_kaya_flathoofAI : public npc_escortAI switch(i) { case 22: - DoSay(SAY_AMBUSH, LANG_UNIVERSAL, NULL); + DoScriptText(SAY_AMBUSH, m_creature); m_creature->SummonCreature(MOB_GB, -48.53, -503.34, -46.31, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); m_creature->SummonCreature(MOB_GR, -38.85, -503.77, -45.90, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); m_creature->SummonCreature(MOB_GS, -36.37, -496.23, -45.71, 0.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000); break; case 23: m_creature->SetInFront(player); - DoSay(SAY_END, LANG_UNIVERSAL, player, true); + DoScriptText(SAY_END, m_creature, player); if (player && player->GetTypeId() == TYPEID_PLAYER) ((Player*)player)->GroupEventHappens(QUEST_PK, m_creature); break; @@ -140,7 +146,7 @@ bool QuestAccept_npc_kaya_flathoof(Player* player, Creature* creature, Quest con if (quest->GetQuestId() == QUEST_PK) { ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID()); - creature->Say(SAY_START, LANG_UNIVERSAL, NULL); + DoScriptText(SAY_START, creature); creature->setFaction(113); creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2); } diff --git a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp index 81498a6a7a5..c6ef71f25e5 100644 --- a/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp +++ b/src/bindings/scripts/scripts/zone/stormwind/stormwind_city.cpp @@ -17,7 +17,7 @@ /* ScriptData SDName: Stormwind_City SD%Complete: 100 -SDComment: Quest support: 1640, 1447, 4185, 11223 (DB support required for spell 42711). Receive emote General Marcus +SDComment: Quest support: 1640, 1447, 4185, 11223. Receive emote General Marcus SDCategory: Stormwind City EndScriptData */ diff --git a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp index c7e832fd172..256ffbae949 100644 --- a/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp +++ b/src/bindings/scripts/scripts/zone/tempest_keep/the_eye/boss_void_reaver.cpp @@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL boss_void_reaverAI : public ScriptedAI target = *(target_list.begin()+rand()%target_list.size()); if (target) - m_creature->CastSpell(target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(), SPELL_ARCANE_ORB, true); + m_creature->CastSpell(target->GetPositionX(),target->GetPositionY(),target->GetPositionZ(), SPELL_ARCANE_ORB, false); ArcaneOrb_Timer = 3000; }else ArcaneOrb_Timer -= diff; |