6 files changed, 138 insertions, 6 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 5f55f9b4a4d..734dea95aff 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -1990,7 +1990,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
 
 -- -1 608 000 VIOLET HOLD
    (30658,-1608000,'Prision guards, we are leaving! These adventurers are taking over! Go go go',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
-   
+  
 -- -1 615 000 OBSIDIAN SANCTUM
    (30451,-1615000,'I fear nothing! Least of all you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14111,1,0,0,'shadron SAY_SHADRON_AGGRO'),
    (30451,-1615001,'You are insignificant!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,14112,1,0,0,'shadron SAY_SHADRON_SLAY_1'),
@@ -2300,7 +2300,15 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (29173,-1609283,'collapses.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'Highlord Darion Mograine'),
    (29173,-1609284,'charges towards the Lich King, Ashbringer in hand and strikes the Lich King.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'Highlord Tirion Fordring'),
    (29173,-1609285,'disappears. Tirion walks over to where Darion lay',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'The Lich King'),
-   (29173,-1609286,'Light washes over the chapel  the Light of Dawn is uncovered.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,'');
-   
+   (29173,-1609286,'Light washes over the chapel  the Light of Dawn is uncovered.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,2,0,0,''),
+   (25504, -1750040, 'My father''s aura is quite strong, he cannot be far. Could you be a doll and fight off the monsters wandering throught the mist?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+   (25504, -1750041, 'Watch out for the monsters!Which way should we go first? Let''s try this way...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+   (25504, -1750042, 'What could this be?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+   (25504, -1750043, 'There''s no sign of it ending! Where could my father be?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+   (25504, -1750044, 'Father! You''re safe!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+   (25589, -1700003, 'I\'ll make you a deal: If you get me out of here alive, you\'ll get a reward larger than you can imagine!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','npc_bonker_togglevolt'),
+   (25589, -1700002, 'I AM NOT AN APPETIZER!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','npc_bonker_togglevolt'),
+   (25589, -1700001, 'Right then, no time to waste. Lets get outa here!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','npc_bonker_togglevolt');
+
 -- moved from world_spells_full.sql
 UPDATE `script_texts` SET `type` = '3' WHERE `entry` IN ('-1532089','-1532090');
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 563fddb48d9..9733793b775 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -1789,3 +1789,59 @@ INSERT INTO `script_waypoint` VALUES
    (30017, 5, 5808.862, -2965.138, 277.089, 0, ''),
    (30017, 6, 5811.703, -2970.821, 273.569, 0, ''),
    (30017, 7, 5789.979, -2980.250, 273.584, 0, '');
+
+DELETE FROM `script_waypoint` WHERE `entry` IN(25504, 25589);
+INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`, `location_y`, `location_z`,`waittime`,`point_comment`) VALUES
+(25504,1,'2882.26','6734.51','32.8864',0,'Mootoo the Younger'),
+(25504,2,'2877.37','6731.59','32.8721',0,'Mootoo the Younger'),
+(25504,3,'2874.18','6725.85','30.3087',0,'Mootoo the Younger'),
+(25504,4,'2866.36','6726.04','26.7277',0,'Mootoo the Younger'),
+(25504,5,'2863.97','6731.91','23.8372',0,'Mootoo the Younger'),
+(25504,6,'2869.29','6736.92','20.5227',0,'Mootoo the Younger'),
+(25504,7,'2874.16','6731.88','18.5042',0,'Mootoo the Younger'),
+(25504,8,'2887.05','6736.39','13.997',0,'Mootoo the Younger'),
+(25504,9,'2901.68','6741.25','14.0413',0,'Mootoo the Younger'),
+(25504,10,'2919.45','6746.28','13.7325',5000,'Mootoo the Younger'),
+(25504,11,'2947.18','6738.71','12.7117',0,'Mootoo the Younger'),
+(25504,12,'2982.43','6748.59','10.2755',5000,'Mootoo the Younger'),
+(25504,13,'2985.05','6776.05','8.33081',0,'Mootoo the Younger'),
+(25504,14,'2978.72','6801.48','5.83056',0,'Mootoo the Younger'),
+(25504,15,'2957.81','6818.86','4.7594',0,'Mootoo the Younger'),
+(25504,16,'2917.03','6820.55','5.87954',5000,'Mootoo the Younger'),
+(25504,17,'2890.04','6825.68','4.11676',0,'Mootoo the Younger'),
+(25504,18,'2850.31','6812.35','2.09411',0,'Mootoo the Younger'),
+(25504,19,'2821.29','6797.99','4.49696',0,'Mootoo the Younger'),
+(25504,20,'2798.25','6770.64','5.0632',1000,'Mootoo the Younger'),
+(25504,21,'2807.49','6748.29','8.25933',5000,'Mootoo the Younger');
+
+INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`, `location_y`, `location_z`,`waittime`) VALUES
+(25589, 1,'4462.37','5372.75','-15.2912',0),
+(25589, 2,'4478.7','5377.27','-15.0012',5000),
+(25589, 3,'4482.25','5390.64','-15.2354',0),
+(25589, 4,'4477.09','5405.02','-15.2386',0),
+(25589, 5,'4468.71','5416.9','-15.2602',0),
+(25589, 6,'4457.24','5426.87','-15.6104',0),
+(25589, 7,'4439.7','5433.46','-15.2384',0),
+(25589, 8,'4422.63','5432.32','-14.8822',0),
+(25589, 9,'4404.71','5422.74','-14.4494',0),
+(25589, 10,'4394.68','5406.63','-10.8423',0),
+(25589, 11,'4391.99','5392.88','-6.45477',0),
+(25589, 12,'4390.65','5370.91','0.504708',0),
+(25589, 13,'4393.34','5354.19','3.1859',0),
+(25589, 14,'4401.68','5342.78','5.20245',0),
+(25589, 15,'4417.98','5335.18','8.31299',0),
+(25589, 16,'4431.01','5335.17','11.0135',0),
+(25589, 17,'4446.21','5340.58','14.4585',0),
+(25589, 18,'4462.73','5350.22','16.8783',0),
+(25589, 19,'4475.06','5362.82','19.1229',0),
+(25589, 20,'4480.92','5381.72','22.2479',0),
+(25589, 21,'4481.31','5394.2','26.2008',0),
+(25589, 22,'4476.32','5409.12','29.0811',5000),
+(25589, 23,'4466.33','5420.75','31.8093',0),
+(25589, 24,'4450.66','5430.03','36.2843',0),
+(25589, 25,'4431.24','5433.77','38.2282',0),
+(25589, 26,'4417.65','5437.11','40.2429',0),
+(25589, 27,'4402.5','5440.94','42.7727',0),
+(25589, 28,'4387.11','5450.98','48.6992',0),
+(25589, 29,'4364.52','5468.98','48.8229',0),
+(25589, 30,'4344.02','5483.26','48.0509',0);
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index b1b11eeee83..26e8464fbb0 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1,4 +1,4 @@
--- Up to TC2 6857
+-- Up to TC2 6859
 
 -- Cleanup first
 UPDATE `creature_template` SET `ScriptName`='';
@@ -384,8 +384,9 @@ UPDATE `creature_template` SET `ScriptName`='npc_thassarian' WHERE `entry`=26170
 UPDATE `creature_template` SET `ScriptName`='npc_image_lich_king' WHERE `entry`=26203;
 UPDATE `creature_template` SET `ScriptName`='npc_counselor_talbot' WHERE `entry`=25301;
 UPDATE `creature_template` SET `ScriptName`='npc_beryl_sorcerer' WHERE `entry`=25316;
-UPDATE `creature_template` SET `ScriptName` ='npc_imprisoned_beryl_sorcerer' WHERE `entry` = 25478;
-
+UPDATE `creature_template` SET `ScriptName`='npc_imprisoned_beryl_sorcerer' WHERE `entry` = 25478;
+UPDATE `creature_template` SET `ScriptName`='npc_mootoo_the_younger' WHERE `entry`= 25504;
+UPDATE `creature_template` SET `ScriptName`='npc_bonker_togglevolt' WHERE `entry`= 25589;
 
 /* BURNING STEPPES */
 UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
diff --git a/sql/updates/6859_world_script_texts.sql b/sql/updates/6859_world_script_texts.sql
new file mode 100644
index 00000000000..2029fb79915
--- /dev/null
+++ b/sql/updates/6859_world_script_texts.sql
@@ -0,0 +1,10 @@
+DELETE FROM `script_texts` WHERE `npc_entry` IN (25504, 25589);
+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 
+(25504, -1750040, 'My father''s aura is quite strong, he cannot be far. Could you be a doll and fight off the monsters wandering throught the mist?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+(25504, -1750041, 'Watch out for the monsters!Which way should we go first? Let''s try this way...', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+(25504, -1750042, 'What could this be?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+(25504, -1750043, 'There''s no sign of it ending! Where could my father be?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+(25504, -1750044, 'Father! You''re safe!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'npc_mootoo_the_younger'),
+(25589, -1700003, 'I\'ll make you a deal: If you get me out of here alive, you\'ll get a reward larger than you can imagine!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','npc_bonker_togglevolt'),
+(25589, -1700002, 'I AM NOT AN APPETIZER!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','npc_bonker_togglevolt'),
+(25589, -1700001, 'Right then, no time to waste. Lets get outa here!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','0','0','0','npc_bonker_togglevolt');
diff --git a/sql/updates/6859_world_script_waypoints.sql b/sql/updates/6859_world_script_waypoints.sql
new file mode 100644
index 00000000000..aa9b67fe23c
--- /dev/null
+++ b/sql/updates/6859_world_script_waypoints.sql
@@ -0,0 +1,55 @@
+DELETE FROM `script_waypoint` WHERE `entry` IN(25504, 25589);
+INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`, `location_y`, `location_z`,`waittime`,`point_comment`) VALUES
+(25504,1,'2882.26','6734.51','32.8864',0,'Mootoo the Younger'),
+(25504,2,'2877.37','6731.59','32.8721',0,'Mootoo the Younger'),
+(25504,3,'2874.18','6725.85','30.3087',0,'Mootoo the Younger'),
+(25504,4,'2866.36','6726.04','26.7277',0,'Mootoo the Younger'),
+(25504,5,'2863.97','6731.91','23.8372',0,'Mootoo the Younger'),
+(25504,6,'2869.29','6736.92','20.5227',0,'Mootoo the Younger'),
+(25504,7,'2874.16','6731.88','18.5042',0,'Mootoo the Younger'),
+(25504,8,'2887.05','6736.39','13.997',0,'Mootoo the Younger'),
+(25504,9,'2901.68','6741.25','14.0413',0,'Mootoo the Younger'),
+(25504,10,'2919.45','6746.28','13.7325',5000,'Mootoo the Younger'),
+(25504,11,'2947.18','6738.71','12.7117',0,'Mootoo the Younger'),
+(25504,12,'2982.43','6748.59','10.2755',5000,'Mootoo the Younger'),
+(25504,13,'2985.05','6776.05','8.33081',0,'Mootoo the Younger'),
+(25504,14,'2978.72','6801.48','5.83056',0,'Mootoo the Younger'),
+(25504,15,'2957.81','6818.86','4.7594',0,'Mootoo the Younger'),
+(25504,16,'2917.03','6820.55','5.87954',5000,'Mootoo the Younger'),
+(25504,17,'2890.04','6825.68','4.11676',0,'Mootoo the Younger'),
+(25504,18,'2850.31','6812.35','2.09411',0,'Mootoo the Younger'),
+(25504,19,'2821.29','6797.99','4.49696',0,'Mootoo the Younger'),
+(25504,20,'2798.25','6770.64','5.0632',1000,'Mootoo the Younger'),
+(25504,21,'2807.49','6748.29','8.25933',5000,'Mootoo the Younger');
+
+INSERT INTO `script_waypoint` (`entry`,`pointid`,`location_x`, `location_y`, `location_z`,`waittime`) VALUES
+(25589, 1,'4462.37','5372.75','-15.2912',0),
+(25589, 2,'4478.7','5377.27','-15.0012',5000),
+(25589, 3,'4482.25','5390.64','-15.2354',0),
+(25589, 4,'4477.09','5405.02','-15.2386',0),
+(25589, 5,'4468.71','5416.9','-15.2602',0),
+(25589, 6,'4457.24','5426.87','-15.6104',0),
+(25589, 7,'4439.7','5433.46','-15.2384',0),
+(25589, 8,'4422.63','5432.32','-14.8822',0),
+(25589, 9,'4404.71','5422.74','-14.4494',0),
+(25589, 10,'4394.68','5406.63','-10.8423',0),
+(25589, 11,'4391.99','5392.88','-6.45477',0),
+(25589, 12,'4390.65','5370.91','0.504708',0),
+(25589, 13,'4393.34','5354.19','3.1859',0),
+(25589, 14,'4401.68','5342.78','5.20245',0),
+(25589, 15,'4417.98','5335.18','8.31299',0),
+(25589, 16,'4431.01','5335.17','11.0135',0),
+(25589, 17,'4446.21','5340.58','14.4585',0),
+(25589, 18,'4462.73','5350.22','16.8783',0),
+(25589, 19,'4475.06','5362.82','19.1229',0),
+(25589, 20,'4480.92','5381.72','22.2479',0),
+(25589, 21,'4481.31','5394.2','26.2008',0),
+(25589, 22,'4476.32','5409.12','29.0811',5000),
+(25589, 23,'4466.33','5420.75','31.8093',0),
+(25589, 24,'4450.66','5430.03','36.2843',0),
+(25589, 25,'4431.24','5433.77','38.2282',0),
+(25589, 26,'4417.65','5437.11','40.2429',0),
+(25589, 27,'4402.5','5440.94','42.7727',0),
+(25589, 28,'4387.11','5450.98','48.6992',0),
+(25589, 29,'4364.52','5468.98','48.8229',0),
+(25589, 30,'4344.02','5483.26','48.0509',0);
diff --git a/sql/updates/6859_world_scriptnames.sql b/sql/updates/6859_world_scriptnames.sql
new file mode 100644
index 00000000000..5e53cfeb337
--- /dev/null
+++ b/sql/updates/6859_world_scriptnames.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='npc_mootoo_the_younger' WHERE `entry`=25504;
+UPDATE `creature_template` SET `ScriptName`='npc_bonker_togglevolt' WHERE `entry`=25589;