Merge branch 'master' of github.com:TrinityCore/TrinityCore

5 files changed, 19 insertions, 2 deletions

diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 606688c44de..58a90f99a36 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1535,8 +1535,6 @@ UPDATE `creature_template` SET `ScriptName`='mob_lightning_elemental' WHERE `ent
 UPDATE `creature_template` SET `ScriptName`='mob_rune_of_summoning' WHERE `entry`=33051;
 UPDATE `creature_template` SET `ScriptName`= 'mob_rune_of_power' WHERE entry = 33705;
 UPDATE `creature_template` SET `ScriptName`='boss_kologarn' WHERE `entry`=32930;
-UPDATE `creature_template` SET `ScriptName`='npc_right_arm' WHERE `entry`=32934;
-UPDATE `creature_template` SET `ScriptName`='npc_left_arm' WHERE `entry`=32933;
 UPDATE `creature_template` SET `ScriptName`='boss_general_vezax' WHERE `entry`=33271;
 UPDATE `creature_template` SET `ScriptName`='npc_saronite_vapors' WHERE `entry`=33488;
 UPDATE `creature_template` SET `ScriptName`='npc_saronite_animus' WHERE `entry`=33524;
@@ -2064,6 +2062,12 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 62521, 'spell_attuned_to_nature_dose_reduction'),
 ( 62524, 'spell_attuned_to_nature_dose_reduction'),
 ( 62525, 'spell_attuned_to_nature_dose_reduction'),
+( 63633, 'spell_ulduar_rubble_summon'),
+( 65594, 'spell_ulduar_cancel_stone_grip'),
+( 62056, 'spell_ulduar_stone_grip'),
+( 63985, 'spell_ulduar_stone_grip'),
+( 64224, 'spell_ulduar_stone_grip_absorb'),
+( 64225, 'spell_ulduar_stone_grip_absorb'),
 -- quest
 (  8913, 'spell_q55_sacred_cleansing'),
 ( 17271, 'spell_q5206_test_fetid_skull'),
diff --git a/sql/updates/world/2011_02_22_0_world_scriptname.sql b/sql/updates/world/2011_02_22_0_world_scriptname.sql
new file mode 100644
index 00000000000..0199d796ece
--- /dev/null
+++ b/sql/updates/world/2011_02_22_0_world_scriptname.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `entry` IN(32933,32934);
\ No newline at end of file
diff --git a/sql/updates/world/2011_02_22_1_world_spell_script_names.sql b/sql/updates/world/2011_02_22_1_world_spell_script_names.sql
new file mode 100644
index 00000000000..d0b20794f96
--- /dev/null
+++ b/sql/updates/world/2011_02_22_1_world_spell_script_names.sql
@@ -0,0 +1,8 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN(63633,65594,62056,63985,64224,64225);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES 
+(63633,'spell_ulduar_rubble_summon'),
+(65594,'spell_ulduar_cancel_stone_grip'),
+(62056,'spell_ulduar_stone_grip'),
+(63985,'spell_ulduar_stone_grip'),
+(64224,'spell_ulduar_stone_grip_absorb'),
+(64225,'spell_ulduar_stone_grip_absorb');
diff --git a/sql/updates/world/2011_02_22_2_world_conditions.sql b/sql/updates/world/2011_02_22_2_world_conditions.sql
new file mode 100644
index 00000000000..93328d671cc
--- /dev/null
+++ b/sql/updates/world/2011_02_22_2_world_conditions.sql
@@ -0,0 +1,3 @@
+DELETE FROM `conditions` WHERE `SourceEntry`=65594 AND `ConditionTypeOrReference`=18;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
+(13,0,65594,18,1,0,'Cancel Stone Grip Target');
\ No newline at end of file
diff --git a/sql/updates/world/2011_02_22_3_world_creature_template.sql b/sql/updates/world/2011_02_22_3_world_creature_template.sql
new file mode 100644
index 00000000000..38064813aa1
--- /dev/null
+++ b/sql/updates/world/2011_02_22_3_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `flags_extra`= `flags_extra`&~1 WHERE `entry` IN(32933,32934);