diff --git a/sql/scriptdev2/scriptdev2.sql b/sql/scriptdev2/scriptdev2.sql index 30eaa783d5..57b9a19c51 100644 --- a/sql/scriptdev2/scriptdev2.sql +++ b/sql/scriptdev2/scriptdev2.sql @@ -4117,75 +4117,6 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,broadc -- -1 558 000 AUCHENAI CRYPTS -- -1 560 000 ESCAPE FROM DURNHOLDE (OLD HILLSBRAD) -INSERT INTO script_texts (entry,content_default,sound,type,language,emote,broadcast_text_id,comment) VALUES -('-1560000','Thrall! You didn''t really think you would escape, did you? You and your allies shall answer to Blackmoore... after I''ve had my fun.','10406','0','0','1','15909','skarloc SAY_ENTER'), - -('-1560001','My magical power can turn back time to before Thrall''s death, but be careful. My power to manipulate time is limited.','0','0','0','0','16729','image of eronzion SAY_RESET_THRALL'), -('-1560002','I have set back the flow of time just once more. If you fail to prevent Thrall''s death, then all is lost.','0','0','0','0','16731','image of eronzion SAY_RESET_THRALL_LAST'), - -('-1560003','What''s the meaning of this? GUARDS!','0','0','0','0','15891','armorer SAY_CALL_GUARDS'), -('-1560004','All that you know... will be undone.','0','0','0','0','19537','infinite dragon SAY_INFINITE_AGGRO_1'), -('-1560005','Let''s go.','0','0','0','0','15894','thrall hillsbrad SAY_TH_ARMORY2'), -('-1560006','Thrall startles the horse with a fierce yell!','0','2','0','5','16499','thrall hillsbrad EMOTE_TH_STARTLE_HORSE'), -('-1560007','I thought I saw something go into the barn.','0','0','0','0','15958','tarren mill lookout SAY_LOOKOUT_BARN_1'), -('-1560008','I didn''t see anything.','0','0','0','0','15968','tarren mill lookout SAY_PROTECTOR_BARN_2'), -('-1560009','Thrall tries to calm the horse down.','0','2','0','0','15970','thrall hillsbrad EMOTE_TH_CALM_HORSE'), -('-1560010','Something riled that horse. Let''s go!','0','0','0','0','15969','tarren mill lookout SAY_PROTECTOR_BARN_3'), -('-1560011','Taretha isn''t here. Let''s head into town.','0','0','0','0','15974','thrall hillsbrad SAY_TH_HEAD_TOWN'), -('-1560012','She''s not here.','0','0','0','0','15975','thrall hillsbrad SAY_TH_CHURCH_ENTER'), - -('-1560013','Thrall! Come outside and face your fate!','10418','1','0','0','16016','epoch SAY_ENTER1'), -('-1560014','Taretha''s life hangs in the balance. Surely you care for her. Surely you wish to save her... ','10419','1','0','0','16019','epoch SAY_ENTER2'), -('-1560015','Ah, there you are. I had hoped to accomplish this with a bit of subtlety, but I suppose direct confrontation was inevitable. Your future, Thrall, must not come to pass and so... you and your troublesome friends must die!','10420','1','0','0','16021','epoch SAY_ENTER3'), - -('-1560016','Thrall''s trapped himself in the chapel. He can''t escape now.','0','0','0','0','15976','tarren mill lookout SAY_LOOKOUT_CHURCH'), -('-1560017','He''s here, stop him!','0','0','0','0','15986','tarren mill lookout SAY_LOOKOUT_INN'), -('-1560018','We have all the time in the world....','0','0','0','0','19536','infinite dragon SAY_INFINITE_AGGRO_2'), -('-1560019','You cannot escape us!','0','0','0','0','19538','infinite dragon SAY_INFINITE_AGGRO_3'), -('-1560020','Do not think you can win!','0','0','0','0','19534','infinite dragon SAY_INFINITE_AGGRO_4'), - -('-1560021','REUSE_ME','0','0','0','0','0','REUSE_ME'), -('-1560022','REUSE_ME','0','0','0','0','0','REUSE_ME'), - -('-1560023','Very well then. Let''s go!','10465','0','0','0','17622','thrall hillsbrad SAY_TH_START_EVENT_PART1'), -('-1560024','As long as we''re going with a new plan, I may as well pick up a weapon and some armor.','0','0','0','0','15893','thrall hillsbrad SAY_TH_ARMORY'), -('-1560025','A rider approaches.','10466','0','0','0','15908','thrall hillsbrad SAY_TH_SKARLOC_MEET'), -('-1560026','I''ll never be chained again!','10467','1','0','0','17623','thrall hillsbrad SAY_TH_SKARLOC_TAUNT'), -('-1560027','Very well. Tarren Mill lies just west of here. Since time is of the essence...','10468','0','0','0','15916','thrall hillsbrad SAY_TH_START_EVENT_PART2'), -('-1560028','Let''s ride!','10469','0','0','1','15948','thrall hillsbrad SAY_TH_MOUNTS_UP'), -('-1560029','Taretha must be in the inn. Let''s go.','0','0','0','0','15977','thrall hillsbrad SAY_TH_CHURCH_END'), -('-1560030','Taretha! What foul magic is this?','0','0','0','0','15978','thrall hillsbrad SAY_TH_MEET_TARETHA'), -('-1560031','Who or what was that?','10470','0','0','1','16017','thrall hillsbrad SAY_TH_EPOCH_WONDER'), -('-1560032','No!','10471','0','0','5','5265','thrall hillsbrad SAY_TH_EPOCH_KILL_TARETHA'), -('-1560033','Goodbye, Taretha. I will never forget your kindness.','10472','0','0','0','16089','thrall hillsbrad SAY_TH_EVENT_COMPLETE'), -('-1560034','Things are looking grim....','10458','1','0','0','17610','thrall hillsbrad SAY_TH_RANDOM_LOW_HP1'), -('-1560035','I''ll fight... to the last!','10459','1','0','0','17611','thrall hillsbrad SAY_TH_RANDOM_LOW_HP2'), -('-1560036','Taretha....','10460','1','0','0','17612','thrall hillsbrad SAY_TH_RANDOM_DIE1'), -('-1560037','A good day... to die.','10461','1','0','0','17613','thrall hillsbrad SAY_TH_RANDOM_DIE2'), -('-1560038','I have earned my freedom!','10448','0','0','0','17600','thrall hillsbrad SAY_TH_RANDOM_AGGRO1'), -('-1560039','This day is long overdue! Out of my way!','10449','0','0','0','17601','thrall hillsbrad SAY_TH_RANDOM_AGGRO2'), -('-1560040','I am a slave no longer!','10450','0','0','0','17602','thrall hillsbrad SAY_TH_RANDOM_AGGRO3'), -('-1560041','Blackmoore has much to answer for!','10451','0','0','0','17603','thrall hillsbrad SAY_TH_RANDOM_AGGRO4'), -('-1560042','You have forced my hand!','10452','0','0','0','17604','thrall hillsbrad SAY_TH_RANDOM_KILL1'), -('-1560043','It should not have come to this!','10453','0','0','0','17605','thrall hillsbrad SAY_TH_RANDOM_KILL2'), -('-1560044','I did not ask for this!','10454','0','0','0','17606','thrall hillsbrad SAY_TH_RANDOM_KILL3'), -('-1560045','I am truly in your debt, strangers.','10455','0','0','0','17607','thrall hillsbrad SAY_TH_LEAVE_COMBAT1'), -('-1560046','Thank you, strangers. You have given me hope.','10456','0','0','0','17608','thrall hillsbrad SAY_TH_LEAVE_COMBAT2'), -('-1560047','I will not waste this chance. I will seek out my destiny.','10457','0','0','0','17609','thrall hillsbrad SAY_TH_LEAVE_COMBAT3'), - -('-1560048','I''m free! Thank you all!','0','0','0','0','16082','taretha SAY_TA_FREE'), -('-1560049','Thrall, you escaped!','0','0','0','0','15979','taretha SAY_TA_ESCAPED'), - -('-1560050','That''s enough out of him.','0','0','0','0','15892','thrall hillsbrad SAY_TH_KILL_ARMORER'), -('-1560051','That spell should wipe their memories of us and what just happened. All they should remember now is what reality would be like without the attempted temporal interference. Well done. Thrall will journey on to find his destiny, and Taretha...','0','0','0','0','16087','erozion SAY_WIPE_MEMORY'), -('-1560052','Her fate is regrettably unavoidable.','0','0','0','0','16088','erozion SAY_ABOUT_TARETHA'), -('-1560053','They call you a monster. But they''re the monsters, not you. Farewell, Thrall.','0','0','0','0','16090','taretha SAY_TA_FAREWELL'), - -('-1560054','I''m glad you''re safe, Taretha. None of this would have been possible without your friends. They made all of this happen.','0','0','0','0','16083','thrall hillsbrad SAY_TR_GLAD_SAFE'), -('-1560055','Thrall, I''ve never met these people before in my life.','0','0','0','0','16085','taretha SAY_TA_NEVER_MET'), -('-1560056','Then who are these people?','0','0','0','0','16084','thrall hillsbrad SAY_TR_THEN_WHO'), -('-1560057','I believe I can explain everything to you two if you give me a moment of your time.','0','0','0','0','16086','erozion SAY_PRE_WIPE'), -('-1560058','You have done a great thing. Alas, the young warchief''s memory of these events must be as they originally were ... Andormu awaits you in the master''s lair.','0','0','0','0','0','erozion SAY_AFTER_WIPE'); -- -1 564 000 BLACK TEMPLE INSERT INTO script_texts (entry,content_default,sound,type,language,emote,broadcast_text_id,comment) VALUES diff --git a/src/game/AI/ScriptDevAI/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbradScripts.cpp b/src/game/AI/ScriptDevAI/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbradScripts.cpp index 71a58f23cb..c1e32fc340 100644 --- a/src/game/AI/ScriptDevAI/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbradScripts.cpp +++ b/src/game/AI/ScriptDevAI/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbradScripts.cpp @@ -86,72 +86,72 @@ bool GossipSelect_npc_erozion(Player* pPlayer, Creature* pCreature, uint32 /*uiS enum { // Thrall texts - part I - SAY_TH_START_EVENT_PART_1 = -1560023, - SAY_ARMORER_CALL_GUARDS = -1560003, - SAY_TH_KILL_ARMORER = -1560050, - SAY_TH_ARMORY_1 = -1560024, - SAY_TH_ARMORY_2 = -1560005, - SAY_TH_SKARLOC_MEET = -1560025, - SAY_SKARLOC_ENTER = -1560000, - SAY_TH_SKARLOC_TAUNT = -1560026, + SAY_TH_START_EVENT_PART_1 = 17622, + SAY_ARMORER_CALL_GUARDS = 15891, + SAY_TH_KILL_ARMORER = 15892, + SAY_TH_ARMORY_1 = 15893, + SAY_TH_ARMORY_2 = 15894, + SAY_TH_SKARLOC_MEET = 15908, + SAY_SKARLOC_ENTER = 15909, + SAY_TH_SKARLOC_TAUNT = 17623, // Thrall texts - part II - SAY_TH_START_EVENT_PART2 = -1560027, - SAY_TH_MOUNTS_UP = -1560028, - EMOTE_TH_STARTLE_HORSE = -1560006, + SAY_TH_START_EVENT_PART2 = 15916, + SAY_TH_MOUNTS_UP = 15948, + EMOTE_TH_STARTLE_HORSE = 16499, // Thrall texts part III (barn) - SAY_LOOKOUT_BARN_1 = -1560007, - SAY_PROTECTOR_BARN_2 = -1560008, - EMOTE_TH_CALM_HORSE = -1560009, - SAY_PROTECTOR_BARN_3 = -1560010, - SAY_TH_HEAD_TOWN = -1560011, + SAY_LOOKOUT_BARN_1 = 15958, + SAY_PROTECTOR_BARN_2 = 15968, + EMOTE_TH_CALM_HORSE = 15970, + SAY_PROTECTOR_BARN_3 = 15969, + SAY_TH_HEAD_TOWN = 15974, // Thrall texts part III (church) - SAY_TH_CHURCH_ENTER = -1560012, - SAY_LOOKOUT_CHURCH = -1560016, - SAY_TH_CHURCH_END = -1560029, + SAY_TH_CHURCH_ENTER = 15975, + SAY_LOOKOUT_CHURCH = 15976, + SAY_TH_CHURCH_END = 15977, // Thrall texts part III (inn) - SAY_LOOKOUT_INN = -1560017, - SAY_TA_ESCAPED = -1560049, - SAY_TH_MEET_TARETHA = -1560030, + SAY_LOOKOUT_INN = 15986, + SAY_TA_ESCAPED = 15979, + SAY_TH_MEET_TARETHA = 15978, - SAY_EPOCH_ENTER1 = -1560013, - SAY_TH_EPOCH_WONDER = -1560031, - SAY_EPOCH_ENTER2 = -1560014, - SAY_TH_EPOCH_KILL_TARETHA = -1560032, - SAY_EPOCH_ENTER3 = -1560015, + SAY_EPOCH_ENTER1 = 16016, + SAY_TH_EPOCH_WONDER = 16017, + SAY_EPOCH_ENTER2 = 16019, + SAY_TH_EPOCH_KILL_TARETHA = 16020, + SAY_EPOCH_ENTER3 = 16021, // infinite dragons texts - SAY_INFINITE_DRAGON_AGGRO_1 = -1560004, - SAY_INFINITE_DRAGON_AGGRO_2 = -1560018, - SAY_INFINITE_DRAGON_AGGRO_3 = -1560019, - SAY_INFINITE_DRAGON_AGGRO_4 = -1560020, + SAY_INFINITE_DRAGON_AGGRO_1 = 19537, + SAY_INFINITE_DRAGON_AGGRO_2 = 19536, + SAY_INFINITE_DRAGON_AGGRO_3 = 19538, + SAY_INFINITE_DRAGON_AGGRO_4 = 19534, // Thrall texts - misc - SAY_TH_RANDOM_LOW_HP1 = -1560034, - SAY_TH_RANDOM_LOW_HP2 = -1560035, + SAY_TH_RANDOM_LOW_HP1 = 17610, + SAY_TH_RANDOM_LOW_HP2 = 17611, - SAY_TH_RANDOM_DIE1 = -1560036, - SAY_TH_RANDOM_DIE2 = -1560037, + SAY_TH_RANDOM_DIE1 = 17612, + SAY_TH_RANDOM_DIE2 = 17613, - SAY_TH_RANDOM_AGGRO1 = -1560038, - SAY_TH_RANDOM_AGGRO2 = -1560039, - SAY_TH_RANDOM_AGGRO3 = -1560040, - SAY_TH_RANDOM_AGGRO4 = -1560041, + SAY_TH_RANDOM_AGGRO1 = 17600, + SAY_TH_RANDOM_AGGRO2 = 17601, + SAY_TH_RANDOM_AGGRO3 = 17602, + SAY_TH_RANDOM_AGGRO4 = 17603, - SAY_TH_RANDOM_KILL1 = -1560042, - SAY_TH_RANDOM_KILL2 = -1560043, - SAY_TH_RANDOM_KILL3 = -1560044, + SAY_TH_RANDOM_KILL1 = 17604, + SAY_TH_RANDOM_KILL2 = 17605, + SAY_TH_RANDOM_KILL3 = 17606, - SAY_TH_LEAVE_COMBAT1 = -1560045, - SAY_TH_LEAVE_COMBAT2 = -1560046, - SAY_TH_LEAVE_COMBAT3 = -1560047, + SAY_TH_LEAVE_COMBAT1 = 17607, + SAY_TH_LEAVE_COMBAT2 = 17608, + SAY_TH_LEAVE_COMBAT3 = 10457, // reset texts - SAY_ERONZION_RESET_THRALL = -1560001, - SAY_ERONZION_RESET_LAST = -1560002, + SAY_ERONZION_RESET_THRALL = 16729, + SAY_ERONZION_RESET_LAST = 16731, // gossip - start item GOSSIP_ITEM_START = -3560000, // "We are ready to get you out of here, Thrall" @@ -287,10 +287,10 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper { switch (urand(0, 3)) { - case 0: DoScriptText(SAY_TH_RANDOM_AGGRO1, m_creature); break; - case 1: DoScriptText(SAY_TH_RANDOM_AGGRO2, m_creature); break; - case 2: DoScriptText(SAY_TH_RANDOM_AGGRO3, m_creature); break; - case 3: DoScriptText(SAY_TH_RANDOM_AGGRO4, m_creature); break; + case 0: DoBroadcastText(SAY_TH_RANDOM_AGGRO1, m_creature); break; + case 1: DoBroadcastText(SAY_TH_RANDOM_AGGRO2, m_creature); break; + case 2: DoBroadcastText(SAY_TH_RANDOM_AGGRO3, m_creature); break; + case 3: DoBroadcastText(SAY_TH_RANDOM_AGGRO4, m_creature); break; } if (m_creature->IsMounted()) @@ -304,9 +304,9 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper { switch (urand(0, 2)) { - case 0: DoScriptText(SAY_TH_RANDOM_KILL1, m_creature); break; - case 1: DoScriptText(SAY_TH_RANDOM_KILL2, m_creature); break; - case 2: DoScriptText(SAY_TH_RANDOM_KILL3, m_creature); break; + case 0: DoBroadcastText(SAY_TH_RANDOM_KILL1, m_creature); break; + case 1: DoBroadcastText(SAY_TH_RANDOM_KILL2, m_creature); break; + case 2: DoBroadcastText(SAY_TH_RANDOM_KILL3, m_creature); break; } } @@ -316,7 +316,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper if (m_pInstance) m_pInstance->SetData(TYPE_THRALL_EVENT, FAIL); - DoScriptText(urand(0, 1) ? SAY_TH_RANDOM_DIE1 : SAY_TH_RANDOM_DIE2, m_creature); + DoBroadcastText(urand(0, 1) ? SAY_TH_RANDOM_DIE1 : SAY_TH_RANDOM_DIE2, m_creature); DoCastSpellIfCan(m_creature, SPELL_SUMMON_EROZION_IMAGE, CAST_TRIGGERED); // despawn the summons which won't self despawn @@ -425,9 +425,9 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper { switch (urand(0, 2)) { - case 0: DoScriptText(SAY_TH_LEAVE_COMBAT1, m_creature); break; - case 1: DoScriptText(SAY_TH_LEAVE_COMBAT2, m_creature); break; - case 2: DoScriptText(SAY_TH_LEAVE_COMBAT3, m_creature); break; + case 0: DoBroadcastText(SAY_TH_LEAVE_COMBAT1, m_creature); break; + case 1: DoBroadcastText(SAY_TH_LEAVE_COMBAT2, m_creature); break; + case 2: DoBroadcastText(SAY_TH_LEAVE_COMBAT3, m_creature); break; } } @@ -456,7 +456,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper { if (!m_bHasInnYelled) { - DoScriptText(SAY_LOOKOUT_INN, pSummoned); + DoBroadcastText(SAY_LOOKOUT_INN, pSummoned); m_bHasInnYelled = true; } pSummoned->AI()->AttackStart(m_creature); @@ -474,10 +474,10 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper { switch (urand(0, 3)) { - case 0: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_1, pSummoned); break; - case 1: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_2, pSummoned); break; - case 2: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_3, pSummoned); break; - case 3: DoScriptText(SAY_INFINITE_DRAGON_AGGRO_4, pSummoned); break; + case 0: DoBroadcastText(SAY_INFINITE_DRAGON_AGGRO_1, pSummoned); break; + case 1: DoBroadcastText(SAY_INFINITE_DRAGON_AGGRO_2, pSummoned); break; + case 2: DoBroadcastText(SAY_INFINITE_DRAGON_AGGRO_3, pSummoned); break; + case 3: DoBroadcastText(SAY_INFINITE_DRAGON_AGGRO_4, pSummoned); break; } m_bHasEpochYelled = true; } @@ -491,7 +491,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper case NPC_CHURCH_PROTECTOR: if (!m_bHasChurchYelled) { - DoScriptText(SAY_LOOKOUT_CHURCH, pSummoned); + DoBroadcastText(SAY_LOOKOUT_CHURCH, pSummoned); m_bHasChurchYelled = true; } pSummoned->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_IMMUNE_TO_PLAYER); @@ -500,7 +500,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper // Spawned when Thrall is dead case NPC_IMAGE_OF_ERONZION: if (m_pInstance) - DoScriptText(m_pInstance->GetThrallEventCount() < MAX_WIPE_COUNTER ? SAY_ERONZION_RESET_THRALL : SAY_ERONZION_RESET_LAST, pSummoned); + DoBroadcastText(m_pInstance->GetThrallEventCount() < MAX_WIPE_COUNTER ? SAY_ERONZION_RESET_THRALL : SAY_ERONZION_RESET_LAST, pSummoned); pSummoned->CastSpell(pSummoned, SPELL_SPAWN_EROZION_IMAGE, TRIGGERED_NONE); pSummoned->ForcedDespawn(30000); break; @@ -510,7 +510,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper break; case NPC_EPOCH: pSummoned->SetLevitate(true); - DoScriptText(SAY_EPOCH_ENTER1, pSummoned); + DoBroadcastText(SAY_EPOCH_ENTER1, pSummoned); break; // Skarloc helpers - they have special behavior case NPC_WARDEN: @@ -616,7 +616,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper break; case 2: // taunt Thrall - DoScriptText(SAY_SKARLOC_ENTER, pSummoned); + DoBroadcastText(SAY_SKARLOC_ENTER, pSummoned); SetEscortPaused(false); break; } @@ -696,16 +696,16 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper case 9: if (Creature* pArmorer = m_pInstance->GetSingleCreatureFromStorage(NPC_ARMORER)) { - DoScriptText(SAY_ARMORER_CALL_GUARDS, pArmorer); + DoBroadcastText(SAY_ARMORER_CALL_GUARDS, pArmorer); pArmorer->SetFacingToObject(m_creature); } break; case 10: - DoScriptText(SAY_TH_KILL_ARMORER, m_creature); + DoBroadcastText(SAY_TH_KILL_ARMORER, m_creature); DoCastSpellIfCan(nullptr, SPELL_KNOCKOUT_ARMORER); break; case 11: - DoScriptText(SAY_TH_ARMORY_1, m_creature); + DoBroadcastText(SAY_TH_ARMORY_1, m_creature); m_creature->SetStandState(UNIT_STAND_STATE_KNEEL); break; case 12: @@ -723,7 +723,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper case 16: if (Creature* pArmorer = m_pInstance->GetSingleCreatureFromStorage(NPC_ARMORER)) m_creature->SetFacingToObject(pArmorer); - DoScriptText(SAY_TH_ARMORY_2, m_creature); + DoBroadcastText(SAY_TH_ARMORY_2, m_creature); break; // *** Escort event - Part I - outside the keep *** case 21: @@ -756,7 +756,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper m_creature->SummonCreature(NPC_SKARLOC, 2000.201f, 277.9190f, 66.4911f, 6.11f, TEMPSPAWN_DEAD_DESPAWN, 0); m_creature->SummonCreature(NPC_VETERAN, 1997.969f, 274.4247f, 66.6181f, 5.67f, TEMPSPAWN_DEAD_DESPAWN, 0); m_creature->SummonCreature(NPC_WARDEN, 2000.002f, 282.0754f, 66.2986f, 6.02f, TEMPSPAWN_DEAD_DESPAWN, 0); - DoScriptText(SAY_TH_SKARLOC_MEET, m_creature); + DoBroadcastText(SAY_TH_SKARLOC_MEET, m_creature); SetEscortPaused(true); break; case 37: @@ -793,7 +793,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper } break; case 40: - DoScriptText(SAY_TH_MOUNTS_UP, m_creature); + DoBroadcastText(SAY_TH_MOUNTS_UP, m_creature); m_creature->SetFacingTo(5.33f); m_creature->Mount(MODEL_SKARLOC_MOUNT); break; @@ -806,7 +806,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper case 69: if (Creature* pMount = m_creature->GetMap()->GetCreature(m_skarlocMountGuid)) m_creature->SetFacingToObject(pMount); - DoScriptText(EMOTE_TH_STARTLE_HORSE, m_creature); + DoBroadcastText(EMOTE_TH_STARTLE_HORSE, m_creature); break; case 70: if (Creature* pMount = m_creature->GetMap()->GetCreature(m_skarlocMountGuid)) @@ -839,11 +839,11 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper SetEscortPaused(true); break; case 81: - DoScriptText(SAY_TH_HEAD_TOWN, m_creature); + DoBroadcastText(SAY_TH_HEAD_TOWN, m_creature); break; // *** Escort event - Part III - church *** case 98: - DoScriptText(SAY_TH_CHURCH_ENTER, m_creature); + DoBroadcastText(SAY_TH_CHURCH_ENTER, m_creature); m_creature->SetFacingTo(1.0f); break; case 99: @@ -853,7 +853,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper m_creature->SummonCreature(NPC_CHURCH_GUARDSMAN, 2629.98f, 656.96f, 55.96f, 4.34f, TEMPSPAWN_TIMED_OOC_OR_DEAD_DESPAWN, 5000); break; case 100: - DoScriptText(SAY_TH_CHURCH_END, m_creature); + DoBroadcastText(SAY_TH_CHURCH_END, m_creature); break; // *** Escort event - Part III - inside the inn *** case 111: @@ -866,11 +866,11 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper // *** Escort event - Part III - meet Taretha *** case 112: if (Creature* pTaretha = m_pInstance->GetSingleCreatureFromStorage(NPC_TARETHA)) - DoScriptText(SAY_TA_ESCAPED, pTaretha, m_creature); + DoBroadcastText(SAY_TA_ESCAPED, pTaretha, m_creature); break; case 113: // wait for player input - DoScriptText(SAY_TH_MEET_TARETHA, m_creature); + DoBroadcastText(SAY_TH_MEET_TARETHA, m_creature); m_pInstance->SetData(TYPE_ESCORT_INN, DONE); m_creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP); if (Creature* pTaretha = m_pInstance->GetSingleCreatureFromStorage(NPC_TARETHA)) @@ -887,7 +887,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper case 122: if (Creature* pEpoch = m_pInstance->GetSingleCreatureFromStorage(NPC_EPOCH)) { - DoScriptText(SAY_EPOCH_ENTER3, pEpoch); + DoBroadcastText(SAY_EPOCH_ENTER3, pEpoch); m_creature->SetFacingToObject(pEpoch); } break; @@ -970,7 +970,7 @@ struct npc_thrall_old_hillsbradAI : public npc_escortAI, private DialogueHelper if (!m_bIsLowHp && m_creature->GetHealthPercent() < 20.0f) { - DoScriptText(urand(0, 1) ? SAY_TH_RANDOM_LOW_HP1 : SAY_TH_RANDOM_LOW_HP2, m_creature); + DoBroadcastText(urand(0, 1) ? SAY_TH_RANDOM_LOW_HP1 : SAY_TH_RANDOM_LOW_HP2, m_creature); m_bIsLowHp = true; } @@ -1029,7 +1029,7 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, { pPlayer->CLOSE_GOSSIP_MENU(); - DoScriptText(SAY_TH_START_EVENT_PART_1, pCreature); + DoBroadcastText(SAY_TH_START_EVENT_PART_1, pCreature); if (pInstance) pInstance->SetData(TYPE_THRALL_EVENT, IN_PROGRESS); @@ -1059,7 +1059,7 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, { pPlayer->CLOSE_GOSSIP_MENU(); - DoScriptText(SAY_TH_START_EVENT_PART2, pCreature); + DoBroadcastText(SAY_TH_START_EVENT_PART2, pCreature); if (pInstance) pInstance->SetData(TYPE_ESCORT_BARN, IN_PROGRESS); @@ -1099,16 +1099,15 @@ bool GossipSelect_npc_thrall_old_hillsbrad(Player* pPlayer, Creature* pCreature, enum { // end event texts and spells - SAY_TA_FREE = -1560048, - SAY_TR_GLAD_SAFE = -1560054, - SAY_TA_NEVER_MET = -1560055, - SAY_TR_THEN_WHO = -1560056, - SAY_PRE_WIPE = -1560057, - SAY_WIPE_MEMORY = -1560051, - SAY_ABOUT_TARETHA = -1560052, - SAY_TH_EVENT_COMPLETE = -1560033, - SAY_TA_FAREWELL = -1560053, - SAY_AFTER_WIPE = -1560058, // not sure when to use this one + SAY_TA_FREE = 16082, + SAY_TR_GLAD_SAFE = 16083, + SAY_TA_NEVER_MET = 16085, + SAY_TR_THEN_WHO = 16084, + SAY_PRE_WIPE = 16086, + SAY_WIPE_MEMORY = 16087, + SAY_ABOUT_TARETHA = 16088, + SAY_TH_EVENT_COMPLETE = 16089, + SAY_TA_FAREWELL = 16090, GOSSIP_ITEM_EPOCH_1 = -3560005, // "Strange wizard?" TEXT_ID_EPOCH_1 = 9610, // Thank you for helping Thrall escape, friends. Now I only hope @@ -1162,7 +1161,7 @@ struct npc_tarethaAI : public npc_escortAI, private DialogueHelper // Remove flags from the npc - the quest will be handled by the entrance version if (pSummoned->GetEntry() == NPC_EROZION) { - DoScriptText(SAY_PRE_WIPE, pSummoned); + DoBroadcastText(SAY_PRE_WIPE, pSummoned); pSummoned->CastSpell(pSummoned, SPELL_TELEPORT, TRIGGERED_NONE); pSummoned->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_GOSSIP | UNIT_NPC_FLAG_QUESTGIVER); }