From 28d0feabe2bc6ab60a11eeaf822965d6d63f8c61 Mon Sep 17 00:00:00 2001
From: Drahy <none@none>
Date: Wed, 20 May 2009 04:25:27 +0200
Subject: * Used trinity sql coding style

--HG--
branch : trunk
---
 sql/updates/3233_world_scripts_naxx.sql            |  2 +-
 sql/updates/3358_world_spell_bonus_data.sql        |  2 +-
 sql/updates/3373_world_spell.sql                   |  2 +-
 .../3375_mangos_7839_01_world_trinity_string.sql   |  4 ++
 sql/updates/3375_mangos_7839_02_world_command.sql  | 22 ++++++++++
 sql/updates/3392_world_spell_proc_event.sql        |  2 +-
 sql/updates/3394_world_spell_bonus_data.sql        |  2 +-
 sql/updates/3409_world_spell_proc_event.sql        |  3 +-
 sql/updates/3410_world.sql                         | 31 -------------
 sql/updates/3410_world_SD2_scripts.sql             | 31 +++++++++++++
 sql/updates/3414_mangos_7850_01_world_command.sql  |  6 +++
 sql/updates/3416_mangos_7855_01_world_pools.sql    | 13 ++++++
 sql/updates/3419_world.sql                         | 51 ----------------------
 sql/updates/3419_world_SD2_scripts.sql             | 51 ++++++++++++++++++++++
 sql/updates/7839_01_mangos_mangos_string.sql       |  6 ---
 sql/updates/7839_02_mangos_command.sql             | 22 ----------
 sql/updates/7850_01_mangos_command.sql             |  7 ---
 sql/updates/7855_01_mangos_pools.sql               | 13 ------
 18 files changed, 133 insertions(+), 137 deletions(-)
 create mode 100644 sql/updates/3375_mangos_7839_01_world_trinity_string.sql
 create mode 100644 sql/updates/3375_mangos_7839_02_world_command.sql
 delete mode 100644 sql/updates/3410_world.sql
 create mode 100644 sql/updates/3410_world_SD2_scripts.sql
 create mode 100644 sql/updates/3414_mangos_7850_01_world_command.sql
 create mode 100644 sql/updates/3416_mangos_7855_01_world_pools.sql
 delete mode 100644 sql/updates/3419_world.sql
 create mode 100644 sql/updates/3419_world_SD2_scripts.sql
 delete mode 100644 sql/updates/7839_01_mangos_mangos_string.sql
 delete mode 100644 sql/updates/7839_02_mangos_command.sql
 delete mode 100644 sql/updates/7850_01_mangos_command.sql
 delete mode 100644 sql/updates/7855_01_mangos_pools.sql

(limited to 'sql')

diff --git a/sql/updates/3233_world_scripts_naxx.sql b/sql/updates/3233_world_scripts_naxx.sql
index 230ca99b867..fc582058259 100644
--- a/sql/updates/3233_world_scripts_naxx.sql
+++ b/sql/updates/3233_world_scripts_naxx.sql
@@ -1,4 +1,4 @@
-DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-28169,28732,54097);
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (28732,54097,-29865,-55053,-28169,28059,39088,-28059,-39088,28062,39090,28084,39091,-28084,-39091,28085,39093);
 INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
 ( 28732,-28798,  1, 'Widow\'s Embrace - Frenzy'),
 ( 54097,-54100,  1, 'Widow\'s Embrace - Frenzy (H)'),
diff --git a/sql/updates/3358_world_spell_bonus_data.sql b/sql/updates/3358_world_spell_bonus_data.sql
index e2cb0aa706b..5f06839a164 100644
--- a/sql/updates/3358_world_spell_bonus_data.sql
+++ b/sql/updates/3358_world_spell_bonus_data.sql
@@ -1 +1 @@
-UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `spell_bonus_data`.`entry` =33763;
+UPDATE `spell_bonus_data` SET `direct_bonus` = '0.6453' WHERE `spell_bonus_data`.`entry` =33763;
\ No newline at end of file
diff --git a/sql/updates/3373_world_spell.sql b/sql/updates/3373_world_spell.sql
index 23fe9bac842..cbe123889a2 100644
--- a/sql/updates/3373_world_spell.sql
+++ b/sql/updates/3373_world_spell.sql
@@ -1,2 +1,2 @@
 DELETE FROM spell_linked_spell WHERE `spell_trigger` IN (38528);
