Scripts/Icecrown Citadel: Added script for Blood Queen Lana'Thel

Scripts/Icecrown Citadel: Fixed Invocation of Blood announcement emote for Blood Prince Council
Scripts/Icecrown Citadel: Fixed intro for Lady Deathwhisper
Scripts/Icecrown Citadel: Fixed Bone Spike for Lord Marrowgar

--HG--
branch : trunk

6 files changed, 78 insertions, 2 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 974bfcd249b..72970b0d351 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -18097,6 +18097,25 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 (-71224, 69706, 0, 'Rotface: Mutated Infection Summon'),
 (-73022, 69706, 0, 'Rotface: Mutated Infection Summon'),
 (-73023, 69706, 0, 'Rotface: Mutated Infection Summon'),
+( 70867, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 71473, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 71532, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 71533, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 70879, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 71525, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 71530, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 71531, 70871, 2, 'Blood-Queen: Essence of the Blood Queen'),
+( 70877, 72649, 2, 'Blood-Queen: Frenzied Bloodthirst 10man'),
+( 70877, 72151, 2, 'Blood-Queen: Frenzied Bloodthirst 10man'),
+( 71474, 72648, 2, 'Blood-Queen: Frenzied Bloodthirst 25man'),
+( 71474, 72650, 2, 'Blood-Queen: Frenzied Bloodthirst 25man'),
+( 70923, 70924, 2, 'Blood-Queen: Uncontrollable Frenzy'),
+( 71446, 71447, 1, 'Blood-Queen: Bloodbolt Splash'),
+( 71478, 71481, 1, 'Blood-Queen: Bloodbolt Splash'),
+( 71479, 71482, 1, 'Blood-Queen: Bloodbolt Splash'),
+( 71480, 71483, 1, 'Blood-Queen: Bloodbolt Splash'),
+( 71952, 70995, 1, 'Blood-Queen: Presence of the Darkfallen'),
+( 71390, 71341, 0, 'Blood-Queen: Pact of the Darkfallen'),
 -- Warsong Gulch
 ( 54861,-23335, 0, 'Drop Flag on Nitro Boost WSG'),
 ( 54861,-23333, 0, 'Drop Flag on Nitro Boost WSG'),
@@ -26836,6 +26855,16 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 72087, 'spell_valanar_kinetic_bomb_knockback'),
 ( 73001, 'spell_blood_council_shadow_prison'),
 ( 72999, 'spell_blood_council_shadow_prison_damage'),
+( 70877, 'spell_blood_queen_frenzied_bloodthirst'),
+( 71474, 'spell_blood_queen_frenzied_bloodthirst'),
+( 70946, 'spell_blood_queen_vampiric_bite'),
+( 71475, 'spell_blood_queen_vampiric_bite'),
+( 71476, 'spell_blood_queen_vampiric_bite'),
+( 71477, 'spell_blood_queen_vampiric_bite'),
+( 71899, 'spell_blood_queen_bloodbolt'),
+( 71900, 'spell_blood_queen_bloodbolt'),
+( 71901, 'spell_blood_queen_bloodbolt'),
+( 71902, 'spell_blood_queen_bloodbolt'),
 -- Ulduar
 ( 62717, 'spell_ignis_slag_pot'),
 ( 63477, 'spell_ignis_slag_pot'),
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index e18f803f9e5..ddb0c52a5e6 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -861,6 +861,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_blood_queen_lana_thel' WHERE `e
 UPDATE `creature_template` SET `ScriptName`='npc_kinetic_bomb' WHERE `entry`=38454;
 UPDATE `creature_template` SET `ScriptName`='npc_dark_nucleus' WHERE `entry`=38369;
 UPDATE `creature_template` SET `ScriptName`='npc_ball_of_flame' WHERE `entry` IN (38332,38451);
+UPDATE `creature_template` SET `ScriptName`='boss_blood_queen_lana_thel' WHERE `entry`=37955;
 
 /* IRONFORGE */
 UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879;
@@ -1751,7 +1752,7 @@ UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_si' WHERE `TypeId`=5;
 UPDATE `outdoorpvp_template` SET `ScriptName`='outdoorpvp_ep' WHERE `TypeId`=6;
 
 /* ACHIEVEMENTS */
-DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3693,6641,6642,6643,6644,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,1234,1239,5605,5606,12778,13036,13035,13037,12977,12967,12986,12982) AND `type` IN (0,11);
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (3693,6641,6642,6643,6644,3804,3805,3806,3807,3808,3809,3810,3811,3812,3813,1234,1239,5605,5606,12778,13036,13035,13037,12977,12967,12986,12982,12780,13012,13011,13013) AND `type` IN (0,11);
 INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
 (3693,11,0,0, 'achievement_storm_glory'),
 (6641,11,0,0, 'achievement_school_of_hard_knocks'),
