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

Conflicts:
	src/server/game/DataStores/DBCfmt.h
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/scripts/Kalimdor/feralas.cpp

6 files changed, 95 insertions, 15 deletions

diff --git a/sql/updates/world/2012_10_18_00_world_trinity_string.sql b/sql/updates/world/2012_10_18_00_world_trinity_string.sql
index 8d62174d868..a12b20388eb 100644
--- a/sql/updates/world/2012_10_18_00_world_trinity_string.sql
+++ b/sql/updates/world/2012_10_18_00_world_trinity_string.sql
@@ -1,16 +1,17 @@
-REPLACE INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
+DELETE FROM `trinity_string` WHERE `entry` IN (9986, 9987, 9989, 9990, 9991, 9992, 9993, 9994, 9995, 9996, 9997, 9998, 9999);
+INSERT INTO `trinity_string` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`)
 VALUES
-  (11015, 'Error', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11014, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11013, 'Leader', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11012, 'Dps', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11011, 'Healer', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11010, 'Tank', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11009, 'Raid browser', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11008, 'Finished dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11007, 'In dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11006, 'Vote kick', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11005, 'Proposal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11004, 'Queued', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11003, 'Role check', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
-  (11002, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+  (9986, 'Error', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9987, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9988, 'Leader', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9989, 'Dps', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9990, 'Healer', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9991, 'Tank', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9992, 'Raid browser', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9993, 'Finished dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9994, 'In dungeon', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9995, 'Vote kick', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9996, 'Proposal', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9997, 'Queued', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9998, 'Role check', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL),
+  (9999, 'None', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
diff --git a/sql/updates/world/2012_10_20_00_world_transports.sql b/sql/updates/world/2012_10_20_00_world_transports.sql
new file mode 100644
index 00000000000..8cc2bae4b47
--- /dev/null
+++ b/sql/updates/world/2012_10_20_00_world_transports.sql
@@ -0,0 +1,6 @@
+-- Update position for Koltira Deathweaver
+UPDATE `creature_transport` SET `TransOffsetX`=45.50927,`TransOffsetY`=6.679555,`TransOffsetZ`=30.17881,`TransOffsetO`=5.445427 WHERE `guid`=36;
+
+-- Set proper name and period timers for icecrown ships
+UPDATE `transports` SET `name`= 'Alliance gunship patrolling above Icecrown (\"The Skybreaker\")',`period`=1051388 WHERE `entry`=192242;
+UPDATE `transports` SET `name`= 'Horde gunship patrolling above Icecrown (\"Orgrim''s Hammer\")',`period`=1431158 WHERE `entry`=192241;
diff --git a/sql/updates/world/2012_10_20_01_world_spell_script_names.sql b/sql/updates/world/2012_10_20_01_world_spell_script_names.sql
new file mode 100644
index 00000000000..d0eefb17943
--- /dev/null
+++ b/sql/updates/world/2012_10_20_01_world_spell_script_names.sql
@@ -0,0 +1,8 @@
+-- Spellscript and conditions for spells of quest Gordunni Cobalt
+DELETE FROM `spell_script_names` WHERE `spell_id`=19395;
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(19395,'spell_gordunni_trap');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=11757;
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
+(13,1,11757,31,5,144050,'Digging for Cobalt targets Gordunni Trap');
diff --git a/sql/updates/world/2012_10_20_02_world_creature_text.sql b/sql/updates/world/2012_10_20_02_world_creature_text.sql
new file mode 100644
index 00000000000..bb153c6b2f6
--- /dev/null
+++ b/sql/updates/world/2012_10_20_02_world_creature_text.sql
@@ -0,0 +1,27 @@
+-- Gnomeregan/Blastmaster Emi Shortfuse's event
+DELETE FROM `script_texts` WHERE `entry` BETWEEN -1090028 AND -1090000;
+DELETE FROM `creature_text` WHERE `entry` IN (7361,7998);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+-- Emi Shortfuse
+(7998,0,0, 'With your help, I can evaluate these tunnels.',12,0,100,0,0,0, 'SAY_BLASTMASTER_0'),
+(7998,1,0, 'Let''s see if we can find out where these Troggs are coming from... and put a stop to the invasion!',12,0,100,0,0,0, 'SAY_BLASTMASTER_1'),
+(7998,2,0, 'Such devastation... what horrible mess...',12,0,100,0,0,0, 'SAY_BLASTMASTER_2'),
+(7998,3,0, 'It''s quiet here...',12,0,100,0,0,0, 'SAY_BLASTMASTER_3'),
+(7998,4,0, '...too quiet.',12,0,100,0,0,0, 'SAY_BLASTMASTER_4'),
+(7998,5,0, 'Look! Over there at the tunnel wall!',12,0,100,0,0,0, 'SAY_BLASTMASTER_5'),
+(7998,6,0, 'Trogg incrusion! Defend me while I blast the hole closed!',12,0,100,0,0,0, 'SAY_BLASTMASTER_6'),
+(7998,7,0, 'I don''t think one charge is going to cut it. Keep fending them off!',12,0,100,0,0,0, 'SAY_BLASTMASTER_7'),
+(7998,8,0, 'The charges are set. Get back before they blow!',12,0,100,0,0,0, 'SAY_BLASTMASTER_8'),
+(7998,9,0, 'Incoming blast in 10 seconds!',14,0,100,0,0,0, 'SAY_BLASTMASTER_9'),
+(7998,10,0, 'Incoming blast in 5 seconds. Clear the tunnel!',14,0,100,0,0,0, 'SAY_BLASTMASTER_10'),
+(7998,11,0, 'FIRE IN THE HOLE!',14,0,100,0,0,0, 'SAY_BLASTMASTER_11'),
+(7998,12,0, 'Well done! Without your help I would have never been able to thwart that wave of troggs.',12,0,100,0,0,0, 'SAY_BLASTMASTER_12'),
+(7998,13,0, 'Did you hear something?',12,0,100,0,0,0, 'SAY_BLASTMASTER_13'),
+(7998,14,0, 'I heard something over there.',12,0,100,0,0,0, 'SAY_BLASTMASTER_14'),
+(7998,15,0, 'More troggs! Ward them off as I prepare the explosives!',12,0,100,0,0,0, 'SAY_BLASTMASTER_15'),
+(7998,16,0, 'The final charge is set. Stand back!',12,0,100,0,0,0, 'SAY_BLASTMASTER_16'),
+(7998,17,0, '10 seconds to blast! Stand back!!!',14,0,100,0,0,0, 'SAY_BLASTMASTER_17'),
+(7998,18,0, '5 seconds until detonation!!',14,0,100,0,0,0, 'SAY_BLASTMASTER_18'),
+(7998,19,0, 'Superb! Because of your help, my people stand a chance of re-taking our belowed city. Three cheers to you!',12,0,100,0,0,0, 'SAY_BLASTMASTER_19'),
+-- Grubbis
+(7361,0,0, 'We come from below! You can never stop us!',14,0,100,0,0,0, 'SAY_GRUBBIS');
diff --git a/sql/updates/world/2012_10_21_00_world_conditions.sql b/sql/updates/world/2012_10_21_00_world_conditions.sql
new file mode 100644
index 00000000000..35b44fec196
--- /dev/null
+++ b/sql/updates/world/2012_10_21_00_world_conditions.sql
@@ -0,0 +1 @@
+ALTER TABLE `conditions` CHANGE COLUMN `SourceEntry` `SourceEntry` MEDIUMINT(8) NOT NULL DEFAULT 0
diff --git a/sql/updates/world/2012_10_21_01_world_misc.sql b/sql/updates/world/2012_10_21_01_world_misc.sql
new file mode 100644
index 00000000000..fe74f8a7a80
--- /dev/null
+++ b/sql/updates/world/2012_10_21_01_world_misc.sql
@@ -0,0 +1,37 @@
+-- Area conditions for Plant Chieftains Totem
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=56765;
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ErrorTextId`,`Comment`) VALUES
+(17,56765,29,30446,15,64,'Plant Chieftains Totem only useable next to Rift');
+
+-- Apply Close Rift to The Chieftain's Totem
+DELETE FROM `creature_template_addon` WHERE `entry`=30444;
+INSERT INTO `creature_template_addon`(`entry`,`auras`) VALUES
+(30444,'56763');
+
+-- Assign aura script to Close Rift
+DELETE FROM `spell_script_names` WHERE `spell_id`=56763;
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUES
+(56763,'spell_close_rift');
+
+-- Target conditions for spell triggered by Close Rift Periodic
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (56764,61665);
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`Comment`) VALUES
+(13,1,56764,31,3,30446,'Close Rift Periodic targets Frostfloe Rift'),
+(13,1,61665,31,3,30446,'Despawn Rift targets Frostfloe Rift');
+
+-- Assign SmartAI to Frostfloe Rift
+UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=30446;
+
+-- Create SAI for Frostfloe Rift
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30446 AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`id`,`link`,`event_type`,`event_param1`,`action_type`,`action_param1`,`action_param2`,`target_type`,`comment`) VALUES
+(30446,1,2,8,61665,45,1,1,7,'Frostfloe Rift - On spell hit - Set data of invoker'),
+(30446,2,0,61,0,41,0,0,1,'Frostfloe Rift - On spell hit - Despawn');
+
+-- Assign SmartAI to Chieftain's Totem
+UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry`=30444;
+
+-- Create SAI for Chieftain's Totem
+DELETE FROM `smart_scripts` WHERE `entryorguid`=30444 AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`event_type`,`event_param1`,`event_param2`,`action_type`,`action_param1`,`target_type`,`comment`) VALUES
+(30444,38,1,1,33,30444,23,'Chieftains Totem - On data set - Give quest credit');