*Cleanup in world zones (now all world map zones finished)

--HG--
branch : trunk

10 files changed, 129 insertions, 80 deletions

diff --git a/sql/updates/954_wrold_scripts.sql b/sql/updates/954_world_scripts.sql
index 009f59517ac..009f59517ac 100644
--- a/sql/updates/954_wrold_scripts.sql
+++ b/sql/updates/954_world_scripts.sql
diff --git a/sql/updates/956_world_scripts.sql b/sql/updates/956_world_scripts.sql
new file mode 100644
index 00000000000..35859f191b5
--- /dev/null
+++ b/sql/updates/956_world_scripts.sql
@@ -0,0 +1,26 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000365 and -1000350;
+INSERT INTO script_texts (entry, content_default, type, comment) VALUES
+(-1000350, 'Who dares awaken Aquementas?', 1, 'mob_aquementas - AGGRO_YELL_AQUE'),
+
+(-1000351, 'I give up! Please don\'t kill me!', 0, 'mob_unkor_the_ruthless - SAY_SUBMIT'),
+
+(-1000352, 'I choose the third option: KILLING YOU!', 0, 'npc_floon - SAY_FLOON_ATTACK'),
+
+(-1000353, 'Ok let\'s get out of here!', 0, 'npc_isla_starmane - SAY_PROGRESS_1'),
+(-1000354, 'You sure you\'re ready? Take a moment.', 0, 'npc_isla_starmane - SAY_PROGRESS_2'),
+(-1000355, 'Alright, let\'s do this!', 0, 'npc_isla_starmane - SAY_PROGRESS_3'),
+(-1000356, 'Ok, I think I can make it on my own from here. Thank you so much for breaking me out of there!', 0, 
+
+'npc_isla_starmane - SAY_PROGRESS_4'),
+
+(-1000357, 'Belore...', 0, 'npc_lady_sylvanas_windrunner - SAY_LAMENT_END'),
+(-1000358, 'kneels down and pick up the amulet.', 2, 'npc_lady_sylvanas_windrunner - EMOTE_LAMENT_END'),
+
+(-1000359, 'You have my blessing', 0, 'npcs_ashyen_and_keleth - GOSSIP_REWARD_BLESS'),
+
+(-1000360, 'Is the way clear? Let\'s get out while we can, $N.', 0, 'npc_kayra_longmane - SAY_PROGRESS_1'),
+(-1000361, 'Looks like we won\'t get away so easy. Get ready!', 0, 'npc_kayra_longmane - SAY_PROGRESS_2'),
+(-1000362, 'Let\'s keep moving. We\'re not safe here!', 0, 'npc_kayra_longmane - SAY_PROGRESS_3'),
+(-1000363, 'Look out, $N! Enemies ahead!', 0, 'npc_kayra_longmane - SAY_PROGRESS_4'),
+(-1000364, 'We\'re almost to the refuge! Let\'s go.', 0, 'npc_kayra_longmane - SAY_PROGRESS_5'),
+(-1000365, 'I can see my fellow druids from here. Thank you, $N. I\'m sure Ysiel will reward you for your actions!', 0, 'npc_kayra_longmane - SAY_PROGRESS_6');
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index df51b03190a..3c28413eb67 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -155,4 +155,5 @@ INSTALL(FILES
 953_world_scripts.sql
 954_world_scripts.sql
 955_world_scripts.sql
+956_world_scripts.sql
 DESTINATION share/trinity/sql/updates)
diff --git a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp
index 6cf663616bf..7a68227457f 100644
--- a/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp
+++ b/src/bindings/scripts/scripts/zone/tanaris/tanaris.cpp
@@ -37,7 +37,7 @@ EndContentData */
 ## mob_aquementas
 ######*/
 
-#define AGGRO_YELL_AQUE     "Who dares awaken Aquementas?"
+#define AGGRO_YELL_AQUE     -1000350
 
 #define SPELL_AQUA_JET      13586
 #define SPELL_FROST_SHOCK   15089
@@ -80,7 +80,7 @@ struct TRINITY_DLL_DECL mob_aquementasAI : public ScriptedAI
 
     void Aggro(Unit* who)
     {
-        DoYell(AGGRO_YELL_AQUE,LANG_UNIVERSAL,who);
+        DoScriptText(AGGRO_YELL_AQUE, m_creature, who);
     }
 
     void UpdateAI(const uint32 diff)
