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

Conflicts:
	src/server/game/Scripting/ScriptLoader.cpp

5 files changed, 33 insertions, 2 deletions

diff --git a/sql/updates/world/2013_08_09_09_world_sai.sql b/sql/updates/world/2013_08_09_09_world_sai.sql
index 619f2fa9d3f..1ba2e7a5b15 100644
--- a/sql/updates/world/2013_08_09_09_world_sai.sql
+++ b/sql/updates/world/2013_08_09_09_world_sai.sql
@@ -17,9 +17,11 @@ DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=10
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
 (15,10024,0,0,28,12521,0,0,0,'','Show gossip option if player has quest Where in the World is Hemet Nesingwary?');
 DELETE FROM `gossip_menu_option` WHERE `menu_id`=10024 AND `id`=1;
+
 -- Add spell target position
-DELETE FROM `spell_target_position` WHERE `id`=50859;
+DELETE FROM `spell_target_position` WHERE `id`=50987;
 INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
-(50859,571,5832.892,482.8708,658.2753,0.9121326);
+(50987,571,5071.35,4642.54,72.164,0.878587);
+
 -- Update Archmage Pentarus' Flying Machine
 UPDATE `creature_template` SET `InhabitType`=4 WHERE `entry`=28192;
diff --git a/sql/updates/world/2013_08_10_00_world_eai.sql b/sql/updates/world/2013_08_10_00_world_eai_335.sql
index 445e86712bc..445e86712bc 100644
--- a/sql/updates/world/2013_08_10_00_world_eai.sql
+++ b/sql/updates/world/2013_08_10_00_world_eai_335.sql
diff --git a/sql/updates/world/2013_08_10_01_world_creature.sql b/sql/updates/world/2013_08_10_01_world_creature.sql
new file mode 100644
index 00000000000..ca12b55b00a
--- /dev/null
+++ b/sql/updates/world/2013_08_10_01_world_creature.sql
@@ -0,0 +1,15 @@
+UPDATE `creature_template` SET `AIName` = 'NullAI' WHERE `entry` = 27490;
+UPDATE `creature_template` SET `unit_flags` = 64 WHERE `entry` = 31339;
+UPDATE `creature_template` SET `ScriptName` = '', AIName = 'SmartAI' WHERE `entry` = 26638;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 26638 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 
+(26638, 0, 1, 0, 0, 0, 100, 6, 0, 0, 0, 0, 43, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Risen Drakkari Bat Rider - In Combat - Dismount"),
+(26638, 0, 2, 0, 0, 0, 100, 6, 0, 0, 0, 0, 19, 0x02000000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Risen Drakkari Bat Rider - In Combat - Remove flag"),
+(26638, 0, 3, 0, 9, 0, 100, 6, 5, 30, 9000, 12000, 11, 16001, 0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, "Risen Drakkari Bat Rider - At 5 - 30 Range - Cast Impale"),
+(26638, 0, 4, 0, 0, 0, 100, 2, 3000, 6000, 9000, 12000, 11, 50414, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Risen Drakkari Bat Rider - In Combat - Cast Curse of Blood"),
+(26638, 0, 5, 0, 0, 0, 100, 4, 3000, 6000, 9000, 12000, 11, 59009, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Risen Drakkari Bat Rider - In Combat - Cast Curse of Blood");
+
+DELETE FROM `creature_addon` WHERE `guid` = 127448;
+INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(127448, 0, 26751, 0, 1, 0, '');
diff --git a/sql/updates/world/2013_08_10_02_world_spell_target_position.sql b/sql/updates/world/2013_08_10_02_world_spell_target_position.sql
new file mode 100644
index 00000000000..e576a424f05
--- /dev/null
+++ b/sql/updates/world/2013_08_10_02_world_spell_target_position.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_target_position` WHERE `id`=50859;
+DELETE FROM `spell_target_position` WHERE `id`=50987;
+INSERT INTO `spell_target_position` (`id`,`target_map`,`target_position_x`,`target_position_y`,`target_position_z`,`target_orientation`) VALUES
+(50987,571,5832.892,482.8708,658.2753,0.9121326);
diff --git a/sql/updates/world/2013_08_10_03_world_creature_text.sql b/sql/updates/world/2013_08_10_03_world_creature_text.sql
new file mode 100644
index 00000000000..5c799a946fe
--- /dev/null
+++ b/sql/updates/world/2013_08_10_03_world_creature_text.sql
@@ -0,0 +1,10 @@
+SET @NPC := 7271;
+-- Move boss_zum_rah from SAI to CPP
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'boss_zum_rah' WHERE `entry`=@NPC;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@NPC;
+DELETE FROM `creature_text` WHERE `entry` =@NPC;
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`) VALUES
+(@NPC, 0, 0, 'How dare you enter my sanctum!', 12, 0, 100, 0, 0, 0, 'Witch Doctor Zum''rah'),
+(@NPC, 1, 1, 'T''eif godehsi wha!', 14, 14, 100, 0, 0, 0, 'Witch Doctor Zum''rah'),
+(@NPC, 2, 2, 'Sands consume you!', 14, 0, 100, 0, 0, 0, 'Witch Doctor Zum''rah'),
+(@NPC, 2, 3, 'Fall!', 14, 0, 100, 0, 0, 0, 'Witch Doctor Zum''rah');