*Merge.

--HG--
branch : trunk

8 files changed, 27 insertions, 7 deletions

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