@@ -1779,6 +1780,10 @@ INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,
 (12977,11,0,0, 'achievement_flu_shot_shortage'),
 (12967,11,0,0, 'achievement_flu_shot_shortage'),
 (12986,11,0,0, 'achievement_flu_shot_shortage'),
-(12982,11,0,0, 'achievement_flu_shot_shortage');
+(12982,11,0,0, 'achievement_flu_shot_shortage'),
+(12780,11,0,0, 'achievement_once_bitten_twice_shy_n'),
+(13012,11,0,0, 'achievement_once_bitten_twice_shy_n'),
+(13011,11,0,0, 'achievement_once_bitten_twice_shy_v'),
+(13013,11,0,0, 'achievement_once_bitten_twice_shy_v');
 
 /* EOF */
diff --git a/sql/updates/10561_world_achievement_criteria_data.sql b/sql/updates/10561_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..b64f14bcb85
--- /dev/null
+++ b/sql/updates/10561_world_achievement_criteria_data.sql
@@ -0,0 +1,6 @@
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (12780,13012,13011,13013) AND `type` IN (0,11);
+INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,`ScriptName`) VALUES
+(12780,11,0,0, 'achievement_once_bitten_twice_shy_n'),
+(13012,11,0,0, 'achievement_once_bitten_twice_shy_n'),
+(13011,11,0,0, 'achievement_once_bitten_twice_shy_v'),
+(13013,11,0,0, 'achievement_once_bitten_twice_shy_v');
diff --git a/sql/updates/10561_world_scriptname.sql b/sql/updates/10561_world_scriptname.sql
new file mode 100644
index 00000000000..faa92a98ae1
--- /dev/null
+++ b/sql/updates/10561_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='boss_blood_queen_lana_thel' WHERE `entry`=37955;
diff --git a/sql/updates/10561_world_spell_linked_spell.sql b/sql/updates/10561_world_spell_linked_spell.sql
new file mode 100644
index 00000000000..7a186fb3d97
--- /dev/null
+++ b/sql/updates/10561_world_spell_linked_spell.sql
@@ -0,0 +1,21 @@
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (70867,71473,71532,71533,70879,71525,71530,71531,70877,71474,70923,71446,71478,71479,71480,71952,71390);
+INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES
+(70867,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(71473,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(71532,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(71533,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(70879,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(71525,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(71530,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(71531,70871,2, 'Blood-Queen: Essence of the Blood Queen'),
+(70877,72649,2, 'Blood-Queen: Frenzied Bloodthirst 10man'),
+(70877,72151,2, 'Blood-Queen: Frenzied Bloodthirst 10man'),
+(71474,72648,2, 'Blood-Queen: Frenzied Bloodthirst 25man'),
+(71474,72650,2, 'Blood-Queen: Frenzied Bloodthirst 25man'),
+(70923,70924,2, 'Blood-Queen: Uncontrollable Frenzy'),
+(71446,71447,1, 'Blood-Queen: Bloodbolt Splash'),
+(71478,71481,1, 'Blood-Queen: Bloodbolt Splash'),
+(71479,71482,1, 'Blood-Queen: Bloodbolt Splash'),
+(71480,71483,1, 'Blood-Queen: Bloodbolt Splash'),
+(71952,70995,1, 'Blood-Queen: Presence of the Darkfallen'),
+(71390,71341,0, 'Blood-Queen: Pact of the Darkfallen');
diff --git a/sql/updates/10561_world_spell_script_names.sql b/sql/updates/10561_world_spell_script_names.sql
new file mode 100644
index 00000000000..e6f6ba6295c
--- /dev/null
+++ b/sql/updates/10561_world_spell_script_names.sql
@@ -0,0 +1,14 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (70877,71474) AND `ScriptName`='spell_blood_queen_frenzied_bloodthirst';
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (70946,71475,71476,71477) AND `ScriptName`='spell_blood_queen_vampiric_bite';
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (71899,71900,71901,71902) AND `ScriptName`='spell_blood_queen_bloodbolt';
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(70877, 'spell_blood_queen_frenzied_bloodthirst'),
+(71474, 'spell_blood_queen_frenzied_bloodthirst'),
+(70946, 'spell_blood_queen_vampiric_bite'),
+(71475, 'spell_blood_queen_vampiric_bite'),
+(71476, 'spell_blood_queen_vampiric_bite'),
+(71477, 'spell_blood_queen_vampiric_bite'),
+(71899, 'spell_blood_queen_bloodbolt'),
+(71900, 'spell_blood_queen_bloodbolt'),
+(71901, 'spell_blood_queen_bloodbolt'),
+(71902, 'spell_blood_queen_bloodbolt');