aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/FULL/world_script_texts.sql7
-rw-r--r--sql/FULL/world_script_waypoints.sql8
-rw-r--r--sql/FULL/world_scripts_full.sql2
-rw-r--r--sql/updates/6889_world_script_texts.sql4
-rw-r--r--sql/updates/6889_world_script_waypoints.sql7
-rw-r--r--sql/updates/6889_world_scriptnames.sql1
6 files changed, 25 insertions, 4 deletions
diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 5bfab83de77..896357606b6 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -469,9 +469,10 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
(4508,-1047010,'Many thanks for your help.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'Willix'),
-- -1 048 000 BLACKFATHOM DEEPS
- (4832,-1048000,'Just...Dust...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5803,1,0,0,''),
- (4832,-1048001,'Sleep...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5804,1,0,0,''),
- (4832,-1048002,'Who dares disturb my meditation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5805,1,0,0,''),
+ (4832,-1048000,'Just...Dust...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5803,1,0,0,''), (4832,-1048001,'Sleep...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5804,1,0,0,''),
+(4832,-1048002,'Who dares disturb my meditation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,5805,1,0,0,''),
+(6729,-1048003,'Aku''mai is dead! At last, I can leave this wretched place.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
+(6729,-1048004,'Speak with me to hear my tale',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,''),
-- -1 060 000 863_world_scripts.sql
(0,-1060005,'REUSE',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'REUSE'),
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index 749b9d0a3d5..9899047e9bf 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -1963,3 +1963,11 @@ INSERT INTO `script_waypoint` VALUES
(349,113,-9264.73,-2292.92,70.0089,0,''),
(349,114,-9272.24,-2293.79,68.6096,0,''),
(349,115,-9277.03,-2295.98,68.1135,10000,'');
+
+DELETE FROM `script_waypoint` WHERE `entry`=6729;
+INSERT INTO `script_waypoint` VALUES
+(6729,1,-861.803,-460.36,-33.8918,0,''),
+(6729,2,-856.168,-464.425,-33.9223,0,''),
+(6729,3,-849.964,-469.231,-34.0381,0,''),
+(6729,4,-839.838,-473.654,-34.0535,0,''),
+(6729,5,-837.417,-473.105,-34.0288,0,'');
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 4351a250591..bc6278a3cdc 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -290,7 +290,7 @@ UPDATE `creature_template` SET `ScriptName`='boss_gelihast' WHERE `entry`=6243;
UPDATE `creature_template` SET `ScriptName`='boss_kelris' WHERE `entry`=4832;
UPDATE `creature_template` SET `ScriptName`='boss_aku_mai' WHERE `entry`=4829;
UPDATE `creature_template` SET `ScriptName`='npc_blackfathom_deeps_event' WHERE `entry` IN (4823,4825,4977,4978);
-
+UPDATE `creature_template` SET `ScriptName`='npc_morridune' WHERE `entry`=6729;
/* BLACKROCK DEPTHS */
UPDATE `instance_template` SET `script`='instance_blackrock_depths' WHERE `map`=230;
diff --git a/sql/updates/6889_world_script_texts.sql b/sql/updates/6889_world_script_texts.sql
new file mode 100644
index 00000000000..4186a4f0591
--- /dev/null
+++ b/sql/updates/6889_world_script_texts.sql
@@ -0,0 +1,4 @@
+DELETE FROM `script_texts` WHERE `entry` IN (-1048003,-1048004);
+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
+(6729,-1048003,'Aku''mai is dead! At last, I can leave this wretched place.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,1,0,0,''),
+(6729,-1048004,'Speak with me to hear my tale',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0,0,'');
diff --git a/sql/updates/6889_world_script_waypoints.sql b/sql/updates/6889_world_script_waypoints.sql
new file mode 100644
index 00000000000..c3eb3d37e97
--- /dev/null
+++ b/sql/updates/6889_world_script_waypoints.sql
@@ -0,0 +1,7 @@
+DELETE FROM `script_waypoint` WHERE `entry`=6729;
+INSERT INTO `script_waypoint` VALUES
+(6729,1,-861.803,-460.36,-33.8918,0,''),
+(6729,2,-856.168,-464.425,-33.9223,0,''),
+(6729,3,-849.964,-469.231,-34.0381,0,''),
+(6729,4,-839.838,-473.654,-34.0535,0,''),
+(6729,5,-837.417,-473.105,-34.0288,0,'');
diff --git a/sql/updates/6889_world_scriptnames.sql b/sql/updates/6889_world_scriptnames.sql
new file mode 100644
index 00000000000..71957535bac
--- /dev/null
+++ b/sql/updates/6889_world_scriptnames.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='npc_morridune' WHERE `entry`=6729;