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

Conflicts:
	src/server/game/Conditions/ConditionMgr.h

sql/updates/world/2013_01_04_02_world_novos_the_summoner.sql

@@ -0,0 +1,63 @@
+-- Summon minions
+DELETE FROM `spell_script_names` WHERE `spell_id`=59910;
+INSERT INTO `spell_script_names`(`spell_id`,`ScriptName`) VALUE
+(59910,'spell_summon_minions');
+
+-- Heroic spells
+DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (49198,49034,49037,50089,49668,51363) OR `spellid0` IN (49198,49034,49037,50089,49668,51363);
+INSERT INTO `spelldifficulty_dbc`(`id`,`spellid0`,`spellid1`) VALUES
+(49198,49198,59909), -- Arcance Blast
+(49034,49034,59854), -- Blizzard
+(49037,49037,59855), -- Frostbolt
+(50089,50089,59856), -- Wrath of Misery
+(49668,49668,59004), -- Flash of Darkness
+(51363,51363,59016); -- Shadow Bolt
+
+-- Script assignment for summoners
+UPDATE `creature_template` SET `ScriptName`='npc_crystal_channel_target',`AIName`='' WHERE `entry`=26712;
+
+-- Spawn summoner for Crystal Handlers
+SET @GUID = 40153;
+DELETE FROM `creature` WHERE `guid`=@GUID;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `curhealth`) VALUE
+(@GUID,26712,600,3,17188,-341.31,-724.4,28.57,3.78,3600,8982);
+
+-- Check instance script for achievement Oh Novos
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id`=7361;
+INSERT INTO `achievement_criteria_data`(`criteria_id`,`type`,`ScriptName`) VALUE
+(7361,11,'achievement_oh_novos');
+
+-- Waypoints for summoned adds
+DELETE FROM `waypoint_data` WHERE `id` IN(2759700,2759800,2760000,2662700);
+INSERT INTO `waypoint_data`(`id`,`point`,`position_x`,`position_y`,`position_z`) VALUES 
+(2759700,1,-379.473,-810.974,59.7612),
+(2759700,2,-379.449,-791.535,44.1756),
+(2759700,3,-379.448,-790.328,44.1756),
+(2759700,4,-379.426,-772.338,28.5884),
+(2759700,5,-379.415,-763.518,28.5884),
+(2760000,1,-376.571,-810.681,59.6673),
+(2760000,2,-375.627,-791.874,44.1756),
+(2760000,3,-375.629,-790.273,44.1434),
+(2760000,4,-375.402,-771.145,28.5895),
+(2760000,5,-375.337,-765.027,28.5895),
+(2759800,1,-382.303,-810.815,59.7628),
+(2759800,2,-382.324,-791.595,44.1756),
+(2759800,3,-382.326,-790.331,44.1746),
+(2759800,4,-383.037,-770.382,28.5884),
+(2759800,5,-383.140,-765.399,28.5884),
+(2662700,1,-346.977,-733.319,28.5838),
+(2662700,2,-363.009,-765.202,28.5907),
+(2662700,3,-378.269,-765.701,28.5893);
+
+-- SAI for Crystal Handlers and Risen Shadowcasters
+UPDATE `creature_template` SET `AIName`='SmartAI',`ScriptName`='' WHERE `entry` IN (26627,27600);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (26627,27600) AND `source_type`=0;
+INSERT INTO `smart_scripts`(`entryorguid`,`event_type`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`target_type`,`comment`) VALUES
+(26627,0,1000,1000,5000,5000,11,49668,2,'Crystal Handler - In fight - After 1s then every 5s - Cast Flash of Darkness - On victim'),
+(27600,0,1000,1000,5000,5000,11,51363,2,'Risen Shadowcaster - In fight - After 1s then every 5s - Cast Shadow Bolt - On victim');
+
+-- Conditions for beam spell
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=52106;
+INSERT INTO `conditions`(`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`Comment`) VALUES
+(13,1,52106,31,0,3,26712,0,'Beam Channel target has to be Crystal Channel Target'),
+(13,1,52106,35,1,0,   18,1,'Beam Channel target must not be self');

