* Trinity sql coding style

* Added 1703_world.sql
* Small fixies in other files

--HG--
branch : trunk

18 files changed, 201 insertions, 37 deletions

diff --git a/sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql b/sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql
index 80ec0871971..dc4bab32473 100644
--- a/sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql
+++ b/sql/updates/1293_mangos_7249_01_world_spell_proc_event.sql
@@ -1,3 +1,3 @@
 /*ALTER TABLE db_version CHANGE COLUMN required_7242_01_mangos_spell_bonus_data required_7249_01_mangos_spell_proc_event bit;*/
 
-DELETE FROM `spell_proc_event` WHERE `entry`='60200';
+DELETE FROM `spell_proc_event` WHERE `entry`='60200';
\ No newline at end of file
diff --git a/sql/updates/1495_mangos_7312_01_world_trinity_string.sql b/sql/updates/1495_mangos_7312_01_world_trinity_string.sql
index 5c6deb5c270..ff873dc948a 100644
--- a/sql/updates/1495_mangos_7312_01_world_trinity_string.sql
+++ b/sql/updates/1495_mangos_7312_01_world_trinity_string.sql
@@ -1,5 +1,5 @@
 /*ALTER TABLE db_version CHANGE COLUMN required_7303_01_mangos_pools required_7312_01_mangos_mangos_string bit;*/
 
-DELETE FROM `trinity_string` WHERE entry = 810;
+DELETE FROM `trinity_string` WHERE `entry`=810;
 INSERT INTO `trinity_string` VALUES
