3 files changed, 29 insertions, 3 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index f6d741e5828..752d52ffec4 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -1058,7 +1058,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_altar_of_archaedas' WHERE `ent
 UPDATE `instance_template` SET `script`='instance_ulduar' WHERE `map`=603;
 UPDATE `creature_template` SET `ScriptName` = 'boss_auriaya' WHERE `entry` = 33515;
 UPDATE `creature_template` SET `ScriptName` = 'boss_flame_leviathan' WHERE `entry` = 33113;
-UPDATE `creature_template` SET `ScriptName` = 'boss_flame_leviathan_turret' WHERE entry=33139;
+UPDATE `creature_template` SET AIName = 'TurretAI',`ScriptName` = '' WHERE entry=33139;
 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;
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index 3a9d13eca74..5972adc456d 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -2116,8 +2116,10 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
 -- ULDUAR
 -- --------
 INSERT INTO creature_template (entry, vehicleid) VALUES
+(32930, 312), # Kologarn
 (33113, 340), # Flame Leviathan
-(33114, 341) # Flame Leviathan Seat
+(33114, 341), # Flame Leviathan Seat
+(33214, 348) # Mechanolift 304-A
 ON DUPLICATE KEY UPDATE
 vehicleid = VALUES(vehicleid);
 
@@ -2128,6 +2130,7 @@ 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);
+UPDATE creature_template SET InhabitType = 4 WHERE entry = 33214; # Mechanolift 304-A
 
 INSERT INTO creature_template (entry, spell1, spell2, spell3, spell4, spell5, spell6, vehicleid) VALUES
 (33062, 62974, 62286, 62299, 64660, 0, 0, 335), # Salvaged Chopper
@@ -2153,7 +2156,8 @@ INSERT INTO `spell_script_target` (`entry`, `type`, `targetEntry`) VALUES
 
 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,-62399, 0, 'System Shutdown - Overload Circuit'),
+(-62475,-62375, 0, 'System Shutdown - Gathering Speed'),
 (-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
 ( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');
 
@@ -2161,6 +2165,10 @@ 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
 
+update creature_template set spell1=62395, AIName = 'TurretAI', scriptname='' where entry = 33139;
+update creature_template set spell1=62402 where entry = 33142;
+update creature_template set ScriptName = 'boss_kologarn' where entry = 32930;
+
 
 -- --------
 -- WINTERGRASP
diff --git a/sql/updates/5403_world_scripts_ulduar.sql b/sql/updates/5403_world_scripts_ulduar.sql
new file mode 100644
index 00000000000..f9fa49f5941
--- /dev/null
+++ b/sql/updates/5403_world_scripts_ulduar.sql
@@ -0,0 +1,18 @@
+INSERT INTO creature_template (entry, vehicleid) VALUES
+(32930, 312), # Kologarn
+(33214, 348) # Mechanolift 304-A
+ON DUPLICATE KEY UPDATE
+vehicleid = VALUES(vehicleid);
+
+UPDATE creature_template SET InhabitType = 4 WHERE entry = 33214;
+
+update creature_template set spell1=62395, AIName = 'TurretAI', scriptname='' where entry = 33139;
+update creature_template set spell1=62402 where entry = 33142;
+update creature_template set ScriptName = 'boss_kologarn' where entry = 32930;
+
+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 - Overload Circuit'),
+(-62475,-62375, 0, 'System Shutdown - Gathering Speed'),
+(-62475, 62472, 0, 'System Shutdown'), #inform, not correct spell
+( 62427, 62340, 2, 'Load into Catapult - Passenger Loaded');