19 files changed, 397 insertions, 2 deletions
diff --git a/sql/characters.sql b/sql/characters.sql
index 92cda40fdf6..ad691159878 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -165,6 +165,65 @@ LOCK TABLES `auctionhouse` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `auctionhousebot`
+--
+
+DROP TABLE IF EXISTS `auctionhousebot`;
+CREATE TABLE `auctionhousebot` (
+  `auctionhouse` int(11) NOT NULL default '0' COMMENT 'mapID of the auctionhouse.',
+  `name` char(25) default NULL COMMENT 'Text name of the auctionhouse.',
+  `minitems` int(11) default '0' COMMENT 'This is the minimum number of items you want to keep in the auction house. a 0 here will make it the same as the maximum.',
+  `maxitems` int(11) default '0' COMMENT 'This is the number of items you want to keep in the auction house.',
+  `mintime` int(11) default '8' COMMENT 'Sets the minimum number of hours for an auction.',
+  `maxtime` int(11) default '24' COMMENT 'Sets the maximum number of hours for an auction.',
+  `percentwhitetradegoods` int(11) default '27' COMMENT 'Sets the percentage of the White Trade Goods auction items',
+  `percentgreentradegoods` int(11) default '12' COMMENT 'Sets the percentage of the Green Trade Goods auction items',
+  `percentbluetradegoods` int(11) default '10' COMMENT 'Sets the percentage of the Blue Trade Goods auction items',
+  `percentpurpletradegoods` int(11) default '1' COMMENT 'Sets the percentage of the Purple Trade Goods auction items',
+  `percentwhiteitems` int(11) default '10' COMMENT 'Sets the percentage of the non trade White auction items',
+  `percentgreenitems` int(11) default '30' COMMENT 'Sets the percentage of the non trade Green auction items',
+  `percentblueitems` int(11) default '8' COMMENT 'Sets the percentage of the non trade Blue auction items',
+  `percentpurpleitems` int(11) default '2' COMMENT 'Sets the percentage of the non trade Purple auction items',
+  `minpricewhite` int(11) default '150' COMMENT 'Minimum price of White items (percentage).',
+  `maxpricewhite` int(11) default '250' COMMENT 'Maximum price of White items (percentage).',
+  `minpricegreen` int(11) default '800' COMMENT 'Minimum price of Green items (percentage).',
+  `maxpricegreen` int(11) default '1400' COMMENT 'Maximum price of Green items (percentage).',
+  `minpriceblue` int(11) default '1250' COMMENT 'Minimum price of Blue items (percentage).',
+  `maxpriceblue` int(11) default '1750' COMMENT 'Maximum price of Blue items (percentage).',
+  `minpricepurple` int(11) default '2250' COMMENT 'Minimum price of Purple items (percentage).',
+  `maxpricepurple` int(11) default '4550' COMMENT 'Maximum price of Purple items (percentage).',
+  `minbidpricewhite` int(11) default '70' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpricewhite` int(11) default '100' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `minbidpricegreen` int(11) default '80' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpricegreen` int(11) default '100' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `minbidpriceblue` int(11) default '75' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpriceblue` int(11) default '100' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `minbidpricepurple` int(11) default '80' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpricepurple` int(11) default '100' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxstackwhite` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackgreen` int(11) default '3' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackblue` int(11) default '2' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackpurple` int(11) default '1' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `buyerpricegrey` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying grey items from auctionhouse',
+  `buyerpricewhite` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying white items from auctionhouse',
+  `buyerpricegreen` int(11) default '5' COMMENT 'Multiplier to vendorprice when buying green items from auctionhouse',
+  `buyerpriceblue` int(11) default '12' COMMENT 'Multiplier to vendorprice when buying blue items from auctionhouse',
+  `buyerpricepurple` int(11) default '15' COMMENT 'Multiplier to vendorprice when buying purple items from auctionhouse',
+  `buyerbiddinginterval` int(11) default '1' COMMENT 'Interval how frequently AHB bids on each AH. Time in minutes',
+  `buyerbidsperinterval` int(11) default '1' COMMENT 'number of bids to put in per bidding interval',
+  PRIMARY KEY  (`auctionhouse`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Data for table `auctionhousebot`
+--
+
+insert  into `auctionhousebot`(`auctionhouse`,`name`,`minitems`,`maxitems`,`mintime`,`maxtime`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerbiddinginterval`,`buyerbidsperinterval`) values
+(2,'Alliance',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1),
+(6,'Horde',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1),
+(7,'Neutral',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1);
+
+--
 -- Table structure for table `bugreport`
 --
 
diff --git a/sql/updates/832_characters.sql b/sql/updates/832_characters.sql
deleted file mode 100644
index 1330aef891e..00000000000
--- a/sql/updates/832_characters.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `gm_tickets` CHANGE `closed` `closed` tinyint(1) NOT NULL default '0';
-\ No newline at end of file
diff --git a/sql/updates/927_characters.sql b/sql/updates/927_characters.sql
new file mode 100644
index 00000000000..6cbcf21e7bd
--- /dev/null
+++ b/sql/updates/927_characters.sql
@@ -0,0 +1 @@
+ALTER TABLE `gm_tickets` CHANGE `closed` `closed` int(10) NOT NULL default '0';
+\ No newline at end of file
diff --git a/sql/updates/930_characters.sql b/sql/updates/930_characters.sql
new file mode 100644
index 00000000000..f0ec58c2dc6
--- /dev/null
+++ b/sql/updates/930_characters.sql
@@ -0,0 +1,56 @@
+--
+-- Table structure for table `auctionhousebot`
+--
+
+CREATE TABLE IF NOT EXISTS `auctionhousebot` (
+  `auctionhouse` int(11) NOT NULL default '0' COMMENT 'mapID of the auctionhouse.',
+  `name` char(25) default NULL COMMENT 'Text name of the auctionhouse.',
+  `minitems` int(11) default '0' COMMENT 'This is the minimum number of items you want to keep in the auction house. a 0 here will make it the same as the maximum.',
+  `maxitems` int(11) default '0' COMMENT 'This is the number of items you want to keep in the auction house.',
+  `mintime` int(11) default '8' COMMENT 'Sets the minimum number of hours for an auction.',
+  `maxtime` int(11) default '24' COMMENT 'Sets the maximum number of hours for an auction.',
+  `percentwhitetradegoods` int(11) default '27' COMMENT 'Sets the percentage of the White Trade Goods auction items',
+  `percentgreentradegoods` int(11) default '12' COMMENT 'Sets the percentage of the Green Trade Goods auction items',
+  `percentbluetradegoods` int(11) default '10' COMMENT 'Sets the percentage of the Blue Trade Goods auction items',
+  `percentpurpletradegoods` int(11) default '1' COMMENT 'Sets the percentage of the Purple Trade Goods auction items',
+  `percentwhiteitems` int(11) default '10' COMMENT 'Sets the percentage of the non trade White auction items',
+  `percentgreenitems` int(11) default '30' COMMENT 'Sets the percentage of the non trade Green auction items',
+  `percentblueitems` int(11) default '8' COMMENT 'Sets the percentage of the non trade Blue auction items',
+  `percentpurpleitems` int(11) default '2' COMMENT 'Sets the percentage of the non trade Purple auction items',
+  `minpricewhite` int(11) default '150' COMMENT 'Minimum price of White items (percentage).',
+  `maxpricewhite` int(11) default '250' COMMENT 'Maximum price of White items (percentage).',
+  `minpricegreen` int(11) default '800' COMMENT 'Minimum price of Green items (percentage).',
+  `maxpricegreen` int(11) default '1400' COMMENT 'Maximum price of Green items (percentage).',
+  `minpriceblue` int(11) default '1250' COMMENT 'Minimum price of Blue items (percentage).',
+  `maxpriceblue` int(11) default '1750' COMMENT 'Maximum price of Blue items (percentage).',
+  `minpricepurple` int(11) default '2250' COMMENT 'Minimum price of Purple items (percentage).',
+  `maxpricepurple` int(11) default '4550' COMMENT 'Maximum price of Purple items (percentage).',
+  `minbidpricewhite` int(11) default '70' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpricewhite` int(11) default '100' COMMENT 'Starting bid price of White items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `minbidpricegreen` int(11) default '80' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpricegreen` int(11) default '100' COMMENT 'Starting bid price of Green items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `minbidpriceblue` int(11) default '75' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpriceblue` int(11) default '100' COMMENT 'Starting bid price of Blue items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `minbidpricepurple` int(11) default '80' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxbidpricepurple` int(11) default '100' COMMENT 'Starting bid price of Purple items as a percentage of the randomly chosen buyout price. Default: 100 (Bid and buyout price the same)',
+  `maxstackwhite` int(11) default '0' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackgreen` int(11) default '3' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackblue` int(11) default '2' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `maxstackpurple` int(11) default '1' COMMENT 'Stack size limits for item qualities - a value of 0 will disable a maximum stack size for that quality, which will allow the bot to create items in stack as large as the item allows.',
+  `buyerpricegrey` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying grey items from auctionhouse',
+  `buyerpricewhite` int(11) default '1' COMMENT 'Multiplier to vendorprice when buying white items from auctionhouse',
+  `buyerpricegreen` int(11) default '5' COMMENT 'Multiplier to vendorprice when buying green items from auctionhouse',
+  `buyerpriceblue` int(11) default '12' COMMENT 'Multiplier to vendorprice when buying blue items from auctionhouse',
+  `buyerpricepurple` int(11) default '15' COMMENT 'Multiplier to vendorprice when buying purple items from auctionhouse',
+  `buyerbiddinginterval` int(11) default '1' COMMENT 'Interval how frequently AHB bids on each AH. Time in minutes',
+  `buyerbidsperinterval` int(11) default '1' COMMENT 'number of bids to put in per bidding interval',
+  PRIMARY KEY  (`auctionhouse`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Data for table `auctionhousebot`
+--
+insert into `auctionhousebot` (`auctionhouse`,`name`,`minitems`,`maxitems`,`mintime`,`maxtime`,`percentwhitetradegoods`,`percentgreentradegoods`,`percentbluetradegoods`,`percentpurpletradegoods`,`percentwhiteitems`,`percentgreenitems`,`percentblueitems`,`percentpurpleitems`,`minpricewhite`,`maxpricewhite`,`minpricegreen`,`maxpricegreen`,`minpriceblue`,`maxpriceblue`,`minpricepurple`,`maxpricepurple`,`minbidpricewhite`,`maxbidpricewhite`,`minbidpricegreen`,`maxbidpricegreen`,`minbidpriceblue`,`maxbidpriceblue`,`minbidpricepurple`,`maxbidpricepurple`,`maxstackwhite`,`maxstackgreen`,`maxstackblue`,`maxstackpurple`,`buyerpricegrey`,`buyerpricewhite`,`buyerpricegreen`,`buyerpriceblue`,`buyerpricepurple`,`buyerbiddinginterval`,`buyerbidsperinterval`) values
+(2,'Alliance',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1),
+(6,'Horde',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1),
+(7,'Neutral',0,0,8,24,27,12,10,1,10,30,8,2,150,250,800,1400,1250,1750,2250,4550,70,100,80,100,75,100,80,100,0,3,2,1,1,1,5,12,15,1,1);
diff --git a/sql/updates/933_world_scripts.sql b/sql/updates/933_world_scripts.sql
new file mode 100644
index 00000000000..7b1271e25cc
--- /dev/null
+++ b/sql/updates/933_world_scripts.sql
@@ -0,0 +1 @@
+update creature_template set scriptname='npc_snake_trap_serpents' where entry in (19921, 19833);
diff --git a/sql/updates/935_world_scripts.sql b/sql/updates/935_world_scripts.sql
new file mode 100644
index 00000000000..de02b51d490
--- /dev/null
+++ b/sql/updates/935_world_scripts.sql
@@ -0,0 +1,6 @@
+DELETE FROM `creature` WHERE `id` = '17653';
+
+UPDATE `gameobject_template` SET `flags` = '4' WHERE `entry` IN ('181766','181823');
+UPDATE `gameobject` SET `SpawnMask` = '3',`state` = '1' WHERE `id` IN ('181766','181823');
+
+UPDATE `instance_template` SET `script` = 'instance_blood_furnace' WHERE `map` = '542';
+\ No newline at end of file
diff --git a/sql/updates/940_world_scripts.sql b/sql/updates/940_world_scripts.sql
new file mode 100644
index 00000000000..c9ad252f41f
--- /dev/null
+++ b/sql/updates/940_world_scripts.sql
@@ -0,0 +1,2 @@
+ALTER TABLE custom_texts CHANGE COLUMN emote emote smallint(5) unsigned NOT NULL DEFAULT '0';
+ALTER TABLE script_texts CHANGE COLUMN emote emote smallint(5) unsigned NOT NULL DEFAULT '0';
+\ No newline at end of file
diff --git a/sql/updates/945_world_scripts.sql b/sql/updates/945_world_scripts.sql
new file mode 100644
index 00000000000..8d007e347f9
--- /dev/null
+++ b/sql/updates/945_world_scripts.sql
@@ -0,0 +1,41 @@
+update creature_template set scriptname='' where entry=22083;
+update creature_template set scriptname='npc_overlord_morghor' where entry=23139;
+update creature_template set scriptname='' where entry=23141;
+DELETE FROM script_texts WHERE entry BETWEEN -1000221 and -1000206;
+INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES
+(-1000206, 'Come, $N. Lord Stormrage awaits.', 0, 1, 'OVERLORD_SAY_1'),
+(-1000207, 'Lord Illidan will be here shortly.', 0, 1, 'OVERLORD_SAY_2'),
+(-1000208, 'Lord Illidan, this is the Dragonmaw that I, and others, have told you about. He will lead us to victory!', 0, 1, 'OVERLORD_SAY_3'),
+(-1000209, 'But... My lord, I do not understand. $N... He is the orc that has...', 0, 1, 'OVERLORD_SAY_4'),
+(-1000210, 'It will be done, my lord.', 0, 1, 'OVERLORD_SAY_5'),
+(-1000211, 'So you thought to make a fool of Mor\'ghor, eh? Before you are delivered to Lord Illidan, you will feel pain that you could not know to exist. I will take pleasure in exacting my own vengeance.', 0, 25, 'OVERLORD_SAY_6'),
+(-1000212, 'Warriors of Dragonmaw, gather \'round! One among you has attained the rank of highlord! Bow your heads in reverence! Show your respect and allegiance to Highlord $N!', 1, 22, 'OVERLORD_YELL_1'),
+(-1000213, 'All hail Lord Illidan!', 1, 66, 'OVERLORD_YELL_2'),
+(-1000214, 'What is the meaning of this, Mor\'ghor?', 0, 1, 'LORD_ILLIDAN_SAY_1'),
+(-1000215, 'SILENCE!', 0, 22, 'LORD_ILLIDAN_SAY_2'),
+(-1000216, 'Blathering idiot. You incomprehensibly incompetent buffoon...', 0, 1, 'LORD_ILLIDAN_SAY_3'),
+(-1000217, 'THIS is your hero?', 0, 6, 'LORD_ILLIDAN_SAY_4'),
+(-1000218, 'You have been deceived, imbecile.', 0, 1, 'LORD_ILLIDAN_SAY_5'),
+(-1000219, 'This... whole... operation... HAS BEEN COMPROMISED!', 0, 22, 'LORD_ILLIDAN_SAY_6'),
+(-1000220, 'I expect to see this insect\'s carcass in pieces in my lair within the hour. Fail and you will suffer a fate so much worse than death.', 0, 1, 'LORD_ILLIDAN_SAY_7'),
+(-1000221, 'You will not harm the boy, Mor\'ghor! Quickly, $N, climb on my back!', 0, 22, 'YARZILL_THE_MERC_SAY');
+
+DELETE FROM script_texts WHERE entry='-1000222';
+INSERT INTO script_texts (entry, content_default, type, language, emote, comment) VALUES
+(-1000222, 'Thank you, mortal.', 0, 11, 1, 'SAY_JUST_EATEN');
+
+DELETE FROM script_texts WHERE entry BETWEEN -1000234 and -1000223;
+INSERT INTO script_texts (entry, content_default, emote, comment) VALUES
+(-1000223, 'I sense the tortured spirits, $N. They are this way, come quickly!', 1, 'SAY_START'),
+(-1000224, 'Watch out!', 0, 'SAY_AGGRO1'),
+(-1000225, 'Naga attackers! Defend yourself!', 0, 'SAY_AGGRO2'),
+(-1000226, 'Kill them all!', 0, 'ASSASSIN_SAY_AGGRO1'),
+(-1000227, 'You will never essscape Coilssskarrr...', 0, 'ASSASSIN_SAY_AGGRO2'),
+(-1000228, 'Grant me protection $N, i must break trough their foul magic!', 0, 'SAY_PROGRESS1'),
+(-1000229, 'The naga of Coilskar are exceptionally cruel to their prisoners. It is a miracle that I survived inside that watery prison for as long as I did. Earthmother be praised.', 0, 'SAY_PROGRESS2'),
+(-1000230, 'Now we must find the exit.', 0, 'SAY_PROGRESS3'),
+(-1000231, 'Lady Vashj must answer for these atrocities. She must be brought to justice!', 0, 'SAY_PROGRESS4'),
+(-1000232, 'The tumultuous nature of the great waterways of Azeroth and Draenor are a direct result of tormented water spirits.', 0, 'SAY_PROGRESS5'),
+(-1000233, 'It shouldn\'t be much further, $N. The exit is just up ahead.', 0, 'SAY_PROGRESS6'),
+(-1000234, 'Thank you, $N. Please return to my brethren at the Altar of Damnation, near the Hand of Gul\'dan, and tell them that Wilda is safe. May the Earthmother watch over you...', 0, 'SAY_END');
+
diff --git a/sql/updates/947_world_scripts.sql b/sql/updates/947_world_scripts.sql
new file mode 100644
index 00000000000..7067a1ed706
--- /dev/null
+++ b/sql/updates/947_world_scripts.sql
@@ -0,0 +1,12 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000244 and -1000235;
+INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES
+(-1000235, 'Ok, $N. Follow me to the cave where I\'ll attempt to harness the power of the rune stone into these goggles.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_1'),
+(-1000236, 'I discovered this cave on our first day here. I believe the energy in the stone can be used to our advantage.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_2'),
+(-1000237, 'I\'ll begin drawing energy from the stone. Your job, $N, is to defend me. This place is cursed... trust me.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_3'),
+(-1000238, 'begins tinkering with the goggles before the stone.', 2, 0, 'phizzlethorpe - EMOTE_PROGRESS_4'),
+(-1000239, 'Help!!! Get these things off me so I can get my work done!', 0, 0, 'SAY_AGGRO'),
+(-1000240, 'Almost done! Just a little longer!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_5'),
+(-1000241, 'I\'ve done it! I have harnessed the power of the stone into the goggles! Let\'s get out of here!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_6'),
+(-1000242, 'Phew! Glad to be back from that creepy cave.', 0, 1, 'phizzlethorpe - SAY_PROGRESS_7'),
+(-1000243, 'hands one glowing goggles over to Doctor Draxlegauge.', 2, 0, 'phizzlethorpe - EMOTE_PROGRESS_8'),
+(-1000244, 'Doctor Draxlegauge will give you further instructions, $N. Many thanks for your help!', 0, 1, 'phizzlethorpe - SAY_PROGRESS_9');
+\ No newline at end of file
diff --git a/sql/updates/948_world_scripts.sql b/sql/updates/948_world_scripts.sql
new file mode 100644
index 00000000000..5f8f74cb5c0
--- /dev/null
+++ b/sql/updates/948_world_scripts.sql
@@ -0,0 +1,5 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000247 and -1000245;
+INSERT INTO script_texts (entry, content_default, type, comment) VALUES
+(-1000245, 'You, there! Hand over that moonstone and nobody gets hurt!', 1, 'SAY_RIZZLE_START'),
+(-1000246, 'Just chill!', 4, 'SAY_RIZZLE_GRENADE'),
+(-1000247, 'All right, you win! I surrender! Just don\'t hurt me!', 1, 'SAY_RIZZLE_FINAL');
+\ No newline at end of file
diff --git a/sql/updates/950_world_scripts.sql b/sql/updates/950_world_scripts.sql
new file mode 100644
index 00000000000..789ad810123
--- /dev/null
+++ b/sql/updates/950_world_scripts.sql
@@ -0,0 +1,23 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000266 and -1000248;
+INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES
+(-1000248, 'The last thing I remember is the ship falling and us getting into the pods. I\'ll go see how I can help. Thank you!', 0, 0, 'draenei survivor - HEAL1'),
+(-1000249, '$C, Where am I? Who are you? Oh no! What happened to the ship?.', 0, 0, 'draenei survivor - HEAL2'),
+(-1000250, '$C You saved me! I owe you a debt that I can never repay. I\'ll go see if I can help the others.', 0, 0, 'draenei survivor - HEAL3'),
+(-1000251, 'Ugh... what is this place? Is that all that\'s left of the ship over there?', 0, 0, 'draenei survivor - HEAL4'),
+(-1000252, 'Oh, the pain...', 0, 0, 'draenei survivor - HELP1'),
+(-1000253, 'Everything hurts, Please make it stop...', 0, 0, 'draenei survivor - HELP2'),
+(-1000254, 'Ughhh... I hurt. Can you help me?', 0, 0, 'draenei survivor - HELP3'),
+(-1000255, 'I don\'t know if I can make it, please help me...', 0, 0, 'draenei survivor - HELP4'),
+
+(-1000256, 'Yes Master, all goes along as planned.', 0, 1, 'overgrind - SAY_TEXT'),
+(-1000257, 'puts the shell to his ear.', 2, 0, 'overgrind - SAY_EMOTE'),
+(-1000258, 'Now I cut you!', 1, 0, 'overgrind - YELL_ATTACK'),
+
+(-1000259, 'What\'s the big idea, Spark?', 0, 0, 'geezle - GEEZLE_SAY_1'),
+(-1000260, 'What\'s the big idea? You nearly blew my cover, idiot! I told you to put the compass and navigation maps somewhere safe - not out in the open for any fool to discover.', 0, 0, 'geezle - SPARK_SAY_2'),
+(-1000261, 'The Master has gone to great lengths to secure information about the whereabouts of the Exodar. You could have blown the entire operation, including the cover of our spy on the inside.', 0, 0, 'geezle - SPARK_SAY_3'),
+(-1000262, 'Relax, Spark! I have it all under control. We\'ll strip mine the Exodar right out from under \'em - making both you and I very, very rich in the process.', 0, 0, 'geezle - GEEZLE_SAY_4'),
+(-1000263, 'Relax? Do you know what Kael\'thas does to those that fail him, Geezle? Eternal suffering and pain... Do NOT screw this up, fool.', 0, 0, 'geezle - SPARK_SAY_5'),
+(-1000264, 'Our Bloodmyst scouts have located our contact. The fool, Velen, will soon leave himself open and defenseless -- long enough for us to strike! Now get out of my sight before I vaporize you...', 0, 0, 'geezle - SPARK_SAY_6'),
+(-1000265, 'Yes, sir. It won\'t happen again...', 0, 0, 'geezle - GEEZLE_SAY_7'),
+(-1000266, 'picks up the naga flag.', 2, 0, 'geezle - EMOTE_SPARK');
+\ No newline at end of file
diff --git a/sql/updates/951_world_scripts.sql b/sql/updates/951_world_scripts.sql
new file mode 100644
index 00000000000..39208672b32
--- /dev/null
+++ b/sql/updates/951_world_scripts.sql
@@ -0,0 +1,16 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000279 and -1000267;
+INSERT INTO script_texts (entry, content_default, type, comment) VALUES
+(-1000267, 'Ready when you are, warrior.', 1, 'flathead - SAY_BIG_WILL_READY'),
+(-1000268, 'The Affray has begun, get ready to fight!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_BEGIN'),
+(-1000269, 'You! Enter the fray!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_FRAY'),
+(-1000270, 'Challenger is down!', 1, 'flathead - SAY_TWIGGY_FLATHEAD_DOWN'),
+(-1000271, 'The Affray is over.', 1, 'flathead - SAY_TWIGGY_FLATHEAD_OVER'),
+
+(-1000272, 'Alright, alright I think I can figure out how to operate this thing...', 0, 'shredder - SAY_PROGRESS_1'),
+(-1000273, 'Arrrgh! This isn\'t right!', 0, 'shredder - SAY_PROGRESS_2'),
+(-1000274, 'Okay, I think I\'ve got it, now. Follow me, $N!', 0, 'shredder - SAY_PROGRESS_3'),
+(-1000275, 'There\'s the stolen shredder! Stop it or Lugwizzle will have our hides!', 1, 'shredder - SAY_MERCENARY_4'),
+(-1000276, 'Looks like we\'re out of woods, eh? Wonder what this does...', 0, 'shredder - SAY_PROGRESS_5'),
+(-1000277, 'Come on, don\'t break down on me now!', 0, 'shredder - SAY_PROGRESS_6'),
+(-1000278, 'That was a close one! Well, let\'s get going, it\'s still a ways to Ratchet!', 0, 'shredder - SAY_PROGRESS_7'),
+(-1000279, 'Hmm... I don\'t think this blinking red light is a good thing...', 0, 'shredder - SAY_PROGRESS_8');
+\ No newline at end of file
diff --git a/sql/updates/952_world_scripts.sql b/sql/updates/952_world_scripts.sql
new file mode 100644
index 00000000000..e06302538a2
--- /dev/null
+++ b/sql/updates/952_world_scripts.sql
@@ -0,0 +1,10 @@
+DELETE FROM script_texts where entry BETWEEN -1000285 and -1000280;
+INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES
+(-1000280, 'Thank you, dear Paladin, you just saved my life.', 0, 7, 'faulk - SAY_HEAL'),
+
+(-1000281, 'Very well. Let\'s see what you have to show me, $N.', 0, 0, 'anvilvard - SAY_PR_1'),
+(-1000282, 'What manner of trick is this, $R? If you seek to ambush me, I warn you I will not go down quietly!', 0, 0, 'anvilvard - SAY_PR_2'),
+(-1000283, 'releases the last of its energies into the nerarby runestone, succesfully reactivating it.', 2, 0, 'crystal - EMOTE'),
+
+(-1000284, 'Deployment sucessful. Trespassers will be neutralized.', 0, 0, 'sentry - SAY_CONVERTED_1'),
+(-1000285, 'Objective acquired. Initiating security routines.', 0, 0, 'sentry - SAY_CONVERTED_1');
+\ No newline at end of file
diff --git a/sql/updates/953_world_scripts.sql b/sql/updates/953_world_scripts.sql
new file mode 100644
index 00000000000..3811b6a98cf
--- /dev/null
+++ b/sql/updates/953_world_scripts.sql
@@ -0,0 +1,9 @@
+DELETE FROM script_texts where entry BETWEEN -1000292 and -1000286;
+INSERT INTO script_texts (entry, content_default, type, emote, comment) VALUES
+(-1000286, 'A shadowy, sinister presence has invader the Emerald Dream. Its power is poised to spill over into our world, $N. We must oppose it! That\'s why I cannot accompany you in person.', 0, 0, 'clintar_spirit'),
+(-1000287, 'The Emerald Dream will never be yours!', 0, 0, 'clintar_spirit'),
+(-1000288, 'Begone from this place!', 0, 0, 'clintar_spirit'),
+(-1000289, 'That\'s the first relic, but there are still two more. Follow me, $N.', 0, 0, 'clintar_spirit'),
+(-1000290, 'I\'ve recovered the second relic. Take a moment to rest, and then we\'ll continue to the last reliquary.', 0, 0, 'clintar_spirit'),
+(-1000291, 'We have all three of the relics, but my energy is rapidly fading. We must make our way back to Dreamwarden Lurosa! He will let you know what to do next.', 0, 0, 'clintar_spirit'),
+(-1000292, 'Lurosa, I am entrusting the Relics of Aviana to $N, who will take them to Morthis Whisperwing. I must return completely to the Emerald Dream now. Do not let $N fail!', 0, 0, 'clintar_spirit');
+\ No newline at end of file
diff --git a/sql/updates/954_world_scripts.sql b/sql/updates/954_world_scripts.sql
new file mode 100644
index 00000000000..009f59517ac
--- /dev/null
+++ b/sql/updates/954_world_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/955_world_scripts.sql b/sql/updates/955_world_scripts.sql
new file mode 100644
index 00000000000..7c389377433
--- /dev/null
+++ b/sql/updates/955_world_scripts.sql
@@ -0,0 +1,59 @@
+DELETE FROM script_texts WHERE entry BETWEEN -1000333 and -1000306;
+INSERT INTO script_texts (entry, content_default, type, comment) VALUES
+(-1000306, 'Follow me, stranger. This won\'t take long.', 0, 'npc_kservant - SAY1'),
+(-1000307, 'Shattrath was once the draenei capital of this world. Its name means \"dwelling of light.\"', 4, 'npc_kservant - WHISP1'),
+(-1000308, 'When the Burning Legion turned the orcs against the draenei, the fiercest battle was fought here. The draenei fought tooth and nail, but in the end the city fell.', 4, 'npc_kservant - WHISP2'),
+(-1000309, 'The city was left in ruins and darkness... until the Sha\'tar arrived.', 4, 'npc_kservant - WHISP3'),
+(-1000310, 'Let us go into the Lower City. I will warn you that as one of the only safe havens in Outland, Shattrath has attracted droves of refugees from all wars, current and past.', 4, 'npc_kservant - WHISP4'),
+(-1000311, 'The Sha\'tar, or \"born from light\" are the naaru that came to Outland to fight the demons of the Burning Legion.', 4, 'npc_kservant - WHISP5'),
+(-1000312, 'They were drawn to the ruins of Shattrath City where a small remnant of the draenei priesthood conducted its rites inside a ruined temple on this very spot.', 4, 'npc_kservant - WHISP6'),
+(-1000313, 'The priesthood, known as the Aldor, quickly regained its strength as word spread that the naaru had returned and reconstruction soon began. The ruined temple is now used as an infirmary for injured refugees.', 4, 'npc_kservant - WHISP7'),
+(-1000314, 'It wouldn\'t be long, however, before the city came under attack once again. This time, the attack came from Illidan\'s armies. A large regiment of blood elves had been sent by Illidan\'s ally, Kael\'thas Sunstrider, to lay waste to the city.', 4, 'npc_kservant - WHISP8'),
+(-1000315, 'As the regiment of blood elves crossed this very bridge, the Aldor\'s exarchs and vindicators lined up to defend the Terrace of Light. But then the unexpected happened.', 4, 'npc_kservant - WHISP9'),
+(-1000316, 'The blood elves laid down their weapons in front of the city\'s defenders; their leader, a blood elf elder known as Voren\'thal, stormed into the Terrace of Light and demanded to speak to A\'dal.', 4, 'npc_kservant - WHISP10'),
+(-1000317, 'As the naaru approached him, Voren\'thal kneeled before him and uttered the following words: \"I\'ve seen you in a vision, naaru. My race\'s only hope for survival lies with you. My followers and I are here to serve you.\"', 4, 'npc_kservant - WHISP11'),
+(-1000318, 'The defection of Voren\'thal and his followers was the largest loss ever incurred by Kael\'s forces. And these weren\'t just any blood elves. Many of the best and brightest amongst Kael\'s scholars and magisters had been swayed by Voren\'thal\'s influence.', 4, 'npc_kservant - WHISP12'),
+(-1000319, 'The naaru accepted the defectors, who would become known as the Scryers; their dwelling lies in the platform above. Only those initiated with the Scryers are allowed there.', 4, 'npc_kservant - WHISP13'),
+(-1000320, 'The Aldor are followers of the Light and forgiveness and redemption are values they understand. However, they found hard to forget the deeds of the blood elves while under Kael\'s command.', 4, 'npc_kservant - WHISP14'),
+(-1000321, 'Many of the priesthood had been slain by the same magisters who now vowed to serve the naaru. They were not happy to share the city with their former enemies.', 4, 'npc_kservant - WHISP15'),
+(-1000322, 'The Aldor\'s most holy temple and its surrounding dwellings lie on the terrace above. As a holy site, only the initiated are welcome inside.', 4, 'npc_kservant - WHISP16'),
+(-1000323, 'The attacks against Shattrath continued, but the city did not fall, as you can see. On the contrary, the naaru known as Xi\'ri led a successful incursion into Shadowmoon Valley - Illidan\'s doorstep.', 4, 'npc_kservant - WHISP17'),
+(-1000324, 'There he continues to wage war on Illidan with the assistance of the Aldor and the Scryers. The two factions have not given up on their old feuds, though.', 4, 'npc_kservant - WHISP18'),
+(-1000325, 'Such is their animosity that they vie for the honor of being sent to assist the naaru there. Each day, that decision is made here by A\'dal. The armies gather here to receive A\'dal\'s blessing before heading to Shadowmoon.', 4, 'npc_kservant - WHISP19'),
+(-1000326, 'Khadgar should be ready to see you again. Just remember that to serve the Sha\'tar you will most likely have to ally with the Aldor or the Scryers. And seeking the favor of one group will cause the others\' dislike.', 4, 'npc_kservant - WHISP20'),
+(-1000327, 'Good luck stranger, and welcome to Shattrath City.', 4, 'npc_kservant - WHISP21'),
+
+
+(-1000328, 'Time to teach you a lesson in manners, little boy!', 0, ''),
+(-1000329, 'Now I\'m gonna give you to the count of \'3\' to get out of here before I sick the dogs on you.', 0, ''),
+(-1000330, '1...', 0, ''),
+(-1000331, '2...', 0, ''),
+(-1000332, 'Time to meet your maker!', 0, ''),
+(-1000333, 'Alright, we give up! Don\'t hurt us!', 0, '');
+
+DELETE FROM script_texts WHERE entry=-1000334;
+INSERT INTO script_texts (entry, content_default, type, language, comment) VALUES
+(-1000334, 'Thank you, dear Paladin, you just saved my life.', 0, 10, 'stillblade - SAY_HEAL');
+
+DELETE FROM script_texts WHERE entry BETWEEN -1000349 and -1000335;
+INSERT INTO script_texts (entry, content_default, type, comment) VALUES
+(-1000335, 'Let\'s get to the others, and keep an eye open for those wolves cutside...', 0, 'npc_deathstalker_erland 
+- SAY_QUESTACCEPT'),
+(-1000336, 'Be careful, $N. Those wolves like to hide among the trees.', 0, 'npc_deathstalker_erland - SAY_START'),
+(-1000337, 'A $C attacks!', 0, 'npc_deathstalker_erland - SAY_AGGRO_1'),
+(-1000338, 'Beware! I am under attack!', 0, 'npc_deathstalker_erland - SAY_AGGRO_2'),
+(-1000339, 'We\'re almost there!', 0, 'npc_deathstalker_erland - SAY_LAST'),
+(-1000340, 'We made it! Thanks, $N. I couldn\'t have gotten without you.', 0, 'npc_deathstalker_erland - 
+SAY_THANKS'),
+(-1000341, 'It\'s good to see you again, Erland. What is your report?', 0, 'npc_deathstalker_erland - SAY_RANE'),
+(-1000342, 'Masses of wolves are to the east, and whoever lived at Malden\'s Orchard is gone.', 0, 
+'npc_deathstalker_erland - SAY_ANSWER'),
+(-1000343, 'If I am excused, then I\'d like to check on Quinn...', 0, 'npc_deathstalker_erland - SAY_MOVE_QUINN'),
+(-1000344, 'Hello, Quinn. How are you faring?', 0, 'npc_deathstalker_erland - SAY_GREETINGS'),
+(-1000345, 'I\'ve been better. Ivar the Foul got the better of me...', 0, 'npc_deathstalker_erland - SAY_QUINN'),
+(-1000346, 'Try to take better care of yourself, Quinn. You were lucky this time.', 0, 'npc_deathstalker_erland - 
+SAY_ON_BYE'),
+
+(-1000347, 'Let\'s go before they find out I\'m free!', 0, 'npc_kaya_flathoof - SAY_START'),
+(-1000348, 'Look out! We\'re under attack!', 0, 'npc_kaya_flathoof - SAY_AMBUSH'),
+(-1000349, 'Thank you for helping me. I know my way back from here.', 0, 'npc_kaya_flathoof - SAY_END');
+\ No newline at end of file
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/957_world_scripts.sql b/sql/updates/957_world_scripts.sql
new file mode 100644
index 00000000000..8cae6b3fe87
--- /dev/null
+++ b/sql/updates/957_world_scripts.sql
@@ -0,0 +1,36 @@
+-- Liquid Fire
+UPDATE `gameobject_template` SET `data2`='5',`data11`='1' WHERE `entry` IN ('180125','182533');
+
+-- Scripts & Stats
+UPDATE `creature_template` SET `ScriptName`='boss_vazruden_the_herald' WHERE `entry` = '17307';
+UPDATE `creature_template` SET `ScriptName`='boss_vazruden',`heroic_entry`='18434' WHERE `entry` = '17537';
+UPDATE `creature_template` SET `ScriptName`='boss_nazan' WHERE `entry` = '17536';
+UPDATE `creature_template` SET `ScriptName`='mob_hellfire_sentry' WHERE `entry` = '17517';
+UPDATE `creature_template` SET `equipment_id`='2183',`mechanic_immune_mask`='805306367' WHERE `entry` = '18434';
+
+-- Reinforced Fel Iron Chest
+DELETE FROM `gameobject` WHERE `id` IN ('185168','185169');
+
+-- Script Texts
+DELETE FROM `script_texts` WHERE `entry` BETWEEN '-1543025' AND '-1543017';
+INSERT INTO `script_texts` (`entry`,`content_default`,`sound`,`type`,`language`,`comment`) VALUES
+('-1543017','You have faced many challenges, pity they were all in vain. Soon your people will kneel to my lord!',10292,1,0,'vazruden SAY_INTRO'),
+('-1543018','Is there no one left to test me?',10293,1,0,'vazruden SAY_WIPE'),
+('-1543019','Your time is running out!',10294,1,0,'vazruden SAY_AGGRO_1'),
+('-1543020','You are nothing, I answer a higher call!',10295,1,0,'vazruden SAY_AGGRO_2'),
+('-1543021','The Dark Lord laughs at you!',10296,1,0,'vazruden SAY_AGGRO_3'),
+('-1543022','It is over. Finished!',10297,1,0,'vazruden SAY_KILL_1'),
+('-1543023','Your days are done!',10298,1,0,'vazruden SAY_KILL_2'),
+('-1543024','My lord will be the end you all...',10299,1,0,'vazruden SAY_DIE'),
+('-1543025','descends from the sky',0,3,0,'vazruden EMOTE');
+
+-- Waypoint Movement
+DELETE FROM `waypoint_data` WHERE `id` = '2081';
+INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES
+('2081','1','-1412.2','1784','112'),
+('2081','2','-1447.9','1760.9','112'),
+('2081','3','-1454.2','1729.3','112'),
+('2081','4','-1430','1705','112'),
+('2081','5','-1393.5','1705.5','112'),
+('2081','6','-1369.8','1724.5','112'),
+('2081','7','-1377','1760','112');
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index dc983f8c14d..05287e091be 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -124,7 +124,6 @@ INSTALL(FILES
 817_world_scripts.sql
 822_world_scripts.sql
 826_world_scripts.sql
-832_characters.sql
 833_world_scripts.sql
 834_world_scripts.sql
 837_world_scripts.sql
@@ -142,4 +141,20 @@ INSTALL(FILES
 905_world_scripts.sql
 917_world.sql
 919_world.sql
+927_characters.sql
+930_characters.sql
+933_world_scripts.sql
+935_world_scripts.sql
+940_world_scripts.sql
+945_world_scripts.sql
+947_world_scripts.sql
+948_world_scripts.sql
+950_world_scripts.sql
+951_world_scripts.sql
+952_world_scripts.sql
+953_world_scripts.sql
+954_world_scripts.sql
+955_world_scripts.sql
+956_world_scripts.sql
+957_world_scripts.sql
 DESTINATION share/trinity/sql/updates)