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

7 files changed, 68 insertions, 2 deletions

diff --git a/sql/updates/world/2014_08_21_02_world_misc.sql b/sql/updates/world/2014_08_21_02_world_misc.sql
index 041c9820b04..71d83bffa77 100644
--- a/sql/updates/world/2014_08_21_02_world_misc.sql
+++ b/sql/updates/world/2014_08_21_02_world_misc.sql
@@ -1,4 +1,4 @@
-SET @CGuid :=    29974;
+SET @CGuid :=    74504;
 
 -- These two gossip menus on Injured rainspeaker oracle are not meant to be linked, they are two
 -- seperate gossips the first one for Just Following Orders to help the injured rainspeaker oracle and start event
@@ -42,7 +42,7 @@ INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spe
 UPDATE `creature_template` SET `ainame`='SmartAI', `scriptname`='' WHERE `entry` IN(28217,28325,28327);
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN(28217,28325,28327) AND `source_type`=0;
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN(28077) AND `source_type`=0 and `id`>14;
-DELETE FROM `smart_scripts` WHERE `entryorguid` IN(28133) AND `source_type`=0 and `id`=4;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(28113) AND `source_type`=0 and `id`=4;
 DELETE FROM `smart_scripts` WHERE `entryorguid` IN(2811301) AND `source_type`=9 and `id`>0;
 UPDATE `smart_scripts` SET `event_param1`=290 WHERE  `entryorguid`=28308 AND `source_type`=0 AND `id`=2 AND `link`=3;
 