-DELETE FROM spell_proc_event WHERE `entry` IN (31785, 33776);
+DELETE FROM spell_proc_event WHERE `entry` IN (31785, 33776);
\ No newline at end of file
diff --git a/sql/updates/3375_mangos_7839_01_world_trinity_string.sql b/sql/updates/3375_mangos_7839_01_world_trinity_string.sql
new file mode 100644
index 00000000000..3ce333869e6
--- /dev/null
+++ b/sql/updates/3375_mangos_7839_01_world_trinity_string.sql
@@ -0,0 +1,4 @@
+DELETE FROM trinity_string WHERE entry IN(283);
+UPDATE trinity_string SET entry = 5011 WHERE entry = 171;
+INSERT INTO trinity_string VALUES
+(171,'You can\'t teleport self to self!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/3375_mangos_7839_02_world_command.sql b/sql/updates/3375_mangos_7839_02_world_command.sql
new file mode 100644
index 00000000000..597f5fd6cf8
--- /dev/null
+++ b/sql/updates/3375_mangos_7839_02_world_command.sql
@@ -0,0 +1,22 @@
+/* ALTER TABLE db_version CHANGE COLUMN required_7839_01_mangos_mangos_string required_7839_02_mangos_command bit;*/
+
+DELETE FROM `command` WHERE `name` IN (
+   'baninfo account','baninfo character','baninfo ip','goname','groupgo',
+   'guild create','guild invite','guild rank','guild uninvite','mute',
+   'namego','tele name','unmute'
+);
+
+INSERT INTO `command` VALUES
+('baninfo account',3,'Syntax: .baninfo account $accountid\r\nWatch full information about a specific ban.'),
+('baninfo character',3,'Syntax: .baninfo character $charactername \r\nWatch full information about a specific ban.'),
+('baninfo ip',3,'Syntax: .baninfo ip $ip\r\nWatch full information about a specific ban.'),
+('goname',1,'Syntax: .goname [$charactername]\r\n\r\nTeleport to the given character. Either specify the character name or click on the character\'s portrait, e.g. when you are in a group. Character can be offline.'),
+('groupgo',1,'Syntax: .groupgo [$charactername]\r\n\r\nTeleport the given character and his group to you. Teleported only online characters but original selected group member can be offline.'),
+('guild create',2,'Syntax: .guild create [$GuildLeaderName] $GuildName\r\n\r\nCreate a guild named $GuildName with the player $GuildLeaderName (or selected) as leader.'),
+('guild invite',2,'Syntax: .guild invite [$CharacterName] $GuildName\r\n\r\nAdd player $CharacterName (or selected) into a guild $GuildName.'),
+('guild rank',2,'Syntax: .guild rank [$CharacterName] #Rank\r\n\r\nSet for player $CharacterName (or selected) rank #Rank in a guild.'),
+('guild uninvite',2,'Syntax: .guild uninvite [$CharacterName]\r\n\r\nRemove player $CharacterName (or selected) from a guild.'),
+('mute',1,'Syntax: .mute [$playerName] $timeInMinutes\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.'),
+('namego',1,'Syntax: .namego [$charactername]\r\n\r\nTeleport the given character to you. Character can be offline.'),
+('tele name',1,'Syntax: .tele name [#playername] #location\r\n\r\nTeleport the given character to a given location. Character can be offline.'),
+('unmute',1,'Syntax: .unmute [$playerName]\r\n\r\nRestore chat messaging for any character from account of character $playerName (or selected). Character can be ofline.');
\ No newline at end of file
diff --git a/sql/updates/3392_world_spell_proc_event.sql b/sql/updates/3392_world_spell_proc_event.sql
index d0965c1a7ab..6358fe166a3 100644
--- a/sql/updates/3392_world_spell_proc_event.sql
+++ b/sql/updates/3392_world_spell_proc_event.sql
@@ -17,4 +17,4 @@ VALUES
 (60529, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45),
 (60717, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 100.000000, 0),
 (62147, 0x00, 15, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0),
-(57907, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
+(57907, 0x00, 7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/3394_world_spell_bonus_data.sql b/sql/updates/3394_world_spell_bonus_data.sql
index d960ae5ca06..9c4443b0a19 100644
--- a/sql/updates/3394_world_spell_bonus_data.sql
+++ b/sql/updates/3394_world_spell_bonus_data.sql
@@ -7,4 +7,4 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
 (53194, 0.05, 0, 0, 'Druid - Starfall rank 3'),
 (53189, 0.012, 0, 0, 'Druid - Starfall AOE rank 3'),
 (53195, 0.05, 0, 0, 'Druid - Starfall rank 4'),
-(53190, 0.012, 0, 0, 'Druid - Starfall AOE rank 4');
+(53190, 0.012, 0, 0, 'Druid - Starfall AOE rank 4');
\ No newline at end of file
diff --git a/sql/updates/3409_world_spell_proc_event.sql b/sql/updates/3409_world_spell_proc_event.sql
index 47b1fab8aa9..9e78b36bae8 100644
--- a/sql/updates/3409_world_spell_proc_event.sql
+++ b/sql/updates/3409_world_spell_proc_event.sql
@@ -1,9 +1,8 @@
 DELETE FROM `spell_proc_event` WHERE `entry` IN (31878, 31877, 31876, 46913, 46914, 46915);
-
 INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES
 (31876, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
 (31877, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
 (31878, 0, 10, 8388608, 0, 0, 0, 0, 0, 0, 0),
 (46913, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0),
 (46914, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0),
-(46915, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0);
+(46915, 0, 4, 0, 1024, 0, 0, 0, 0, 0, 0);
\ No newline at end of file
diff --git a/sql/updates/3410_world.sql b/sql/updates/3410_world.sql
deleted file mode 100644
index 9a54cea49db..00000000000
--- a/sql/updates/3410_world.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-UPDATE `creature_template` SET `ScriptName` = 'npc_daphne_stilwell' WHERE `entry` = 6182;
-
-DELETE FROM `script_waypoint` WHERE `entry` = 6182;
-INSERT INTO `script_waypoint` VALUES
-(6182, 0, -11480.684570, 1545.091187, 49.898571, 0, ''),
-(6182, 1, -11466.825195, 1530.151733, 50.263611, 0, ''),
-(6182, 2, -11465.213867, 1528.343750, 50.954369, 0, 'entrance hut'),
-(6182, 3, -11462.990234, 1525.235596, 50.937702, 0, ''),
-(6182, 4, -11461.000000, 1526.614014, 50.937702, 5000, 'pick up rifle'),
-(6182, 5, -11462.990234, 1525.235596, 50.937702, 0, ''),
-(6182, 6, -11465.213867, 1528.343750, 50.954369, 0, ''),
-(6182, 7, -11468.353516, 1535.075562, 50.400948, 15000, 'hold, prepare for wave1'),
-(6182, 8, -11468.353516, 1535.075562, 50.400948, 15000, 'hold, prepare for wave2'),
-(6182, 9, -11468.353516, 1535.075562, 50.400948, 10000, 'hold, prepare for wave3'),
-(6182, 10, -11467.898438, 1532.459595, 50.348885, 0, 'we are done'),
-(6182, 11, -11466.064453, 1529.855225, 50.209351, 0, ''),
-(6182, 12, -11462.990234, 1525.235596, 50.937702, 0, ''),
-(6182, 13, -11461.000000, 1526.614014, 50.937702, 5000, 'deliver rifle'),
-(6182, 14, -11462.990234, 1525.235596, 50.937702, 0, ''),
-(6182, 15, -11465.213867, 1528.343750, 50.954369, 0, ''),
-(6182, 16, -11470.260742, 1537.276733, 50.378487, 0, ''),
-(6182, 17, -11475.581055, 1548.678833, 50.184380, 0, 'complete quest'),
-(6182, 18, -11482.299805, 1557.410034, 48.624519, 0, '');
-
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000406 AND -1000402;
-INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES
-(-1000402, 'To the house! Stay close to me, no matter what! I have my gun and ammo there!', 0, 0, 7, 0, 'stilwell SAY_DS_START'),
-(-1000403, 'We showed that one!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_1'),
-(-1000404, 'One more down!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_2'),
-(-1000405, 'We\'ve done it! We won!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_3'),
-(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE');
diff --git a/sql/updates/3410_world_SD2_scripts.sql b/sql/updates/3410_world_SD2_scripts.sql
new file mode 100644
index 00000000000..57e8f4d37c2
--- /dev/null
+++ b/sql/updates/3410_world_SD2_scripts.sql
@@ -0,0 +1,31 @@
+UPDATE `creature_template` SET `ScriptName` = 'npc_daphne_stilwell' WHERE `entry` = 6182;
+
+DELETE FROM `script_waypoint` WHERE `entry` = 6182;
+INSERT INTO `script_waypoint` VALUES
+(6182, 0, -11480.684570, 1545.091187, 49.898571, 0, ''),
+(6182, 1, -11466.825195, 1530.151733, 50.263611, 0, ''),
+(6182, 2, -11465.213867, 1528.343750, 50.954369, 0, 'entrance hut'),
+(6182, 3, -11462.990234, 1525.235596, 50.937702, 0, ''),
+(6182, 4, -11461.000000, 1526.614014, 50.937702, 5000, 'pick up rifle'),
+(6182, 5, -11462.990234, 1525.235596, 50.937702, 0, ''),
+(6182, 6, -11465.213867, 1528.343750, 50.954369, 0, ''),
+(6182, 7, -11468.353516, 1535.075562, 50.400948, 15000, 'hold, prepare for wave1'),
+(6182, 8, -11468.353516, 1535.075562, 50.400948, 15000, 'hold, prepare for wave2'),
+(6182, 9, -11468.353516, 1535.075562, 50.400948, 10000, 'hold, prepare for wave3'),
+(6182, 10, -11467.898438, 1532.459595, 50.348885, 0, 'we are done'),
+(6182, 11, -11466.064453, 1529.855225, 50.209351, 0, ''),
+(6182, 12, -11462.990234, 1525.235596, 50.937702, 0, ''),
+(6182, 13, -11461.000000, 1526.614014, 50.937702, 5000, 'deliver rifle'),
+(6182, 14, -11462.990234, 1525.235596, 50.937702, 0, ''),
+(6182, 15, -11465.213867, 1528.343750, 50.954369, 0, ''),
+(6182, 16, -11470.260742, 1537.276733, 50.378487, 0, ''),
+(6182, 17, -11475.581055, 1548.678833, 50.184380, 0, 'complete quest'),
+(6182, 18, -11482.299805, 1557.410034, 48.624519, 0, '');
+
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1000406 AND -1000402;
+INSERT INTO `script_texts` (`entry`, `content_default`, `sound`, `type`, `language`, `emote`, `comment`) VALUES
+(-1000402, 'To the house! Stay close to me, no matter what! I have my gun and ammo there!', 0, 0, 7, 0, 'stilwell SAY_DS_START'),
+(-1000403, 'We showed that one!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_1'),
+(-1000404, 'One more down!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_2'),
+(-1000405, 'We\'ve done it! We won!', 0, 0, 7, 0, 'stilwell SAY_DS_DOWN_3'),
+(-1000406, 'Meet me down by the orchard--I just need to put my gun away.', 0, 0, 7, 0, 'stilwell SAY_DS_PROLOGUE');
\ No newline at end of file
diff --git a/sql/updates/3414_mangos_7850_01_world_command.sql b/sql/updates/3414_mangos_7850_01_world_command.sql
new file mode 100644
index 00000000000..b4bc7ce12be
--- /dev/null
+++ b/sql/updates/3414_mangos_7850_01_world_command.sql
@@ -0,0 +1,6 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7839_02_mangos_command required_7850_01_mangos_command bit;*/
+
+DELETE FROM `command` WHERE `name` IN ('character reputation','pinfo');
+INSERT INTO `command` VALUES
+('pinfo',2,'Syntax: .pinfo [$player_name]\r\n\r\nOutput account information for selected player or player find by $player_name.'),
+('character reputation',2,'Syntax: .character reputation [$player_name]\r\n\r\nShow reputation information for selected player or player find by $player_name.');
\ No newline at end of file
diff --git a/sql/updates/3416_mangos_7855_01_world_pools.sql b/sql/updates/3416_mangos_7855_01_world_pools.sql
new file mode 100644
index 00000000000..6a9d879d728
--- /dev/null
+++ b/sql/updates/3416_mangos_7855_01_world_pools.sql
@@ -0,0 +1,13 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7850_01_mangos_command required_7855_01_mangos_pools bit;*/
+
+ALTER TABLE pool_creature
+  ADD COLUMN description varchar(255) NOT NULL AFTER chance;
+
+ALTER TABLE pool_gameobject
+  ADD COLUMN description varchar(255) NOT NULL AFTER chance;
+
+ALTER TABLE pool_pool
+  ADD COLUMN description varchar(255) NOT NULL AFTER chance;
+
+ALTER TABLE pool_template
+  ADD COLUMN description varchar(255) NOT NULL AFTER max_limit;
\ No newline at end of file
diff --git a/sql/updates/3419_world.sql b/sql/updates/3419_world.sql
deleted file mode 100644
index 5cccad6bce5..00000000000
--- a/sql/updates/3419_world.sql
+++ /dev/null
@@ -1,51 +0,0 @@
-UPDATE `creature_template` SET `ScriptName` = 'npc_oox22fe' WHERE `entry` = 7807;
-
-DELETE FROM `script_waypoint` WHERE `entry` = 7807;
-INSERT INTO `script_waypoint` VALUES
-(7807, 0, -4943.74, 1715.74, 62.74, 0, 'SAY_START'),
-(7807, 1, -4944.93, 1706.66, 63.16, 0, ''),
-(7807, 2, -4942.82, 1690.22, 64.25, 0, ''),
-(7807, 3, -4946.47, 1669.62, 63.84, 0, ''),
-(7807, 4, -4955.93, 1651.88, 63.00, 0, ''),
-(7807, 5, -4967.58, 1643.86, 64.31, 0, ''),
-(7807, 6, -4978.12, 1607.90, 64.30, 0, ''),
-(7807, 7, -4975.38, 1596.16, 64.70, 0, ''),
-(7807, 8, -4972.82, 1581.89, 61.75, 0, ''),
-(7807, 9, -4958.65, 1581.05, 61.81, 0, ''),
-(7807, 10, -4936.72, 1594.89, 65.96, 0, ''),
-(7807, 11, -4885.69, 1598.10, 67.45, 4000, 'first ambush SAY_AMBUSH'),
-(7807, 12, -4874.20, 1601.73, 68.54, 0, ''),
-(7807, 13, -4816.64, 1594.47, 78.20, 0, ''),
-(7807, 14, -4802.20, 1571.92, 87.01, 0, ''),
-(7807, 15, -4746.40, 1576.11, 84.59, 0, ''),
-(7807, 16, -4739.72, 1707.16, 94.04, 0, ''),
-(7807, 17, -4674.03, 1840.44, 89.17, 0, ''),
-(7807, 18, -4667.94, 1864.11, 85.18, 0, ''),
-(7807, 19, -4668.08, 1886.39, 81.14, 0, ''),
-(7807, 20, -4679.43, 1932.32, 73.76, 0, ''),
-(7807, 21, -4674.17, 1946.66, 70.83, 5000, 'second ambush SAY_AMBUSH'),
-(7807, 22, -4643.94, 1967.45, 65.27, 0, ''),
-(7807, 23, -4595.60, 2010.75, 52.10, 0, ''),
-(7807, 24, -4562.65, 2029.28, 45.41, 0, ''),
-(7807, 25, -4538.56, 2032.65, 45.28, 0, ''),
-(7807, 26, -4531.96, 2034.15, 48.34, 0, ''),
-(7807, 27, -4507.75, 2039.32, 51.57, 0, ''),
-(7807, 28, -4482.74, 2045.67, 48.15, 0, ''),
-(7807, 29, -4460.87, 2051.54, 45.55, 0, ''),
-(7807, 30, -4449.97, 2060.03, 45.51, 10000, 'third ambush SAY_AMBUSH'),
-(7807, 31, -4448.99, 2079.05, 44.64, 0, ''),
-(7807, 32, -4436.64, 2134.48, 28.83, 0, ''),
-(7807, 33, -4429.25, 2170.20, 15.44, 0, ''),
-(7807, 34, -4424.83, 2186.11, 11.48, 0, ''),
-(7807, 35, -4416.71, 2209.76, 7.36, 0, ''),
-(7807, 36, -4405.25, 2231.77, 5.94, 0, ''),
-(7807, 37, -4377.61, 2265.45, 06.71, 15000, 'complete quest SAY_END');
-
-DELETE FROM `script_texts` WHERE `entry` BETWEEN -1060005 AND -1060000;
-INSERT INTO `script_texts` (`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
-(-1060005, 'Cloaking systems online! CLUCK! Engaging cloak for transport to Booty Bay!', NULL, NULL, 'Tarnsysteme online! GLUCK! Tarnung für Transport nach Beutebucht wird aktiviert.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_END'),
-(-1060004, 'No one challenges the wastevander nomads -- not even robotic chickens! ATTACK!', NULL, NULL, 'Niemand fordert die Wüsenläufernomaden heraus - auch keine Robothühner! ANGRIFF!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AMBUSH_REPLY'),
-(-1060003, 'CLUCK! Sensors detect spatial anomaly -- danger imminent! CLUCK', NULL, NULL, 'GLUCK! Sensoren haben räumliche Anomalie entdeckt - Gefahr im Verzug! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AMBUSH'),
-(-1060002, 'Threat analyzed! Activating combat plan beta! CLUCK!', NULL, NULL, 'Bedrohung analysiert! Gefechtsplan Beta wird aktiviert! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO2'),
-(-1060001, 'Physical threat detected! Evasive action! CLUCK!', NULL, NULL, 'Körperliche Bedrohung entdeckt! Ausweichmanöver! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO1'),
-(-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_START');
diff --git a/sql/updates/3419_world_SD2_scripts.sql b/sql/updates/3419_world_SD2_scripts.sql
new file mode 100644
index 00000000000..ba0fcc53445
--- /dev/null
+++ b/sql/updates/3419_world_SD2_scripts.sql
@@ -0,0 +1,51 @@
+UPDATE `creature_template` SET `ScriptName` = 'npc_oox22fe' WHERE `entry` = 7807;
+
+DELETE FROM `script_waypoint` WHERE `entry` = 7807;
+INSERT INTO `script_waypoint` VALUES
+(7807, 0, -4943.74, 1715.74, 62.74, 0, 'SAY_START'),
+(7807, 1, -4944.93, 1706.66, 63.16, 0, ''),
+(7807, 2, -4942.82, 1690.22, 64.25, 0, ''),
+(7807, 3, -4946.47, 1669.62, 63.84, 0, ''),
+(7807, 4, -4955.93, 1651.88, 63.00, 0, ''),
+(7807, 5, -4967.58, 1643.86, 64.31, 0, ''),
+(7807, 6, -4978.12, 1607.90, 64.30, 0, ''),
+(7807, 7, -4975.38, 1596.16, 64.70, 0, ''),
+(7807, 8, -4972.82, 1581.89, 61.75, 0, ''),
+(7807, 9, -4958.65, 1581.05, 61.81, 0, ''),
+(7807, 10, -4936.72, 1594.89, 65.96, 0, ''),
+(7807, 11, -4885.69, 1598.10, 67.45, 4000, 'first ambush SAY_AMBUSH'),
+(7807, 12, -4874.20, 1601.73, 68.54, 0, ''),
+(7807, 13, -4816.64, 1594.47, 78.20, 0, ''),
+(7807, 14, -4802.20, 1571.92, 87.01, 0, ''),
+(7807, 15, -4746.40, 1576.11, 84.59, 0, ''),
+(7807, 16, -4739.72, 1707.16, 94.04, 0, ''),
+(7807, 17, -4674.03, 1840.44, 89.17, 0, ''),
+(7807, 18, -4667.94, 1864.11, 85.18, 0, ''),
+(7807, 19, -4668.08, 1886.39, 81.14, 0, ''),
+(7807, 20, -4679.43, 1932.32, 73.76, 0, ''),
+(7807, 21, -4674.17, 1946.66, 70.83, 5000, 'second ambush SAY_AMBUSH'),
+(7807, 22, -4643.94, 1967.45, 65.27, 0, ''),
+(7807, 23, -4595.60, 2010.75, 52.10, 0, ''),
+(7807, 24, -4562.65, 2029.28, 45.41, 0, ''),
+(7807, 25, -4538.56, 2032.65, 45.28, 0, ''),
+(7807, 26, -4531.96, 2034.15, 48.34, 0, ''),
+(7807, 27, -4507.75, 2039.32, 51.57, 0, ''),
+(7807, 28, -4482.74, 2045.67, 48.15, 0, ''),
+(7807, 29, -4460.87, 2051.54, 45.55, 0, ''),
+(7807, 30, -4449.97, 2060.03, 45.51, 10000, 'third ambush SAY_AMBUSH'),
+(7807, 31, -4448.99, 2079.05, 44.64, 0, ''),
+(7807, 32, -4436.64, 2134.48, 28.83, 0, ''),
+(7807, 33, -4429.25, 2170.20, 15.44, 0, ''),
+(7807, 34, -4424.83, 2186.11, 11.48, 0, ''),
+(7807, 35, -4416.71, 2209.76, 7.36, 0, ''),
+(7807, 36, -4405.25, 2231.77, 5.94, 0, ''),
+(7807, 37, -4377.61, 2265.45, 06.71, 15000, 'complete quest SAY_END');
+
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1060005 AND -1060000;
+INSERT INTO `script_texts` (`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
+(-1060005, 'Cloaking systems online! CLUCK! Engaging cloak for transport to Booty Bay!', NULL, NULL, 'Tarnsysteme online! GLUCK! Tarnung für Transport nach Beutebucht wird aktiviert.', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_END'),
+(-1060004, 'No one challenges the wastevander nomads -- not even robotic chickens! ATTACK!', NULL, NULL, 'Niemand fordert die Wüsenläufernomaden heraus - auch keine Robothühner! ANGRIFF!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AMBUSH_REPLY'),
+(-1060003, 'CLUCK! Sensors detect spatial anomaly -- danger imminent! CLUCK', NULL, NULL, 'GLUCK! Sensoren haben räumliche Anomalie entdeckt - Gefahr im Verzug! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AMBUSH'),
+(-1060002, 'Threat analyzed! Activating combat plan beta! CLUCK!', NULL, NULL, 'Bedrohung analysiert! Gefechtsplan Beta wird aktiviert! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO2'),
+(-1060001, 'Physical threat detected! Evasive action! CLUCK!', NULL, NULL, 'Körperliche Bedrohung entdeckt! Ausweichmanöver! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_AGGRO1'),
+(-1060000, 'Emergency power activated! Initializing ambulatory motor! CLUCK!', NULL, NULL, 'Notfallenergie aktiviert! Ambulatorenantrieb wird gestartet! GLUCK!', NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'oox17 SAY_START');
\ No newline at end of file
diff --git a/sql/updates/7839_01_mangos_mangos_string.sql b/sql/updates/7839_01_mangos_mangos_string.sql
deleted file mode 100644
index b2fbcfa4592..00000000000
--- a/sql/updates/7839_01_mangos_mangos_string.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-DELETE FROM trinity_string WHERE entry IN(283);
-
-UPDATE trinity_string SET entry = 5011 WHERE entry = 171;
-
-INSERT INTO trinity_string VALUES
-(171,'You can\'t teleport self to self!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/7839_02_mangos_command.sql b/sql/updates/7839_02_mangos_command.sql
deleted file mode 100644
index b66d6f556fa..00000000000
--- a/sql/updates/7839_02_mangos_command.sql
+++ /dev/null
@@ -1,22 +0,0 @@
--- ALTER TABLE db_version CHANGE COLUMN required_7839_01_mangos_mangos_string required_7839_02_mangos_command bit;
-
-DELETE FROM `command` WHERE `name` IN (
-   'baninfo account','baninfo character','baninfo ip','goname','groupgo',
-   'guild create','guild invite','guild rank','guild uninvite','mute',
-   'namego','tele name','unmute'
-);
-
-INSERT INTO `command` VALUES
-('baninfo account',3,'Syntax: .baninfo account $accountid\r\nWatch full information about a specific ban.'),
-('baninfo character',3,'Syntax: .baninfo character $charactername \r\nWatch full information about a specific ban.'),
-('baninfo ip',3,'Syntax: .baninfo ip $ip\r\nWatch full information about a specific ban.'),
-('goname',1,'Syntax: .goname [$charactername]\r\n\r\nTeleport to the given character. Either specify the character name or click on the character\'s portrait, e.g. when you are in a group. Character can be offline.'),
-('groupgo',1,'Syntax: .groupgo [$charactername]\r\n\r\nTeleport the given character and his group to you. Teleported only online characters but original selected group member can be offline.'),
-('guild create',2,'Syntax: .guild create [$GuildLeaderName] $GuildName\r\n\r\nCreate a guild named $GuildName with the player $GuildLeaderName (or selected) as leader.'),
-('guild invite',2,'Syntax: .guild invite [$CharacterName] $GuildName\r\n\r\nAdd player $CharacterName (or selected) into a guild $GuildName.'),
-('guild rank',2,'Syntax: .guild rank [$CharacterName] #Rank\r\n\r\nSet for player $CharacterName (or selected) rank #Rank in a guild.'),
-('guild uninvite',2,'Syntax: .guild uninvite [$CharacterName]\r\n\r\nRemove player $CharacterName (or selected) from a guild.'),
-('mute',1,'Syntax: .mute [$playerName] $timeInMinutes\r\n\r\nDisible chat messaging for any character from account of character $playerName (or currently selected) at $timeInMinutes minutes. Player can be offline.'),
-('namego',1,'Syntax: .namego [$charactername]\r\n\r\nTeleport the given character to you. Character can be offline.'),
-('tele name',1,'Syntax: .tele name [#playername] #location\r\n\r\nTeleport the given character to a given location. Character can be offline.'),
-('unmute',1,'Syntax: .unmute [$playerName]\r\n\r\nRestore chat messaging for any character from account of character $playerName (or selected). Character can be ofline.');
diff --git a/sql/updates/7850_01_mangos_command.sql b/sql/updates/7850_01_mangos_command.sql
deleted file mode 100644
index 5dd0274bc26..00000000000
--- a/sql/updates/7850_01_mangos_command.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7839_02_mangos_command required_7850_01_mangos_command bit;
-
-DELETE FROM `command` WHERE `name` IN ('character reputation','pinfo');
-
-INSERT INTO `command` VALUES
-('pinfo',2,'Syntax: .pinfo [$player_name]\r\n\r\nOutput account information for selected player or player find by $player_name.'),
-('character reputation',2,'Syntax: .character reputation [$player_name]\r\n\r\nShow reputation information for selected player or player find by $player_name.');
diff --git a/sql/updates/7855_01_mangos_pools.sql b/sql/updates/7855_01_mangos_pools.sql
deleted file mode 100644
index b5ac676c3e1..00000000000
--- a/sql/updates/7855_01_mangos_pools.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7850_01_mangos_command required_7855_01_mangos_pools bit;
-
-ALTER TABLE pool_creature
-  ADD COLUMN description varchar(255) NOT NULL AFTER chance;
-
-ALTER TABLE pool_gameobject
-  ADD COLUMN description varchar(255) NOT NULL AFTER chance;
-
-ALTER TABLE pool_pool
-  ADD COLUMN description varchar(255) NOT NULL AFTER chance;
-
-ALTER TABLE pool_template
-  ADD COLUMN description varchar(255) NOT NULL AFTER max_limit;
-- 
cgit v1.2.3