2 files changed, 7 insertions, 5 deletions
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index 82541c73f55..ae8a46e0607 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -282,8 +282,6 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (10181,-1000357,'Let''s go before they find out I''m free!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,1,'KAYA_SAY_START'),
    (10181,-1000358,'Look out! We''re under attack!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'KAYA_AMBUSH'),
    (17900,-1000359,'Thank you for helping me. I know my way back from here.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'KAYA_END'),
-   (17969,-1000360,'The strands of LIFE have been severed! The Dreamers must be avenged!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,' ysondre SAY_AGGRO'),
-   (17969,-1000361,'Come forth, ye Dreamers   and claim your vengeance!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,' ysondre SAY_SUMMONDRUIDS'),
    (17969,-1000362,'Let''s go $N. I am ready to reach Whitereach Post.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'paoka SAY_START'),
    (17969,-1000363,'Now this looks familiar. If we keep heading east, I think we can... Ahh, Wyvern on the attack!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'paoka SAY_WYVERN'),
    (17969,-1000364,'Thanks a bunch... I can find my way back to Whitereach Post from here. Be sure to talk with Motega Firemane; perhaps you can keep him from sending me home.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'paoka SAY_COMPLETE'),
@@ -330,7 +328,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (6182,-1000405,'Rin''ji needs help!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'SAY_RIN_HELP_1'),
    (6182,-1000406,'Rin''ji is being attacked!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'SAY_RIN_HELP_2'),
    (7780,-1000407,'Rin''ji can see road now, $n. Rin''ji knows the way home.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'SAY_RIN_COMPLETE'),
-   (7780,-1000408,'Rin''ji will tell you secret now... $n, should go to the Overlook Cliffs. Rin''ji hid something on island  there',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'SAY_RIN_PROGRESS_1'),
+   (7780,-1000408,'Rin''ji will tell you secret now... $n, should go to the Overlook Cliffs. Rin''ji hid something on island there',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'SAY_RIN_PROGRESS_1'),
    (7780,-1000409,'You find it, you keep it! Don''t tell no one that Rin''ji talked to you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,'SAY_RIN_PROGRESS_2'),
    (10638,-1000410,'Here they come! Defend yourself!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,5,'kanati SAY_KAN_START'),
    (3568,-1000411,'Why don''t we deal with you now, Hendel? Lady Proudmoore will speak for you back in the tower.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,7,0,'hendel SAY_PROGRESS_1_TER'),
@@ -1346,7 +1344,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (21216,-1548007,'You are no better than they!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11299,1,0,0,'hydross SAY_CORRUPT_SLAY2'),
    (21216,-1548008,'You are the disease, not I',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11300,1,0,0,'hydross SAY_CORRUPT_DEATH'),
    (21215,-1548009,'Finally, my banishment ends!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11312,1,0,0,'leotheras SAY_AGGRO'),
-   (21215,-1548010,'Be gone, trifling elf.  I am in control now!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11304,1,0,0,'leotheras SAY_SWITCH_TO_DEMON'),
+   (21215,-1548010,'Be gone, trifling elf. I am in control now!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11304,1,0,0,'leotheras SAY_SWITCH_TO_DEMON'),
    (21215,-1548011,'We all have our demons...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11305,1,0,0,'leotheras SAY_INNER_DEMONS'),
    (21215,-1548012,'I have no equal.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11306,1,0,0,'leotheras SAY_DEMON_SLAY1'),
    (21215,-1548013,'Perish, mortal.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,11307,1,0,0,'leotheras SAY_DEMON_SLAY2'),
@@ -2535,7 +2533,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (33350,-1603254,'Gaze upon its magnificence! Bask in its glorious, um, glory! I present you... V-07-TR-0N!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15624,1,0,0,'Mimiron SAY_V07TRON_ACTIVATE'),
    (33350,-1603255,'Prognosis: Negative!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15625,1,0,0,'Mimiron SAY_V07TRON_SLAY_1'),
    (33350,-1603256,'You''re not going to get up from that one, friend.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15626,1,0,0,'Mimiron SAY_V07TRON_SLAY_2'),
-   (33350,-1603257,'It would appear that I''ve made a slight miscalculation. I allowed my mind to be corrupted by the fiend  in the prison, overriding my primary directive. All systems seem to be functional now. Clear.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15627,1,0,0,'Mimiron SAY_V07TRON_DEATH'),
+   (33350,-1603257,'It would appear that I''ve made a slight miscalculation. I allowed my mind to be corrupted by the fiend in the prison, overriding my primary directive. All systems seem to be functional now. Clear.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15627,1,0,0,'Mimiron SAY_V07TRON_DEATH'),
    (33350,-1603258,'Oh, my! It would seem that we are out of time, my friends!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15628,1,0,0,'Mimiron SAY_BERSERK'),
    (33350,-1603259,'Combat matrix enhanced. Behold wonderous rapidity!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15630,1,0,0,'Mimiron SAY_YS_HELP'),
 
diff --git a/sql/updates/world/2011_07_04_world_script_texts.sql b/sql/updates/world/2011_07_04_world_script_texts.sql
new file mode 100644
index 00000000000..fb954ffa448
--- /dev/null
+++ b/sql/updates/world/2011_07_04_world_script_texts.sql
@@ -0,0 +1,4 @@
+UPDATE `script_texts` SET `content_default`='%s hugs her father.' WHERE `entry`=-1000116;
+UPDATE `script_texts` SET `content_default`='Be gone, trifling elf. I am in control now!' WHERE `entry`=-1548010;
+UPDATE `script_texts` SET `content_default`='It would appear that I''ve made a slight miscalculation. I allowed my mind to be corrupted by the fiend in the prison, overriding my primary directive. All systems seem to be functional now. Clear.' WHERE `entry`=-1603257;
+UPDATE `script_texts` SET `content_default`='Rin''ji will tell you secret now... $n, should go to the Overlook Cliffs. Rin''ji hid something on island there' WHERE `entry`=-1000408;