merge

--HG--
branch : trunk

5 files changed, 47 insertions, 10 deletions

diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 91b416b5e3f..5aae839f3ec 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -1031,14 +1031,31 @@ INSERT INTO `script_waypoint` VALUES
 (3678, 23, 114.619, 235.908, -96.0495, 0, ''),
 (3678, 24, 114.777, 237.155, -96.0304, 2500, 'NARALEX_EVENT_FINISHED');
 
-/* EOF */
+DELETE FROM `script_waypoint` WHERE `entry` = 22424;
+INSERT INTO `script_waypoint` VALUES
+('22424','0','-3605.719971','4175.580078','-0.031817','0','START_SKYWING'),
+('22424','1','-3602.311279','4253.213867','0.562436','0',''),
+('22424','2','-3529.151367','4263.524414','-7.871151','0',''),
+('22424','3','-3448.130371','4257.990723','-11.626289','0',''),
+('22424','4','-3377.783936','4209.064941','-9.476727','0',''),
+('22424','5','-3378.211426','4154.628418','0.366330','0',''),
+('22424','6','-3376.920166','4085.501709','14.178538','0',''),
+('22424','7','-3399.274658','4055.948975','18.603474','0',''),
+('22424','8','-3432.678223','4054.069824','29.588032','10000','');
+
+DELETE FROM `script_waypoint` WHERE `entry` = 22377;
+INSERT INTO `script_waypoint` VALUES
+(22377, 0, -2766.31, 5429.65, -34.53, 0, ''),
+(22377, 1, -2769.35, 5416.25, -34.53, 0, ''),
+(22377, 2, -2780.07, 5416.06, -34.53, 1000, ''),
+(22377, 3, -2812.56, 5415.20, -34.53, 1000, ''),
+(22377, 4, -2816.95, 5415.02, -34.52, 0, ''),
+(22377, 5, -2827.86, 5414.56, -28.29, 0, ''),
+(22377, 6, -2878.32, 5414.11, -28.26, 0, ''),
+(22377, 7, -2893.17, 5413.15, -18.59, 0, ''),
+(22377, 8, -2896.36, 5409.65, -18.59, 0, ''),
+(22377, 9, -2896.50, 5396.76, -8.77, 0, ''),
+(22377, 10, -2896.67, 5366.20, -9.59, 0, ''),
+(22377, 11, -2888.23, 5330.39, -11.19, 2000, '');
 
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','0','-3605.719971','4175.580078','-0.031817','0','START_SKYWING');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','1','-3602.311279','4253.213867','0.562436','0','');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','2','-3529.151367','4263.524414','-7.871151','0','');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','3','-3448.130371','4257.990723','-11.626289','0','');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','4','-3377.783936','4209.064941','-9.476727','0','');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','5','-3378.211426','4154.628418','0.366330','0','');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','6','-3376.920166','4085.501709','14.178538','0','');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','7','-3399.274658','4055.948975','18.603474','0','');
-insert into `script_waypoint` (`entry`, `pointid`, `location_x`, `location_y`, `location_z`, `waittime`, `point_comment`) values('22424','8','-3432.678223','4054.069824','29.588032','10000','');
\ No newline at end of file
+/* EOF */
\ No newline at end of file
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 4bd45feb993..fa83cee479a 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -109,6 +109,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_valkyr_battle_maiden' WHERE `en
 UPDATE `creature_template` SET `ScriptName`='npc_mirror_image' WHERE `entry`=31216;
 UPDATE `creature_template` SET `ScriptName`='npc_training_dummy' WHERE `entry` IN (17578,24792,32543,32546,32542,32545,30527,31143,31144,31146,32541,32666,32667);
 UPDATE `creature_template` SET `ScriptName`='npc_lightwell' WHERE `entry` IN (31883,31893,31894,31895,31896,31897);
+UPDATE `creature_template` SET `ScriptName`='npc_ebon_gargoyle' WHERE `entry`=27829;
 
 /*  */
 /* ZONE */
@@ -997,6 +998,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_floon' WHERE `entry`=18588;
 UPDATE `creature_template` SET `ScriptName`='npc_isla_starmane' WHERE `entry`=18760;
 UPDATE `creature_template` SET `ScriptName`='mob_unkor_the_ruthless' WHERE `entry`=18262;
 UPDATE `creature_template` SET `ScriptName`='npc_slim' WHERE `entry`=19679;
+UPDATE `creature_template` SET `ScriptName`='npc_akuno' WHERE `entry`=22377;
 
 /* THOUSAND NEEDLES */
 UPDATE `creature_template` SET `ScriptName`='npc_paoka_swiftmountain' WHERE `entry`=10427;
diff --git a/sql/updates/5009_world.sql b/sql/updates/5009_world.sql
new file mode 100644
index 00000000000..0a50905614a
--- /dev/null
+++ b/sql/updates/5009_world.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_ebon_gargoyle' WHERE `entry`=27829;
\ No newline at end of file
diff --git a/sql/updates/5009_world_TDB.sql b/sql/updates/5009_world_TDB.sql
new file mode 100644
index 00000000000..574546fb60b
--- /dev/null
+++ b/sql/updates/5009_world_TDB.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `spell1`=51963 WHERE `entry`=27829;
\ No newline at end of file
diff --git a/sql/updates/5009_world_scripts.sql b/sql/updates/5009_world_scripts.sql
new file mode 100644
index 00000000000..732614d4ad9
--- /dev/null
+++ b/sql/updates/5009_world_scripts.sql
@@ -0,0 +1,16 @@
+UPDATE `creature_template` SET `ScriptName`='npc_akuno' WHERE `entry`=22377;
+
+DELETE FROM `script_waypoint` WHERE `entry`=22377;
+INSERT INTO `script_waypoint` VALUES
+(22377, 0, -2766.31, 5429.65, -34.53, 0, ''),
+(22377, 1, -2769.35, 5416.25, -34.53, 0, ''),
+(22377, 2, -2780.07, 5416.06, -34.53, 1000, ''),
+(22377, 3, -2812.56, 5415.20, -34.53, 1000, ''),
+(22377, 4, -2816.95, 5415.02, -34.52, 0, ''),
+(22377, 5, -2827.86, 5414.56, -28.29, 0, ''),
+(22377, 6, -2878.32, 5414.11, -28.26, 0, ''),
+(22377, 7, -2893.17, 5413.15, -18.59, 0, ''),
+(22377, 8, -2896.36, 5409.65, -18.59, 0, ''),
+(22377, 9, -2896.50, 5396.76, -8.77, 0, ''),
+(22377, 10, -2896.67, 5366.20, -9.59, 0, ''),
+(22377, 11, -2888.23, 5330.39, -11.19, 2000, '');