*More cleanups

--HG--
branch : trunk

5 files changed, 131 insertions, 72 deletions

diff --git a/sql/updates/954_wrold_scripts.sql b/sql/updates/954_wrold_scripts.sql
new file mode 100644
index 00000000000..009f59517ac
--- /dev/null
+++ b/sql/updates/954_wrold_scripts.sql
@@ -0,0 +1,19 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000305 and -1000293;
+INSERT INTO script_texts (entry, content_default, type, comment) VALUES
+(-1000293, 'In Nagrand, food hunt ogre!', 0, 'LUMP_SAY0'),
+(-1000294, 'You taste good with maybe a little salt and pepper.', 0, 'LUMP_SAY1'),
+(-1000295, 'OK, OK! Lump give up!', 0, 'LUMP_DEFEAT'),
+
+(-1000296, 'Warning! Emergency shutdown process initiated by $N. Shutdown will complete in two minutes.', 2, 'npc_manaforge_control_console - EMOTE_START'),
+(-1000297, 'Emergency shutdown will complete in one minute.', 2, 'npc_manaforge_control_console - EMOTE_60'),
+(-1000298, 'Emergency shutdown will complete in thirty seconds.', 2, 'npc_manaforge_control_console - EMOTE_30'),
+(-1000299, 'Emergency shutdown will complete in ten seconds.', 2, 'npc_manaforge_control_console - EMOTE_10'),
+(-1000300, 'Emergency shutdown complete.', 2, 'npc_manaforge_control_console - EMOTE_COMPLETE'),
+(-1000301, 'Emergency shutdown aborted.', 2, 'npc_manaforge_control_console - EMOTE_ABORT'),
+
+(-1000302, 'Saeed is currently engaged or awaiting orders to engage. You may check directly east of me and see if Saeed is ready for you. If he is not present then he is off fighting another battle. I recommend that you wait for him to return before attacking Dimensius.', 4, 'npc_professor_dabiri - WHISPER_DABIRI'),
+
+(-1000303, 'is very weak', 2, 'mob_phase_hunter - EMOTE_WEAK'),
+
+(-1000304, 'Bessy, is that you?', 0, 'npc_bessy- SAY_THADELL_1'),
+(-1000305, 'Thank you for bringing back my Bessy, $N. I couldn\'t live without her!', 0, 'npc_bessy- SAY_THADELL_2');
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index dae6a56b69d..6ce60c51804 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -153,4 +153,5 @@ INSTALL(FILES
 951_world_scripts.sql
 952_world_scripts.sql
 953_world_scripts.sql
+954_world_scripts.sql
 DESTINATION share/trinity/sql/updates)
diff --git a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
index c4647f207f2..598d64fdc8d 100644
--- a/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
+++ b/src/bindings/scripts/scripts/zone/nagrand/nagrand.cpp
@@ -80,10 +80,15 @@ CreatureAI* GetAI_mob_shattered_rumbler(Creature *_Creature)
 #define SPELL_VISUAL_SLEEP  16093
 #define SPELL_SPEAR_THROW   32248
 
-#define LUMP_SAY0 "In Nagrand, food hunt ogre!"
-#define LUMP_SAY1 "You taste good with maybe a little salt and pepper."
+#define LUMP_SAY0 -1000293
+#define LUMP_SAY1 -1000294
 
-#define LUMP_DEFEAT "OK, OK! Lump give up!"
+#define LUMP_DEFEAT -1000295
+
+#define GOSSIP_HL "I need answers, ogre!"
+#define GOSSIP_SL1 "Why are Boulderfist out this far? You know that this is Kurenai territory."
+#define GOSSIP_SL2 "And you think you can just eat anything you want? You're obviously trying to eat the Broken of Telaar."
+#define GOSSIP_SL3 "This means war, Lump! War I say!"
 
 struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI
 {
@@ -121,7 +126,7 @@ struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI
                 m_creature->CombatStop();
                 m_creature->setFaction(1080);               //friendly
                 m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, PLAYER_STATE_SIT);
-                m_creature->Say(LUMP_DEFEAT, LANG_UNIVERSAL, 0);
+                DoScriptText(LUMP_DEFEAT, m_creature);
 
                 bReset = true;
             }
