Merge branch 'master' into 4.3.4

Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp

10 files changed, 61 insertions, 0 deletions

diff --git a/sql/updates/world/2014_07_24_00_world_misc.sql b/sql/updates/world/2014_07_24_00_world_misc.sql
new file mode 100644
index 00000000000..be4cb4313a8
--- /dev/null
+++ b/sql/updates/world/2014_07_24_00_world_misc.sql
@@ -0,0 +1,12 @@
+SET @OGUID := 100499;
+
+DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+7;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(@OGUID+0, 195624, 0, 1, 1, 1483.641, 187.9667, -62.29154, -1.178734, 0, 0, -0.004363404, 0.9999905, 120, 255, 1), -- 195624 (Area: 0)
+(@OGUID+1, 195626, 0, 1, 1, 1547.33, 276.8282, -62.28028, -1.626545, 0, 0, -0.004363404, 0.9999905, 120, 255, 1), -- 195626 (Area: 0)
+(@OGUID+2, 195628, 0, 1, 1, 1644.318, 204.0325, -62.27996, -0.1478646, 0, 0, -0.004363404, 0.9999905, 120, 255, 1), -- 195628 (Area: 0)
+(@OGUID+3, 195627, 0, 1, 1, 1644.843, 276.1801, -62.2799, 0.8283948, 0, 0, -0.004363404, 0.9999905, 120, 255, 1), -- 195627 (Area: 0)
+(@OGUID+4, 195625, 0, 1, 1, 1547.062, 204.5494, -62.28075, 0.7760351, 0, 0, -0.004363404, 0.9999905, 120, 255, 1), -- 195625 (Area: 0)
+(@OGUID+5, 195629, 0, 1, 1, 1554.973, 235.1078, -43.20095, 0.2524359, 0, 0, -0.004363404, 0.9999905, 120, 255, 1), -- 195629 (Area: 0)
+(@OGUID+6, 195618, 0, 1, 1, -8572.362, 552.6837, 102.0039, -2.617989, 0, 0, 0.944089, -0.3296907, 120, 255, 1), -- 195618 (Area: 0)
+(@OGUID+7, 195610, 0, 1, 1, -9003.499, 860.5499, 105.8766, -1.213004, 0, 0, 0.944089, -0.3296907, 120, 255, 1); -- 195610 (Area: 0)
diff --git a/sql/updates/world/2014_07_24_04_world_spell_script_names.sql b/sql/updates/world/2014_07_24_04_world_spell_script_names.sql
new file mode 100644
index 00000000000..4a7a1ff648c
--- /dev/null
+++ b/sql/updates/world/2014_07_24_04_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+UPDATE `spell_script_names` SET `ScriptName`='spell_ioc_gunship_portal' WHERE `ScriptName`='spell_gen_gunship_portal';
+UPDATE `spell_script_names` SET `ScriptName`='spell_ioc_parachute_ic'   WHERE `ScriptName`='spell_gen_parachute_ic';
+UPDATE `spell_script_names` SET `ScriptName`='spell_ioc_launch'         WHERE `ScriptName`='spell_gen_launch';
diff --git a/sql/updates/world/2014_07_24_05_world_spell_creature.sql b/sql/updates/world/2014_07_24_05_world_spell_creature.sql
new file mode 100644
index 00000000000..8f21f7f3546
--- /dev/null
+++ b/sql/updates/world/2014_07_24_05_world_spell_creature.sql
@@ -0,0 +1 @@
+UPDATE `creature` SET `modelid`=14515 WHERE `id`=21060; -- Enraged Air Spirit
diff --git a/sql/updates/world/2014_07_24_06_world_gossip.sql b/sql/updates/world/2014_07_24_06_world_gossip.sql
new file mode 100644
index 00000000000..b233c3c5888
--- /dev/null
+++ b/sql/updates/world/2014_07_24_06_world_gossip.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `gossip_menu_option` SET `action_menu_id`=1221 WHERE `menu_id`=1297 AND `id`=3 OR `menu_id`=1294 AND `id`=2;
diff --git a/sql/updates/world/2014_07_24_07_world_conditions.sql b/sql/updates/world/2014_07_24_07_world_conditions.sql
new file mode 100644
index 00000000000..4934c1960e6
--- /dev/null
+++ b/sql/updates/world/2014_07_24_07_world_conditions.sql
@@ -0,0 +1,4 @@
+-- Update conditions for Gart Mistrunner gossip
+UPDATE `conditions` SET `ConditionValue1`=511 WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=4644 AND `SourceEntry`=5717;
+UPDATE `conditions` SET `ConditionValue1`=1024 WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=4644 AND `SourceEntry`=5716;
+UPDATE `conditions` SET `ConditionValue1`=1024 WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=4644;
diff --git a/sql/updates/world/2014_07_24_08_world_spell_script_names.sql b/sql/updates/world/2014_07_24_08_world_spell_script_names.sql
new file mode 100644
index 00000000000..16c12b70c5a
--- /dev/null
+++ b/sql/updates/world/2014_07_24_08_world_spell_script_names.sql
@@ -0,0 +1,3 @@
+DELETE FROM spell_script_names WHERE spell_id=-43265;
+INSERT INTO spell_script_names VALUES
+(-43265, 'spell_dk_death_and_decay');
diff --git a/sql/updates/world/2014_07_24_09_world_sai.sql b/sql/updates/world/2014_07_24_09_world_sai.sql
new file mode 100644
index 00000000000..a34c20ce765
--- /dev/null
+++ b/sql/updates/world/2014_07_24_09_world_sai.sql
@@ -0,0 +1,12 @@
+-- Argus Shadow Mage SAI
+SET @ENTRY := 2318;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,4,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Argus Shadow Mage - On Aggro - Set Event Phase 1"),
+(@ENTRY,0,1,0,0,1,100,0,0,0,3500,4900,11,20816,64,0,0,0,0,2,0,0,0,0,0,0,0,"Argus Shadow Mage - In Combat CMC - Cast 'Shadow Bolt' (Phase 1)"),
+(@ENTRY,0,2,0,2,0,100,1,0,30,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Argus Shadow Mage - Between 0-30% Health - Set Event Phase 2"),
+(@ENTRY,0,3,4,0,2,100,1,0,0,0,0,11,4063,1,0,0,0,0,1,0,0,0,0,0,0,0,"Argus Shadow Mage - In Combat - Cast 'Argus Shadow Mage Transform' (Phase 2) (No Repeat)"),
+(@ENTRY,0,4,5,61,2,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Argus Shadow Mage - In Combat - Enable Combat Movement"),
+(@ENTRY,0,5,0,61,2,100,1,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Argus Shadow Mage - In Combat - Say Line 0"),
+(@ENTRY,0,6,0,23,2,100,0,4063,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Argus Shadow Mage - Missing Aura - Set Event Phase 1");
diff --git a/sql/updates/world/2014_07_24_10_world_sai.sql b/sql/updates/world/2014_07_24_10_world_sai.sql
new file mode 100644
index 00000000000..ba9eca7e2e8
--- /dev/null
+++ b/sql/updates/world/2014_07_24_10_world_sai.sql
@@ -0,0 +1,6 @@
+-- Fallen Ranger SAI
+SET @ENTRY := 16314;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,0,0,0,100,0,0,0,3400,4800,11,28993,64,0,0,0,0,2,0,0,0,0,0,0,0,"Fallen Ranger - In Combat CMC - Cast 'Banshee Wail'");
diff --git a/sql/updates/world/2014_07_24_12_world_conditions.sql b/sql/updates/world/2014_07_24_12_world_conditions.sql
new file mode 100644
index 00000000000..b755a43c601
--- /dev/null
+++ b/sql/updates/world/2014_07_24_12_world_conditions.sql
@@ -0,0 +1,4 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=2 AND `SourceEntry`=6550 AND `SourceId`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(22,2,6550,0,0,29,1,6550,100,0,1,0,0,'','Execute SAI if only there is no Mana Surge in vicinity');
diff --git a/sql/updates/world/2014_07_24_13_world_sai.sql b/sql/updates/world/2014_07_24_13_world_sai.sql
new file mode 100644
index 00000000000..e63eb83831a
--- /dev/null
+++ b/sql/updates/world/2014_07_24_13_world_sai.sql
@@ -0,0 +1,14 @@
+SET @ENTRY := 8612;
+
+-- Add missing gossip (by Malcrom)
+DELETE FROM `gossip_menu` WHERE `entry`=1405;
+INSERT INTO `gossip_menu` (`entry`,`text_id`) VALUES (1405,2039);
+UPDATE `creature_template` SET `gossip_menu_id`=1405 WHERE entry=@ENTRY;
+
+-- SAI (by Rushor)
+UPDATE `creature_template` SET `AIName`='SmartAI', `ScriptName`='' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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
+(@ENTRY,0,0,1,64,0,100,0,0,0,0,0,33,8612,0,0,0,0,0,7,0,0,0,0,0,0,0,"Screecher Spirit - On Gossip Hello - Quest Credit 'Screecher Spirits'"),
+(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,18,33554432,0,0,0,0,0,1,0,0,0,0,0,0,0,"Screecher Spirit - On Gossip Hello - Set Flag Not Selectable"),
+(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,41,3000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Screecher Spirit - On Gossip Hello - Despawn In 3000 ms");