Scripts/Ulduar: Boss Ignis

- Update Boss Ignis thanks to snakeice for main patch
- add support for spell slagpot thanks to Shauren and Linencloth
- apply trinity coding standard to patch

--HG--
branch : trunk

6 files changed, 15 insertions, 0 deletions

diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql
index 74013e28f80..c917a3adf72 100644
--- a/sql/base/world_database.sql
+++ b/sql/base/world_database.sql
@@ -26838,6 +26838,8 @@ INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
 ( 71222, 'spell_festergut_blighted_spores'),
 ( 73033, 'spell_festergut_blighted_spores'),
 ( 73034, 'spell_festergut_blighted_spores'),
+( 62717, 'spell_ignis_slag_pot'),
+( 63477, 'spell_ignis_slag_pot'),
 -- quest
 (  8913, 'spell_q55_sacred_cleansing'),
 ( 17271, 'spell_q5206_test_fetid_skull'),
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index 0b0525da58e..0186eaba102 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -2485,6 +2485,7 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
    (33118,-1603226,'Let the inferno consume you!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15567,1,0,0,'Ignis SAY_SCORCH_1'),
    (33118,-1603227,'BURN! Burn in the makers fire!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15568,1,0,0,'Ignis SAY_SCORCH_2'),
    (33118,-1603228,'Let it be finished!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15571,1,0,0,'Ignis SAY_BERSERK'),
+   (33118,-1603229,'Ignis the Furnace Master begins to cast Flame Jets!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'IGNIS EMOTE_JETS'),
 
 -- Kologarn
    (32930,-1603230,'None shall pass!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,15586,1,0,0,'Kologarn SAY_AGGRO'),
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index cc6ba278698..f13819b4af7 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -1486,6 +1486,8 @@ UPDATE `creature_template` SET `ScriptName`='boss_flame_leviathan_overload_devic
 UPDATE `creature_template` SET `ScriptName`='npc_colossus' WHERE `entry`=33237;
 UPDATE `creature_template` SET `ScriptName`='spell_pool_of_tar' WHERE `entry`=33090;
 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_xt002' WHERE `entry`=33293;
 UPDATE `creature_template` SET `ScriptName`='mob_xt002_heart' WHERE `entry`=33329;
diff --git a/sql/updates/10181_world_script_name.sql b/sql/updates/10181_world_script_name.sql
new file mode 100644
index 00000000000..d654bdbecbf
--- /dev/null
+++ b/sql/updates/10181_world_script_name.sql
@@ -0,0 +1,3 @@
+-- Add script name to boss ignis adds
+UPDATE `creature_template` SET `ScriptName`='npc_iron_construct' WHERE `entry`=33121;
+UPDATE `creature_template` SET `ScriptName`='npc_scorch_ground' WHERE `entry`=33221;
diff --git a/sql/updates/10181_world_script_texts.sql b/sql/updates/10181_world_script_texts.sql
new file mode 100644
index 00000000000..e131affb749
--- /dev/null
+++ b/sql/updates/10181_world_script_texts.sql
@@ -0,0 +1,3 @@
+DELETE FROM `script_texts` WHERE `entry` IN (-1571043,-1571042);
+INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`,`sound`,`type`,`language`,`emote`,`comment`) VALUES
+(33118,-1603229,'Ignis the Furnace Master begins to cast Flame Jets!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'IGNIS EMOTE_JETS');
diff --git a/sql/updates/10181_world_spell_script_names.sql b/sql/updates/10181_world_spell_script_names.sql
new file mode 100644
index 00000000000..8fd8b74e431
--- /dev/null
+++ b/sql/updates/10181_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`=62717 AND `ScriptName`='spell_ignis_slag_pot';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(62717, 'spell_ignis_slag_pot'); -- boss Ignis 10man
+(62717, 'spell_ignis_slag_pot'); -- boss Ignis 25man