Scripts/Ulduar: Add proper support for Razorscale harpoon event.

Add script for Razorscale Controller.
Add spell script for Devouring Flame.
A little code cleanup in script

6 files changed, 39 insertions, 0 deletions

diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index d9f43bb12e0..7188af722f4 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1514,6 +1514,8 @@ UPDATE `creature_template` SET `ScriptName`='boss_ignis' WHERE `entry`=33118;
 UPDATE `creature_template` SET `ScriptName`='npc_iron_construct' WHERE `entry`=33121;
 UPDATE `creature_template` SET `ScriptName`='npc_scorch_ground' WHERE `entry`=33221;
 UPDATE `creature_template` SET `ScriptName`='boss_razorscale' WHERE `entry`=33186;
+UPDATE `creature_template` SET `ScriptName`='boss_razorscale_controller' WHERE `entry`=33233;
+UPDATE `gameobject_template` SET `ScriptName`='go_razorscale_harpoon' WHERE `entry` IN(194519,194541,194542,194543);
 UPDATE `creature_template` SET `ScriptName`='npc_devouring_flame' WHERE `entry`=34188;
 UPDATE `creature_template` SET `ScriptName`='npc_mole_machine_trigger' WHERE `entry`=33245;
 UPDATE `creature_template` SET `ScriptName`='npc_expedition_commander' WHERE `entry`=33210;
@@ -2060,6 +2062,7 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 68646, 'spell_gen_leeching_swarm'),
 ( 68647, 'spell_gen_leeching_swarm'),
 -- Ulduar
+( 63308, 'spell_razorscale_devouring_flame'),
 ( 62717, 'spell_ignis_slag_pot'),
 ( 63477, 'spell_ignis_slag_pot'),
 ( 62521, 'spell_attuned_to_nature_dose_reduction'),
diff --git a/sql/updates/world/2011_03_23_14_world_conditions.sql b/sql/updates/world/2011_03_23_14_world_conditions.sql
new file mode 100644
index 00000000000..c374bdd8fc6
--- /dev/null
+++ b/sql/updates/world/2011_03_23_14_world_conditions.sql
@@ -0,0 +1,11 @@
+DELETE FROM `conditions` WHERE `SourceEntry` IN (63317,62505,63524,63657,63658,63659);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`)
+VALUES
+(13,0,63317,0,18,1,33453,0,0,'','Flame Breath - Dark Rune Watcher'),
+(13,0,63317,0,18,1,33846,0,0,'','Flame Breath - Dark Rune Sentinel'),
+(13,0,63317,0,18,1,33388,0,0,'','Flame Breath - Dark Rune Guardian'),
+(13,0,62505,0,18,1,33186,0,0,'','Harpoon Trigger - Razorscale'),
+(13,0,63524,0,18,1,33233,0,0,'','Harpoon Shot - Razorscale'),
+(13,0,63657,0,18,1,33233,0,0,'','Harpoon Shot - Razorscale'),
+(13,0,63658,0,18,1,33233,0,0,'','Harpoon Shot - Razorscale'),
+(13,0,63659,0,18,1,33233,0,0,'','Harpoon Shot - Razorscale');
diff --git a/sql/updates/world/2011_03_23_14_world_creature_template.sql b/sql/updates/world/2011_03_23_14_world_creature_template.sql
new file mode 100644
index 00000000000..ff9569bb8fa
--- /dev/null
+++ b/sql/updates/world/2011_03_23_14_world_creature_template.sql
@@ -0,0 +1,9 @@
+UPDATE `creature_template` SET `ScriptName` = 'boss_razorscale_controller' WHERE `entry` = 33233;
+UPDATE `creature_template` SET `ScriptName` = 'boss_razorscale' WHERE `entry` = 33186;
+UPDATE `creature_template` SET `ScriptName` = 'npc_darkrune_watcher' WHERE `entry` = 33453;
+UPDATE `creature_template` SET `ScriptName` = 'npc_darkrune_sentinel' WHERE `entry` = 33846;
+UPDATE `creature_template` SET `ScriptName` = 'npc_darkrune_guardian' WHERE `entry` = 33388;
+UPDATE `creature_template` SET `ScriptName` = 'npc_devouring_flame' WHERE `entry` = 34188;
+UPDATE `creature_template` SET `ScriptName` = 'npc_expedition_commander' WHERE `entry` = 33210;
+UPDATE `creature_template` SET `ScriptName` = 'npc_mole_machine_trigger' WHERE `entry` IN (33282, 33245);
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|2 WHERE `entry` IN (33210,33287,33259,33233);
diff --git a/sql/updates/world/2011_03_23_14_world_creatures.sql b/sql/updates/world/2011_03_23_14_world_creatures.sql
new file mode 100644
index 00000000000..bbc4ac0ca60
--- /dev/null
+++ b/sql/updates/world/2011_03_23_14_world_creatures.sql
@@ -0,0 +1,11 @@
+SET @GUID :=48304;
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID+6;
+INSERT INTO `creature` (`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`DeathState`,`MovementType`)
+VALUES
+(@GUID,33233,603,1,1,0,0,560.1334,-143.035431,393.822632,0,120,0,0,1,0,0,0),
+(@GUID+1,33233,603,1,1,0,0,572.410645,-138.656357,393.904419,0,120,0,0,1,0,0,0),
+(@GUID+2,33233,603,1,1,0,0,585.9284,-146.587509,391.6004,0,120,0,0,1,0,0,0),
+(@GUID+3,33233,603,1,1,0,0,589.7287,-137.1148,393.9011,0,120,0,0,1,0,0,0),
+(@GUID+4,33233,603,1,1,0,0,605.9284,-140.108887,393.7972,0,120,0,0,1,0,0,0),
+(@GUID+5,33233,603,1,1,0,0,630.2436,-276.259064,392.3122,0,120,0,0,1,0,0,0),
+(@GUID+6,33233,603,1,1,0,0,638.241638,-272.1735,392.135132,0,120,0,0,1,0,0,0);
diff --git a/sql/updates/world/2011_03_23_14_world_gameobject_template.sql b/sql/updates/world/2011_03_23_14_world_gameobject_template.sql
new file mode 100644
index 00000000000..00c40de6276
--- /dev/null
+++ b/sql/updates/world/2011_03_23_14_world_gameobject_template.sql
@@ -0,0 +1 @@
+UPDATE `gameobject_template` SET `ScriptName`='go_razorscale_harpoon' WHERE `entry` IN (194519,194541,194542,194543);
diff --git a/sql/updates/world/2011_03_23_14_world_spell_script_names.sql b/sql/updates/world/2011_03_23_14_world_spell_script_names.sql
new file mode 100644
index 00000000000..c91c5273f9c
--- /dev/null
+++ b/sql/updates/world/2011_03_23_14_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=63308;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`)
+VALUES
+(63308,'spell_razorscale_devouring_flame');