*Update flame leviathan script.

--HG--
branch : trunk

3 files changed, 46 insertions, 5 deletions

diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 0e23b8a52da..408411f89cc 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1062,6 +1062,7 @@ UPDATE `creature_template` SET `ScriptName` = 'boss_flame_leviathan_turret' WHER
 UPDATE `creature_template` SET `ScriptName` = 'boss_flame_leviathan_seat' WHERE entry=33114;
 UPDATE `creature_template` SET `ScriptName` = 'boss_flame_leviathan_defense_turret' WHERE entry=33142;
 UPDATE `creature_template` SET `ScriptName` = 'boss_flame_leviathan_overload_device' WHERE entry=33143;
+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` = 'boss_razorscale' WHERE `entry` = 33186;
 UPDATE `creature_template` SET `ScriptName` = 'boss_xt002' WHERE `entry` = 33293;
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index ac7f92f3a3c..a99ffdd2c98 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -1972,9 +1972,6 @@ INSERT INTO `spell_elixir` (`entry`, `mask`) VALUES
 -- --------
 -- Death Knight
 -- --------
-# endless hunger
-UPDATE `creature_template` SET `KillCredit1` = '29519' WHERE `entry` IN ('29519','29520','29565','29566','29567');
-
 DELETE FROM `spell_script_target` WHERE entry IN
 (51859, 48743, 52124, 52479, 52576, 53110);
 INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
@@ -2113,7 +2110,13 @@ INSERT INTO creature_template (entry, vehicleid) VALUES
 ON DUPLICATE KEY UPDATE
 vehicleid = VALUES(vehicleid);
 
-UPDATE creature_template SET flags_extra = 128 WHERE entry IN (33114);
+UPDATE creature_template SET spell1=62288 WHERE entry = 33090;
+UPDATE creature_template SET speed=1 WHERE entry=33113;
+UPDATE creature_template SET speed=1.25 WHERE entry IN (33060,33109);
+UPDATE creature_template SET speed=2 WHERE entry=33062;
+UPDATE creature_template SET faction_A=1965,faction_H=1965 WHERE entry IN (33090,33113,33139);
+
+UPDATE creature_template SET flags_extra = 0 WHERE entry IN (33114);
 
 INSERT INTO creature_template (entry, spell1, spell2, spell3, spell4, spell5, spell6, vehicleid) VALUES
 (33062, 62974, 62286, 62299, 64660, 0, 0, 335), # Salvaged Chopper
@@ -2130,12 +2133,23 @@ spell5 = VALUES(spell5),
 spell6 = VALUES(spell6),
 vehicleid = VALUES(vehicleid);
 
-DELETE FROM `spell_script_target` WHERE `entry` IN (62374,62399);
+DELETE FROM `spell_script_target` WHERE `entry` IN (62427,62374,62399);
 INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(62427, 1, 33109), # Load into Catapult
 (62374, 1, 33060), # Pursued
 (62374, 1, 33109),
 (62399, 1, 33139); # Overload Circuit
 
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(-62475,-62399, 0, 'System Shutdown'),
+(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
+( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33143);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(33143, 62399, 0, 0, 0, 0); # Overide device
+
 
 -- --------
 -- WINTERGRASP
diff --git a/sql/updates/5314_world_scripts_ulduar.sql b/sql/updates/5314_world_scripts_ulduar.sql
new file mode 100644
index 00000000000..efe012b5ebf
--- /dev/null
+++ b/sql/updates/5314_world_scripts_ulduar.sql
@@ -0,0 +1,26 @@
+UPDATE creature_template SET scriptname = "spell_pool_of_tar" WHERE entry = 33090;
+
+UPDATE creature_template SET spell1=62288 WHERE entry = 33090;
+UPDATE creature_template SET speed=1 WHERE entry=33113;
+UPDATE creature_template SET speed=1.25 WHERE entry IN (33060,33109);
+UPDATE creature_template SET speed=2 WHERE entry=33062;
+UPDATE creature_template SET faction_A=1965,faction_H=1965 WHERE entry IN (33090,33113,33139);
+
+UPDATE creature_template SET flags_extra = 0 WHERE entry IN (33114);
+
+DELETE FROM `spell_script_target` WHERE `entry` IN (62427,62374,62399);
+INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
+(62427, 1, 33109), # Load into Catapult
+(62374, 1, 33060), # Pursued
+(62374, 1, 33109),
+(62399, 1, 33139); # Overload Circuit
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (-62475,62427);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(-62475,-62399, 0, 'System Shutdown'),
+(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
+( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` IN (33143);
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `quest_start`, `quest_start_active`, `quest_end`, `cast_flags`) VALUES
+(33143, 62399, 0, 0, 0, 0); # Overide device