@@ -397,23 +397,23 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
                 m_creature->SummonCreature(SPAWN_FIRST, -8350.96, -4445.79, 10.10, 6.20, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                 m_creature->SummonCreature(SPAWN_FIRST, -8355.96, -4447.79, 10.10, 6.27, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                 m_creature->SummonCreature(SPAWN_FIRST, -8353.96, -4442.79, 10.10, 6.08, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-				m_creature->Say(SAY_CHICKEN_AMB, LANG_UNIVERSAL, NULL);
+				DoScriptText(SAY_CHICKEN_AMB, m_creature);
 				break;
 
             case 56:
                 m_creature->SummonCreature(SPAWN_SECOND_1, -7510.07, -4795.50, 9.35, 6.06, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
                 m_creature->SummonCreature(SPAWN_SECOND_2, -7515.07, -4797.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
 				m_creature->SummonCreature(SPAWN_SECOND_2, -7518.07, -4792.50, 9.35, 6.22, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 25000);
-				m_creature->Say(SAY_CHICKEN_AMB, LANG_UNIVERSAL, NULL);
+				DoScriptText(SAY_CHICKEN_AMB, m_creature);
 				{Unit* scoff = FindCreature(SPAWN_SECOND_2, 30);
 				if(scoff)
-				((Creature*)scoff)->Say(SAY_SCOFF, LANG_UNIVERSAL, NULL);}break;
+				DoScriptText(SAY_SCOFF, scoff);}break;
                 break;
 
             case 86:
                 if (player)
                 {
-					m_creature->Say(SAY_CHICKEN_COMP, LANG_UNIVERSAL, NULL);
+					DoScriptText(SAY_CHICKEN_COMP, m_creature);
                     ((Player*)player)->GroupEventHappens(Q_OOX17, m_creature);
                 }
 				break;
@@ -424,15 +424,11 @@ struct TRINITY_DLL_DECL npc_OOX17AI : public npc_escortAI
 
 	void Aggro(Unit* who)
     {
-		switch (rand()%2) {
-			case 0: 
-				m_creature->Say(SAY_CHICKEN_AGGRO_1, LANG_UNIVERSAL, 0);
-				break;
-			case 1: 
-				m_creature->Say(SAY_CHICKEN_AGGRO_2, LANG_UNIVERSAL, 0);
-				break;
-		}
-	
+		switch (rand()%2) 
+        {
+        case 0:	DoScriptText(SAY_CHICKEN_AGGRO_1, m_creature); break;
+        case 1: DoScriptText(SAY_CHICKEN_AGGRO_2, m_creature); break;
+		}	
     }
 
 	void JustSummoned(Creature* summoned)
@@ -466,7 +462,7 @@ bool QuestAccept_npc_OOX17(Player* player, Creature* creature, Quest const* ques
 		creature->SetHealth(creature->GetMaxHealth());
 		creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
 		creature->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_ATTACKABLE_2);
-		creature->Say(SAY_CHICKEN_ACC, LANG_UNIVERSAL, NULL);
+		DoScriptText(SAY_CHICKEN_ACC, creature);
         ((npc_escortAI*)(creature->AI()))->Start(true, true, false, player->GetGUID());
 
     }
diff --git a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
index 81268dd5cea..aca9d6957cd 100644
--- a/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
+++ b/src/bindings/scripts/scripts/zone/terokkar_forest/terokkar_forest.cpp
@@ -38,7 +38,7 @@ EndContentData */
 ## mob_unkor_the_ruthless
 ######*/
 
-#define SAY_SUBMIT                      "I give up! Please don't kill me!"
+#define SAY_SUBMIT                      -1000351
 
 #define FACTION_HOSTILE                 45
 #define FACTION_FRIENDLY                35
@@ -68,7 +68,7 @@ struct TRINITY_DLL_DECL mob_unkor_the_ruthlessAI : public ScriptedAI
 
     void DoNice()
     {
-        DoSay(SAY_SUBMIT,LANG_UNIVERSAL,NULL);
+        DoScriptText(SAY_SUBMIT, m_creature);
         m_creature->setFaction(FACTION_FRIENDLY);
         m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1, PLAYER_STATE_SIT);
         m_creature->RemoveAllAuras();
@@ -242,7 +242,8 @@ CreatureAI* GetAI_mob_netherweb_victim(Creature *_Creature)
 
 #define GOSSIP_FLOON1           "You owe Sim'salabim money. Hand them over or die!"
 #define GOSSIP_FLOON2           "Hand over the money or die...again!"
-#define SAY_FLOON_ATTACK        "I choose the third option: KILLING YOU!"
+
+#define SAY_FLOON_ATTACK        -1000352
 
 #define FACTION_HOSTILE_FL      1738
 #define FACTION_FRIENDLY_FL     35
@@ -320,7 +321,7 @@ bool GossipSelect_npc_floon(Player *player, Creature *_Creature, uint32 sender,
     {
         player->CLOSE_GOSSIP_MENU();
         _Creature->setFaction(FACTION_HOSTILE_FL);
-        ((npc_floonAI*)_Creature->AI())->DoSay(SAY_FLOON_ATTACK,LANG_UNIVERSAL,player);
+        DoScriptText(SAY_FLOON_ATTACK, _Creature, player);
         ((npc_floonAI*)_Creature->AI())->AttackStart(player);
     }
     return true;
@@ -359,10 +360,10 @@ bool GossipSelect_npc_skyguard_handler_deesak(Player *player, Creature *_Creatur
 ## npc_isla_starmane
 ######*/
 
-#define SAY_PROGRESS_1	"Ok let's get out of here!"
-#define SAY_PROGRESS_2	"You sure you're ready? Take a moment."
-#define SAY_PROGRESS_3	"Alright, let's do this!"
-#define SAY_PROGRESS_4	"Ok, I think I can make it on my own from here. Thank you so much for breaking me out of there!"
+#define SAY_PROGRESS_1	-1000353
+#define SAY_PROGRESS_2	-1000354
+#define SAY_PROGRESS_3	-1000355
+#define SAY_PROGRESS_4	-1000356
 
 #define QUEST_EFTW_H	10052
 #define QUEST_EFTW_A	10051
@@ -390,10 +391,10 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI
 			if(Cage)
 				Cage->SetGoState(0);
 			}break;
-		case 2: DoSay(SAY_PROGRESS_1, LANG_UNIVERSAL, player); break;
-		case 5: DoSay(SAY_PROGRESS_2, LANG_UNIVERSAL, player); break;
-		case 6: DoSay(SAY_PROGRESS_3, LANG_UNIVERSAL, player); break;
-		case 29:DoSay(SAY_PROGRESS_4, LANG_UNIVERSAL, player);
+		case 2: DoScriptText(SAY_PROGRESS_1, m_creature, player); break;
+		case 5: DoScriptText(SAY_PROGRESS_2, m_creature, player); break;
+		case 6: DoScriptText(SAY_PROGRESS_3, m_creature, player); break;
+		case 29:DoScriptText(SAY_PROGRESS_4, m_creature, player);
 			if (player)
 			{
 				if(((Player*)player)->GetTeam() == ALLIANCE)
@@ -411,6 +412,7 @@ struct TRINITY_DLL_DECL npc_isla_starmaneAI : public npc_escortAI
 	void Reset()
 	{
 		Completed = false;
+        m_creature->setFaction(1660);
 	}
 
 	void Aggro(Unit* who){}
diff --git a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp
index 7bd1c540a76..d8b5eafaddb 100644
--- a/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp
+++ b/src/bindings/scripts/scripts/zone/thunder_bluff/thunder_bluff.cpp
@@ -33,6 +33,7 @@ EndScriptData */
 #define SPELL_THUNDERCLAP       23931
 #define SPELL_UPPERCUT          22916
 
+#define GOSSIP_HCB "I know this is rather silly but a young ward who is a bit shy would like your hoofprint."
 //TODO: verify abilities/timers
 struct TRINITY_DLL_DECL npc_cairne_bloodhoofAI : public ScriptedAI
 {
@@ -106,7 +107,7 @@ bool GossipHello_npc_cairne_bloodhoof(Player *player, Creature *_Creature)
         player->PrepareQuestMenu( _Creature->GetGUID() );
 
     if( player->GetQuestStatus(925) == QUEST_STATUS_INCOMPLETE )
-        player->ADD_GOSSIP_ITEM( 0, "I know this is rather silly but a young ward who is a bit shy would like your hoofprint.", GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO );
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HCB, GOSSIP_SENDER_MAIN, GOSSIP_SENDER_INFO );
 
     player->SEND_GOSSIP_MENU(7013, _Creature->GetGUID() );
 
diff --git a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp
index a5ba4abfd9a..4761af1c7bd 100644
--- a/src/bindings/scripts/scripts/zone/undercity/undercity.cpp
+++ b/src/bindings/scripts/scripts/zone/undercity/undercity.cpp
@@ -33,8 +33,8 @@ EndContentData */
 ## npc_lady_sylvanas_windrunner
 ######*/
 
-#define SAY_LAMENT_END              "Belore..."
-#define EMOTE_LAMENT_END            "kneels down and pick up the amulet."
+#define SAY_LAMENT_END              -1000357
+#define EMOTE_LAMENT_END            -1000358
 
 #define SOUND_CREDIT                10896
 #define ENTRY_HIGHBORNE_LAMENTER    21628
@@ -51,6 +51,7 @@ float HighborneLoc[4][3]=
     {1289.66, 309.66, 1.52},
     {1292.51, 310.50, 1.99},
 };
+
 #define HIGHBORNE_LOC_Y             -61.00
 #define HIGHBORNE_LOC_Y_NEW         -55.50
 
@@ -85,9 +86,9 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI
         {
             if( Unit* target = Unit::GetUnit(*summoned,targetGUID) )
             {
-                target->SendMonsterMove(target->GetPositionX(),target->GetPositionY(),myZ+15.0,0,0,0);
-                target->Relocate(target->GetPositionX(),target->GetPositionY(),myZ+15.0);
-                summoned->CastSpell(target,SPELL_RIBBON_OF_SOULS,false);
+                target->SendMonsterMove(target->GetPositionX(), target->GetPositionY(), myZ+15.0,0,0,0);
+                target->Relocate(target->GetPositionX(), target->GetPositionY(), myZ+15.0);
+                summoned->CastSpell(target, SPELL_RIBBON_OF_SOULS, false);
             }
 
             summoned->AddUnitMovementFlag(MOVEMENTFLAG_ONTRANSPORT);
@@ -105,14 +106,14 @@ struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI
                 float raY = myY;
                 float raZ = myZ;
 
-                m_creature->GetRandomPoint(myX,myY,myZ,20.0,raX,raY,raZ);
-                m_creature->SummonCreature(ENTRY_HIGHBORNE_BUNNY,raX,raY,myZ,0,TEMPSUMMON_TIMED_DESPAWN,3000);
+                m_creature->GetRandomPoint(myX, myY, myZ, 20.0, raX, raY, raZ);
+                m_creature->SummonCreature(ENTRY_HIGHBORNE_BUNNY, raX, raY, myZ, 0, TEMPSUMMON_TIMED_DESPAWN, 3000);
 
                 LamentEvent_Timer = 2000;
-                if( !m_creature->HasAura(SPELL_SYLVANAS_CAST,0) )
+                if( !m_creature->HasAura(SPELL_SYLVANAS_CAST, 0))
                 {
-                    DoSay(SAY_LAMENT_END,LANG_UNIVERSAL,NULL);
-                    DoTextEmote(EMOTE_LAMENT_END,NULL);
+                    DoScriptText(SAY_LAMENT_END, m_creature);
+                    DoScriptText(EMOTE_LAMENT_END, m_creature);
                     LamentEvent = false;
                 }
             }else LamentEvent_Timer -= diff;
@@ -137,7 +138,7 @@ bool ChooseReward_npc_lady_sylvanas_windrunner(Player *player, Creature *_Creatu
         ((npc_lady_sylvanas_windrunnerAI*)_Creature->AI())->DoPlaySoundToSet(_Creature,SOUND_CREDIT);
         _Creature->CastSpell(_Creature,SPELL_SYLVANAS_CAST,false);
 
-        for( uint8 i = 0; i < 4; i++ )
+        for( uint8 i = 0; i < 4; ++i)
             _Creature->SummonCreature(ENTRY_HIGHBORNE_LAMENTER, HighborneLoc[i][0], HighborneLoc[i][1], HIGHBORNE_LOC_Y, HighborneLoc[i][2], TEMPSUMMON_TIMED_DESPAWN, 160000);
     }
 
@@ -200,6 +201,10 @@ CreatureAI* GetAI_npc_highborne_lamenter(Creature *_Creature)
 
 #define SPELL_MARK_OF_SHAME 6767
 
+#define GOSSIP_HPF1 "Gul'dan"
+#define GOSSIP_HPF2 "Kel'Thuzad"
+#define GOSSIP_HPF3 "Ner'zhul"
+
 bool GossipHello_npc_parqual_fintallas(Player *player, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
@@ -207,9 +212,9 @@ bool GossipHello_npc_parqual_fintallas(Player *player, Creature *_Creature)
 
     if (player->GetQuestStatus(6628) == QUEST_STATUS_INCOMPLETE && !player->HasAura(SPELL_MARK_OF_SHAME,0) )
     {
-        player->ADD_GOSSIP_ITEM( 0, "Gul'dan", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM( 0, "Kel'Thuzad", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM( 0, "Ner'zhul", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HPF1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HPF2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        player->ADD_GOSSIP_ITEM( 0, GOSSIP_HPF3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
         player->SEND_GOSSIP_MENU(5822, _Creature->GetGUID());
     }
     else
diff --git a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp
index ed1f415bb95..48146e0231e 100644
--- a/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp
+++ b/src/bindings/scripts/scripts/zone/western_plaguelands/western_plaguelands.cpp
@@ -17,7 +17,7 @@
 /* ScriptData
 SDName: Western_Plaguelands
 SD%Complete: 90
-SDComment: Quest support: 5216,5219,5222,5225,5229,5231,5233,5235. To obtain Vitreous Focuser (could use more spesifics about gossip items)
+SDComment: Quest support: 5216, 5219, 5222, 5225, 5229, 5231, 5233, 5235. To obtain Vitreous Focuser (could use more spesifics about gossip items)
 SDCategory: Western Plaguelands
 EndScriptData */
 
@@ -32,6 +32,13 @@ EndContentData */
 ## npcs_dithers_and_arbington
 ######*/
 
+#define GOSSIP_HDA1 "What does the Felstone Field Cauldron need?"
+#define GOSSIP_HDA2 "What does the Dalson's Tears Cauldron need?"
+#define GOSSIP_HDA3 "What does the Writhing Haunt Cauldron need?"
+#define GOSSIP_HDA4 "What does the Gahrron's Withering Cauldron need?"
+
+#define GOSSIP_SDA1 "Thanks, i need a Vitreous Focuser"
+
 bool GossipHello_npcs_dithers_and_arbington(Player *player, Creature *_Creature)
 {
     if(_Creature->isQuestGiver())
@@ -41,10 +48,10 @@ bool GossipHello_npcs_dithers_and_arbington(Player *player, Creature *_Creature)
 
     if(player->GetQuestRewardStatus(5237) || player->GetQuestRewardStatus(5238))
     {
-        player->ADD_GOSSIP_ITEM(0, "What does the Felstone Field Cauldron need?",      GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
-        player->ADD_GOSSIP_ITEM(0, "What does the Dalson's Tears Cauldron need?",      GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
-        player->ADD_GOSSIP_ITEM(0, "What does the Writhing Haunt Cauldron need?",      GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
-        player->ADD_GOSSIP_ITEM(0, "What does the Gahrron's Withering Cauldron need?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
+        player->ADD_GOSSIP_ITEM(0, GOSSIP_HDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        player->ADD_GOSSIP_ITEM(0, GOSSIP_HDA2, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+2);
+        player->ADD_GOSSIP_ITEM(0, GOSSIP_HDA3, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+3);
+        player->ADD_GOSSIP_ITEM(0, GOSSIP_HDA4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+4);
         player->SEND_GOSSIP_MENU(3985, _Creature->GetGUID());
     }else
         player->SEND_GOSSIP_MENU(_Creature->GetNpcTextId(), _Creature->GetGUID());
@@ -60,19 +67,19 @@ bool GossipSelect_npcs_dithers_and_arbington(Player *player, Creature *_Creature
             player->SEND_VENDORLIST( _Creature->GetGUID() );
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM(0, "Thanks, i need a Vitreous Focuser", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            player->ADD_GOSSIP_ITEM(0, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
             player->SEND_GOSSIP_MENU(3980, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM(0, "Thanks, i need a Vitreous Focuser", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            player->ADD_GOSSIP_ITEM(0, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
             player->SEND_GOSSIP_MENU(3981, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM(0, "Thanks, i need a Vitreous Focuser", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            player->ADD_GOSSIP_ITEM(0, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
             player->SEND_GOSSIP_MENU(3982, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM(0, "Thanks, i need a Vitreous Focuser", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
+            player->ADD_GOSSIP_ITEM(0, GOSSIP_SDA1, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+5);
             player->SEND_GOSSIP_MENU(3983, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
diff --git a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp
index 08ead2eb1de..9f1932ecc02 100644
--- a/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp
+++ b/src/bindings/scripts/scripts/zone/winterspring/winterspring.cpp
@@ -33,13 +33,21 @@ EndContentData */
 ## npc_lorax
 ######*/
 
+#define GOSSIP_HL "Talk to me"
+
+#define GOSSIP_SL1 "What do you do here?"
+#define GOSSIP_SL2 "I can help you"
+#define GOSSIP_SL3 "What deal?"
+#define GOSSIP_SL4 "Then what happened?"
+#define GOSSIP_SL5 "He is not safe, i'll make sure of that."
+
 bool GossipHello_npc_lorax(Player *player, Creature *_Creature)
 {
     if (_Creature->isQuestGiver())
         player->PrepareQuestMenu( _Creature->GetGUID() );
 
     if (player->GetQuestStatus(5126) == QUEST_STATUS_INCOMPLETE)
-        player->ADD_GOSSIP_ITEM( 0, "Talk to me", 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(_Creature->GetNpcTextId(), _Creature->GetGUID());
 
@@ -51,23 +59,23 @@ bool GossipSelect_npc_lorax(Player *player, Creature *_Creature, uint32 sender,
     switch (action)
     {
         case GOSSIP_ACTION_INFO_DEF:
-            player->ADD_GOSSIP_ITEM( 0, "What do you do here?", 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(3759, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+1:
-            player->ADD_GOSSIP_ITEM( 0, "I can help you", 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(3760, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+2:
-            player->ADD_GOSSIP_ITEM( 0, "What deal?", 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(3761, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+3:
-            player->ADD_GOSSIP_ITEM( 0, "Then what happened?", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SL4, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 4);
             player->SEND_GOSSIP_MENU(3762, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+4:
-            player->ADD_GOSSIP_ITEM( 0, "He is not safe, i'll make sure of that.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
+            player->ADD_GOSSIP_ITEM( 0, GOSSIP_SL5, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 5);
             player->SEND_GOSSIP_MENU(3763, _Creature->GetGUID());
             break;
         case GOSSIP_ACTION_INFO_DEF+5:
@@ -107,6 +115,8 @@ bool GossipSelect_npc_rivern_frostwind(Player *player, Creature *_Creature, uint
 ## npc_witch_doctor_mauari
 ######*/
 
+#define GOSSIP_HWDM "I'd like you to make me a new Cache of Mau'ari please."
+
 bool GossipHello_npc_witch_doctor_mauari(Player *player, Creature *_Creature)
 {
     if(_Creature->isQuestGiver())
@@ -114,7 +124,7 @@ bool GossipHello_npc_witch_doctor_mauari(Player *player, Creature *_Creature)
 
     if(player->GetQuestRewardStatus(975))
     {
-        player->ADD_GOSSIP_ITEM(0, "I'd like you to make me a new Cache of Mau'ari please.", GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
+        player->ADD_GOSSIP_ITEM(0, GOSSIP_HWDM, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF+1);
         player->SEND_GOSSIP_MENU(3377, _Creature->GetGUID());
     }else
         player->SEND_GOSSIP_MENU(3375, _Creature->GetGUID());
diff --git a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
index 72c283f9f32..2275efbb586 100644
--- a/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
+++ b/src/bindings/scripts/scripts/zone/zangarmarsh/zangarmarsh.cpp
@@ -38,7 +38,7 @@ EndContentData */
 
 #define GOSSIP_ITEM_BLESS_ASH     "Grant me your mark, wise ancient."
 #define GOSSIP_ITEM_BLESS_KEL     "Grant me your mark, mighty ancient."
-#define GOSSIP_REWARD_BLESS       "You have my blessing"
+#define GOSSIP_REWARD_BLESS       -1000359
 //#define TEXT_BLESSINGS        "<You need higher standing with Cenarion Expedition to recive a blessing.>"
 
 bool GossipHello_npcs_ashyen_and_keleth(Player *player, Creature *_Creature )
@@ -69,19 +69,19 @@ bool GossipSelect_npcs_ashyen_and_keleth(Player *player, Creature *_Creature, ui
             {                                               //mark of lore
                 case REP_FRIENDLY:
                     _Creature->CastSpell(player, 31808, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_HONORED:
                     _Creature->CastSpell(player, 31810, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_REVERED:
                     _Creature->CastSpell(player, 31811, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_EXALTED:
                     _Creature->CastSpell(player, 31815, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
             }
         }
@@ -92,19 +92,19 @@ bool GossipSelect_npcs_ashyen_and_keleth(Player *player, Creature *_Creature, ui
             {
                 case REP_FRIENDLY:
                     _Creature->CastSpell(player, 31807, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_HONORED:
                     _Creature->CastSpell(player, 31812, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_REVERED:
                     _Creature->CastSpell(player, 31813, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
                 case REP_EXALTED:
                     _Creature->CastSpell(player, 31814, true);
-                    _Creature->Say(GOSSIP_REWARD_BLESS, LANG_UNIVERSAL, 0);
+                    DoScriptText(GOSSIP_REWARD_BLESS, _Creature);
                     break;
             }
         }
@@ -255,12 +255,12 @@ bool GossipSelect_npc_mortog_steamhead(Player *player, Creature *_Creature, uint
 ## npc_kayra_longmane
 ######*/
 
-#define SAY_PROGRESS_1	"Is the way clear? Let's get out while we can, $N."
-#define SAY_PROGRESS_2	"Looks like we won't get away so easy. Get ready!"
-#define SAY_PROGRESS_3	"Let's keep moving. We're not safe here!"
-#define SAY_PROGRESS_4	"Look out, $N! Enemies ahead!"
-#define SAY_PROGRESS_5	"We're almost to the refuge! Let's go."
-#define SAY_PROGRESS_6	"I can see my fellow druids from here. Thank you, $N. I'm sure Ysiel will reward you for your actions!"
+#define SAY_PROGRESS_1	-1000360
+#define SAY_PROGRESS_2	-1000361
+#define SAY_PROGRESS_3	-1000362
+#define SAY_PROGRESS_4	-1000363
+#define SAY_PROGRESS_5	-1000364
+#define SAY_PROGRESS_6	-1000365
 
 #define QUEST_EFU	9752
 #define MOB_AMBUSH	18042
@@ -274,6 +274,7 @@ struct TRINITY_DLL_DECL	npc_kayra_longmaneAI : public npc_escortAI
 	void Reset()
 	{
 		Completed = false;
+        m_creature->setFaction(1660);
 	}
 
 	void Aggro(Unit* who){}
@@ -290,21 +291,21 @@ struct TRINITY_DLL_DECL	npc_kayra_longmaneAI : public npc_escortAI
 
 		switch(i)
 		{
-		case 0: DoSay(SAY_PROGRESS_1, LANG_UNIVERSAL, player); break;
-		case 5: DoSay(SAY_PROGRESS_2, LANG_UNIVERSAL, player);
+		case 0: DoScriptText(SAY_PROGRESS_1, m_creature, player); break;
+		case 5: DoScriptText(SAY_PROGRESS_2, m_creature, player);
 			m_creature->SummonCreature(MOB_AMBUSH, -922.24, 5357.98, 17.93, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
 			m_creature->SummonCreature(MOB_AMBUSH, -922.24, 5357.98, 17.93, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
 			break;
-		case 6: DoSay(SAY_PROGRESS_3, LANG_UNIVERSAL, player);
+		case 6: DoScriptText(SAY_PROGRESS_3, m_creature, player);
 			m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
 			break;
-		case 18: DoSay(SAY_PROGRESS_4, LANG_UNIVERSAL, player);
+		case 18: DoScriptText(SAY_PROGRESS_4, m_creature, player);
 			m_creature->SummonCreature(MOB_AMBUSH, -671.86, 5379.81, 22.12, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
 			m_creature->SummonCreature(MOB_AMBUSH, -671.86, 5379.81, 22.12, 5.0f, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 10000);
 			break;
 		case 19: m_creature->RemoveUnitMovementFlag(MOVEMENTFLAG_WALK_MODE);
-			DoSay(SAY_PROGRESS_5, LANG_UNIVERSAL, player); break;
-		case 26: DoSay(SAY_PROGRESS_6, LANG_UNIVERSAL, player);
+			DoScriptText(SAY_PROGRESS_5, m_creature, player); break;
+		case 26: DoScriptText(SAY_PROGRESS_6, m_creature, player);
 			Completed = true;
 			if(player)
 				((Player*)player)->GroupEventHappens(QUEST_EFU, m_creature);