sql/updates/world/2013_01_05_00_world_waypoints.sql

@@ -0,0 +1,10 @@
+-- Pathing for Harrison Jones Entry: 24358
+SET @NPC := 86177;
+SET @PATH := @NPC * 10;
+DELETE FROM `waypoint_data` WHERE `id`IN (@PATH,@PATH+1,@PATH+2);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,131.8243,1644.853,42.0216,0,0,0,100,0),
+(@PATH+1,1,121.897,1639.106,42.19081,0,0,0,100,0),
+(@PATH+1,2,120.8522,1637.931,42.37172,0,0,0,100,0),
+(@PATH+1,3,120.7898,1609.063,43.49005,0,0,0,100,0),
+(@PATH+2,1,120.6967,1603.713,43.4503,0,0,0,100,0);

sql/updates/world/2013_01_06_00_world_creature_addon.sql

@@ -0,0 +1,10 @@
+-- Cleanup creature_addon and creature_template_addon
+-- we had 83 duplicate aura definitions in those
+-- Glacier Penguin (51 rows) 
+DELETE FROM `creature_addon` WHERE `guid` IN (134996,134997,134998,134999,135000,135001,135002,135004,135005,135006,135007,135008,135009,135010,135011,135012,135013,135014,135015,135016,135017,135018,135025,135026,135027,135028,135029,135030,135031,135032,135033,135034,135035,135036,135037,135038,135039,135040,135041,53884,53885,53886,53887,53888,53889,53890,53891,53892,54042,54043,54044);
+-- Plagued Dragonflayer Tribesman (21 rows)
+DELETE FROM `creature_addon` WHERE `guid` IN (97517,97518,97519,97520,97521,97522,97523,97524,97526,97527,97528,97529,97530,97531,97532,97534,97535,97537,97538,97539,97541);
+DELETE FROM `creature_addon` WHERE `guid` IN (
+85036, -- Sir Marcus Barlowe
+85038, -- Captain Joseph Holley
+85053); -- Marshal Jacob Alerius

sql/updates/world/2013_01_06_00_world_creature_template.sql

@@ -0,0 +1,4 @@
+-- Add cpp script to Harrison Jones Entry: 24358
+UPDATE `creature_template` SET `AIName`= '', `ScriptName`= 'npc_harrison_jones' WHERE `entry`=24358;
+-- Remove cpp script from Strange Gong
+UPDATE `gameobject_template` SET `AIName`= '', `ScriptName`= '' WHERE `entry`=187359;

sql/updates/world/2013_01_06_01_world_waypoints.sql

@@ -0,0 +1,18 @@
+-- Pathing for Kirtonos the Herald Entry: 10506
+SET @PATH := 105061;
+DELETE FROM `waypoint_data` WHERE `id`IN (@PATH,@PATH+1,@PATH+2);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,316.7087,71.26834,104.5843,0,0,0,100,0),
+(@PATH,2,321.1605,72.80973,104.6676,0,0,0,100,0),
+(@PATH,3,332.3713,77.98991,105.8621,0,0,0,100,0),
+(@PATH,4,333.3254,86.60159,106.6399,0,0,0,100,0),
+(@PATH,5,334.1263,101.6836,106.8343,0,0,0,100,0),
+(@PATH,6,331.0458,114.5935,106.3621,0,0,0,100,0),
+(@PATH,7,329.5439,126.7019,106.1399,0,0,0,100,0),
+(@PATH,8,335.2471,136.546,105.7232,0,0,0,100,0),
+(@PATH,9,343.21,139.9459,107.6399,0,0,0,100,0),
+(@PATH,10,364.3288,140.9012,109.9454,0,0,0,100,0),
+(@PATH,11,362.676,115.6384,110.3065,0,0,0,100,0),
+(@PATH,12,341.7896,91.9439,107.1676,0,0,0,100,0),
+(@PATH,13,313.4945,93.45945,104.0565,0,0,0,100,0),
+(@PATH,14,306.3839,93.61675,104.0565,0,0,0,100,0);

