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

Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp

10 files changed, 203 insertions, 0 deletions

diff --git a/sql/updates/world/2013_01_20_00_world_sai.sql b/sql/updates/world/2013_01_20_00_world_sai.sql
new file mode 100644
index 00000000000..d4e4bb81c41
--- /dev/null
+++ b/sql/updates/world/2013_01_20_00_world_sai.sql
@@ -0,0 +1 @@
+UPDATE `smart_scripts` SET `event_type`=25,`event_flags`=0,`event_param1`=0,`event_param2`=0 WHERE `entryorguid`=16029 AND `source_type`=0 AND `id`=0; -- Sludge Belcher
diff --git a/sql/updates/world/2013_01_20_01_world_creature_text.sql b/sql/updates/world/2013_01_20_01_world_creature_text.sql
new file mode 100644
index 00000000000..d543b02d9fc
--- /dev/null
+++ b/sql/updates/world/2013_01_20_01_world_creature_text.sql
@@ -0,0 +1,10 @@
+UPDATE `creature_text` SET `sound`=14344 WHERE `entry`=29310 AND `groupid`=1 AND `id`=0;
+UPDATE `creature_text` SET `sound`=14345 WHERE `entry`=29310 AND `groupid`=1 AND `id`=1;
+UPDATE `creature_text` SET `text`='Yogg-Saron! Grant me your power!', `sound`=14346 WHERE `entry`=29310 AND `groupid`=2 AND `id`=0;
+UPDATE `creature_text` SET `sound`=14347 WHERE `entry`=29310 AND `groupid`=2 AND `id`=1;
+UPDATE `creature_text` SET `sound`=14348 WHERE `entry`=29310 AND `groupid`=3 AND `id`=0;
+UPDATE `creature_text` SET `sound`=14349 WHERE `entry`=29310 AND `groupid`=3 AND `id`=1;
+UPDATE `creature_text` SET `sound`=14351 WHERE `entry`=29310 AND `groupid`=4;
+UPDATE `creature_text` SET `sound`=14354 WHERE `entry`=29310 AND `groupid`=5 AND `id`=2;
+UPDATE `creature_text` SET `sound`=14355 WHERE `entry`=29310 AND `groupid`=5 AND `id`=3;
+UPDATE `creature_text` SET `text`='The faithful shall be exalted, but there is more work to be done. We will press on until all of Azeroth lies beneath his shadow!', `sound`=14356 WHERE `entry`=29310 AND `groupid`=5 AND `id`=4;
diff --git a/sql/updates/world/2013_01_20_02_world_creature_text.sql b/sql/updates/world/2013_01_20_02_world_creature_text.sql
new file mode 100644
index 00000000000..25c8c046dfc
--- /dev/null
+++ b/sql/updates/world/2013_01_20_02_world_creature_text.sql
@@ -0,0 +1,10 @@
+UPDATE `creature_text` SET `sound`=14430, `type`=14 WHERE `entry`=29306 AND `groupid`=0;
+UPDATE `creature_text` SET `sound`=14431, `type`=14 WHERE `entry`=29306 AND `groupid`=4;
+UPDATE `creature_text` SET `sound`=14432, `type`=14 WHERE `entry`=29306 AND `groupid`=5;
+UPDATE `creature_text` SET `sound`=14433, `type`=14 WHERE `entry`=29306 AND `groupid`=3 AND `id`=0;
+UPDATE `creature_text` SET `sound`=14434, `type`=14  WHERE `entry`=29306 AND `groupid`=3 AND `id`=1;
+UPDATE `creature_text` SET `sound`=14435, `type`=14 WHERE `entry`=29306 AND `groupid`=3 AND `id`=2;
+UPDATE `creature_text` SET `sound`=14436, `type`=14 WHERE `entry`=29306 AND `groupid`=1 AND `id`=0;
+UPDATE `creature_text` SET `sound`=14437, `type`=14, `text`='Who needs gods when we ARE gods?' WHERE `entry`=29306 AND `groupid`=1 AND `id`=1;
+UPDATE `creature_text` SET `sound`=14438, `type`=14 WHERE `entry`=29306 AND `groupid`=1 AND `id`=2;
+UPDATE `creature_text` SET `sound`=14439, `type`=14 WHERE `entry`=29306 AND `groupid`=2;
diff --git a/sql/updates/world/2013_01_20_03_world_creature_text.sql b/sql/updates/world/2013_01_20_03_world_creature_text.sql
new file mode 100644
index 00000000000..1ea2c121e1e
--- /dev/null
+++ b/sql/updates/world/2013_01_20_03_world_creature_text.sql
@@ -0,0 +1,15 @@
+-- Moorabi 
+UPDATE `creature_text` SET `sound`=14721, `text`='We fought back da Scourge. What chance joo thinkin'' JOO got?' WHERE `entry`=29305 AND `groupid`=0;
+UPDATE `creature_text` SET `sound`=14722 WHERE `entry`=29305 AND `groupid`=3;
+UPDATE `creature_text` SET `sound`=14723, `text`='Da ground gonna swallow you up!' WHERE `entry`=29305 AND `groupid`=4;
+UPDATE `creature_text` SET `sound`=14726, `text`='Who gonna stop me? You?' WHERE `entry`=29305 AND `groupid`=1 AND `id`=0;
+UPDATE `creature_text` SET `sound`=14727, `text`='Not so tough now!!' WHERE `entry`=29305 AND `groupid`=1 AND `id`=1;
+UPDATE `creature_text` SET `sound`=14728, `text`='If our gods can die... den so can we....' WHERE `entry`=29305 AND `groupid`=2;
+
+-- Slad'ran
+UPDATE `creature_text` SET `sound`=14444, `type`=14 WHERE `entry`=29304 AND `groupid`=3;
+UPDATE `creature_text` SET `sound`=14445, `type`=14, `text`='A thousssand fangsss gonna rend your flesh!' WHERE `entry`=29304 AND `groupid`=4;
+UPDATE `creature_text` SET `sound`=14446, `type`=14, `text`='You not breathin''? Good.' WHERE `entry`=29304 AND `groupid`=1 AND `id`=0;
+UPDATE `creature_text` SET `sound`=14447, `type`=14 WHERE `entry`=29304 AND `groupid`=1 AND `id`=1;
+UPDATE `creature_text` SET `sound`=14448, `type`=14, `text`='I eat you next, mon.' WHERE `entry`=29304 AND `groupid`=1 AND `id`=2;
+UPDATE `creature_text` SET `sound`=14449, `type`=14, `text`='I sssee now... Ssscourge wasss not... our greatessst enemy....' WHERE `entry`=29304 AND `groupid`=2;
diff --git a/sql/updates/world/2013_01_20_03_world_spell_script_names.sql b/sql/updates/world/2013_01_20_03_world_spell_script_names.sql
new file mode 100644
index 00000000000..0cd28de0472
--- /dev/null
+++ b/sql/updates/world/2013_01_20_03_world_spell_script_names.sql
@@ -0,0 +1,81 @@
+DELETE FROM `spell_script_names` WHERE `spell_id` IN (
+48792, -- spell_dk_icebound_fortitude
+59754, -- spell_dk_rune_tap_party
+55233, -- spell_dk_vampiric_blood
+-1850, -- spell_dru_dash
+48391, -- spell_dru_owlkin_frenzy
+29166, -- spell_dru_innervate
+34246, -- spell_dru_idol_lifebloom
+60779, -- spell_dru_idol_lifebloom
+-1079, -- spell_dru_rip
+-61391,-- spell_dru_typhoon
+63845, -- spell_gen_create_lance
+28702, -- spell_gen_netherbloom
+28720, -- spell_gen_nightmare_vine
+26400, -- spell_item_arcane_shroud
+8342,  -- spell_item_goblin_jumper_cables
+22999, -- spell_item_goblin_jumper_cables_xl
+54732, -- spell_item_gnomish_army_knife
+17512, -- spell_item_piccolo_of_the_flaming_fire
+48129, -- spell_item_scroll_of_recall
+60320, -- spell_item_scroll_of_recall
+60321, -- spell_item_scroll_of_recall
+28862, -- spell_item_the_eye_of_diminution
+-543,  -- spell_mage_fire_frost_ward
+-6143, -- spell_mage_fire_frost_ward
+-11426,-- spell_mage_ice_barrier
+-1463, -- spell_mage_mana_shield
+1038,  -- spell_pal_hand_of_salvation
+58597, -- spell_pal_sacred_shield
+-7001, -- spell_pri_lightwell_renew
+-17,   -- spell_pri_power_word_shield
+-1943, -- spell_rog_rupture
+-51490,-- spell_sha_thunderstorm
+-7235, -- spell_warl_shadow_ward
+5246,  -- spell_warr_intimidating_shout
+-772,  -- spell_warr_rend
+64380, -- spell_warr_shattering_throw
+65941, -- spell_warr_shattering_throw
+50725, -- spell_warr_vigilance_trigger
+26275  -- spell_winter_veil_px_238_winter_wondervolt
+);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(48792, 'spell_dk_icebound_fortitude'),
+(59754, 'spell_dk_rune_tap_party'),
+(55233, 'spell_dk_vampiric_blood'),
+(-1850, 'spell_dru_dash'),
+(48391, 'spell_dru_owlkin_frenzy'),
+(29166, 'spell_dru_innervate'),
+(34246, 'spell_dru_idol_lifebloom'),
+(60779, 'spell_dru_idol_lifebloom'),
+(-1079, 'spell_dru_rip'),
+(-61391,'spell_dru_typhoon'),
+(63845, 'spell_gen_create_lance'),
+(28702, 'spell_gen_netherbloom'),
+(28720, 'spell_gen_nightmare_vine'),
+(26400, 'spell_item_arcane_shroud'),
+(8342,  'spell_item_goblin_jumper_cables'),
+(22999, 'spell_item_goblin_jumper_cables_xl'),
+(54732, 'spell_item_gnomish_army_knife'),
+(17512, 'spell_item_piccolo_of_the_flaming_fire'),
+(48129, 'spell_item_scroll_of_recall'),
+(60320, 'spell_item_scroll_of_recall'),
+(60321, 'spell_item_scroll_of_recall'),
+(28862, 'spell_item_the_eye_of_diminution'),
+(-543,  'spell_mage_fire_frost_ward'),
+(-6143, 'spell_mage_fire_frost_ward'),
+(-11426,'spell_mage_ice_barrier'),
+(-1463, 'spell_mage_mana_shield'),
+(1038,  'spell_pal_hand_of_salvation'),
+(58597, 'spell_pal_sacred_shield'),
+(-7001, 'spell_pri_lightwell_renew'),
+(-17,   'spell_pri_power_word_shield'),
+(-1943, 'spell_rog_rupture'),
+(-51490,'spell_sha_thunderstorm'),
+(-7235, 'spell_warl_shadow_ward'),
+(5246,  'spell_warr_intimidating_shout'),
+(-772,  'spell_warr_rend'),
+(64380, 'spell_warr_shattering_throw'),
+(65941, 'spell_warr_shattering_throw'),
+(50725, 'spell_warr_vigilance_trigger'),
+(26275, 'spell_winter_veil_px_238_winter_wondervolt');
diff --git a/sql/updates/world/2013_01_20_04_world_creature_text.sql b/sql/updates/world/2013_01_20_04_world_creature_text.sql
new file mode 100644
index 00000000000..5c457530f92
--- /dev/null
+++ b/sql/updates/world/2013_01_20_04_world_creature_text.sql
@@ -0,0 +1,12 @@
+-- Text for Crushridge Warmonger	
+SET @ENTRY := 2287;	
+DELETE FROM `creature_text` WHERE `entry`=@ENTRY AND `groupid`=1;	
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@ENTRY,1,0,'%s goes into a frenzy!',16,0,100,0,0,0,'Crushridge Warmonger');
+
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid` = 12236 AND `id`=9;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid` = 2428 AND `id`=10;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid` = 2287 AND `id`=1;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` = 2287 AND `id`=3;
+UPDATE `smart_scripts` SET `action_param1`=1 WHERE `entryorguid` = 2287 AND `id`=4;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid` = 8561 AND `id`=11;
diff --git a/sql/updates/world/2013_01_20_05_world_sai.sql b/sql/updates/world/2013_01_20_05_world_sai.sql
new file mode 100644
index 00000000000..9539bc546b1
--- /dev/null
+++ b/sql/updates/world/2013_01_20_05_world_sai.sql
@@ -0,0 +1,41 @@
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=14390 AND `source_type`=0 AND `id`=9;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=2587 AND `source_type`=0 AND `id`=8;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=4064 AND `source_type`=0 AND `id`=9;
+UPDATE `smart_scripts` SET `link`=3 WHERE `entryorguid`=29181 AND `source_type`=0 AND `id`=2;
+UPDATE `smart_scripts` SET `link`=0,`event_type`=61,`event_param2`=0,`event_param3`=0 WHERE `entryorguid`=29181 AND `source_type`=0 AND `id`=3;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29186 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29199 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29199 AND `source_type`=0 AND `id`=2;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29204 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29204 AND `source_type`=0 AND `id`=2;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29200 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29200 AND `source_type`=0 AND `id`=2;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=29176 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=500 AND `source_type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=4462 AND `source_type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=14467 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=2719 AND `source_type`=0 AND `id`=3;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=6004 AND `source_type`=0 AND `id`=9;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=23580 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=17270 AND `source_type`=0 AND `id`=13;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=29836 AND `source_type`=0 AND `id`=13;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=578 AND `source_type`=0 AND `id`=8;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=1397 AND `source_type`=0 AND `id`=14;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=1123 AND `source_type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=1123 AND `source_type`=0 AND `id`=16;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=3142 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=15641 AND `source_type`=0 AND `id`=9;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=424 AND `source_type`=0 AND `id`=9;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=19507 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=3643 AND `source_type`=1 AND `id`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=1162 AND `source_type`=0 AND `id`=9;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=1162 AND `source_type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=3987 AND `source_type`=0 AND `id`=1;
+
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=6066 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid`=8477 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=29206 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=29182 AND `source_type`=0 AND `id` IN (0,1);
+UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid`=29177 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid`=29684 AND `source_type`=0 AND `id` IN (0,1);
+UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid`=15631 AND `source_type`=0 AND `id`=0;
diff --git a/sql/updates/world/2013_01_20_06_world_creature.sql b/sql/updates/world/2013_01_20_06_world_creature.sql
new file mode 100644
index 00000000000..c00ff11ea4a
--- /dev/null
+++ b/sql/updates/world/2013_01_20_06_world_creature.sql
@@ -0,0 +1,24 @@
+-- Image of Commander Ameer <The Protectorate> (22919)
+SET @GUID := 43492;
+
+UPDATE `creature_template` SET `npcflag`=`npcflag`|2,`unit_flags`=`unit_flags`&~33554432 WHERE `entry`=22919;
+
+DELETE FROM `creature` WHERE `guid`=@GUID;
+INSERT INTO `creature` (`guid`,`id`,`map`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`curhealth`) VALUES
+(@GUID,22919,530,3866.55,5978.68,291.792,4.10061,300,6986);
+
+DELETE FROM `creature_questrelation` WHERE `id`=22919;
+INSERT INTO `creature_questrelation` (`id`,`quest`) VALUES
+(22919,10981), -- Nexus-Prince Shaffar's Personal Chamber
+(22919,10975), -- Purging the Chambers of Bash'ir
+(22919,10977), -- Stasis Chambers of the Mana-Tombs
+(22919,10976); -- The Mark of the Nexus-King
+
+DELETE FROM `creature_involvedrelation` WHERE `id`=22919;
+INSERT INTO `creature_involvedrelation` (`id`,`quest`) VALUES
+(22919,10981), -- Nexus-Prince Shaffar's Personal Chamber
+(22919,10975), -- Purging the Chambers of Bash'ir
+(22919,10974), -- Stasis Chambers of Bash'ir
+(22919,10977), -- Stasis Chambers of the Mana-Tombs
+(22919,10982), -- The Eye of Haramad
+(22919,10976); -- The Mark of the Nexus-King
diff --git a/sql/updates/world/2013_01_20_07_world_sai.sql b/sql/updates/world/2013_01_20_07_world_sai.sql
new file mode 100644
index 00000000000..f8d001e73db
--- /dev/null
+++ b/sql/updates/world/2013_01_20_07_world_sai.sql
@@ -0,0 +1,5 @@
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=234 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=2554 AND `source_type`=0 AND `id`=9;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=12265 AND `source_type`=0 AND `id`=1;
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=12265 AND `source_type`=0 AND `id`=3;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=16704 AND `source_type`=0 AND `id`=13;
diff --git a/sql/updates/world/2013_01_20_08_world_sai.sql b/sql/updates/world/2013_01_20_08_world_sai.sql
new file mode 100644
index 00000000000..411d69e08d2
--- /dev/null
+++ b/sql/updates/world/2013_01_20_08_world_sai.sql
@@ -0,0 +1,4 @@
+UPDATE `smart_scripts` SET `link`=0,`event_type`=61 WHERE `entryorguid`=13601 AND `source_type`=0 AND `id`=4;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=13601 AND `source_type`=0 AND `id`=10;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=17670 AND `source_type`=0 AND `id`=13;
+UPDATE `smart_scripts` SET `event_type`=61 WHERE `entryorguid`=11878 AND `source_type`=0 AND `id`=13;