aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/characters.sql25
-rw-r--r--sql/mangos.sql129
-rw-r--r--sql/updates/2444_world.sql3
-rw-r--r--sql/updates/2479_world.sql2
-rw-r--r--sql/updates/2492_mangos_7622_01_world_creature_ai_scripts.sql29
-rw-r--r--sql/updates/2492_mangos_7622_02_world_creature_ai_summons.sql13
-rw-r--r--sql/updates/2492_mangos_7622_03_world_creature_ai_texts.sql21
-rw-r--r--sql/updates/2508_characters.sql1
-rw-r--r--sql/updates/2515_world_scripts.sql22
-rw-r--r--sql/updates/2522_mangos_7627_01_world_achievement_criteria_data.sql10
-rw-r--r--sql/updates/2528_mangos_7633_01_world_achievement_criteria_data.sql5
-rw-r--r--sql/updates/2551_world.sql4
-rw-r--r--sql/updates/2559_world.sql9
-rw-r--r--sql/updates/2565_world.sql343
-rw-r--r--sql/updates/2570_world.sql9
-rw-r--r--sql/updates/2582_mangos_7644_01_characters_character_pet.sql5
-rw-r--r--sql/updates/2586_world.sql4
-rw-r--r--sql/updates/2591_world.sql6
-rw-r--r--sql/updates/2617_world_spell_linked_spell.sql7
-rw-r--r--sql/updates/2629_world.sql2
-rw-r--r--sql/world_scripts_full.sql17
-rw-r--r--sql/world_scripts_structure.sql16
22 files changed, 675 insertions, 7 deletions
diff --git a/sql/characters.sql b/sql/characters.sql
index 55a8796e6e4..97d1e744e7c 100644
--- a/sql/characters.sql
+++ b/sql/characters.sql
@@ -16,6 +16,29 @@
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
--
+<<<<<<< HEAD:sql/characters.sql
+=======
+-- Table structure for table `character_db_version`
+--
+
+DROP TABLE IF EXISTS `character_db_version`;
+CREATE TABLE `character_db_version` (
+ `required_7644_01_characters_character_pet` bit(1) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB';
+
+--
+-- Dumping data for table `character_db_version`
+--
+
+LOCK TABLES `character_db_version` WRITE;
+/*!40000 ALTER TABLE `character_db_version` DISABLE KEYS */;
+INSERT INTO `character_db_version` VALUES
+(NULL);
+/*!40000 ALTER TABLE `character_db_version` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+>>>>>>> ddfa7199207e499dd233854a75ac3a6216938873:sql/characters.sql
-- Table structure for table `account_data`
--
@@ -263,7 +286,7 @@ CREATE TABLE `characters` (
`position_y` float NOT NULL default '0',
`position_z` float NOT NULL default '0',
`map` int(11) unsigned NOT NULL default '0' COMMENT 'Map Identifier',
- `dungeon_difficulty` tinyint(1) unsigned NOT NULL DEFAULT '0',
+ `dungeon_difficulty` tinyint(1) unsigned NOT NULL default '0',
`orientation` float NOT NULL default '0',
`taximask` longtext,
`online` tinyint(3) unsigned NOT NULL default '0',
diff --git a/sql/mangos.sql b/sql/mangos.sql
index b752d0d76ed..4aa7b69c067 100644
--- a/sql/mangos.sql
+++ b/sql/mangos.sql
@@ -22,7 +22,8 @@
DROP TABLE IF EXISTS `db_version`;
CREATE TABLE `db_version` (
`version` varchar(120) default NULL,
- `required_7616_02_mangos_command` bit(1) default NULL
+ `creature_ai_version` varchar(120) default NULL,
+ `required_7643_02_mangos_mangos_string` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Used DB version notes';
--
@@ -32,11 +33,33 @@ CREATE TABLE `db_version` (
LOCK TABLES `db_version` WRITE;
/*!40000 ALTER TABLE `db_version` DISABLE KEYS */;
INSERT INTO `db_version` VALUES
-('Mangos default database.',NULL);
+('Mangos default database.','Creature EventAI not provided.',NULL);
/*!40000 ALTER TABLE `db_version` ENABLE KEYS */;
UNLOCK TABLES;
--
+-- Table structure for table `achievement_criteria_data`
+--
+
+DROP TABLE IF EXISTS `achievement_criteria_data`;
+CREATE TABLE `achievement_criteria_data` (
+ `criteria_id` mediumint(8) NOT NULL,
+ `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `value1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `value2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`criteria_id`,`type`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Achievment system';
+
+--
+-- Dumping data for table `achievement_criteria_data`
+--
+
+LOCK TABLES `achievement_criteria_data` WRITE;
+/*!40000 ALTER TABLE `achievement_criteria_data` DISABLE KEYS */;
+/*!40000 ALTER TABLE `achievement_criteria_data` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `achievement_reward`
--
@@ -50,7 +73,7 @@ CREATE TABLE `achievement_reward` (
`subject` varchar(255) default NULL,
`text` text,
PRIMARY KEY (`entry`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Achievment system';
--
-- Dumping data for table `achievement_reward`
@@ -920,6 +943,105 @@ LOCK TABLES `disenchant_loot_template` WRITE;
UNLOCK TABLES;
--
+-- Table structure for table `creature_ai_scripts`
+--
+
+DROP TABLE IF EXISTS `creature_ai_scripts`;
+CREATE TABLE `creature_ai_scripts` (
+ `id` int(11) unsigned NOT NULL COMMENT 'Identifier' AUTO_INCREMENT,
+ `creature_id` int(11) unsigned NOT NULL default '0' COMMENT 'Creature Template Identifier',
+ `event_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Event Type',
+ `event_inverse_phase_mask` int(11) signed NOT NULL default '0' COMMENT 'Mask which phases this event will not trigger in',
+ `event_chance` int(3) unsigned NOT NULL default '100',
+ `event_flags` int(3) unsigned NOT NULL default '0',
+ `event_param1` int(11) signed NOT NULL default '0',
+ `event_param2` int(11) signed NOT NULL default '0',
+ `event_param3` int(11) signed NOT NULL default '0',
+ `event_param4` int(11) signed NOT NULL default '0',
+ `action1_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Action Type',
+ `action1_param1` int(11) signed NOT NULL default '0',
+ `action1_param2` int(11) signed NOT NULL default '0',
+ `action1_param3` int(11) signed NOT NULL default '0',
+ `action2_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Action Type',
+ `action2_param1` int(11) signed NOT NULL default '0',
+ `action2_param2` int(11) signed NOT NULL default '0',
+ `action2_param3` int(11) signed NOT NULL default '0',
+ `action3_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Action Type',
+ `action3_param1` int(11) signed NOT NULL default '0',
+ `action3_param2` int(11) signed NOT NULL default '0',
+ `action3_param3` int(11) signed NOT NULL default '0',
+ `comment` varchar(255) NOT NULL default '' COMMENT 'Event Comment',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='EventAI Scripts';
+
+--
+-- Dumping data for table `creature_ai_scripts`
+--
+
+LOCK TABLES `creature_ai_scripts` WRITE;
+/*!40000 ALTER TABLE `creature_ai_scripts` DISABLE KEYS */;
+/*!40000 ALTER TABLE `creature_ai_scripts` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `creature_ai_summons`
+--
+
+DROP TABLE IF EXISTS `creature_ai_summons`;
+CREATE TABLE `creature_ai_summons` (
+ `id` int(11) unsigned NOT NULL COMMENT 'Location Identifier' AUTO_INCREMENT,
+ `position_x` float NOT NULL default '0',
+ `position_y` float NOT NULL default '0',
+ `position_z` float NOT NULL default '0',
+ `orientation` float NOT NULL default '0',
+ `spawntimesecs` int(11) unsigned NOT NULL default '120',
+ `comment` varchar(255) NOT NULL default '' COMMENT 'Summon Comment',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='EventAI Summoning Locations';
+
+--
+-- Dumping data for table `creature_ai_summons`
+--
+
+LOCK TABLES `creature_ai_summons` WRITE;
+/*!40000 ALTER TABLE `creature_ai_summons` DISABLE KEYS */;
+/*!40000 ALTER TABLE `creature_ai_summons` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `creature_ai_texts`
+--
+
+DROP TABLE IF EXISTS `creature_ai_texts`;
+CREATE TABLE `creature_ai_texts` (
+ `entry` mediumint(8) NOT NULL,
+ `content_default` text NOT NULL,
+ `content_loc1` text,
+ `content_loc2` text,
+ `content_loc3` text,
+ `content_loc4` text,
+ `content_loc5` text,
+ `content_loc6` text,
+ `content_loc7` text,
+ `content_loc8` text,
+ `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `comment` text,
+ PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
+
+--
+-- Dumping data for table `creature_ai_texts`
+--
+
+LOCK TABLES `creature_ai_texts` WRITE;
+/*!40000 ALTER TABLE `creature_ai_texts` DISABLE KEYS */;
+/*!40000 ALTER TABLE `creature_ai_texts` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
-- Table structure for table `event_scripts`
--
@@ -2341,6 +2463,7 @@ INSERT INTO `mangos_string` VALUES
(56,'Current Message of the day: \r\n%s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(57,'Using World DB: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(58,'Using script library: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
+(59,'Using creature EventAI: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(100,'Global notify: ',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(101,'Map: %u (%s) Zone: %u (%s) Area: %u (%s) Phase: %u\nX: %f Y: %f Z: %f Orientation: %f\ngrid[%u,%u]cell[%u,%u] InstanceID: %u\n ZoneX: %f ZoneY: %f\nGroundZ: %f FloorZ: %f Have height data (Map: %u VMap: %u)',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
(102,'%s is already being teleported.',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),
diff --git a/sql/updates/2444_world.sql b/sql/updates/2444_world.sql
new file mode 100644
index 00000000000..7eec5331e50
--- /dev/null
+++ b/sql/updates/2444_world.sql
@@ -0,0 +1,3 @@
+DELETE FROM `command` WHERE `name` IN ('reload spell_linked_spell');
+INSERT INTO `command` VALUES
+('reload spell_linked_spell','3','Usage: .reload spell_linked_spell\r\nReloads the spell_linked_spell DB table.'); \ No newline at end of file
diff --git a/sql/updates/2479_world.sql b/sql/updates/2479_world.sql
index e5f0e2fb772..28bb545b72f 100644
--- a/sql/updates/2479_world.sql
+++ b/sql/updates/2479_world.sql
@@ -1,2 +1,2 @@
DELETE FROM `trinity_string` WHERE `entry` = 5007;
-INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (5007, 'You must be in a raid group to enter this instance.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`) VALUES (5007, 'You must be in a raid group to enter this instance.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); \ No newline at end of file
diff --git a/sql/updates/2492_mangos_7622_01_world_creature_ai_scripts.sql b/sql/updates/2492_mangos_7622_01_world_creature_ai_scripts.sql
new file mode 100644
index 00000000000..a657e359923
--- /dev/null
+++ b/sql/updates/2492_mangos_7622_01_world_creature_ai_scripts.sql
@@ -0,0 +1,29 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7616_02_mangos_command required_7622_01_mangos_creature_ai_scripts bit;*/
+
+DROP TABLE IF EXISTS `creature_ai_scripts`;
+CREATE TABLE `creature_ai_scripts` (
+ `id` int(11) unsigned NOT NULL COMMENT 'Identifier' AUTO_INCREMENT,
+ `creature_id` int(11) unsigned NOT NULL default '0' COMMENT 'Creature Template Identifier',
+ `event_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Event Type',
+ `event_inverse_phase_mask` int(11) signed NOT NULL default '0' COMMENT 'Mask which phases this event will not trigger in',
+ `event_chance` int(3) unsigned NOT NULL default '100',
+ `event_flags` int(3) unsigned NOT NULL default '0',
+ `event_param1` int(11) signed NOT NULL default '0',
+ `event_param2` int(11) signed NOT NULL default '0',
+ `event_param3` int(11) signed NOT NULL default '0',
+ `event_param4` int(11) signed NOT NULL default '0',
+ `action1_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Action Type',
+ `action1_param1` int(11) signed NOT NULL default '0',
+ `action1_param2` int(11) signed NOT NULL default '0',
+ `action1_param3` int(11) signed NOT NULL default '0',
+ `action2_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Action Type',
+ `action2_param1` int(11) signed NOT NULL default '0',
+ `action2_param2` int(11) signed NOT NULL default '0',
+ `action2_param3` int(11) signed NOT NULL default '0',
+ `action3_type` tinyint(5) unsigned NOT NULL default '0' COMMENT 'Action Type',
+ `action3_param1` int(11) signed NOT NULL default '0',
+ `action3_param2` int(11) signed NOT NULL default '0',
+ `action3_param3` int(11) signed NOT NULL default '0',
+ `comment` varchar(255) NOT NULL default '' COMMENT 'Event Comment',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='EventAI Scripts'; \ No newline at end of file
diff --git a/sql/updates/2492_mangos_7622_02_world_creature_ai_summons.sql b/sql/updates/2492_mangos_7622_02_world_creature_ai_summons.sql
new file mode 100644
index 00000000000..e9d6a0a48e4
--- /dev/null
+++ b/sql/updates/2492_mangos_7622_02_world_creature_ai_summons.sql
@@ -0,0 +1,13 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7622_01_mangos_creature_ai_scripts required_7622_02_mangos_creature_ai_summons bit;*/
+
+DROP TABLE IF EXISTS `creature_ai_summons`;
+CREATE TABLE `creature_ai_summons` (
+ `id` int(11) unsigned NOT NULL COMMENT 'Location Identifier' AUTO_INCREMENT,
+ `position_x` float NOT NULL default '0',
+ `position_y` float NOT NULL default '0',
+ `position_z` float NOT NULL default '0',
+ `orientation` float NOT NULL default '0',
+ `spawntimesecs` int(11) unsigned NOT NULL default '120',
+ `comment` varchar(255) NOT NULL default '' COMMENT 'Summon Comment',
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='EventAI Summoning Locations'; \ No newline at end of file
diff --git a/sql/updates/2492_mangos_7622_03_world_creature_ai_texts.sql b/sql/updates/2492_mangos_7622_03_world_creature_ai_texts.sql
new file mode 100644
index 00000000000..cdb4995367b
--- /dev/null
+++ b/sql/updates/2492_mangos_7622_03_world_creature_ai_texts.sql
@@ -0,0 +1,21 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7622_02_mangos_creature_ai_summons required_7622_03_mangos_creature_ai_texts bit;*/
+
+DROP TABLE IF EXISTS `creature_ai_texts`;
+CREATE TABLE `creature_ai_texts` (
+ `entry` mediumint(8) NOT NULL,
+ `content_default` text NOT NULL,
+ `content_loc1` text,
+ `content_loc2` text,
+ `content_loc3` text,
+ `content_loc4` text,
+ `content_loc5` text,
+ `content_loc6` text,
+ `content_loc7` text,
+ `content_loc8` text,
+ `sound` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `language` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `emote` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `comment` text,
+ PRIMARY KEY (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts'; \ No newline at end of file
diff --git a/sql/updates/2508_characters.sql b/sql/updates/2508_characters.sql
new file mode 100644
index 00000000000..33d49010b93
--- /dev/null
+++ b/sql/updates/2508_characters.sql
@@ -0,0 +1 @@
+DROP TABLE IF EXISTS `has_logged_in_before`; \ No newline at end of file
diff --git a/sql/updates/2515_world_scripts.sql b/sql/updates/2515_world_scripts.sql
new file mode 100644
index 00000000000..e334e241585
--- /dev/null
+++ b/sql/updates/2515_world_scripts.sql
@@ -0,0 +1,22 @@
+UPDATE `creature_template` SET `ScriptName`='mob_giant_infernal' WHERE `entry`=17908;
+UPDATE `creature_template` SET `ScriptName`='mob_abomination' WHERE `entry`=17898;
+UPDATE `creature_template` SET `ScriptName`='mob_ghoul' WHERE `entry`=17895;
+UPDATE `creature_template` SET `ScriptName`='mob_necromancer' WHERE `entry`=17899;
+UPDATE `creature_template` SET `ScriptName`='mob_banshee' WHERE `entry`=17905;
+UPDATE `creature_template` SET `ScriptName`='mob_crypt_fiend' WHERE `entry`=17897;
+UPDATE `creature_template` SET `ScriptName`='mob_fel_stalker' WHERE `entry`=17916;
+UPDATE `creature_template` SET `ScriptName`='mob_frost_wyrm' WHERE `entry`=17907;
+UPDATE `creature_template` SET `ScriptName`='mob_gargoyle' WHERE `entry`=17906;
+UPDATE `creature_template` SET `ScriptName`='alliance_rifleman' WHERE `entry`=17921;
+UPDATE `creature_template` SET `ScriptName`='mob_towering_infernal' WHERE `entry`=17818;
+UPDATE `creature_template` SET `ScriptName`='boss_anetheron' WHERE `entry`=17808;
+UPDATE `creature_template` SET `ScriptName`='boss_azgalor' WHERE `entry`=17842;
+UPDATE `creature_template` SET `ScriptName`='mob_lesser_doomguard' WHERE `entry`=17864;
+UPDATE `creature_template` SET `ScriptName`='boss_kazrogal' WHERE `entry`=17888;
+UPDATE `creature_template` SET `ScriptName`='boss_rage_winterchill' WHERE `entry`=17767;
+UPDATE `creature_template` SET `scale`='0.5' WHERE `entry`=17968;
+UPDATE `creature_template` SET `equipment_id`='17888' WHERE `entry`=17888;
+UPDATE `creature_template` SET `equipment_id`='17921' WHERE `entry`=17921;
+/*DELETE FROM creature_equip_template WHERE `entry` IN (17888, 17921);
+INSERT INTO creature_equip_template () VALUES (17888, 45776, 0, 0, 33490946, 0, 0, 0, 0, 0);
+INSERT INTO creature_equip_template () VALUES (17921, 20732, 0, 20732, 33489666, 0, 33489666, 26, 0, 26);*/ \ No newline at end of file
diff --git a/sql/updates/2522_mangos_7627_01_world_achievement_criteria_data.sql b/sql/updates/2522_mangos_7627_01_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..da2fecf8971
--- /dev/null
+++ b/sql/updates/2522_mangos_7627_01_world_achievement_criteria_data.sql
@@ -0,0 +1,10 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7622_03_mangos_creature_ai_texts required_7627_01_mangos_achievement_criteria_data bit;*/
+
+DROP TABLE IF EXISTS `achievement_criteria_data`;
+CREATE TABLE `achievement_criteria_data` (
+ `criteria_id` mediumint(8) NOT NULL,
+ `type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `value1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ `value2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+ PRIMARY KEY (`criteria_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Achievment system'; \ No newline at end of file
diff --git a/sql/updates/2528_mangos_7633_01_world_achievement_criteria_data.sql b/sql/updates/2528_mangos_7633_01_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..4cc035e3169
--- /dev/null
+++ b/sql/updates/2528_mangos_7633_01_world_achievement_criteria_data.sql
@@ -0,0 +1,5 @@
+/*ALTER TABLE db_version CHANGE COLUMN required_7627_01_mangos_achievement_criteria_data required_7633_01_mangos_achievement_criteria_data bit;*/
+
+ALTER TABLE `achievement_criteria_data`
+ DROP PRIMARY KEY,
+ ADD PRIMARY KEY (`criteria_id`,`type`); \ No newline at end of file
diff --git a/sql/updates/2551_world.sql b/sql/updates/2551_world.sql
new file mode 100644
index 00000000000..531f248a2ef
--- /dev/null
+++ b/sql/updates/2551_world.sql
@@ -0,0 +1,4 @@
+-- Judgement
+DELETE FROM `spell_bonus_data` WHERE `entry` = 54158;
+INSERT INTO `spell_bonus_data` (`entry`,`direct_bonus`,`dot_bonus`,`ap_bonus`,`comments`) VALUES
+('54158','0.25','0','0.16','Paladin - Unleashing spell for Seal of Wisdom, Justice and Light'); \ No newline at end of file
diff --git a/sql/updates/2559_world.sql b/sql/updates/2559_world.sql
new file mode 100644
index 00000000000..50ebcb09e96
--- /dev/null
+++ b/sql/updates/2559_world.sql
@@ -0,0 +1,9 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (44544);
+-- Fingers of frost triggered spell
+INSERT INTO `spell_proc_event` VALUES (44544, 0x00, 0x00000003, 0x00000000, 0x00100000, 0x00000000, 0x00010000, 0x00000000, 0.000000, 0.000000, 0);
+
+-- Sudden Death
+DELETE FROM `spell_proc_event` WHERE `entry` IN (29723, 29725, 29724);
+INSERT INTO `spell_proc_event` VALUES (29723, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0);
+INSERT INTO `spell_proc_event` VALUES (29725, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0);
+INSERT INTO `spell_proc_event` VALUES (29724, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0); \ No newline at end of file
diff --git a/sql/updates/2565_world.sql b/sql/updates/2565_world.sql
new file mode 100644
index 00000000000..2b744ba549b
--- /dev/null
+++ b/sql/updates/2565_world.sql
@@ -0,0 +1,343 @@
+DROP TABLE IF EXISTS script_waypoint;
+CREATE TABLE script_waypoint (
+ entry mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'creature_template entry',
+ pointid mediumint(8) unsigned NOT NULL DEFAULT '0',
+ location_x float NOT NULL DEFAULT '0',
+ location_y float NOT NULL DEFAULT '0',
+ location_z float NOT NULL DEFAULT '0',
+ waittime int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'waittime in millisecs',
+ point_comment text,
+ PRIMARY KEY (entry, pointid)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
+
+-- script waypoint
+DELETE FROM script_waypoint WHERE entry=467;
+INSERT INTO script_waypoint VALUES
+(467, 0, -10508.40, 1068.00, 55.21, 0, ''),
+(467, 1, -10518.30, 1074.84, 53.96, 0, ''),
+(467, 2, -10534.82, 1081.92, 49.88, 0, ''),
+(467, 3, -10546.51, 1084.88, 50.13, 0, ''),
+(467, 4, -10555.29, 1084.45, 45.75, 0, ''),
+(467, 5, -10566.57, 1083.53, 42.10, 0, ''),
+(467, 6, -10575.83, 1082.34, 39.46, 0, ''),
+(467, 7, -10585.67, 1081.08, 37.77, 0, ''),
+(467, 8, -10600.08, 1078.19, 36.23, 0, ''),
+(467, 9, -10608.69, 1076.08, 35.88, 0, ''),
+(467, 10, -10621.26, 1073.00, 35.40, 0, ''),
+(467, 11, -10638.12, 1060.18, 33.61, 0, ''),
+(467, 12, -10655.87, 1038.99, 33.48, 0, ''),
+(467, 13, -10664.68, 1030.54, 32.70, 0, ''),
+(467, 14, -10708.68, 1033.86, 33.32, 0, ''),
+(467, 15, -10754.43, 1017.93, 32.79, 0, ''),
+(467, 16, -10802.26, 1018.01, 32.16, 0, ''),
+(467, 17, -10832.60, 1009.04, 32.71, 0, ''),
+(467, 18, -10866.56, 1006.51, 31.71, 0, ''),
+(467, 19, -10879.98, 1005.10, 32.84, 0, ''),
+(467, 20, -10892.45, 1001.32, 34.46, 0, ''),
+(467, 21, -10906.14, 997.11, 36.15, 0, ''),
+(467, 22, -10922.26, 1002.23, 35.74, 0, ''),
+(467, 23, -10936.32, 1023.38, 36.52, 0, ''),
+(467, 24, -10933.35, 1052.61, 35.85, 0, ''),
+(467, 25, -10940.25, 1077.66, 36.49, 0, ''),
+(467, 26, -10957.09, 1099.33, 36.83, 0, ''),
+(467, 27, -10956.53, 1119.90, 36.73, 0, ''),
+(467, 28, -10939.30, 1150.75, 37.42, 0, ''),
+(467, 29, -10915.14, 1202.09, 36.55, 0, ''),
+(467, 30, -10892.59, 1257.03, 33.37, 0, ''),
+(467, 31, -10891.93, 1306.66, 35.45, 0, ''),
+(467, 32, -10896.17, 1327.86, 37.77, 0, ''),
+(467, 33, -10906.03, 1368.05, 40.91, 0, ''),
+(467, 34, -10910.18, 1389.33, 42.62, 0, ''),
+(467, 35, -10915.42, 1417.72, 42.93, 0, ''),
+(467, 36, -10926.37, 1421.18, 43.04, 0, 'walk here and say'),
+(467, 37, -10952.31, 1421.74, 43.40, 0, ''),
+(467, 38, -10980.04, 1411.38, 42.79, 0, ''),
+(467, 39, -11006.06, 1420.47, 43.26, 0, ''),
+(467, 40, -11021.98, 1450.59, 43.09, 0, ''),
+(467, 41, -11025.36, 1491.59, 43.15, 0, ''),
+(467, 42, -11036.09, 1508.32, 43.28, 0, ''),
+(467, 43, -11060.68, 1526.72, 43.19, 0, ''),
+(467, 44, -11072.75, 1527.77, 43.20, 5000, 'say and quest credit');
+
+DELETE FROM script_waypoint WHERE entry=2768;
+INSERT INTO script_waypoint VALUES
+(2768, 0, -2066.45, -2085.96, 9.08, 0, ''),
+(2768, 1, -2077.99, -2105.33, 13.24, 0, ''),
+(2768, 2, -2074.60, -2109.67, 14.24, 0, ''),
+(2768, 3, -2076.60, -2117.46, 16.67, 0, ''),
+(2768, 4, -2073.51, -2123.46, 18.42, 2000, ''),
+(2768, 5, -2073.51, -2123.46, 18.42, 4000, ''),
+(2768, 6, -2066.60, -2131.85, 21.56, 0, ''),
+(2768, 7, -2053.85, -2143.19, 20.31, 0, ''),
+(2768, 8, -2043.49, -2153.73, 20.20, 10000, ''),
+(2768, 9, -2043.49, -2153.73, 20.20, 20000, ''),
+(2768, 10, -2043.49, -2153.73, 20.20, 10000, ''),
+(2768, 11, -2043.49, -2153.73, 20.20, 2000, ''),
+(2768, 12, -2053.85, -2143.19, 20.31, 0, ''),
+(2768, 13, -2066.60, -2131.85, 21.56, 0, ''),
+(2768, 14, -2073.51, -2123.46, 18.42, 0, ''),
+(2768, 15, -2076.60, -2117.46, 16.67, 0, ''),
+(2768, 16, -2074.60, -2109.67, 14.24, 0, ''),
+(2768, 17, -2077.99, -2105.33, 13.24, 0, ''),
+(2768, 18, -2066.45, -2085.96, 9.08, 0, ''),
+(2768, 19, -2066.41, -2086.21, 8.97, 6000, ''),
+(2768, 20, -2066.41, -2086.21, 8.97, 2000, '');
+
+DELETE FROM script_waypoint WHERE entry=12818;
+INSERT INTO script_waypoint VALUES
+(12818, 0, 3347.250089, -694.700989, 159.925995, 0, ''),
+(12818, 1, 3341.527039, -694.725891, 161.124542, 4000, ''),
+(12818, 2, 3338.351074, -686.088138, 163.444000, 0, ''),
+(12818, 3, 3352.744873, -677.721741, 162.316269, 0, ''),
+(12818, 4, 3370.291016, -669.366943, 160.751358, 0, ''),
+(12818, 5, 3381.479492, -659.449097, 162.545303, 0, ''),
+(12818, 6, 3389.554199, -648.500000, 163.651825, 0, ''),
+(12818, 7, 3396.645020, -641.508911, 164.216019, 0, ''),
+(12818, 8, 3410.498535, -634.299622, 165.773453, 0, ''),
+(12818, 9, 3418.461426, -631.791992, 166.477615, 0, ''),
+(12818, 10, 3429.500000, -631.588745, 166.921265, 0, ''),
+(12818, 11,3434.950195, -629.245483, 168.333969, 0, ''),
+(12818, 12,3438.927979, -618.503235, 171.503143, 0, ''),
+(12818, 13,3444.217529, -609.293640, 173.077972, 1000, 'Ambush 1'),
+(12818, 14,3460.505127, -593.794189, 174.342255, 0, ''),
+(12818, 15,3480.283203, -578.210327, 176.652313, 0, ''),
+(12818, 16,3492.912842, -562.335449, 181.396301, 0, ''),
+(12818, 17,3495.230957, -550.977600, 184.652267, 0, ''),
+(12818, 18,3496.247070, -529.194214, 188.172028, 0, ''),
+(12818, 19,3497.619385, -510.411499, 188.345322, 1000, 'Ambush 2'),
+(12818, 20,3498.498047, -497.787506, 185.806274, 0, ''),
+(12818, 21,3484.218750, -489.717529, 182.389862, 4000, '');
+
+DELETE FROM script_waypoint WHERE entry=12858;
+INSERT INTO script_waypoint VALUES
+(12858, 0, 1782.63, -2241.11, 109.73, 5000, ''),
+(12858, 1, 1788.88, -2240.17, 111.71, 0, ''),
+(12858, 2, 1797.49, -2238.11, 112.31, 0, ''),
+(12858, 3, 1803.83, -2232.77, 111.22, 0, ''),
+(12858, 4, 1806.65, -2217.83, 107.36, 0, ''),
+(12858, 5, 1811.81, -2208.01, 107.45, 0, ''),
+(12858, 6, 1820.85, -2190.82, 100.49, 0, ''),
+(12858, 7, 1829.60, -2177.49, 96.44, 0, ''),
+(12858, 8, 1837.98, -2164.19, 96.71, 0, 'prepare'),
+(12858, 9, 1839.99, -2149.29, 96.78, 0, ''),
+(12858, 10, 1835.14, -2134.98, 96.80, 0, ''),
+(12858, 11, 1823.57, -2118.27, 97.43, 0, ''),
+(12858, 12, 1814.99, -2110.35, 98.38, 0, ''),
+(12858, 13, 1806.60, -2103.09, 99.19, 0, ''),
+(12858, 14, 1798.27, -2095.77, 100.04, 0, ''),
+(12858, 15, 1783.59, -2079.92, 100.81, 0, ''),
+(12858, 16, 1776.79, -2069.48, 101.77, 0, ''),
+(12858, 17, 1776.82, -2054.59, 109.82, 0, ''),
+(12858, 18, 1776.88, -2047.56, 109.83, 0, ''),
+(12858, 19, 1776.86, -2036.55, 109.83, 0, ''),
+(12858, 20, 1776.90, -2024.56, 109.83, 0, 'win'),
+(12858, 21, 1776.87, -2028.31, 109.83,60000, 'stay'),
+(12858, 22, 1776.90, -2028.30, 109.83, 0, '');
+
+DELETE FROM script_waypoint WHERE entry=15420;
+INSERT INTO script_waypoint VALUES
+(15420, 0, 9294.78, -6682.51, 22.42, 0, ''),
+(15420, 1, 9298.27, -6667.99, 22.42, 0, ''),
+(15420, 2, 9309.63, -6658.84, 22.43, 0, ''),
+(15420, 3, 9304.43, -6649.31, 26.46, 0, ''),
+(15420, 4, 9298.83, -6648.00, 28.61, 0, ''),
+(15420, 5, 9291.06, -6653.46, 31.83,2500, ''),
+(15420, 6, 9289.08, -6660.17, 31.85,5000, ''),
+(15420, 7, 9291.06, -6653.46, 31.83, 0, '');
+
+DELETE FROM script_waypoint WHERE entry=16993;
+INSERT INTO script_waypoint VALUES
+(16993, 0, -1137.72, 4272.10, 14.04, 5000, ''),
+(16993, 1, -1141.34, 4232.42, 14.63, 0, ''),
+(16993, 2, -1133.47, 4220.88, 11.78, 0, ''),
+(16993, 3, -1126.18, 4213.26, 13.51, 0, ''),
+(16993, 4, -1100.12, 4204.32, 16.41, 0, ''),
+(16993, 5, -1063.68, 4197.92, 15.51, 0, ''),
+(16993, 6, -1027.28, 4194.36, 15.52, 0, ''),
+(16993, 7, -995.68, 4189.59, 19.84, 0, ''),
+(16993, 8, -970.90, 4188.60, 24.61, 0, ''),
+(16993, 9, -961.93, 4193.34, 26.11, 15000, 'Summon 1'),
+(16993, 10, -935.52, 4210.99, 31.98, 0, ''),
+(16993, 11, -913.42, 4218.27, 37.29, 0, ''),
+(16993, 12, -896.53, 4207.73, 43.23, 0, ''),
+(16993, 13, -868.49, 4194.77, 46.75, 30000, 'Kneel and Rest Here'),
+(16993, 14, -852.83, 4198.29, 47.28, 15000, 'Summon 2'),
+(16993, 15, -819.85, 4200.50, 46.37, 0, ''),
+(16993, 16, -791.92, 4201.96, 44.19, 0, ''),
+(16993, 17, -774.42, 4202.46, 47.41, 0, ''),
+(16993, 18, -762.90, 4202.17, 48.81, 0, ''),
+(16993, 19, -728.25, 4195.35, 50.68, 0, ''),
+(16993, 20, -713.58, 4192.07, 53.98, 0, ''),
+(16993, 21, -703.09, 4189.74, 56.96, 0, ''),
+(16993, 22, -693.70, 4185.43, 57.06, 0, ''),
+(16993, 23, -686.38, 4159.81, 60.26, 0, ''),
+(16993, 24, -679.88, 4147.04, 64.20, 0, ''),
+(16993, 25, -656.74, 4147.72, 64.11, 0, ''),
+(16993, 26, -652.22, 4137.50, 64.58, 0, ''),
+(16993, 27, -649.99, 4136.38, 64.63, 30000, 'Quest Credit');
+
+DELETE FROM script_waypoint WHERE entry=17312;
+INSERT INTO script_waypoint VALUES
+(17312, 0, -4784.532227, -11051.060547, 3.484263, 0, ''),
+(17312, 1, -4805.509277, -11037.293945, 3.043942, 0, ''),
+(17312, 2, -4827.826172, -11034.398438, 1.741959, 0, ''),
+(17312, 3, -4852.630859, -11033.695313, 2.208656, 0, ''),
+(17312, 4, -4876.791992, -11034.517578, 3.175228, 0, ''),
+(17312, 5, -4895.486816, -11038.306641, 9.390890, 0, ''),
+(17312, 6, -4915.464844, -11048.402344, 12.369793, 0, ''),
+(17312, 7, -4937.288086, -11067.041992, 13.857983, 0, ''),
+(17312, 8, -4966.577637, -11067.507813, 15.754786, 0, ''),
+(17312, 9, -4993.799805, -11056.544922, 19.175295, 0, ''),
+(17312, 10, -5017.836426, -11052.569336, 22.476587, 0, ''),
+(17312, 11, -5039.706543, -11058.459961, 25.831593, 0, ''),
+(17312, 12, -5057.289063, -11045.474609, 26.972496, 0, ''),
+(17312, 13, -5078.828125, -11037.601563, 29.053417, 0, ''),
+(17312, 14, -5104.158691, -11039.195313, 29.440195, 0, ''),
+(17312, 15, -5120.780273, -11039.518555, 30.142139, 0, ''),
+(17312, 16, -5140.833008, -11039.810547, 28.788074, 0, ''),
+(17312, 17, -5161.201660, -11040.050781, 27.879545, 4000, ''),
+(17312, 18, -5171.842285, -11046.803711, 27.183821, 0, ''),
+(17312, 19, -5185.995117, -11056.359375, 20.234867, 0, ''),
+(17312, 20, -5198.485840, -11065.065430, 18.872593, 0, ''),
+(17312, 21, -5214.062500, -11074.653320, 19.215731, 0, ''),
+(17312, 22, -5220.157227, -11088.377930, 19.818476, 0, ''),
+(17312, 23, -5233.652832, -11098.846680, 18.349432, 0, ''),
+(17312, 24, -5250.163086, -11111.653320, 16.438959, 0, ''),
+(17312, 25, -5268.194336, -11125.639648, 12.668313, 0, ''),
+(17312, 26, -5286.270508, -11130.669922, 6.912246, 0, ''),
+(17312, 27, -5317.449707, -11137.392578, 4.963446, 0, ''),
+(17312, 28, -5334.854492, -11154.384766, 6.742664, 0, ''),
+(17312, 29, -5353.874512, -11171.595703, 6.903912, 20000, ''),
+(17312, 30, -5354.240000, -11171.940000, 6.890000, 0, '');
+
+DELETE FROM script_waypoint WHERE entry=19685;
+INSERT INTO script_waypoint VALUES
+(19685, 0, -1863.369019, 5419.517090, -10.463668, 5000, ''),
+(19685, 1, -1861.749023, 5416.465332, -10.508068, 0, ''),
+(19685, 2, -1857.036133, 5410.966309, -12.428039, 0, ''),
+(19685, 3, -1831.539185, 5365.472168, -12.428039, 0, ''),
+(19685, 4, -1813.416504, 5333.776855, -12.428039, 0, ''),
+(19685, 5, -1800.354370, 5313.290039, -12.428039, 0, ''),
+(19685, 6, -1775.624878, 5268.786133, -38.809181, 0, ''),
+(19685, 7, -1770.147339, 5259.268066, -38.829231, 0, ''),
+(19685, 8, -1762.814209, 5261.098145, -38.848995, 0, ''),
+(19685, 9, -1740.110474, 5268.858398, -40.208965, 0, ''),
+(19685, 10, -1725.837402, 5270.936035, -40.208965, 0, ''),
+(19685, 11, -1701.580322, 5290.323242, -40.209187, 0, ''),
+(19685, 12, -1682.877808, 5291.406738, -34.429646, 0, ''),
+(19685, 13, -1670.101685, 5291.201172, -32.786007, 0, ''),
+(19685, 14, -1656.666870, 5294.333496, -37.862648, 0, ''),
+(19685, 15, -1652.035767, 5295.413086, -40.245499, 0, ''),
+(19685, 16, -1620.860596, 5300.133301, -40.208992, 0, ''),
+(19685, 17, -1607.630981, 5293.983398, -38.577045, 5000, ''),
+(19685, 18, -1607.630981, 5293.983398, -38.577045, 5000, ''),
+(19685, 19, -1607.630981, 5293.983398, -38.577045, 5000, ''),
+(19685, 20, -1622.140869, 5301.955566, -40.208897, 0, ''),
+(19685, 21, -1621.131836, 5333.112793, -40.208897, 0, ''),
+(19685, 22, -1637.598999, 5342.134277, -40.208790, 0, ''),
+(19685, 23, -1648.521606, 5352.309570, -47.496170, 0, ''),
+(19685, 24, -1654.606934, 5357.419434, -45.870892, 0, ''),
+(19685, 25, -1633.670044, 5422.067871, -42.835541, 0, ''),
+(19685, 26, -1656.567505, 5426.236328, -40.405815, 0, ''),
+(19685, 27, -1664.932373, 5425.686523, -38.846405, 0, ''),
+(19685, 28, -1681.406006, 5425.871094, -38.810928, 0, ''),
+(19685, 29, -1730.875977, 5427.413574, -12.427910, 0, ''),
+(19685, 30, -1743.509521, 5369.599121, -12.427910, 0, ''),
+(19685, 31, -1877.217041, 5303.710449, -12.427989, 0, ''),
+(19685, 32, -1890.371216, 5289.273438, -12.428268, 0, ''),
+(19685, 33, -1905.505737, 5266.534668, 2.630672, 0, ''),
+(19685, 34, -1909.381348, 5273.008301, 1.663714, 10000, ''),
+(19685, 35, -1909.381348, 5273.008301, 1.663714, 12000, ''),
+(19685, 36, -1909.381348, 5273.008301, 1.663714, 8000, ''),
+(19685, 37, -1909.381348, 5273.008301, 1.663714, 15000, ''),
+(19685, 38, -1927.561401, 5275.324707, 1.984987, 0, ''),
+(19685, 39, -1927.385498, 5300.879883, -12.427236, 0, ''),
+(19685, 40, -1921.063965, 5314.318359, -12.427236, 0, ''),
+(19685, 41, -1965.425415, 5379.298828, -12.427236, 0, ''),
+(19685, 42, -1981.233154, 5450.743652, -12.427236, 0, ''),
+(19685, 43, -1958.022461, 5455.904297, 0.487659, 0, ''),
+(19685, 44, -1951.991455, 5463.580566, 0.874490, 10000, ''),
+(19685, 45, -1951.991455, 5463.580566, 0.874490, 12000, ''),
+(19685, 46, -1968.730225, 5481.752930, -12.427846, 0, ''),
+(19685, 47, -1881.839844, 5554.040039, -12.427846, 0, ''),
+(19685, 48, -1841.566650, 5545.965332, -12.427846, 0, ''),
+(19685, 49, -1837.658325, 5523.780273, 0.558756, 0, ''),
+(19685, 50, -1831.321777, 5534.821777, 1.221819, 6000, ''),
+(19685, 51, -1831.321777, 5534.821777, 1.221819, 8000, ''),
+(19685, 52, -1831.321777, 5534.821777, 1.221819, 5000, ''),
+(19685, 53, -1850.060669, 5472.610840, 0.857320, 6000, ''),
+(19685, 54, -1850.060669, 5472.610840, 0.857320, 8000, ''),
+(19685, 55, -1850.060669, 5472.610840, 0.857320, 9000, ''),
+(19685, 56, -1850.060669, 5472.610840, 0.857320, 9000, ''),
+(19685, 57, -1850.060669, 5472.610840, 0.857320, 4000, '');
+
+DELETE FROM script_waypoint WHERE entry=20129;
+INSERT INTO script_waypoint VALUES
+(20129, 0, -8374.93,-4250.21, -204.38,5000, ''),
+(20129, 1, -8374.93,-4250.21, -204.38,16000, ''),
+(20129, 2, -8374.93,-4250.21, -204.38,10000, ''),
+(20129, 3, -8374.93,-4250.21, -204.38,2000, ''),
+(20129, 4, -8439.40,-4180.05, -209.25, 0, ''),
+(20129, 5, -8437.82,-4120.84, -208.59,10000, ''),
+(20129, 6, -8437.82,-4120.84, -208.59,16000, ''),
+(20129, 7, -8437.82,-4120.84, -208.59,13000, ''),
+(20129, 8, -8437.82,-4120.84, -208.59,18000, ''),
+(20129, 9, -8437.82,-4120.84, -208.59,15000, ''),
+(20129, 10, -8437.82,-4120.84, -208.59,2000, ''),
+(20129, 11, -8467.26,-4198.63, -214.21, 0, ''),
+(20129, 12, -8667.76,-4252.13, -209.56, 0, ''),
+(20129, 13, -8703.71,-4234.58, -209.5,14000, ''),
+(20129, 14, -8703.71,-4234.58, -209.5,2000, ''),
+(20129, 15, -8642.81,-4304.37, -209.57, 0, ''),
+(20129, 16, -8649.06,-4394.36, -208.46,6000, ''),
+(20129, 17, -8649.06,-4394.36, -208.46,18000, ''),
+(20129, 18, -8649.06,-4394.36, -208.46,2000, ''),
+(20129, 19, -8468.72,-4437.67, -215.45, 0, ''),
+(20129, 20, -8427.54,-4426, -211.13, 0, ''),
+(20129, 21, -8364.83,-4393.32, -205.91, 0, ''),
+(20129, 22, -8304.54,-4357.2, -208.2,18000, ''),
+(20129, 23, -8304.54,-4357.2, -208.2,2000, ''),
+(20129, 24, -8375.42,-4250.41, -205.14,5000, ''),
+(20129, 25, -8375.42,-4250.41, -205.14,5000, '');
+
+DELETE FROM script_waypoint WHERE entry=6575;
+INSERT INTO script_waypoint VALUES
+(6575, 0, 1945.81, -431.54, 16.36, 0, ''),
+(6575, 1, 1946.21, -436.41, 16.36, 0, ''),
+(6575, 2, 1950.01, -444.11, 14.63, 0, ''),
+(6575, 3, 1956.08, -449.34, 13.12, 0, ''),
+(6575, 4, 1966.59, -450.55, 11.27, 0, ''),
+(6575, 5, 1976.09, -447.51, 11.27, 0, ''),
+(6575, 6, 1983.42, -435.85, 11.27, 0, ''),
+(6575, 7, 1978.17, -428.81, 11.27, 0, ''),
+(6575, 8, 1973.97, -422.08, 9.04, 0, ''),
+(6575, 9, 1963.84, -418.90, 6.17, 0, ''),
+(6575, 10, 1961.22, -422.74, 6.17, 0, ''),
+(6575, 11, 1964.80, -431.26, 6.17, 300000, '');
+
+DELETE FROM script_waypoint WHERE entry=3849;
+INSERT INTO script_waypoint VALUES
+(3849, 0, -252.92, 2126.82, 81.17, 0, ''),
+(3849, 1, -253.88, 2131.11, 81.21, 0, ''),
+(3849, 2, -249.66, 2142.45, 87.01, 0, ''),
+(3849, 3, -248.08, 2143.68, 87.01, 0, ''),
+(3849, 4, -238.87, 2139.93, 87.01, 0, ''),
+(3849, 5, -235.47, 2149.18, 90.59, 0, ''),
+(3849, 6, -239.89, 2156.06, 90.62, 20000, 'SAY_FREE');
+
+DELETE FROM script_waypoint WHERE entry=3850;
+INSERT INTO script_waypoint VALUES
+(3850, 0, -255.33, 2117.99, 81.17, 0, ''),
+(3850, 1, -253.88, 2131.11, 81.21, 0, ''),
+(3850, 2, -249.66, 2142.45, 87.01, 0, ''),
+(3850, 3, -248.08, 2143.68, 87.01, 0, ''),
+(3850, 4, -238.87, 2139.93, 87.01, 0, ''),
+(3850, 5, -235.47, 2149.18, 90.59, 0, ''),
+(3850, 6, -239.89, 2156.06, 90.62, 20000, 'SAY_FREE');
+
+-- Henry Stern
+UPDATE `creature_template` SET `ScriptName`='npc_henry_stern' WHERE `entry`=8696;
+
+DELETE FROM `trinity_string` WHERE `entry` IN (59);
+INSERT INTO `trinity_string` VALUES
+(59,'Using creature EventAI: %s',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); \ No newline at end of file
diff --git a/sql/updates/2570_world.sql b/sql/updates/2570_world.sql
new file mode 100644
index 00000000000..0d87bfc80e8
--- /dev/null
+++ b/sql/updates/2570_world.sql
@@ -0,0 +1,9 @@
+INSERT IGNORE INTO `spell_linked_spell` VALUES (47988, 54501, 2, 'Consume Shadows - Rank 9');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (47987, 54501, 2, 'Consume Shadows - Rank 8');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (27272, 54501, 2, 'Consume Shadows - Rank 7');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17854, 54501, 2, 'Consume Shadows - Rank 6');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17853, 54501, 2, 'Consume Shadows - Rank 5');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17852, 54501, 2, 'Consume Shadows - Rank 4');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17851, 54501, 2, 'Consume Shadows - Rank 3');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17850, 54501, 2, 'Consume Shadows - Rank 2');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17767, 54501, 2, 'Consume Shadows - Rank 1'); \ No newline at end of file
diff --git a/sql/updates/2582_mangos_7644_01_characters_character_pet.sql b/sql/updates/2582_mangos_7644_01_characters_character_pet.sql
new file mode 100644
index 00000000000..c9713aeb4b5
--- /dev/null
+++ b/sql/updates/2582_mangos_7644_01_characters_character_pet.sql
@@ -0,0 +1,5 @@
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7546_01_characters_uptime required_7644_01_characters_character_pet bit;*/
+
+/* only hunter pets must be in stable */
+UPDATE `character_pet`
+ SET slot = 100 WHERE PetType <> 1 AND slot >= 1 AND slot <= 4; \ No newline at end of file
diff --git a/sql/updates/2586_world.sql b/sql/updates/2586_world.sql
new file mode 100644
index 00000000000..489fe7bdb75
--- /dev/null
+++ b/sql/updates/2586_world.sql
@@ -0,0 +1,4 @@
+INSERT IGNORE INTO `spell_linked_spell` VALUES (53563, 53651, 2, 'Beacon of Light');
+
+INSERT INTO `spell_proc_event` VALUES
+(53651, 0x00, 10, 0xC0008000, 0x00000000, 0x00000000, 0x00000000, 0x0000000, 0.000000, 0.000000, 0);
diff --git a/sql/updates/2591_world.sql b/sql/updates/2591_world.sql
new file mode 100644
index 00000000000..63da911d5a4
--- /dev/null
+++ b/sql/updates/2591_world.sql
@@ -0,0 +1,6 @@
+INSERT IGNORE INTO `spell_linked_spell` VALUES (16857, 60089, 0, 'Faerie Fire (Feral) Rank 1');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17390, 60089, 0, 'Faerie Fire (Feral) Rank 2');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17391, 60089, 0, 'Faerie Fire (Feral) Rank 3');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (17392, 60089, 0, 'Faerie Fire (Feral) Rank 4');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (27011, 60089, 0, 'Faerie Fire (Feral) Rank 5');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (48475, 60089, 0, 'Faerie Fire (Feral) Rank 6');
diff --git a/sql/updates/2617_world_spell_linked_spell.sql b/sql/updates/2617_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..392893de6da
--- /dev/null
+++ b/sql/updates/2617_world_spell_linked_spell.sql
@@ -0,0 +1,7 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (781, 57635, 60932, 61507, 49576);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(781, 56446, 0, 'Disengage'),
+(57635, 57636, 0, 'Disengage'),
+(60932, 60934, 0, 'Disengage'),
+(61507, 61508, 0, 'Disengage'),
+(49576, 49560, 0, 'Death Grip'); \ No newline at end of file
diff --git a/sql/updates/2629_world.sql b/sql/updates/2629_world.sql
new file mode 100644
index 00000000000..be4609b7d5e
--- /dev/null
+++ b/sql/updates/2629_world.sql
@@ -0,0 +1,2 @@
+INSERT IGNORE INTO `spell_linked_spell` VALUES (47897, 47960, 1, 'Shadowflame Rank 1');
+INSERT IGNORE INTO `spell_linked_spell` VALUES (61290, 61291, 1, 'Shadowflame Rank 2');
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index b3ab01427ae..fae17c96dca 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -292,6 +292,22 @@ UPDATE `creature_template` SET `ScriptName`='boss_archimonde' WHERE `entry`=1796
UPDATE `creature_template` SET `ScriptName`='mob_doomfire' WHERE `entry`=18095;
UPDATE `creature_template` SET `ScriptName`='mob_doomfire_targetting' WHERE `entry`=18104;
UPDATE `creature_template` SET `ScriptName`='mob_ancient_wisp' WHERE `entry`=17946;
+UPDATE `creature_template` SET `ScriptName`='mob_giant_infernal' WHERE `entry`=17908;
+UPDATE `creature_template` SET `ScriptName`='mob_abomination' WHERE `entry`=17898;
+UPDATE `creature_template` SET `ScriptName`='mob_ghoul' WHERE `entry`=17895;
+UPDATE `creature_template` SET `ScriptName`='mob_necromancer' WHERE `entry`=17899;
+UPDATE `creature_template` SET `ScriptName`='mob_banshee' WHERE `entry`=17905;
+UPDATE `creature_template` SET `ScriptName`='mob_crypt_fiend' WHERE `entry`=17897;
+UPDATE `creature_template` SET `ScriptName`='mob_fel_stalker' WHERE `entry`=17916;
+UPDATE `creature_template` SET `ScriptName`='mob_frost_wyrm' WHERE `entry`=17907;
+UPDATE `creature_template` SET `ScriptName`='mob_gargoyle' WHERE `entry`=17906;
+UPDATE `creature_template` SET `ScriptName`='alliance_rifleman' WHERE `entry`=17921;
+UPDATE `creature_template` SET `ScriptName`='mob_towering_infernal' WHERE `entry`=17818;
+UPDATE `creature_template` SET `ScriptName`='boss_anetheron' WHERE `entry`=17808;
+UPDATE `creature_template` SET `ScriptName`='boss_azgalor' WHERE `entry`=17842;
+UPDATE `creature_template` SET `ScriptName`='mob_lesser_doomguard' WHERE `entry`=17864;
+UPDATE `creature_template` SET `ScriptName`='boss_kazrogal' WHERE `entry`=17888;
+UPDATE `creature_template` SET `ScriptName`='boss_rage_winterchill' WHERE `entry`=17767;
/* OLD HILLSBRAD */
UPDATE `instance_template` SET `script`='instance_old_hillsbrad' WHERE `map`=560;
@@ -643,6 +659,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_thrall_warchief' WHERE `entry`=
/* RAZORFEN DOWNS */
UPDATE `creature_template` SET `ScriptName`='boss_amnennar_the_coldbringer' WHERE `entry`=7358;
+UPDATE `creature_template` SET `ScriptName`='npc_henry_stern' WHERE `entry`=8696;
/* RAZORFEN KRAUL */
UPDATE `creature_template` SET `Scriptname`='npc_willix' WHERE `entry`=4508;
diff --git a/sql/world_scripts_structure.sql b/sql/world_scripts_structure.sql
index 57556ff5910..7ac482bb493 100644
--- a/sql/world_scripts_structure.sql
+++ b/sql/world_scripts_structure.sql
@@ -98,9 +98,21 @@ CREATE TABLE IF NOT EXISTS `script_texts` (
PRIMARY KEY (`entry`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Texts';
+DROP TABLE IF EXISTS script_waypoint;
+CREATE TABLE script_waypoint (
+ entry mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'creature_template entry',
+ pointid mediumint(8) unsigned NOT NULL DEFAULT '0',
+ location_x float NOT NULL DEFAULT '0',
+ location_y float NOT NULL DEFAULT '0',
+ location_z float NOT NULL DEFAULT '0',
+ waittime int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'waittime in millisecs',
+ point_comment text,
+ PRIMARY KEY (entry, pointid)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
+
+
DROP TABLE IF EXISTS `sd2_db_version`;
DROP TABLE IF EXISTS `script_db_version`;
CREATE TABLE `script_db_version` (
`version` varchar(255) NOT NULL default '' COMMENT 'Database version string'
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
+) ENGINE=MyISAM DEFAULT CHARSET=utf8; \ No newline at end of file