@@ -138,12 +143,8 @@ struct TRINITY_DLL_DECL mob_lumpAI : public ScriptedAI
 
         switch(rand()%2)
         {
-            case 0:
-                DoSay(LUMP_SAY0,LANG_UNIVERSAL,NULL);
-                break;
-            case 1:
-                DoSay(LUMP_SAY1,LANG_UNIVERSAL,NULL);
-                break;
+            case 0: DoScriptText(LUMP_SAY0, m_creature); break;
+            case 1: DoScriptText(LUMP_SAY1, m_creature); break;
         }
     }
 
@@ -184,7 +185,7 @@ CreatureAI* GetAI_mob_lump(Creature *_creature)
 bool GossipHello_mob_lump(Player *player, Creature *_Creature)
 {
     if (player->GetQuestStatus(9918) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM( 0, "I need answers, ogre!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HL, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
     player->SEND_GOSSIP_MENU(9352, _Creature->GetGUID());
 
@@ -196,15 +197,15 @@ bool GossipSelect_mob_lump(Player *player, Creature *_Creature, uint32 sender, u
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM( 0, "Why are Boulderfist out this far? You know that this is Kurenai territory.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SL1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
             player->SEND_GOSSIP_MENU(9353, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM( 0, "And you think you can just eat anything you want? You're obviously trying to eat the Broken of Telaar.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SL2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
             player->SEND_GOSSIP_MENU(9354, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM( 0, "This means war, Lump! War I say!", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SL3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
             player->SEND_GOSSIP_MENU(9355, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
@@ -249,6 +250,17 @@ CreatureAI* GetAI_mob_sunspring_villager(Creature *_Creature)
 ## npc_altruis_the_sufferer
 ######*/
 
+#define GOSSIP_HATS1 "I see twisted steel and smell sundered earth."
+#define GOSSIP_HATS2 "Well...?"
+#define GOSSIP_HATS3 "[PH] Story about Illidan's Pupil"
+
+#define GOSSIP_SATS1 "Legion?"
+#define GOSSIP_SATS2 "And now?"
+#define GOSSIP_SATS3 "How do you see them now?"
+#define GOSSIP_SATS4 "Forge camps?"
+#define GOSSIP_SATS5 "Ok."
+#define GOSSIP_SATS6 "[PH] Story done"
+
 bool GossipHello_npc_altruis_the_sufferer(Player *player, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
@@ -256,15 +268,15 @@ bool GossipHello_npc_altruis_the_sufferer(Player *player, Creature *_Creature)
 
     //gossip before obtaining Survey the Land
     if ( player->GetQuestStatus(9991) == QUEST_STATUS_NONE )
-        player->ADD_GOSSIP_ITEM( 0, "I see twisted steel and smell sundered earth.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+10);
 
     //gossip when Survey the Land is incomplete (technically, after the flight)
     if (player->GetQuestStatus(9991) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM( 0, "Well...?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+20);
 
     //wowwiki.com/Varedis
     if (player->GetQuestStatus(10646) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM( 0, "[PH] Story about Illidan's Pupil", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+30);
 
     player->SEND_GOSSIP_MENU(9419, _Creature->GetGUID());
 
@@ -276,19 +288,19 @@ bool GossipSelect_npc_altruis_the_sufferer(Player *player, Creature *_Creature,
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF+10:
-            player->ADD_GOSSIP_ITEM( 0, "Legion?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SATS1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
             player->SEND_GOSSIP_MENU(9420, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+11:
-            player->ADD_GOSSIP_ITEM( 0, "And now?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SATS2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
             player->SEND_GOSSIP_MENU(9421, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+12:
-            player->ADD_GOSSIP_ITEM( 0, "How do you see them now?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SATS3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
             player->SEND_GOSSIP_MENU(9422, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+13:
-            player->ADD_GOSSIP_ITEM( 0, "Forge camps?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SATS4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
             player->SEND_GOSSIP_MENU(9423, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+14:
@@ -296,7 +308,7 @@ bool GossipSelect_npc_altruis_the_sufferer(Player *player, Creature *_Creature,
             break;
 
         case GOSSIP_ACTION_INFO_DEF+20:
-            player->ADD_GOSSIP_ITEM( 0, "Ok.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SATS5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 21);
             player->SEND_GOSSIP_MENU(9427, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+21:
@@ -305,7 +317,7 @@ bool GossipSelect_npc_altruis_the_sufferer(Player *player, Creature *_Creature,
             break;
 
         case GOSSIP_ACTION_INFO_DEF+30:
-            player->ADD_GOSSIP_ITEM( 0, "[PH] Story done", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SATS6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 31);
             player->SEND_GOSSIP_MENU(384, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+31:
@@ -336,6 +348,21 @@ bool QuestAccept_npc_altruis_the_sufferer(Player *player, Creature *creature, Qu
 ## npc_greatmother_geyah
 ######*/
 
+#define GOSSIP_HGG1 "Hello, Greatmother. Garrosh told me that you wanted to speak with me."
+#define GOSSIP_HGG2 "Garrosh is beyond redemption, Greatmother. I fear that in helping the Mag'har, I have convinced Garrosh that he is unfit to lead."
+
+#define GOSSIP_SGG1 "You raised all of the orcs here, Greatmother?"
+#define GOSSIP_SGG2 "Do you believe that?"
+#define GOSSIP_SGG3 "What can be done? I have tried many different things. I have done my best to help the people of Nagrand. Each time I have approached Garrosh, he has dismissed me."
+#define GOSSIP_SGG4 "Left? How can you choose to leave?"
+#define GOSSIP_SGG5 "What is this duty?"
+#define GOSSIP_SGG6 "Is there anything I can do for you, Greatmother?"
+#define GOSSIP_SGG7 "I have done all that I could, Greatmother. I thank you for your kind words."
+#define GOSSIP_SGG8 "Greatmother, you are the mother of Durotan?"
+#define GOSSIP_SGG9 "Greatmother, I never had the honor. Durotan died long before my time, but his heroics are known to all on my world. The orcs of Azeroth reside in a place known as Durotar, named after your son. And ... (You take a moment to breathe and think through what you are about to tell the Greatmother.)"
+#define GOSSIP_SGG10 "It is my Warchief, Greatmother. The leader of my people. From my world. He ... He is the son of Durotan. He is your grandchild."
+#define GOSSIP_SGG11 "I will return to Azeroth at once, Greatmother."
+
 //all the textId's for the below is unknown, but i do believe the gossip item texts are proper.
 bool GossipHello_npc_greatmother_geyah(Player *player, Creature *_Creature)
 {
@@ -344,12 +371,12 @@ bool GossipHello_npc_greatmother_geyah(Player *player, Creature *_Creature)
 
     if (player->GetQuestStatus(10044) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM( 0, "Hello, Greatmother. Garrosh told me that you wanted to speak with me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
         player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
     }
     else if (player->GetQuestStatus(10172) == QUEST_STATUS_INCOMPLETE)
     {
-        player->ADD_GOSSIP_ITEM( 0, "Garrosh is beyond redemption, Greatmother. I fear that in helping the Mag'har, I have convinced Garrosh that he is unfit to lead.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 10);
         player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(),_Creature->GetGUID());
     }
     else
@@ -364,27 +391,27 @@ bool GossipSelect_npc_greatmother_geyah(Player *player, Creature *_Creature, uin
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF + 1:
-            player->ADD_GOSSIP_ITEM( 0, "You raised all of the orcs here, Greatmother?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 2:
-            player->ADD_GOSSIP_ITEM( 0, "Do you believe that?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 3:
-            player->ADD_GOSSIP_ITEM( 0, "What can be done? I have tried many different things. I have done my best to help the people of Nagrand. Each time I have approached Garrosh, he has dismissed me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 4:
-            player->ADD_GOSSIP_ITEM( 0, "Left? How can you choose to leave?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 5:
-            player->ADD_GOSSIP_ITEM( 0, "What is this duty?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 6:
-            player->ADD_GOSSIP_ITEM( 0, "Is there anything I can do for you, Greatmother?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 7:
@@ -393,23 +420,23 @@ bool GossipSelect_npc_greatmother_geyah(Player *player, Creature *_Creature, uin
             break;
 
         case GOSSIP_ACTION_INFO_DEF + 10:
-            player->ADD_GOSSIP_ITEM( 0, "I have done all that I could, Greatmother. I thank you for your kind words.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 11);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 11:
-            player->ADD_GOSSIP_ITEM( 0, "Greatmother, you are the mother of Durotan?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG8, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 12);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 12:
-            player->ADD_GOSSIP_ITEM( 0, "Greatmother, I never had the honor. Durotan died long before my time, but his heroics are known to all on my world. The orcs of Azeroth reside in a place known as Durotar, named after your son. And ... (You take a moment to breathe and think through what you are about to tell the Greatmother.)", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG9, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 13);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 13:
-            player->ADD_GOSSIP_ITEM( 0, "It is my Warchief, Greatmother. The leader of my people. From my world. He ... He is the son of Durotan. He is your grandchild.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG10, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 14);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 14:
-            player->ADD_GOSSIP_ITEM( 0, "I will return to Azeroth at once, Greatmother.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SGG11, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 15);
             player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF + 15:
@@ -424,13 +451,22 @@ bool GossipSelect_npc_greatmother_geyah(Player *player, Creature *_Creature, uin
 ## npc_lantresor_of_the_blade
 ######*/
 
+#define GOSSIP_HLB "I have killed many of your ogres, Lantresor. I have no fear."
+#define GOSSIP_SLB1 "Should I know? You look like an orc to me."
+#define GOSSIP_SLB2 "And the other half?"
+#define GOSSIP_SLB3 "I have heard of your kind, but I never thought to see the day when I would meet a half-breed."
+#define GOSSIP_SLB4 "My apologies. I did not mean to offend. I am here on behalf of my people."
+#define GOSSIP_SLB5 "My people ask that you pull back your Boulderfist ogres and cease all attacks on our territories. In return, we will also pull back our forces."
+#define GOSSIP_SLB6 "We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people."
+#define GOSSIP_SLB7 "What do I need to do?"
+
 bool GossipHello_npc_lantresor_of_the_blade(Player *player, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
         player->PrepareQuestMenu( _Creature->GetGUID() );
 
     if (player->GetQuestStatus(10107) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(10108) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM( 0, "I have killed many of your ogres, Lantresor. I have no fear.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HLB, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
     player->SEND_GOSSIP_MENU(9361, _Creature->GetGUID());
 
@@ -442,31 +478,31 @@ bool GossipSelect_npc_lantresor_of_the_blade(Player *player, Creature *_Creature
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM( 0, "Should I know? You look like an orc to me.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SLB1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1);
             player->SEND_GOSSIP_MENU(9362, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM( 0, "And the other half?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SLB2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2);
             player->SEND_GOSSIP_MENU(9363, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM( 0, "I have heard of your kind, but I never thought to see the day when I would meet a half-breed.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SLB3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3);
             player->SEND_GOSSIP_MENU(9364, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM( 0, "My apologies. I did not mean to offend. I am here on behalf of my people.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SLB4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
             player->SEND_GOSSIP_MENU(9365, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM( 0, "My people ask that you pull back your Boulderfist ogres and cease all attacks on our territories. In return, we will also pull back our forces.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SLB5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
             player->SEND_GOSSIP_MENU(9366, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
-            player->ADD_GOSSIP_ITEM( 0, "We will fight you until the end, then, Lantresor. We will not stand idly by as you pillage our towns and kill our people.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SLB6, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 6);
             player->SEND_GOSSIP_MENU(9367, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+6:
-            player->ADD_GOSSIP_ITEM( 0, "What do I need to do?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SLB7, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 7);
             player->SEND_GOSSIP_MENU(9368, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+7:
@@ -481,7 +517,7 @@ bool GossipSelect_npc_lantresor_of_the_blade(Player *player, Creature *_Creature
 }
 
 /*######
-## npc_creditmarker_visist_with_ancestors (Quest 10085)
+## npc_creditmarker_visist_with_ancestors
 ######*/
 
 struct TRINITY_DLL_DECL npc_creditmarker_visit_with_ancestorsAI : public ScriptedAI
@@ -575,7 +611,7 @@ struct TRINITY_DLL_DECL mob_sparrowhawkAI : public ScriptedAI
                     fleeing = false;
 
                 Player *player = (Player *)Unit::GetUnit((*m_creature), PlayerGUID);
-                if(player && m_creature->IsWithinDistInMap(player, 30)/* && m_creature->CanFreeMove()*/)
+                if(player && m_creature->IsWithinDistInMap(player, 30))
                 {
                     if(!fleeing)
                     {
diff --git a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
index 9237f9f4b3a..eb1da1748a8 100644
--- a/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
+++ b/src/bindings/scripts/scripts/zone/netherstorm/netherstorm.cpp
@@ -37,12 +37,12 @@ EndContentData */
 ## npc_manaforge_control_console
 ######*/
 
-#define EMOTE_START     "Warning! Emergency shutdown process initiated by $N. Shutdown will complete in two minutes."
-#define EMOTE_60        "Emergency shutdown will complete in one minute."
-#define EMOTE_30        "Emergency shutdown will complete in thirty seconds."
-#define EMOTE_10        "Emergency shutdown will complete in ten seconds."
-#define EMOTE_COMPLETE  "Emergency shutdown complete."
-#define EMOTE_ABORT     "Emergency shutdown aborted."
+#define EMOTE_START     -1000296
+#define EMOTE_60        -1000297
+#define EMOTE_30        -1000298
+#define EMOTE_10        -1000299
+#define EMOTE_COMPLETE  -1000300
+#define EMOTE_ABORT     -1000301
 
 #define ENTRY_BNAAR_C_CONSOLE   20209
 #define ENTRY_CORUU_C_CONSOLE   20417
@@ -95,7 +95,7 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
 
     void JustDied(Unit* killer)
     {
-        DoTextEmote(EMOTE_ABORT, NULL);
+        DoScriptText(EMOTE_ABORT, m_creature);
 
         if( someplayer )
         {
@@ -227,32 +227,32 @@ struct TRINITY_DLL_DECL npc_manaforge_control_consoleAI : public ScriptedAI
                 case 1:
                     if( someplayer )
                     {
-                        Unit* u = Unit::GetUnit((*m_creature),someplayer);
-                        if( u && u->GetTypeId() == TYPEID_PLAYER ) DoTextEmote(EMOTE_START, u);
+                        Unit* u = Unit::GetUnit((*m_creature), someplayer);
+                        if( u && u->GetTypeId() == TYPEID_PLAYER ) DoScriptText(EMOTE_START, m_creature, u);
                     }
                     Event_Timer = 60000;
                     Wave = true;
                     ++Phase;
                     break;
                 case 2:
-                    DoTextEmote(EMOTE_60, NULL);
+                    DoScriptText(EMOTE_60, m_creature);
                     Event_Timer = 30000;
                     ++Phase;
                     break;
                 case 3:
-                    DoTextEmote(EMOTE_30, NULL);
+                    DoScriptText(EMOTE_30, m_creature);
                     Event_Timer = 20000;
                     DoFinalSpawnForCreature(m_creature);
                     ++Phase;
                     break;
                 case 4:
-                    DoTextEmote(EMOTE_10, NULL);
+                    DoScriptText(EMOTE_10, m_creature);
                     Event_Timer = 10000;
                     Wave = false;
                     ++Phase;
                     break;
                 case 5:
-                    DoTextEmote(EMOTE_COMPLETE, NULL);
+                    DoScriptText(EMOTE_COMPLETE, m_creature);
                     if( someplayer )
                     {
                         Unit* u = Unit::GetUnit((*m_creature),someplayer);
@@ -488,7 +488,7 @@ struct TRINITY_DLL_DECL npc_commander_dawnforgeAI : public ScriptedAI
 			return true;
 		}
 	 	 
-		debug_log("SD2: npc_commander_dawnforge event already in progress, need to wait.");
+		debug_log("TSCR: npc_commander_dawnforge event already in progress, need to wait.");
 		return false;
 	}
 
@@ -707,7 +707,7 @@ bool GossipSelect_npc_protectorate_nether_drake(Player *player, Creature *_Creat
 
 #define SPELL_PHASE_DISTRUPTOR	35780
 #define GOSSIP_ITEM	"I need a new phase distruptor, Professor"
-#define WHISPER_DABIRI "Saeed is currently engaged or awaiting orders to engage. You may check directly east of me and see if Saeed is ready for you. If he is not present then he is off fighting another battle. I recommend that you wait for him to return before attacking Dimensius."
+#define WHISPER_DABIRI -1000302
 
 #define QUEST_DIMENSIUS	10439
 #define QUEST_ON_NETHERY_WINGS 10438
@@ -739,7 +739,7 @@ bool GossipSelect_npc_professor_dabiri(Player *player, Creature *_Creature, uint
 bool QuestAccept_npc_professor_dabiri(Player *player, Creature *creature, Quest const *quest )
 {
 	if(quest->GetQuestId() == QUEST_DIMENSIUS)
-		creature->Whisper(WHISPER_DABIRI, player->GetGUID(), false);
+		DoScriptText(WHISPER_DABIRI, creature, player);
 
 	return true;
 }
@@ -748,6 +748,8 @@ bool QuestAccept_npc_professor_dabiri(Player *player, Creature *creature, Quest
 ## npc_veronia
 ######*/
 
+#define GOSSIP_HV "Fly me to Manaforge Coruu please"
+
 bool GossipHello_npc_veronia(Player *player, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
@@ -755,7 +757,7 @@ bool GossipHello_npc_veronia(Player *player, Creature *_Creature)
 
     //Behind Enemy Lines
     if (player->GetQuestStatus(10652) && !player->GetQuestRewardStatus(10652))
-        player->ADD_GOSSIP_ITEM(0, "Fly me to Manaforge Coruu please", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
+        player->ADD_GOSSIP_ITEM(0, GOSSIP_HV, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF);
 
     player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
@@ -777,7 +779,7 @@ bool GossipSelect_npc_veronia(Player *player, Creature *_Creature, uint32 sender
 ######*/
 
 #define SUMMONED_MOB            19595
-#define EMOTE_WEAK              "is very weak"
+#define EMOTE_WEAK              -1000303
 
 // Spells
 #define SPELL_PHASE_SLIP        36574
@@ -853,7 +855,7 @@ struct TRINITY_DLL_DECL mob_phase_hunterAI : public ScriptedAI
             if(target && !Weak && m_creature->GetHealth() < (m_creature->GetMaxHealth() / 100 * WeakPercent) 
                 && ((Player*)target)->GetQuestStatus(10190) == QUEST_STATUS_INCOMPLETE)
             {
-                DoTextEmote(EMOTE_WEAK, 0);
+                DoScriptText(EMOTE_WEAK, m_creature);
                 Weak = true;
             }
             if(Weak && !Drained && m_creature->HasAura(34219, 0))
@@ -896,11 +898,11 @@ CreatureAI* GetAI_mob_phase_hunter(Creature *_Creature)
 ######*/
 
 #define Q_ALMABTRIEB    10337
-#define N_THADELL	   20464
+#define N_THADELL       20464
 #define SPAWN_FIRST     20512
-#define SPAWN_SECOND  19881
-#define SAY_THADELL_1   "Bessy, is that you?"
-#define SAY_THADELL_2   "Thank you for bringing back my Bessy, $N. I couldn't live without her!"
+#define SPAWN_SECOND    19881
+#define SAY_THADELL_1   -1000304
+#define SAY_THADELL_2   -1000305
 
 struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
 {
@@ -946,11 +948,11 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
                 }
                 {Unit* Thadell = FindCreature(N_THADELL, 30);
 				if(Thadell)
-				((Creature*)Thadell)->Say(SAY_THADELL_1, LANG_UNIVERSAL, NULL);}break;
+                    DoScriptText(SAY_THADELL_1, m_creature);}break;
 			case 13:
 				{Unit* Thadell = FindCreature(N_THADELL, 30);
 				if(Thadell)
-				((Creature*)Thadell)->Say(SAY_THADELL_2, LANG_UNIVERSAL, NULL);}break;
+                    DoScriptText(SAY_THADELL_2, m_creature, player);}break;
 		}
     }
 
@@ -964,6 +966,7 @@ struct TRINITY_DLL_DECL npc_bessyAI : public npc_escortAI
     void Reset()
     {
         Completed = false;
+        m_creature->setFaction(35);
     }
 
     void UpdateAI(const uint32 diff)
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index c7289269540..7e7228f5885 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -1089,7 +1089,7 @@ bool ChatHandler::HandleLoadScriptsCommand(const char* args)
 {
     if(!LoadScriptingModule(args)) return true;
 
-    sWorld.SendWorldText(LANG_SCRIPTS_RELOADED);
+    sWorld.SendGMText(LANG_SCRIPTS_RELOADED);
     return true;
 }