diff --git a/sql/updates/world/2014_08_21_03_world_sai.sql b/sql/updates/world/2014_08_21_03_world_sai.sql
new file mode 100644
index 00000000000..cfc9aabbc95
--- /dev/null
+++ b/sql/updates/world/2014_08_21_03_world_sai.sql
@@ -0,0 +1,6 @@
+DELETE FROM `creature` WHERE `id`=5806;
+
+UPDATE `creature_template` SET `ainame`='SmartAI', `scriptname`='' WHERE `entry` =4057;
+DELETE FROM `smart_scripts` WHERE `entryorguid` =4057 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES 
+(4057, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 11, 7993, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Son of Cenarius - On Spawn - Cast Summon Treant Ally (Self)');
diff --git a/sql/updates/world/2014_08_22_00_world_conditions.sql b/sql/updates/world/2014_08_22_00_world_conditions.sql
new file mode 100644
index 00000000000..56c3d2641f4
--- /dev/null
+++ b/sql/updates/world/2014_08_22_00_world_conditions.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=5962;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES 
+(14, 5962, 7115, 0, 0, 28, 0, 7722, 0, 0, 0, 0, 0, '', 'Show Gossip Menu - If Quest: What the Flux? is Completed'),
+(14, 5962, 7115, 0, 1, 5, 0, 59, 128, 0, 0, 0, 0, '', 'Show Gossip Menu - If player is exalted with Thorium Brotherhood (59)');
diff --git a/sql/updates/world/2014_08_22_01_world_misc.sql b/sql/updates/world/2014_08_22_01_world_misc.sql
new file mode 100644
index 00000000000..0bb682a3438
--- /dev/null
+++ b/sql/updates/world/2014_08_22_01_world_misc.sql
@@ -0,0 +1,27 @@
+DELETE FROM  `creature_text` WHERE `entry` IN(28092,28033);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
+(28092, 0, 0, 'Omega Rune deployed.  Activation successful.', 12, 0, 100, 51, 0, 0, 'The Etymidian',33004),
+(28033, 0, 0, 'Finally, we have the parts to repair the Spirit of Gnomeregan.', 12, 0, 100, 1, 0, 0, 'Weslex Quickwrench',29878),
+(28033, 1, 0, 'Let''s see, just a tweak here and an adjustment there...', 12, 0, 100, 432, 0, 0, 'Weslex Quickwrench',29879),
+(28033, 2, 0, 'And there she is, the Spirit of Gnomeregan!', 12, 0, 100, 25, 0, 0, 'Weslex Quickwrench',29880),
+(28033, 3, 0, 'You can use her, but I don''t want to hear any complaints about saw blades in your seat. I had to fix ''er with what we could find.', 12, 0, 100, 1, 0, 0, 'Weslex Quickwrench',29881);
+
+DELETE FROM `creature_template_addon` WHERE `entry`=28037;
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(28037, 0, 0x10000, 0x1, '51114'); -- 28037 - 51114
+
+DELETE FROM `spell_area` WHERE `spell`=51116 AND `area` =4284;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES 
+(51116,4284, 12523, 0, 0, 0, 2, 1, 64, 11);
+
+UPDATE `creature_template` SET `ainame`='SmartAI', `scriptname`='' WHERE `entry` IN(28092,28568,28033,28047,27986);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(28092,28033) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN(2803300) AND `source_type`=9;
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(28092, 0, 0, 0, 20, 0, 100, 0, 12547, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'The Etymidian - On Quest Reward (The Activation Rune) - Say'), 
+(28033, 0, 0, 0, 20, 0, 100, 0, 12523, 0, 0, 0, 80, 2803300, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Weslex Quickwrench - On Quest Reward (Have a Part, Give a Part) - Run script'), 
+
+(2803300, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Weslex Quickwrench - Script - Say Line 1'), 
+(2803300, 9, 1, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Weslex Quickwrench - Script - Say Line 2'), 
+(2803300, 9, 2, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Weslex Quickwrench - Script - Say Line 3'), 
+(2803300, 9, 3, 0, 0, 0, 100, 0, 7000, 7000, 0, 0, 1, 3, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Weslex Quickwrench - Script - Say Line 4');
diff --git a/sql/updates/world/2014_08_22_02_world_creature_template.sql b/sql/updates/world/2014_08_22_02_world_creature_template.sql
new file mode 100644
index 00000000000..4c0d7cc45e0
--- /dev/null
+++ b/sql/updates/world/2014_08_22_02_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `InhabitType`=2 WHERE `entry` IN (1224, 2188, 3642, 4830, 5936, 6145, 8236, 15118, 15526, 18284, 21217, 23928, 24285, 24637, 24899, 25204, 25226, 26510, 26511, 26522, 27438, 27617, 28010, 28847, 29392, 29834, 30642, 32664, 33497, 34116);
+UPDATE `creature_template` SET `InhabitType`=3 WHERE `entry`=21689;
diff --git a/sql/updates/world/2014_08_22_03_world_misc.sql b/sql/updates/world/2014_08_22_03_world_misc.sql
new file mode 100644
index 00000000000..74823327793
--- /dev/null
+++ b/sql/updates/world/2014_08_22_03_world_misc.sql
@@ -0,0 +1,24 @@
+SET @CGUID :=    29974;
+
+DELETE FROM `creature_addon` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+2;
+DELETE FROM `creature_addon` WHERE `guid` IN (118456,118301,118183,117164);
+INSERT INTO `creature_addon` (`guid`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(@CGUID+0, 0, 0x10000, 0x1, '49415'), -- 27102 - 49415
+(@CGUID+1, 0, 0x10000, 0x101, '49415'), -- 26839 - 49415
+(@CGUID+2, 0, 0x10000, 0x101, '49415'), -- 26839 - 49415
+
+(118456, 0, 0x10000, 0x1, '49414'), -- 26863 - 49414
+(118301, 0, 0x10000, 0x101, '49414'), -- 26862 - 49414
+(118183, 0, 0x10000, 0x1, '49414'), -- 26860 - 49414
+(117164, 0, 0x10000, 0x1, '49414'); -- 27102 - 49414
+
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+2;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 27102, 571, 1, 1, 3270.905, -2197.24, 117.4559, 4.101524, 120, 0, 0), -- 27102 (Area: 394)
+(@CGUID+1, 26839, 571, 1, 1, 3268.641, -2195.643, 117.4559, 4.34587, 120, 0, 0), -- 26839 (Area: 394)
+(@CGUID+2, 26839, 571, 1, 1, 3273.251, -2197.424, 117.4559, 4.066617, 120, 0, 0); -- 26839 (Area: 394)
+
+DELETE FROM `spell_area` WHERE `spell` IN(49417,49416) AND `area`=4206;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES 
+(49417,4206, 12431, 0, 0, 0, 2, 1, 64, 11),
+(49416,4206, 0, 12431, 0, 0, 2, 1, 64, 11);
diff --git a/sql/updates/world/2014_08_22_04_world_misc.sql b/sql/updates/world/2014_08_22_04_world_misc.sql
new file mode 100644
index 00000000000..318c4eb1f92
--- /dev/null
+++ b/sql/updates/world/2014_08_22_04_world_misc.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ainame`='', `scriptname`='npc_jungle_punch_target' WHERE `entry` IN(28568,28047,27986);
+UPDATE `creature_template` SET `scriptname`='npc_the_etymidian' WHERE `entry` =28033;