sql/updates/world/2013_01_06_02_world_misc.sql

@@ -0,0 +1,12 @@
+-- Small fix to pathing for Harrison Jones
+UPDATE `waypoint_data` SET `position_y`=1642.853 WHERE `id`=861770 AND `point`=1;
+
+-- Text for Amani'shi Guardian from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (23597);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(23597,0,0, 'More intruders! Sound da alarm!',14,0,100,25,0,12104, 'Amani''shi Guardian - Gong Event Say');
+
+-- Spell condition for Cosmetic - Spear Throw
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=43647;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,43647,0,0,31,0,3,24358,0,0,0,0, '', 'Cosmetic - Spear Throw - Harrison Jones');

sql/updates/world/2013_01_06_03_world_sai.sql

@@ -0,0 +1,3 @@
+-- Some SAI Event flag fixes
+UPDATE `smart_scripts` SET `event_flags`=`event_flags` &~2 WHERE `entryorguid` IN (594,2529,3631,3632,3633,3655,11777,11778,11781,11782,11785,11786,12239,12240,12241,14284,14285,16354,16355,24819,25471,25472,25473,29186,29190,29199,29200,29204,29219,29454,29455,29468,32501);
+UPDATE `smart_scripts` SET `event_flags`=`event_flags` &~4 WHERE `entryorguid` IN (32501);

sql/updates/world/2013_01_06_04_world_misc.sql

@@ -0,0 +1,34 @@
+-- Spell condition for Cosmetic - Spear Throw
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=43647;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,43647,0,0,31,0,3,24375,0,0,0,0, '', 'Cosmetic - Spear Throw - Harrison Jones');
+
+-- Text for Harrison Jones from sniff
+DELETE FROM `creature_text` WHERE `entry` IN (24358,24375);
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(24358,0,0, 'Suit yourself. At least five of you must assist me if we''re to get inside. Follow me....',14,0,100,1,0,0, 'Harrison Jones - Gong Event Say 0'),
+(24358,1,0, 'According to my calculations, if enough of us bang the gong at once the seal on these doors will break and we can enter.',14,0,100,1,0,0, 'Harrison Jones - Gong Event Say 1'),
+(24375,0,0, 'I''ve researched this site extensively and I won''t allow any dim-witted treasure hunters to swoop in and steal what belongs in a museum. I''ll lead this charge...',14,0,100,0,0,0, 'Harrison Jones - Gong Event Say 2'),
+(24375,1,0, 'In fact, it would be best if you just stay here. You''d only get in my way....',14,0,100,0,0,0, 'Harrison Jones - Gong Event Say 3');
+
+-- Add spell script for banging the gong
+DELETE FROM `spell_script_names` WHERE `spell_id`=45226;
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(45226, 'spell_banging_the_gong');
+
+-- Remove creature from db
+DELETE FROM `creature` WHERE id=24358;
+DELETE FROM `creature_addon` WHERE guid=86177;
+UPDATE `creature_template` SET `equipment_id`=0 WHERE `entry`=24358;
+
+-- Pathing for Harrison Jones Entry: 24358
+SET @NPC := 86044;
+SET @PATH := @NPC * 10;
+DELETE FROM `waypoint_data` WHERE `id`IN (861770,861771,861772);
+DELETE FROM `waypoint_data` WHERE `id`IN (@PATH,@PATH+1,@PATH+2);
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,131.8243,1642.853,42.0216,0,0,0,100,0),
+(@PATH+1,1,121.897,1639.106,42.19081,0,0,0,100,0),
+(@PATH+1,2,120.8522,1637.931,42.37172,0,0,0,100,0),
+(@PATH+1,3,120.7898,1609.063,43.49005,0,0,0,100,0),
+(@PATH+2,1,120.6967,1603.713,43.4503,0,0,0,100,0);