From 91f3d69edf754c4e62d973cf1ae81e9a2e36d7bc Mon Sep 17 00:00:00 2001
From: Kudlaty <none@none>
Date: Sun, 16 Aug 2009 21:46:31 +0200
Subject: Merge [SD2] r1314 Correct some spellId's and apply SD2 code style
 r1315 Correct more spells and apply SD2 code style r1316 Replace magic number
 with enum type name UNIT_DYNFLAG_DEAD r1317 Add support for quest 1249. Patch
 by jotapdiez r1318 Move AI's implementation from headers. Original patch/idea
 by DasBlub r1319 Convert script related to quest 938 to use followerAI r1320
 Add new virtual function WaypointStart() to escortAI.

--HG--
branch : trunk
---
 sql/FULL/world_script_waypoints.sql | 10 ++++++++++
 sql/FULL/world_scripts_full.sql     |  2 ++
 sql/updates/5096_world_scripts.sql  | 12 ++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 sql/updates/5096_world_scripts.sql

(limited to 'sql')

diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index e6884155154..9dfa805c30f 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -13,6 +13,16 @@ CREATE TABLE script_waypoint (
   PRIMARY KEY (entry, pointid)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
 
+DELETE FROM script_waypoint WHERE entry=4962;
+INSERT INTO script_waypoint VALUES
+(4962, 0, -3804.438965, -828.048035, 10.093068, 0, ''),
+(4962, 1, -3803.934326, -835.772400, 10.077722, 0, ''),
+(4962, 2, -3792.629150, -835.670898,  9.655657, 0, ''),
+(4962, 3, -3772.433838, -835.345947, 10.868981, 0, ''),
+(4962, 4, -3765.937256, -840.128601, 10.885593, 0, ''),
+(4962, 5, -3738.633789, -830.997498, 11.057384, 0, ''),
+(4962, 6, -3690.224121, -862.261597,  9.960449, 0, '');
+
 DELETE FROM script_waypoint WHERE entry=10638;
 INSERT INTO script_waypoint VALUES
 (10638, 0, -4903.521973, -1368.339844, -52.611, 5000, 'SAY_KAN_START'),
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index af5e9af4800..88f51044f53 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1086,6 +1086,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=4
 UPDATE `creature_template` SET `ScriptName`='npc_daphne_stilwell' WHERE `entry`=6182;
 
 /* WETLANDS */
+UPDATE creature_template SET ScriptName='npc_tapoke_slim_jahn' WHERE entry=4962;
+UPDATE creature_template SET ScriptName='npc_mikhail' WHERE entry=4963;
 
 /* WINTERSPRING */
 UPDATE `creature_template` SET `ScriptName`='npc_lorax' WHERE `entry`=10918;
diff --git a/sql/updates/5096_world_scripts.sql b/sql/updates/5096_world_scripts.sql
new file mode 100644
index 00000000000..37bf49f3d7d
--- /dev/null
+++ b/sql/updates/5096_world_scripts.sql
@@ -0,0 +1,12 @@
+UPDATE creature_template SET ScriptName='npc_tapoke_slim_jahn' WHERE entry=4962;
+UPDATE creature_template SET ScriptName='npc_mikhail' WHERE entry=4963;
+
+DELETE FROM script_waypoint WHERE entry=4962;
+INSERT INTO script_waypoint VALUES
+(4962, 0, -3804.438965, -828.048035, 10.093068, 0, ''),
+(4962, 1, -3803.934326, -835.772400, 10.077722, 0, ''),
+(4962, 2, -3792.629150, -835.670898,  9.655657, 0, ''),
+(4962, 3, -3772.433838, -835.345947, 10.868981, 0, ''),
+(4962, 4, -3765.937256, -840.128601, 10.885593, 0, ''),
+(4962, 5, -3738.633789, -830.997498, 11.057384, 0, ''),
+(4962, 6, -3690.224121, -862.261597,  9.960449, 0, '');
-- 
cgit v1.2.3