*Merge.

--HG--
branch : trunk

10 files changed, 219 insertions, 195 deletions

diff --git a/sql/TBC-WLK converter/TBC-WLK_world_run_only_once.sql b/sql/TBC-WLK converter/TBC-WLK_world_run_only_once.sql
index 5882d1a0b3c..798d296370c 100644
--- a/sql/TBC-WLK converter/TBC-WLK_world_run_only_once.sql
+++ b/sql/TBC-WLK converter/TBC-WLK_world_run_only_once.sql
@@ -1,189 +1,189 @@
-DROP TABLE IF EXISTS `achievement_reward`;

-CREATE TABLE `achievement_reward` (

-  `entry` mediumint(8) unsigned NOT NULL default '0',

-  `title_A` mediumint(8) unsigned NOT NULL default '0',

-  `title_H` mediumint(8) unsigned NOT NULL default '0',

-  `item` mediumint(8) unsigned NOT NULL default '0',

-  `sender` mediumint(8) unsigned NOT NULL default '0',

-  `subject` varchar(255) default NULL,

-  `text` text,

-  PRIMARY KEY  (`entry`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';

-

-

-DROP TABLE IF EXISTS `locales_achievement_reward`;

-CREATE TABLE `locales_achievement_reward` (

-  `entry` mediumint(8) unsigned NOT NULL default '0',

-  `subject_loc1` varchar(100) NOT NULL default '',

-  `subject_loc2` varchar(100) NOT NULL default '',

-  `subject_loc3` varchar(100) NOT NULL default '',

-  `subject_loc4` varchar(100) NOT NULL default '',

-  `subject_loc5` varchar(100) NOT NULL default '',

-  `subject_loc6` varchar(100) NOT NULL default '',

-  `subject_loc7` varchar(100) NOT NULL default '',

-  `subject_loc8` varchar(100) NOT NULL default '',

-  `text_loc1` text default NULL,

-  `text_loc2` text default NULL,

-  `text_loc3` text default NULL,

-  `text_loc4` text default NULL,

-  `text_loc5` text default NULL,

-  `text_loc6` text default NULL,

-  `text_loc7` text default NULL,

-  `text_loc8` text default NULL,

-  PRIMARY KEY  (`entry`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8;

-

-TRUNCATE `creature_equip_template`;

-ALTER TABLE `creature_equip_template`

-    DROP COLUMN `equipinfo1`,

-    DROP COLUMN `equipinfo2`,

-    DROP COLUMN `equipinfo3`,

-    DROP COLUMN `equipslot1`,

-    DROP COLUMN `equipslot2`,

-    DROP COLUMN `equipslot3`,

-    CHANGE COLUMN `equipmodel1` `equipentry1` mediumint(8) UNSIGNED default '0' NOT NULL,

-    CHANGE COLUMN `equipmodel2` `equipentry2` mediumint(8) UNSIGNED default '0' NOT NULL,

-    CHANGE COLUMN `equipmodel3` `equipentry3` mediumint(8) UNSIGNED default '0' NOT NULL;

-UPDATE `creature_template` set equipment_id = 0;

-

-ALTER TABLE `item_template`

-    ADD COLUMN `ScalingStatDistribution` smallint(6) DEFAULT '0' NOT NULL after `stat_value10`,

-    ADD COLUMN `ScalingStatValue` smallint(6) DEFAULT '0' NOT NULL after `ScalingStatDistribution`,

-    ADD COLUMN `ItemLimitCategory` smallint(6) DEFAULT '0' NOT NULL after `ArmorDamageModifier`,

-    CHANGE COLUMN `Duration` `Duration` int(11) NOT NULL default '0' COMMENT 'Duration in seconds. Negative value means realtime, postive value ingame time' after ArmorDamageModifier,

-    ADD COLUMN `StatsCount` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL after `ContainerSlots`,

-    CHANGE COLUMN `TotemCategory` `TotemCategory` mediumint(9) NOT NULL default '0';

-

-UPDATE `item_template`

-    SET `maxcount`=0 WHERE `maxcount` > 32000;

-UPDATE `item_template`

-    SET `stackable`=0 WHERE `stackable` > 32000;

-ALTER TABLE `item_template`

-    CHANGE COLUMN `maxcount` `maxcount` smallint(5) NOT NULL default '-1',

-    CHANGE COLUMN `stackable` `stackable` smallint(5) NOT NULL default '1';

-UPDATE `item_template`

-    SET `stackable`=-1 WHERE `stackable` = 0;	

-

-ALTER TABLE `quest_template`

-    ADD COLUMN `PlayersSlain` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL after `CharTitleId`,

-    ADD COLUMN `BonusTalents` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL after `PlayersSlain`,

-    CHANGE COLUMN `RewHonorableKills` `RewHonorableKills` int unsigned NOT NULL default '0';

-    

-DROP TABLE IF EXISTS `milling_loot_template`;

-CREATE TABLE `milling_loot_template` (

-  `entry` mediumint(8) unsigned NOT NULL default '0',

-  `item` mediumint(8) unsigned NOT NULL default '0',

-  `ChanceOrQuestChance` float NOT NULL default '100',

-  `groupid` tinyint(3) unsigned NOT NULL default '0',

-  `mincountOrRef` mediumint(9) NOT NULL default '1',

-  `maxcount` tinyint(3) unsigned NOT NULL default '1',

-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',

-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',

-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',

-  PRIMARY KEY  (`entry`,`item`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';

-

-DROP TABLE IF EXISTS `spell_affect`;

-CREATE TABLE `spell_affect` (

-  `entry` smallint(5) unsigned NOT NULL default '0',

-  `effectId` tinyint(3) unsigned NOT NULL default '0',

-  `SpellClassMask0` int(5) unsigned NOT NULL default '0',

-  `SpellClassMask1` int(5) unsigned NOT NULL default '0',

-  `SpellClassMask2` int(5) unsigned NOT NULL default '0',

-  PRIMARY KEY  (`entry`,`effectId`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8;

-

-ALTER TABLE `skill_discovery_template`

-   DROP PRIMARY KEY,

-   ADD PRIMARY KEY (`spellId`,`reqSpell`),

-   ADD COLUMN `reqClass` tinyint(2) unsigned NOT NULL default '0' COMMENT 'class requirement' AFTER reqSpell;

-ALTER TABLE skill_discovery_template

-   DROP COLUMN `reqClass`,

-   ADD COLUMN `reqSkillValue` smallint(5) unsigned NOT NULL default '0' COMMENT 'skill points requirement' AFTER reqSpell;

-   

-DROP TABLE IF EXISTS `player_classlevelstats`;

-CREATE TABLE `player_classlevelstats` (

-  `class` tinyint(3) unsigned NOT NULL,

-  `level` tinyint(3) unsigned NOT NULL,

-  `basehp` smallint(5) unsigned NOT NULL,

-  `basemana` smallint(5) unsigned NOT NULL,

-  PRIMARY KEY  (`class`,`level`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.';

-

-DROP TABLE IF EXISTS `player_levelstats`;

-CREATE TABLE `player_levelstats` (

-  `race` tinyint(3) unsigned NOT NULL,

-  `class` tinyint(3) unsigned NOT NULL,

-  `level` tinyint(3) unsigned NOT NULL,

-  `str` tinyint(3) unsigned NOT NULL,

-  `agi` tinyint(3) unsigned NOT NULL,

-  `sta` tinyint(3) unsigned NOT NULL,

-  `inte` tinyint(3) unsigned NOT NULL,

-  `spi` tinyint(3) unsigned NOT NULL,

-  PRIMARY KEY  (`race`,`class`,`level`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.';

-

-DROP TABLE IF EXISTS `playercreateinfo_spell`;

-CREATE TABLE `playercreateinfo_spell` (

-  `race` tinyint(3) unsigned NOT NULL default '0',

-  `class` tinyint(3) unsigned NOT NULL default '0',

-  `Spell` mediumint(8) unsigned NOT NULL default '0',

-  `Note` varchar(255) default NULL,

-  PRIMARY KEY  (`race`,`class`,`Spell`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8;

-

-DROP TABLE IF EXISTS `playercreateinfo_action`;

-CREATE TABLE `playercreateinfo_action` (

-  `race` tinyint(3) unsigned NOT NULL default '0',

-  `class` tinyint(3) unsigned NOT NULL default '0',

-  `button` smallint(5) unsigned NOT NULL default '0',

-  `action` smallint(5) unsigned NOT NULL default '0',

-  `type` smallint(5) unsigned NOT NULL default '0',

-  `misc` smallint(5) unsigned NOT NULL default '0',

-  KEY `playercreateinfo_race_class_index` (`race`,`class`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8;

-

-DROP TABLE IF EXISTS `spell_learn_spell`;

-CREATE TABLE `spell_learn_spell` (

-  `entry` smallint(5) unsigned NOT NULL default '0',

-  `SpellID` smallint(5) unsigned NOT NULL default '0',

-  `Active` tinyint(3) unsigned NOT NULL default '1',

-  PRIMARY KEY  (`entry`,`SpellID`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Item System';

-

-DROP TABLE IF EXISTS `spell_proc_event`;

-CREATE TABLE `spell_proc_event` (

-  `entry` smallint(5) unsigned NOT NULL default '0',

-  `SchoolMask` tinyint(4) NOT NULL default '0',

-  `SpellFamilyName` smallint(5) unsigned NOT NULL default '0',

-  `SpellFamilyMask0` int(10) unsigned NOT NULL default '0',

-  `SpellFamilyMask1` int(10) unsigned NOT NULL default '0',

-  `SpellFamilyMask2` int(10) unsigned NOT NULL default '0',

-  `procFlags` int(10) unsigned NOT NULL default '0',

-  `procEx` int(10) unsigned NOT NULL default '0',

-  `ppmRate` float NOT NULL default '0',

-  `CustomChance` float NOT NULL default '0',

-  `Cooldown` int(10) unsigned NOT NULL default '0',

-  PRIMARY KEY  (`entry`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8;

-

-DROP TABLE IF EXISTS `player_xp_for_level`;

-CREATE TABLE `player_xp_for_level` (

-  `lvl` int(3) unsigned NOT NULL,

-  `xp_for_next_level` int(10) unsigned NOT NULL,

-  PRIMARY KEY  (`lvl`)

-) ENGINE=MyISAM DEFAULT CHARSET=utf8;

-

-DROP TABLE IF EXISTS `spell_loot_template`;

-CREATE TABLE `spell_loot_template` (

-  `entry` mediumint(8) unsigned NOT NULL default '0',

-  `item` mediumint(8) unsigned NOT NULL default '0',

-  `ChanceOrQuestChance` float NOT NULL default '100',

-  `groupid` tinyint(3) unsigned NOT NULL default '0',

-  `mincountOrRef` mediumint(9) NOT NULL default '1',

-  `maxcount` tinyint(3) unsigned NOT NULL default '1',

-  `lootcondition` tinyint(3) unsigned NOT NULL default '0',

-  `condition_value1` mediumint(8) unsigned NOT NULL default '0',

-  `condition_value2` mediumint(8) unsigned NOT NULL default '0',

-  PRIMARY KEY  (`entry`,`item`)

+DROP TABLE IF EXISTS `achievement_reward`;
+CREATE TABLE `achievement_reward` (
+  `entry` mediumint(8) unsigned NOT NULL default '0',
+  `title_A` mediumint(8) unsigned NOT NULL default '0',
+  `title_H` mediumint(8) unsigned NOT NULL default '0',
+  `item` mediumint(8) unsigned NOT NULL default '0',
+  `sender` mediumint(8) unsigned NOT NULL default '0',
+  `subject` varchar(255) default NULL,
+  `text` text,
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
+
+
+DROP TABLE IF EXISTS `locales_achievement_reward`;
+CREATE TABLE `locales_achievement_reward` (
+  `entry` mediumint(8) unsigned NOT NULL default '0',
+  `subject_loc1` varchar(100) NOT NULL default '',
+  `subject_loc2` varchar(100) NOT NULL default '',
+  `subject_loc3` varchar(100) NOT NULL default '',
+  `subject_loc4` varchar(100) NOT NULL default '',
+  `subject_loc5` varchar(100) NOT NULL default '',
+  `subject_loc6` varchar(100) NOT NULL default '',
+  `subject_loc7` varchar(100) NOT NULL default '',
+  `subject_loc8` varchar(100) NOT NULL default '',
+  `text_loc1` text default NULL,
+  `text_loc2` text default NULL,
+  `text_loc3` text default NULL,
+  `text_loc4` text default NULL,
+  `text_loc5` text default NULL,
+  `text_loc6` text default NULL,
+  `text_loc7` text default NULL,
+  `text_loc8` text default NULL,
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+TRUNCATE `creature_equip_template`;
+ALTER TABLE `creature_equip_template`
+    DROP COLUMN `equipinfo1`,
+    DROP COLUMN `equipinfo2`,
+    DROP COLUMN `equipinfo3`,
+    DROP COLUMN `equipslot1`,
+    DROP COLUMN `equipslot2`,
+    DROP COLUMN `equipslot3`,
+    CHANGE COLUMN `equipmodel1` `equipentry1` mediumint(8) UNSIGNED default '0' NOT NULL,
+    CHANGE COLUMN `equipmodel2` `equipentry2` mediumint(8) UNSIGNED default '0' NOT NULL,
+    CHANGE COLUMN `equipmodel3` `equipentry3` mediumint(8) UNSIGNED default '0' NOT NULL;
+UPDATE `creature_template` set equipment_id = 0;
+
+ALTER TABLE `item_template`
+    ADD COLUMN `ScalingStatDistribution` smallint(6) DEFAULT '0' NOT NULL after `stat_value10`,
+    ADD COLUMN `ScalingStatValue` smallint(6) DEFAULT '0' NOT NULL after `ScalingStatDistribution`,
+    ADD COLUMN `ItemLimitCategory` smallint(6) DEFAULT '0' NOT NULL after `ArmorDamageModifier`,
+    CHANGE COLUMN `Duration` `Duration` int(11) NOT NULL default '0' COMMENT 'Duration in seconds. Negative value means realtime, postive value ingame time' after ArmorDamageModifier,
+    ADD COLUMN `StatsCount` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL after `ContainerSlots`,
+    CHANGE COLUMN `TotemCategory` `TotemCategory` mediumint(9) NOT NULL default '0';
+
+UPDATE `item_template`
+    SET `maxcount`=0 WHERE `maxcount` > 32000;
+UPDATE `item_template`
+    SET `stackable`=0 WHERE `stackable` > 32000;
+ALTER TABLE `item_template`
+    CHANGE COLUMN `maxcount` `maxcount` smallint(5) NOT NULL default '-1',
+    CHANGE COLUMN `stackable` `stackable` smallint(5) NOT NULL default '1';
+UPDATE `item_template`
+    SET `stackable`=-1 WHERE `stackable` = 0;	
+
+ALTER TABLE `quest_template`
+    ADD COLUMN `PlayersSlain` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL after `CharTitleId`,
+    ADD COLUMN `BonusTalents` tinyint(3) UNSIGNED DEFAULT '0' NOT NULL after `PlayersSlain`,
+    CHANGE COLUMN `RewHonorableKills` `RewHonorableKills` int unsigned NOT NULL default '0';
+    
+DROP TABLE IF EXISTS `milling_loot_template`;
+CREATE TABLE `milling_loot_template` (
+  `entry` mediumint(8) unsigned NOT NULL default '0',
+  `item` mediumint(8) unsigned NOT NULL default '0',
+  `ChanceOrQuestChance` float NOT NULL default '100',
+  `groupid` tinyint(3) unsigned NOT NULL default '0',
+  `mincountOrRef` mediumint(9) NOT NULL default '1',
+  `maxcount` tinyint(3) unsigned NOT NULL default '1',
+  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
+  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
+  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`,`item`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
+
+DROP TABLE IF EXISTS `spell_affect`;
+CREATE TABLE `spell_affect` (
+  `entry` smallint(5) unsigned NOT NULL default '0',
+  `effectId` tinyint(3) unsigned NOT NULL default '0',
+  `SpellClassMask0` int(5) unsigned NOT NULL default '0',
+  `SpellClassMask1` int(5) unsigned NOT NULL default '0',
+  `SpellClassMask2` int(5) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`,`effectId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+ALTER TABLE `skill_discovery_template`
+   DROP PRIMARY KEY,
+   ADD PRIMARY KEY (`spellId`,`reqSpell`),
+   ADD COLUMN `reqClass` tinyint(2) unsigned NOT NULL default '0' COMMENT 'class requirement' AFTER reqSpell;
+ALTER TABLE skill_discovery_template
+   DROP COLUMN `reqClass`,
+   ADD COLUMN `reqSkillValue` smallint(5) unsigned NOT NULL default '0' COMMENT 'skill points requirement' AFTER reqSpell;
+   
+DROP TABLE IF EXISTS `player_classlevelstats`;
+CREATE TABLE `player_classlevelstats` (
+  `class` tinyint(3) unsigned NOT NULL,
+  `level` tinyint(3) unsigned NOT NULL,
+  `basehp` smallint(5) unsigned NOT NULL,
+  `basemana` smallint(5) unsigned NOT NULL,
+  PRIMARY KEY  (`class`,`level`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.';
+
+DROP TABLE IF EXISTS `player_levelstats`;
+CREATE TABLE `player_levelstats` (
+  `race` tinyint(3) unsigned NOT NULL,
+  `class` tinyint(3) unsigned NOT NULL,
+  `level` tinyint(3) unsigned NOT NULL,
+  `str` tinyint(3) unsigned NOT NULL,
+  `agi` tinyint(3) unsigned NOT NULL,
+  `sta` tinyint(3) unsigned NOT NULL,
+  `inte` tinyint(3) unsigned NOT NULL,
+  `spi` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY  (`race`,`class`,`level`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 PACK_KEYS=0 COMMENT='Stores levels stats.';
+
+DROP TABLE IF EXISTS `playercreateinfo_spell`;
+CREATE TABLE `playercreateinfo_spell` (
+  `race` tinyint(3) unsigned NOT NULL default '0',
+  `class` tinyint(3) unsigned NOT NULL default '0',
+  `Spell` mediumint(8) unsigned NOT NULL default '0',
+  `Note` varchar(255) default NULL,
+  PRIMARY KEY  (`race`,`class`,`Spell`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `playercreateinfo_action`;
+CREATE TABLE `playercreateinfo_action` (
+  `race` tinyint(3) unsigned NOT NULL default '0',
+  `class` tinyint(3) unsigned NOT NULL default '0',
+  `button` smallint(5) unsigned NOT NULL default '0',
+  `action` smallint(5) unsigned NOT NULL default '0',
+  `type` smallint(5) unsigned NOT NULL default '0',
+  `misc` smallint(5) unsigned NOT NULL default '0',
+  KEY `playercreateinfo_race_class_index` (`race`,`class`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `spell_learn_spell`;
+CREATE TABLE `spell_learn_spell` (
+  `entry` smallint(5) unsigned NOT NULL default '0',
+  `SpellID` smallint(5) unsigned NOT NULL default '0',
+  `Active` tinyint(3) unsigned NOT NULL default '1',
+  PRIMARY KEY  (`entry`,`SpellID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Item System';
+
+DROP TABLE IF EXISTS `spell_proc_event`;
+CREATE TABLE `spell_proc_event` (
+  `entry` smallint(5) unsigned NOT NULL default '0',
+  `SchoolMask` tinyint(4) NOT NULL default '0',
+  `SpellFamilyName` smallint(5) unsigned NOT NULL default '0',
+  `SpellFamilyMask0` int(10) unsigned NOT NULL default '0',
+  `SpellFamilyMask1` int(10) unsigned NOT NULL default '0',
+  `SpellFamilyMask2` int(10) unsigned NOT NULL default '0',
+  `procFlags` int(10) unsigned NOT NULL default '0',
+  `procEx` int(10) unsigned NOT NULL default '0',
+  `ppmRate` float NOT NULL default '0',
+  `CustomChance` float NOT NULL default '0',
+  `Cooldown` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `player_xp_for_level`;
+CREATE TABLE `player_xp_for_level` (
+  `lvl` int(3) unsigned NOT NULL,
+  `xp_for_next_level` int(10) unsigned NOT NULL,
+  PRIMARY KEY  (`lvl`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+DROP TABLE IF EXISTS `spell_loot_template`;
+CREATE TABLE `spell_loot_template` (
+  `entry` mediumint(8) unsigned NOT NULL default '0',
+  `item` mediumint(8) unsigned NOT NULL default '0',
+  `ChanceOrQuestChance` float NOT NULL default '100',
+  `groupid` tinyint(3) unsigned NOT NULL default '0',
+  `mincountOrRef` mediumint(9) NOT NULL default '1',
+  `maxcount` tinyint(3) unsigned NOT NULL default '1',
+  `lootcondition` tinyint(3) unsigned NOT NULL default '0',
+  `condition_value1` mediumint(8) unsigned NOT NULL default '0',
+  `condition_value2` mediumint(8) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`entry`,`item`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Loot System';
\ No newline at end of file
diff --git a/sql/updates/1508_world_scripts .sql b/sql/updates/1508_world_scripts .sql
deleted file mode 100644
index 0e479fe78f5..00000000000
--- a/sql/updates/1508_world_scripts .sql
+++ /dev/null
@@ -1,2 +0,0 @@
--- Script for Yrykul Skeleton - Prince Keleseth Event
-update creature_template set scriptname = 'mob_vrykul_skeleton' where entry = 23970;
\ No newline at end of file
diff --git a/sql/updates/1525_world_scripts.sql b/sql/updates/1525_world_scripts.sql
new file mode 100644
index 00000000000..3eb373009da
--- /dev/null
+++ b/sql/updates/1525_world_scripts.sql
@@ -0,0 +1,2 @@
+-- Script for Yrykul Skeleton - Prince Keleseth Event
+UPDATE `creature_template` SET `ScriptName`='mob_vrykul_skeleton' WHERE `entry`=23970;
\ No newline at end of file
diff --git a/sql/updates/7324_01_characters_character_spell.sql b/sql/updates/1531_mangos_7324_01_characters_character_spell.sql
index d4917ec4814..10c4317b457 100644
--- a/sql/updates/7324_01_characters_character_spell.sql
+++ b/sql/updates/1531_mangos_7324_01_characters_character_spell.sql
@@ -1,4 +1,4 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7314_01_characters_guild_rank required_7324_01_characters_character_spell bit;
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7314_01_characters_guild_rank required_7324_01_characters_character_spell bit;*/
 
 /* remove some deleted spells or ranks from characters */
 /* Mana Tap no longer Blood Elf Racial */
@@ -10,4 +10,4 @@ DELETE FROM `character_spell` WHERE `spell` IN ('20616', '20617', '25272', '2527
 /* Overpower is only one rank now, need to delete these zzOLDRank spells */
 DELETE FROM `character_spell` WHERE `spell` IN ('7887', '11584', '11585');
 /* Shield Bash is only one rank now, need to delete these zzOLDRank spells */
-DELETE FROM `character_spell` WHERE `spell` IN ('1671', '1672', '29704');
+DELETE FROM `character_spell` WHERE `spell` IN ('1671', '1672', '29704');
\ No newline at end of file
diff --git a/sql/updates/7324_02_characters_character_aura.sql b/sql/updates/1531_mangos_7324_02_characters_character_aura.sql
index c9379d25788..fd7e405f966 100644
--- a/sql/updates/7324_02_characters_character_aura.sql
+++ b/sql/updates/1531_mangos_7324_02_characters_character_aura.sql
@@ -1,4 +1,4 @@
-ALTER TABLE character_db_version CHANGE COLUMN required_7324_01_characters_character_spell required_7324_02_characters_character_aura bit;
+/*ALTER TABLE character_db_version CHANGE COLUMN required_7324_01_characters_character_spell required_7324_02_characters_character_aura bit;*/
 
 /* remove some deleted spells or ranks from characters auras */
 /* Mana Tap no longer Blood Elf Racial */
@@ -10,4 +10,4 @@ DELETE FROM `character_aura` WHERE `spell` IN ('20616', '20617', '25272', '25275
 /* Overpower is only one rank now, need to delete these zzOLDRank spells */
 DELETE FROM `character_aura` WHERE `spell` IN ('7887', '11584', '11585');
 /* Shield Bash is only one rank now, need to delete these zzOLDRank spells */
-DELETE FROM `character_aura` WHERE `spell` IN ('1671', '1672', '29704');
+DELETE FROM `character_aura` WHERE `spell` IN ('1671', '1672', '29704');
\ No newline at end of file
diff --git a/sql/updates/7331_01_mangos_command.sql b/sql/updates/1555_mangos_7331_01_world_command.sql
index 4a3b2733158..b85942b71a9 100644
--- a/sql/updates/7331_01_mangos_command.sql
+++ b/sql/updates/1555_mangos_7331_01_world_command.sql
@@ -1,4 +1,4 @@
-ALTER TABLE db_version CHANGE COLUMN required_7312_01_mangos_mangos_string required_7331_01_mangos_command bit;
+/*ALTER TABLE db_version CHANGE COLUMN required_7312_01_mangos_mangos_string required_7331_01_mangos_command bit;*/
 
 DELETE FROM `command` WHERE `name` = 'account set addon';
 DELETE FROM `command` WHERE `name` = 'ban account';
diff --git a/sql/updates/1559_world.sql b/sql/updates/1559_world.sql
new file mode 100644
index 00000000000..4421d36e95c
--- /dev/null
+++ b/sql/updates/1559_world.sql
@@ -0,0 +1,11 @@
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(48077, 48075, 0, 'Holy Nova (rank8)'),
+(48078, 48076, 0, 'Holy Nova (rank9)'),
+(47585, 60069, 0, 'Dispersion (transform/regen)');
+
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47549);
+INSERT INTO `spell_proc_event` VALUES (47549, 0x00, 6, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47551);
+INSERT INTO `spell_proc_event` VALUES (47551, 0x00, 6, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
+DELETE FROM `spell_proc_event` WHERE `entry` IN (47552);
+INSERT INTO `spell_proc_event` VALUES (47552, 0x00, 6, 0x00000000, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/1570_world.sql b/sql/updates/1570_world.sql
new file mode 100644
index 00000000000..4c84b54194e
--- /dev/null
+++ b/sql/updates/1570_world.sql
@@ -0,0 +1,3 @@
+-- Bloodsurge
+DELETE FROM `spell_proc_event` WHERE `entry` IN (46915);
+INSERT INTO `spell_proc_event` VALUES (46915, 0x00, 6, 0x00000040, 0x00000404, 0x00000000, 0x00000000, 0x00000002, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/CMakeLists.txt b/sql/updates/CMakeLists.txt
index f54e3161cf5..2b6de8c5c4e 100644
--- a/sql/updates/CMakeLists.txt
+++ b/sql/updates/CMakeLists.txt
@@ -43,5 +43,11 @@ INSTALL(FILES
 1484_mangos_7307_01_characters_arena_team_member.sql
 1495_mangos_7312_01_world_trinity_string.sql
 1497_mangos_7314_01_characters_guild_rank.sql
+1525_world_scripts.sql
+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
+1559_world.sql
+1570_world.sql
 DESTINATION share/trinity/sql/updates)
\ No newline at end of file
diff --git a/sql/world_scripts_full.sql b/sql/world_scripts_full.sql
index 2070bf3bdfa..0601dc6d0f1 100644
--- a/sql/world_scripts_full.sql
+++ b/sql/world_scripts_full.sql
@@ -313,6 +313,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_saat' WHERE `entry`=20201;
 /* THE UNDERBOG */
 UPDATE `creature_template` SET `ScriptName`='mob_underbog_mushroom' WHERE `entry`=17990;
 UPDATE `creature_template` SET `ScriptName`='boss_hungarfen' WHERE `entry`=17770;
+UPDATE `creature_template` SET `ScriptName`='boss_the_black_stalker' WHERE `entry`='17882';
 
 /* THE STEAMVAULT */
 UPDATE `instance_template` SET `script`='instance_steam_vault' WHERE `map`=545;
@@ -330,6 +331,7 @@ UPDATE `creature_template` SET `ScriptName`='mob_toxic_sporebat' WHERE `entry`=2
 /* Leotheras the Blind event */
 UPDATE `creature_template` SET `ScriptName`='boss_leotheras_the_blind' WHERE `entry`=21215;
 UPDATE `creature_template` SET `ScriptName`='boss_leotheras_the_blind_demonform' WHERE `entry`=21845;
+UPDATE `creature_template` SET `ScriptName`='mob_greyheart_spellbinder' WHERE `entry` = '21806';
 /* Fathom-lord Karathress event */
 UPDATE `creature_template` SET `ScriptName`='boss_fathomlord_karathress' WHERE `entry`=21214;
 UPDATE `creature_template` SET `ScriptName`='boss_fathomguard_sharkkis' WHERE `entry`=21966;
@@ -905,6 +907,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_parqual_fintallas' WHERE `entry
 UPDATE `creature_template` SET `scriptname` = 'boss_keleseth' WHERE `entry` = '23953';
 UPDATE `creature_template` SET `scriptname` = 'mob_frost_tomb' WHERE `entry` = '23965';
 UPDATE `instance_template` SET `script`='instance_utgarde_keep' WHERE `map`= '574';
+UPDATE `creature_template` SET `ScriptName`='mob_vrykul_skeleton' WHERE `entry`=23970;
 
 /* WAILING CAVERNS */
 
@@ -954,6 +957,7 @@ UPDATE `creature_template` SET `ScriptName` = 'boss_koragg' WHERE `entry` =24247
 UPDATE `creature_template` SET `ScriptName` = 'boss_zuljin' WHERE `entry` =23863;
 UPDATE `creature_template` SET `ScriptName` = 'do_nothing' WHERE `entry` = '24187';
 UPDATE `creature_template` SET `ScriptName` = 'mob_zuljin_vortex' WHERE `entry` = '24136';
+UPDATE `creature_template` SET `ScriptName` = 'npc_zulaman_hostage' WHERE `entry` IN (23790, 23999, 24024, 24001);
 
 /* ZUL'FARRAK */
 UPDATE `creature_template` SET `ScriptName`='npc_sergeant_bly' WHERE `entry`=7604;