-(810,'|Hplayer:$N|h[$N]|h has earned the achievement $a!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+(810,'|Hplayer:$N|h[$N]|h has earned the achievement $a!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/1558_world_spell_linked_spell.sql b/sql/updates/1558_world.sql
index 667d1c998cc..667d1c998cc 100644
--- a/sql/updates/1558_world_spell_linked_spell.sql
+++ b/sql/updates/1558_world.sql
diff --git a/sql/updates/1693_world.sql b/sql/updates/1693_world.sql
index 6806dab4c42..51bf45011b7 100644
--- a/sql/updates/1693_world.sql
+++ b/sql/updates/1693_world.sql
@@ -1,9 +1,10 @@
 -- Update Proc Rate
-INSERT INTO `spell_proc_event` VALUES ('60442', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45');
-INSERT INTO `spell_proc_event` VALUES ('57345', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45');
-INSERT INTO `spell_proc_event` VALUES ('61356', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45');
-INSERT INTO `spell_proc_event` VALUES ('54707', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60');
-INSERT INTO `spell_proc_event` VALUES ('54808', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60');
+INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `SpellFamilyMask0`, `SpellFamilyMask1`, `SpellFamilyMask2`, `procFlags`, `procEx`, `ppmRate`, `CustomChance`, `Cooldown`) VALUES 
+('60442', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
+('57345', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
+('61356', '0', '0', '0', '0', '0', '0', '0', '0', '0', '45'),
+('54707', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60'),
+('54808', '0', '0', '0', '0', '0', '0', '0', '0', '0', '60');
 
 -- Update Spell Coefficients 
 DELETE FROM `spell_bonus_data` WHERE `entry` IN ('689', '18790', '172', '42223', '42224', '42225', '42226', '42218', '47817', '47818', '1949', '5857', '11681', '11682', '27214', '47822', '27243', '30108', '17962', '6789', '48181', '29722', '5676', '686', '17877', '30283', '1120', '30294', '44425', '42208', '42209', '42210', '42211', '42212', '42213', '42198', '42937', '42938', '11113', '31661', '120', '19750', '635', '25914', '25913', '25903', '27175', '33074', '48820', '48821', '58597', '31803', '53742', '31893', '32221', '53719', '53718', '20167', '20424', '31804', '53733', '31898', '32220', '53726', '53725', '20267', '20187', '20467', '53600', '596', '2944', '8092', '27813', '27817', '27818', '33619');
@@ -83,4 +84,4 @@ INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`
 ('27813', '0', '0', '0', 'Priest - Blessed Recovery Rank 1'),
 ('27817', '0', '0', '0', 'Priest - Blessed Recovery Rank 2'),
 ('27818', '0', '0', '0', 'Priest - Blessed Recovery Rank 3'),
-('33619', '0', '0', '0', 'Priest - Reflective Shield');
+('33619', '0', '0', '0', 'Priest - Reflective Shield');
\ No newline at end of file
diff --git a/sql/updates/1694_world.sql b/sql/updates/1694_world.sql
index 627c9e446fd..4702c66ad49 100644
--- a/sql/updates/1694_world.sql
+++ b/sql/updates/1694_world.sql
@@ -1,4 +1,4 @@
--- Sanctified wrath
+-- Sanctified Wrath
 INSERT INTO `spell_proc_event` VALUES (57318, 0x00, 10, 0x00000000, 0x00002000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 6);
 INSERT INTO `spell_proc_event` VALUES (53375, 0x00, 10, 0x00000000, 0x00002000, 0x00000000, 0x00004000, 0x00000000, 0.000000, 0.000000, 6);
 
@@ -10,7 +10,7 @@ INSERT INTO `spell_proc_event`  VALUES (54738, 0x00, 0, 0x00000000, 0x00000000,
 DELETE FROM `spell_proc_event` WHERE `entry` IN (61618);
 INSERT INTO `spell_proc_event`  VALUES (61618, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 45);
 
--- Demonic Sacriface
+-- Demonic Sacrifice
 DELETE FROM `spell_bonus_data` WHERE `entry` = 18790;
 INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`comments`) VALUES
-('18790','0','0','0','Warlock - Fel Stamina');
+('18790','0','0','0','Warlock - Fel Stamina');
\ No newline at end of file
diff --git a/sql/updates/1697_mangos_7388_01_world_trinity_string.sql b/sql/updates/1697_mangos_7388_01_world_trinity_string.sql
new file mode 100644
index 00000000000..eefddb97e63
--- /dev/null
+++ b/sql/updates/1697_mangos_7388_01_world_trinity_string.sql
@@ -0,0 +1,6 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7382_01_mangos_creature_template required_7388_01_mangos_mangos_string bit;*/
+
+DELETE FROM `trinity_string` WHERE `entry` IN (750,751);
+INSERT INTO `trinity_string` VALUES
+(750,'Not enough players. This game will close in %u mins.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(751,'Not enough players. This game will close in %u seconds.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/1703_world.sql b/sql/updates/1703_world.sql
new file mode 100644
index 00000000000..f25085cf05c
--- /dev/null
+++ b/sql/updates/1703_world.sql
@@ -0,0 +1,140 @@
+DROP TABLE IF EXISTS `access_requirement`;
+CREATE TABLE `access_requirement` (
+  `id` bigint(20) unsigned NOT NULL COMMENT 'Identifier',
+  `level_min` tinyint(3) unsigned NOT NULL default '0',
+  `level_max` tinyint(3) unsigned NOT NULL default '0',
+  `item` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
+  `item2` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
+  `heroic_key` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
+  `heroic_key2` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
+  `quest_done` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
+  `quest_failed_text` TEXT NULL DEFAULT NULL,
+  `heroic_quest_done` MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0',
+  `heroic_quest_failed_text` TEXT NULL DEFAULT NULL,
+  `comment` TEXT NULL DEFAULT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Access Requirements';
+
+ALTER TABLE `instance_template`
+ DROP COLUMN `levelMin`,
+ DROP COLUMN `levelMax`,
+ ADD COLUMN `access_id` bigint(20) unsigned NOT NULL DEFAULT '0' AFTER `reset_delay`;
+
+ALTER TABLE `areatrigger_teleport`
+ DROP COLUMN `required_level`,
+ DROP COLUMN `required_item`,
+ DROP COLUMN `required_item2`,
+ DROP COLUMN `heroic_key`,
+ DROP COLUMN `heroic_key2`,
+ DROP COLUMN `heroic_required_quest_done`,
+ DROP COLUMN `heroic_required_failed_quest_text`,
+ DROP COLUMN `required_quest_done`,
+ DROP COLUMN `required_failed_text`,
+ ADD COLUMN `access_id` bigint(20) unsigned NOT NULL DEFAULT '0' AFTER `name`;
+
+INSERT INTO `access_requirement` VALUES
+('1','10','0','0','0','0','0','0',NULL,'0',NULL,'instance Shadowfang Keep (33)'),
+('2','15','0','0','0','0','0','0',NULL,'0',NULL,'instance The Stockade (34)'),
+('3','10','0','0','0','0','0','0',NULL,'0',NULL,'instance The Deadmines (36)'),
+('4','10','0','0','0','0','0','0',NULL,'0',NULL,'instance Wailing Caverns (43)'),
+('5','15','0','0','0','0','0','0',NULL,'0',NULL,'instance Razorfen Kraul (47)'),
+('6','10','0','0','0','0','0','0',NULL,'0',NULL,'instance Blackfathom Deeps (48)'),
+('7','30','0','0','0','0','0','0',NULL,'0',NULL,'instance Uldaman (70)'),
+('8','15','0','0','0','0','0','0',NULL,'0',NULL,'instance Gnomeregan (90)'),
+('9','35','0','0','0','0','0','0',NULL,'0',NULL,'instance Sunken Temple (109)'),
+('10','25','0','0','0','0','0','0',NULL,'0',NULL,'instance Razorfen Downs (129)'),
+('11','20','0','0','0','0','0','0',NULL,'0',NULL,'instance Scarlet Monastery (189)'),
+('12','35','0','0','0','0','0','0',NULL,'0',NULL,'instance Zul\'Farrak (209)'),
+('13','45','0','0','0','0','0','0',NULL,'0',NULL,'instance Blackrock Spire (229)'),
+('14','40','0','0','0','0','0','0',NULL,'0',NULL,'instance Blackrock Depths (230)'),
+('15','55','0','16309','0','0','0','0',NULL,'0',NULL,'instance Onyxia\'s Lair (249)'),
+('16','66','0','0','0','30635','0','10285','You can\'t enter Black Morass until you rescue Thrall from Durnholde Keep.','0',NULL,'instance The Black Morass (269)'),
+('17','45','0','13704','0','0','0','0',NULL,'0',NULL,'instance Scholomance (289)'),
+('18','50','0','0','0','0','0','0',NULL,'0',NULL,'instance Zul\'Gurub (309)'),
+('19','45','0','0','0','0','0','0',NULL,'0',NULL,'instance Stratholme (329)'),
+('20','30','0','0','0','0','0','0',NULL,'0',NULL,'instance Maraudon (349)'),
+('21','8','0','0','0','0','0','0',NULL,'0',NULL,'instance Ragefire Chasm (389)'),
+('22','50','0','0','0','0','0','7487',NULL,'0',NULL,'instance Molten Core (409)'),
+('23','45','0','0','0','0','0','0',NULL,'0',NULL,'instance Dire Maul (429)'),
+('24','60','0','0','0','0','0','7761',NULL,'0',NULL,'instance Blackwing Lair (469)'),
+('25','60','0','0','0','0','0','0',NULL,'0',NULL,'instance Ruins of Ahn\'Qiraj (509)'),
+('26','60','0','0','0','0','0','0',NULL,'0',NULL,'instance Temple of Ahn\'Qiraj (531)'),
+('27','68','0','0'/*'24490'*/,'0','0','0','0',NULL,'0',NULL,'instance Karazhan (532)'),
+('28','60','0','0','0','0','0','0',NULL,'0',NULL,'instance Naxxramas (533)'),
+('29','70','0','0','0','0','0','10445',NULL,'0',NULL,'instance Hyjal Summit (534)'),
+('30','55','0','0'/*'28395'*/,'0','30637','30622','0',NULL,'0',NULL,'instance The Shattered Halls (540)'),
+('31','55','0','0','0','30637','30622','0',NULL,'0',NULL,'instance The Blood Furnace (542)'),
+('32','55','0','0','0','30637','30622','0',NULL,'0',NULL,'instance Hellfire Ramparts (543)'),
+('33','65','0','0','0','0','0','0',NULL,'0',NULL,'instance Magtheridon\'s Lair (544)'),
+('34','55','0','0','0','30623','0','0',NULL,'0',NULL,'instance The Steamvault (545)'),
+('35','55','0','0','0','30623','0','0',NULL,'0',NULL,'instance The Underbog (546)'),
+('36','55','0','0','0','30623','0','0',NULL,'0',NULL,'instance The Slave Pens (547)'),
+('37','70','0','0','0','0','0','0'/*'10901'*/,NULL,'0',NULL,'instance Serpentshrine Cavern (548)'),
+('38','70','0','0'/*'31704'*/,'0','0','0','0',NULL,'0',NULL,'instance The Eye (550)'),
+('39','68','0','0'/*'31084'*/,'0','30634','0','0',NULL,'0',NULL,'instance The Arcatraz (552)'),
+('40','68','0','0','0','30634','0','0',NULL,'0',NULL,'instance The Botanica (553)'),
+('41','68','0','0','0','30634','0','0',NULL,'0',NULL,'instance The Mechanar (554)'),
+('42','65','0','27991','0','30633','0','0',NULL,'0',NULL,'instance Shadow Labyrinth (555)'),
+('43','55','0','0','0','30633','0','0',NULL,'0',NULL,'instance Sethekk Halls (556)'),
+('44','55','0','0','0','30633','0','0',NULL,'0',NULL,'instance Mana-Tombs (557)'),
+('45','55','0','0','0','30633','0','0',NULL,'0',NULL,'instance Auchenai Crypts (558)'),
+('46','66','0','0','0','30635','0','0',NULL,'0',NULL,'instance Old Hillsbrad Foothills (560)'),
+('47','70','0','32649','0','0','0','0',NULL,'0',NULL,'instance Black Temple (564)'),
+('48','65','0','0','0','0','0','0',NULL,'0',NULL,'instance Gruul\'s Lair (565)'),
+('49','70','0','0','0','0','0','0',NULL,'0',NULL,'instance Zul\'Aman (568)'),
+('50','70','0','0','0','0','0','0',NULL,'0',NULL,'instance Sunwell Plateau (580)'),
+('51','70','0','0','0','0','0','0',NULL,'11492','Heroic Difficulty requires completion of the "Hard to Kill" quest.','instance Magisters\' Terrace (585)'),
+('52','58','0','0','0','0','0','0',NULL,'0',NULL,'Dark Portal');
+
+UPDATE `instance_template` SET `access_id` = '1' WHERE `map` = '33';
+UPDATE `instance_template` SET `access_id` = '2' WHERE `map` = '34';
+UPDATE `instance_template` SET `access_id` = '3' WHERE `map` = '36';
+UPDATE `instance_template` SET `access_id` = '4' WHERE `map` = '43';
+UPDATE `instance_template` SET `access_id` = '5' WHERE `map` = '47';
+UPDATE `instance_template` SET `access_id` = '6' WHERE `map` = '48';
+UPDATE `instance_template` SET `access_id` = '7' WHERE `map` = '70';
+UPDATE `instance_template` SET `access_id` = '8' WHERE `map` = '90';
+UPDATE `instance_template` SET `access_id` = '9' WHERE `map` = '109';
+UPDATE `instance_template` SET `access_id` = '10' WHERE `map` = '129';
+UPDATE `instance_template` SET `access_id` = '11' WHERE `map` = '189';
+UPDATE `instance_template` SET `access_id` = '12' WHERE `map` = '209';
+UPDATE `instance_template` SET `access_id` = '13' WHERE `map` = '229';
+UPDATE `instance_template` SET `access_id` = '14' WHERE `map` = '230';
+UPDATE `instance_template` SET `access_id` = '15' WHERE `map` = '249';
+UPDATE `instance_template` SET `access_id` = '16' WHERE `map` = '269';
+UPDATE `instance_template` SET `access_id` = '17' WHERE `map` = '289';
+UPDATE `instance_template` SET `access_id` = '18' WHERE `map` = '309';
+UPDATE `instance_template` SET `access_id` = '19' WHERE `map` = '329';
+UPDATE `instance_template` SET `access_id` = '20' WHERE `map` = '349';
+UPDATE `instance_template` SET `access_id` = '21' WHERE `map` = '389';
+UPDATE `instance_template` SET `access_id` = '22' WHERE `map` = '409';
+UPDATE `instance_template` SET `access_id` = '23' WHERE `map` = '429';
+UPDATE `instance_template` SET `access_id` = '24' WHERE `map` = '469';
+UPDATE `instance_template` SET `access_id` = '25' WHERE `map` = '509';
+UPDATE `instance_template` SET `access_id` = '26' WHERE `map` = '531';
+UPDATE `instance_template` SET `access_id` = '27' WHERE `map` = '532';
+UPDATE `instance_template` SET `access_id` = '28' WHERE `map` = '533';
+UPDATE `instance_template` SET `access_id` = '29' WHERE `map` = '534';
+UPDATE `instance_template` SET `access_id` = '30' WHERE `map` = '540';
+UPDATE `instance_template` SET `access_id` = '31' WHERE `map` = '542';
+UPDATE `instance_template` SET `access_id` = '32' WHERE `map` = '543';
+UPDATE `instance_template` SET `access_id` = '33' WHERE `map` = '544';
+UPDATE `instance_template` SET `access_id` = '34' WHERE `map` = '545';
+UPDATE `instance_template` SET `access_id` = '35' WHERE `map` = '546';
+UPDATE `instance_template` SET `access_id` = '36' WHERE `map` = '547';
+UPDATE `instance_template` SET `access_id` = '37' WHERE `map` = '548';
+UPDATE `instance_template` SET `access_id` = '38' WHERE `map` = '550';
+UPDATE `instance_template` SET `access_id` = '39' WHERE `map` = '552';
+UPDATE `instance_template` SET `access_id` = '40' WHERE `map` = '553';
+UPDATE `instance_template` SET `access_id` = '41' WHERE `map` = '554';
+UPDATE `instance_template` SET `access_id` = '42' WHERE `map` = '555';
+UPDATE `instance_template` SET `access_id` = '43' WHERE `map` = '556';
+UPDATE `instance_template` SET `access_id` = '44' WHERE `map` = '557';
+UPDATE `instance_template` SET `access_id` = '45' WHERE `map` = '558';
+UPDATE `instance_template` SET `access_id` = '46' WHERE `map` = '560';
+UPDATE `instance_template` SET `access_id` = '47' WHERE `map` = '564';
+UPDATE `instance_template` SET `access_id` = '48' WHERE `map` = '565';
+UPDATE `instance_template` SET `access_id` = '49' WHERE `map` = '568';
+UPDATE `instance_template` SET `access_id` = '50' WHERE `map` = '580';
+UPDATE `instance_template` SET `access_id` = '51' WHERE `map` = '585';
+UPDATE `areatrigger_teleport` SET `access_id` = '52' WHERE `id` IN ('4352','4354');
\ No newline at end of file
diff --git a/sql/updates/1709_mangos_7393_01_world_game_event.sql b/sql/updates/1709_mangos_7393_01_world_game_event.sql
new file mode 100644
index 00000000000..5dcdaf3ce01
--- /dev/null
+++ b/sql/updates/1709_mangos_7393_01_world_game_event.sql
@@ -0,0 +1,4 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7390_01_mangos_areatrigger_teleport required_7393_01_mangos_game_event bit;*/
+
+ALTER TABLE `game_event`
+  ADD COLUMN `holiday` mediumint(8) unsigned NOT NULL default '0' COMMENT 'Client side holiday id' AFTER `length`;
\ No newline at end of file
diff --git a/sql/updates/1724_mangos_7399_01_world_trinity_string.sql b/sql/updates/1724_mangos_7399_01_world_trinity_string.sql
new file mode 100644
index 00000000000..de0ac0ed77d
--- /dev/null
+++ b/sql/updates/1724_mangos_7399_01_world_trinity_string.sql
@@ -0,0 +1,7 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7393_01_mangos_game_event required_7399_01_mangos_mangos_string bit;*/
+
+DELETE FROM `trinity_string` WHERE `entry` IN (753, 754, 755);
+INSERT INTO `trinity_string` VALUES
+(753,'The battle for Warsong Gulch begins in 2 minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(754,'The battle for Arathi Basin begins in 2 minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(755,'The battle for Eye of the Storm begins in 2 minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
\ No newline at end of file
diff --git a/sql/updates/1138_world.sql b/sql/updates/2.4.3_updates/1138_world.sql
index 610f97139a5..610f97139a5 100644
--- a/sql/updates/1138_world.sql
+++ b/sql/updates/2.4.3_updates/1138_world.sql
diff --git a/sql/updates/2.4.3_updates/1142_world.sql b/sql/updates/2.4.3_updates/1142_world.sql
new file mode 100644
index 00000000000..2109d0f8ab7
--- /dev/null
+++ b/sql/updates/2.4.3_updates/1142_world.sql
@@ -0,0 +1,8 @@
+DELETE from `spell_affect` where entry=16999 and effectId=0;
+DELETE from `spell_affect` where entry=16999 and effectId=2;
+INSERT INTO `spell_affect` VALUES (16999, 0, 0x1000001000);
+INSERT INTO `spell_affect` VALUES (16999, 2, 0x1000001000);
+DELETE from `spell_affect` where entry=16998 and effectId=0;
+DELETE from `spell_affect` where entry=16998 and effectId=2;
+INSERT INTO `spell_affect` VALUES (16998, 0, 0x1000001000);
+INSERT INTO `spell_affect` VALUES (16998, 2, 0x1000001000);
diff --git a/sql/updates/2.4.3_updates/1159_world.sql b/sql/updates/2.4.3_updates/1159_world.sql
new file mode 100644
index 00000000000..b237e0422c4
--- /dev/null
+++ b/sql/updates/2.4.3_updates/1159_world.sql
@@ -0,0 +1,10 @@
+DELETE from `spell_affect` where entry=16999;
+DELETE from `spell_affect` where entry=16998;
+INSERT INTO `spell_affect` VALUES (16998, 0, 0x40000001000);
+INSERT INTO `spell_affect` VALUES (16998, 1, 0x40000001000);
+INSERT INTO `spell_affect` VALUES (16998, 2, 0x40000001000);
+INSERT INTO `spell_affect` VALUES (16999, 0, 0x40000001000);
+INSERT INTO `spell_affect` VALUES (16999, 1, 0x40000001000);
+INSERT INTO `spell_affect` VALUES (16999, 2, 0x40000001000);
+
+
diff --git a/sql/updates/2.4.3_updates/1160_world.sql b/sql/updates/2.4.3_updates/1160_world.sql
index bf959443065..f25085cf05c 100644
--- a/sql/updates/2.4.3_updates/1160_world.sql
+++ b/sql/updates/2.4.3_updates/1160_world.sql
@@ -15,7 +15,6 @@ CREATE TABLE `access_requirement` (
   PRIMARY KEY  (`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='Access Requirements';
 
-
 ALTER TABLE `instance_template`
  DROP COLUMN `levelMin`,
  DROP COLUMN `levelMax`,
@@ -138,4 +137,4 @@ UPDATE `instance_template` SET `access_id` = '48' WHERE `map` = '565';
 UPDATE `instance_template` SET `access_id` = '49' WHERE `map` = '568';
 UPDATE `instance_template` SET `access_id` = '50' WHERE `map` = '580';
 UPDATE `instance_template` SET `access_id` = '51' WHERE `map` = '585';
-UPDATE `areatrigger_teleport` SET `access_id` = '52' WHERE `id` IN ('4352','4354');
+UPDATE `areatrigger_teleport` SET `access_id` = '52' WHERE `id` IN ('4352','4354');
\ No newline at end of file
diff --git a/sql/updates/2.4.3_updates/CMakeLists.txt b/sql/updates/2.4.3_updates/CMakeLists.txt
index 85f240ead8c..6d9b6a025cc 100644
--- a/sql/updates/2.4.3_updates/CMakeLists.txt
+++ b/sql/updates/2.4.3_updates/CMakeLists.txt
@@ -168,4 +168,8 @@ INSTALL(FILES
 1069_world_scripts.sql
 1073_world_scripts.sql
 1074_world_scripts.sql
-DESTINATION share/trinity/sql/updates/2.4.3_updates)
+1138_world.sql
+1142_world.sql
+1159_world.sql
+1160_world.sql
+DESTINATION share/trinity/sql/updates/2.4.3_updates)
\ No newline at end of file
diff --git a/sql/updates/7388_01_mangos_mangos_string.sql b/sql/updates/7388_01_mangos_mangos_string.sql
deleted file mode 100644
index 5a876e71323..00000000000
--- a/sql/updates/7388_01_mangos_mangos_string.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7382_01_mangos_creature_template required_7388_01_mangos_mangos_string bit;
-
-DELETE FROM mangos_string WHERE entry IN (750,751);
-INSERT INTO mangos_string VALUES (750,'Not enough players. This game will close in %u mins.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO mangos_string VALUES (751,'Not enough players. This game will close in %u seconds.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/7393_01_mangos_game_event.sql b/sql/updates/7393_01_mangos_game_event.sql
deleted file mode 100644
index 24e576462ed..00000000000
--- a/sql/updates/7393_01_mangos_game_event.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-ALTER TABLE db_version CHANGE COLUMN required_7390_01_mangos_areatrigger_teleport required_7393_01_mangos_game_event bit;
-
-ALTER TABLE game_event
-  ADD COLUMN holiday mediumint(8) unsigned NOT NULL default '0' COMMENT 'Client side holiday id' AFTER length;
diff --git a/sql/updates/7399_01_mangos_mangos_string.sql b/sql/updates/7399_01_mangos_mangos_string.sql
deleted file mode 100644
index a3f76c7fae5..00000000000
--- a/sql/updates/7399_01_mangos_mangos_string.sql
+++ /dev/null
@@ -1,6 +0,0 @@
--- ALTER TABLE db_version CHANGE COLUMN required_7393_01_mangos_game_event required_7399_01_mangos_mangos_string bit;
-
-DELETE FROM mangos_string WHERE entry in (753, 754, 755);
-INSERT INTO mangos_string VALUES (753,'The battle for Warsong Gulch begins in 2 minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO mangos_string VALUES (754,'The battle for Arathi Basin begins in 2 minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
-INSERT INTO mangos_string VALUES (755,'The battle for Eye of the Storm begins in 2 minutes.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index 40a89d262c1..b5e55c71468 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -47,7 +47,7 @@ INSTALL(FILES
 1531_mangos_7324_01_characters_character_spell.sql
 1531_mangos_7324_02_characters_character_aura.sql
 1555_mangos_7331_01_world_command.sql
-1558_world_spell_linked_spell.sql
+1558_world.sql
 1559_world.sql
 1576_mangos_7332_01_world_command.sql
 1605_mangos_7349_01_world_spell_area.sql
@@ -59,11 +59,11 @@ INSTALL(FILES
 1657_world.sql
 1661_world.sql
 1663_mangos_7376_01_world_spell_area.sql
-1679_world.sql
 1688_mangos_7382_01_world_creature_template.sql
 1693_world.sql
-1138_world.sql
-1142_world.sql
-1159_world.sql
-1160_world.sql
-DESTINATION share/trinity/sql/updates)
+1694_world.sql
+1697_mangos_7388_01_world_trinity_string.sql
+1703_world.sql
+1709_mangos_7393_01_world_game_event.sql
+1724_mangos_7399_01_world_trinity_string.sql
+DESTINATION share/trinity/sql/updates)
\ No newline at end of file