diff --git a/sql/scriptdev2/scriptdev2.sql b/sql/scriptdev2/scriptdev2.sql index 99c7ef9a0e..5c47346adb 100644 --- a/sql/scriptdev2/scriptdev2.sql +++ b/sql/scriptdev2/scriptdev2.sql @@ -3468,14 +3468,6 @@ INSERT INTO script_texts (entry,content_default,sound,type,language,emote,broadc ('-1532016','Oh, I''ve gone and made a mess...','9315','1','0','0','15086','moroes SAY_KILL_3'), ('-1532017','How terribly clumsy of me.','9213','1','0','0','15022','moroes SAY_DEATH'), -('-1532018','Your behavior will not be tolerated.','9204','1','0','0','15079','maiden SAY_AGGRO'), -('-1532019','Ah ah ah...','9207','1','0','0','15082','maiden SAY_SLAY1'), -('-1532020','This is for the best.','9312','1','0','0','15084','maiden SAY_SLAY2'), -('-1532021','Impure thoughts lead to profane actions.','9311','1','0','0','15083','maiden SAY_SLAY3'), -('-1532022','Cast out your corrupt thoughts.','9313','1','0','0','15080','maiden SAY_REPENTANCE1'), -('-1532023','Your impurity must be cleansed.','9208','1','0','0','13396','maiden SAY_REPENTANCE2'), -('-1532024','Death comes. Will your conscience be clear?','9206','1','0','0','15081','maiden SAY_DEATH'), - ('-1532025','Oh at last, at last I can go home!','9190','1','0','0','15068','dorothee SAY_DOROTHEE_DEATH'), ('-1532026','Don''t let them hurt us Tito! Oh, you won''t, will you?','9191','1','0','0','15066','dorothee SAY_DOROTHEE_SUMMON'), ('-1532027','Tito! Oh Tito, no!','9192','1','0','0','15069','dorothee SAY_DOROTHEE_TITO_DEATH'), diff --git a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp index 7d40cde360..eb8eba819f 100644 --- a/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp +++ b/src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp @@ -27,13 +27,13 @@ EndScriptData */ enum { - SAY_AGGRO = -1532018, + SAY_AGGRO = 15079, SAY_SLAY1 = 15082, SAY_SLAY2 = 15083, SAY_SLAY3 = 15084, - SAY_REPENTANCE1 = -1532022, - SAY_REPENTANCE2 = -1532023, - SAY_DEATH = -1532024, + SAY_REPENTANCE1 = 15080, + SAY_REPENTANCE2 = 13396, + SAY_DEATH = 15081, SPELL_REPENTANCE = 29511, SPELL_HOLYFIRE = 29522, @@ -88,7 +88,7 @@ struct boss_maiden_of_virtueAI : public CombatAI { if (DoCastSpellIfCan(nullptr, SPELL_REPENTANCE) == CAST_OK) { - DoScriptText(urand(0, 1) ? SAY_REPENTANCE1 : SAY_REPENTANCE2, m_creature); + DoBroadcastText(urand(0, 1) ? SAY_REPENTANCE1 : SAY_REPENTANCE2, m_creature); ResetCombatAction(action, GetSubsequentActionTimer(action)); } return; @@ -118,7 +118,7 @@ struct boss_maiden_of_virtueAI : public CombatAI void JustDied(Unit* /*killer*/) override { - DoScriptText(SAY_DEATH, m_creature); + DoBroadcastText(SAY_DEATH, m_creature); if (m_instance) m_instance->SetData(TYPE_MAIDEN, DONE); @@ -126,7 +126,7 @@ struct boss_maiden_of_virtueAI : public CombatAI void Aggro(Unit* /*who*/) override { - DoScriptText(SAY_AGGRO, m_creature); + DoBroadcastText(SAY_AGGRO, m_creature); if (m_instance) m_instance->SetData(TYPE_MAIDEN, IN_PROGRESS);