8 files changed, 31 insertions, 13 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 5993f04b78e..a20e9635d68 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -1986,12 +1986,12 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
 -- -1 619 000 AHN'KAHET: THE OLD KINGDOM
    (29308,-1619021,'I will feast on your remains.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_AGGRO'),
    (29308,-1619022,'I will drink no blood before it''s time.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_SLAY_1'),
-   (29308,-1618023,'One final embrace.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_SLAY_2'),
-   (29308,-1618024,'Still I hunger, still I thirst.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_DEATH'),
-   (29308,-1618025,'So appetizing.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_FEED1'),
-   (29308,-1618026,'Fresh, warm blood. It has been too long.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_FEED2'),
-   (29308,-1618027,'Your heartbeat is music to my ears.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_VANISH1'),
-   (29308,-1618028,'I am nowhere. I am everywhere. I am the watcher, unseen.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_VANISH2'),
+   (29308,-1619023,'One final embrace.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_SLAY_2'),
+   (29308,-1619024,'Still I hunger, still I thirst.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_DEATH'),
+   (29308,-1619025,'So appetizing.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_FEED1'),
+   (29308,-1619026,'Fresh, warm blood. It has been too long.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_FEED2'),
+   (29308,-1619027,'Your heartbeat is music to my ears.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_VANISH1'),
+   (29308,-1619028,'I am nowhere. I am everywhere. I am the watcher, unseen.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'prince taldaram SAY_VANISH2'),
    
 -- -1 999 900+ - RANDOM
    (0,-1999900,'Let the games begin.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8280,1,0,0,'example_creature SAY_AGGRO'),
diff --git a/sql/updates/5684_world.sql b/sql/updates/5684_world.sql
index 1584fc441d2..8fe66a1ca4c 100644
--- a/sql/updates/5684_world.sql
+++ b/sql/updates/5684_world.sql
@@ -1,5 +1,6 @@
 UPDATE `creature_template` SET `ScriptName`='npc_maghar_captive' WHERE `entry`=18210;
 
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000488 AND -1000482;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (18210,-1000482,'Look out!',0,0,0,0,'maghar captive SAY_MAG_START'),
    (18210,-1000483,'Don''t let them escape! Kill the strong one first!',0,0,0,0,'maghar captive SAY_MAG_NO_ESCAPE'),
diff --git a/sql/updates/5696_world.sql b/sql/updates/5696_world.sql
index eae696fa348..9b52bda9729 100644
--- a/sql/updates/5696_world.sql
+++ b/sql/updates/5696_world.sql
@@ -14,7 +14,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_ancestral_wolf' WHERE `entry`=1
 -- This should be sent to TDB
 -- INSERT INTO `gameobject` VALUES (NULL, 300070, 530, 1,1,-20.236, 3803.41, 93.1402, 5.24994, 0, 0, 0.493946, -0.869492, 25, 0, 1);
 
-DELETE FROM `script_texts` WHERE `entry`=17077;
+DELETE FROM `script_texts` WHERE `npc_entry`=17077;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (17077,-1000496,'%s lifts its head into the air, as if listening for something.',0,2,0,0,'ancestral wolf EMOTE_WOLF_LIFT_HEAD'),
    (17077,-1000497,'%s lets out a howl that rings across the mountains to the north and motions for you to follow.',0,2,0,0,'ancestral wolf EMOTE_WOLF_HOWL'),
diff --git a/sql/updates/5700_world.sql b/sql/updates/5700_world.sql
index 9db2456030d..ee137fd8e64 100644
--- a/sql/updates/5700_world.sql
+++ b/sql/updates/5700_world.sql
@@ -20,6 +20,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_anachronos_the_ancient' WHERE `
 UPDATE `creature_template` SET `ScriptName`='npc_anachronos_quest_trigger' WHERE `entry`=15454;
 
 -- Already in world_script_texts.sql
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1350030 AND -1350000;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`type`,`emote`,`comment`) VALUES
    (15381,-1350000,'We must act quickly or all shall be lost!',0,1,'ANACHRONOS_SAY_1'),
    (15381,-1350001,'NOW, STAGHELM! WE GO NOW! Prepare your magic!',0,81,'ANACHRONOS_SAY_2'),
diff --git a/sql/updates/5713_world_prince_taldaram.sql b/sql/updates/5713_world_prince_taldaram.sql
index 69d23ad2d9a..a3f124de2b3 100644
--- a/sql/updates/5713_world_prince_taldaram.sql
+++ b/sql/updates/5713_world_prince_taldaram.sql
@@ -2,12 +2,14 @@
 UPDATE `creature_template` SET `ScriptName`='boss_taldaram' WHERE `entry`=29308;
 UPDATE `creature_template` SET `ScriptName`='mob_taldaram_flamesphere' WHERE `entry` IN (30106,31686,31687);
 UPDATE `gameobject_template` SET `ScriptName`='prince_taldaram_sphere' WHERE `entry` IN (193093,193094);
+
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1619028 AND -1619021;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (29308,-1619021,'I will feast on your remains.',0,0,0,0,'prince taldaram SAY_AGGRO'),
    (29308,-1619022,'I will drink no blood before it''s time.',0,0,0,0,'prince taldaram SAY_SLAY_1'),
-   (29308,-1618023,'One final embrace.',0,0,0,0,'prince taldaram SAY_SLAY_2'),
-   (29308,-1618024,'Still I hunger, still I thirst.',0,0,0,0,'prince taldaram SAY_DEATH'),
-   (29308,-1618025,'So appetizing.',0,0,0,0,'prince taldaram SAY_FEED1'),
-   (29308,-1618026,'Fresh, warm blood. It has been too long.',0,0,0,0,'prince taldaram SAY_FEED2'),
-   (29308,-1618027,'Your heartbeat is music to my ears.',0,0,0,0,'prince taldaram SAY_VANISH1'),
-   (29308,-1618028,'I am nowhere. I am everywhere. I am the watcher, unseen.',0,0,0,0,'prince taldaram SAY_VANISH2');
+   (29308,-1619023,'One final embrace.',0,0,0,0,'prince taldaram SAY_SLAY_2'),
+   (29308,-1619024,'Still I hunger, still I thirst.',0,0,0,0,'prince taldaram SAY_DEATH'),
+   (29308,-1619025,'So appetizing.',0,0,0,0,'prince taldaram SAY_FEED1'),
+   (29308,-1619026,'Fresh, warm blood. It has been too long.',0,0,0,0,'prince taldaram SAY_FEED2'),
+   (29308,-1619027,'Your heartbeat is music to my ears.',0,0,0,0,'prince taldaram SAY_VANISH1'),
+   (29308,-1619028,'I am nowhere. I am everywhere. I am the watcher, unseen.',0,0,0,0,'prince taldaram SAY_VANISH2');
diff --git a/sql/updates/5736_world.sql b/sql/updates/5736_world.sql
index 35cc7374f44..0adb9af7713 100644
--- a/sql/updates/5736_world.sql
+++ b/sql/updates/5736_world.sql
@@ -1,6 +1,7 @@
 
 UPDATE `creature_template` SET `ScriptName`='boss_krik_thir' where `entry`=28684;
 
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1601003 AND -1601000;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (28684,-1601000, 'This kingdom belongs to the Scourge! Only the dead may enter.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0, 0, 'SAY_AGGRO boss_krik_thir'),
    (28684,-1601001, 'You were foolish to come.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 1, 0, 0, 'SAY_SLAY_1 boss_krik_thir'),
diff --git a/sql/updates/5747_world_scripts.sql b/sql/updates/5747_world_scripts.sql
index cc5d1f2d37b..8ea2664e69e 100644
--- a/sql/updates/5747_world_scripts.sql
+++ b/sql/updates/5747_world_scripts.sql
@@ -1,6 +1,7 @@
 
 UPDATE `creature_template` SET `ScriptName`='boss_moorabi' where entry=29305;
 
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1604017 AND -1604010;
 INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
    (29305,-1604010,'We fought back da Scourge. What chance joo be thinkin'' JOO got?',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'SAY_AGGRO boss_moorabi'),
    (29305,-1604012,'Who gonna stop me; you? ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,'SAY_SLAY_2 boss_moorabi'),
diff --git a/sql/updates/5807_world_script_texts.sql b/sql/updates/5807_world_script_texts.sql
new file mode 100644
index 00000000000..55f1dd046df
--- /dev/null
+++ b/sql/updates/5807_world_script_texts.sql
@@ -0,0 +1,12 @@
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1618028 AND -1618023;
+
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1619028 AND -1619021;
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+   (29308,-1619021,'I will feast on your remains.',0,0,0,0,'prince taldaram SAY_AGGRO'),
+   (29308,-1619022,'I will drink no blood before it''s time.',0,0,0,0,'prince taldaram SAY_SLAY_1'),
+   (29308,-1619023,'One final embrace.',0,0,0,0,'prince taldaram SAY_SLAY_2'),
+   (29308,-1619024,'Still I hunger, still I thirst.',0,0,0,0,'prince taldaram SAY_DEATH'),
+   (29308,-1619025,'So appetizing.',0,0,0,0,'prince taldaram SAY_FEED1'),
+   (29308,-1619026,'Fresh, warm blood. It has been too long.',0,0,0,0,'prince taldaram SAY_FEED2'),
+   (29308,-1619027,'Your heartbeat is music to my ears.',0,0,0,0,'prince taldaram SAY_VANISH1'),
+   (29308,-1619028,'I am nowhere. I am everywhere. I am the watcher, unseen.',0,0,0,0,'prince taldaram SAY_VANISH2');