aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sql/updates/world/2015_09_05_00_world.sql335
-rw-r--r--sql/updates/world/2015_09_05_01_world.sql6
-rw-r--r--sql/updates/world/2015_09_05_02_world_335.sql110
-rw-r--r--sql/updates/world/2015_09_06_00_world.sql73
-rw-r--r--sql/updates/world/2015_09_07_00_world.sql10
-rw-r--r--sql/updates/world/2015_09_07_01_world.sql7
-rw-r--r--sql/updates/world/2015_09_07_02_world.sql5
-rw-r--r--sql/updates/world/2015_09_07_03_world.sql163
-rw-r--r--sql/updates/world/2015_09_07_04_world.sql8
-rw-r--r--sql/updates/world/2015_09_07_05_world.sql5
-rw-r--r--sql/updates/world/2015_09_08_00_world.sql15
-rw-r--r--sql/updates/world/2015_09_08_01_world.sql39
-rw-r--r--sql/updates/world/2015_09_08_02_world.sql2
-rw-r--r--sql/updates/world/2015_09_09_00_world.sql8
-rw-r--r--src/server/authserver/authserver.conf.dist2
-rw-r--r--src/server/game/Chat/Chat.cpp28
-rw-r--r--src/server/game/Chat/Chat.h4
-rw-r--r--src/server/game/DungeonFinding/LFGQueue.cpp48
-rw-r--r--src/server/game/DungeonFinding/LFGQueue.h2
-rw-r--r--src/server/game/Entities/Player/Player.cpp13
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp4
-rw-r--r--src/server/scripts/Commands/cs_lfg.cpp2
22 files changed, 852 insertions, 37 deletions
diff --git a/sql/updates/world/2015_09_05_00_world.sql b/sql/updates/world/2015_09_05_00_world.sql
new file mode 100644
index 00000000000..a259ae99f23
--- /dev/null
+++ b/sql/updates/world/2015_09_05_00_world.sql
@@ -0,0 +1,335 @@
+--
+SET @GUID := 52011; -- 11 FREE CGUID SET BY TC
+DELETE FROM `creature` WHERE `guid` BETWEEN @GUID AND @GUID + 10;
+INSERT INTO `creature` (`guid`, `id`, `map`, `modelid`, `position_x`, `position_y`, `position_z`, `orientation`, `curhealth`) VALUES
+(@GUID + 0, 24833, 584, 22659, 26.68381, 5.156456, 11.14973, 1.562181, 1474), -- Captain "Stash" Torgoley <The Lady Mehley> - 75958
+(@GUID + 1, 24834, 584, 22660, 17.73618, -7.963644, 6.181007, 1.658063, 1474), -- Galley Chief Grace <The Lady Mehley> - 75959
+(@GUID + 2, 24835, 584, 22661, 24.61499, 5.468628, 16.04766, 3.176499, 1358), -- First Mate Kowalski <The Lady Mehley> - 75960
+(@GUID + 3, 24836, 584, 262, -4.359131, 3.349854, 6.099176, 1.576669, 312), -- Abe the Cabin Boy <The Lady Mehley> - 75961
+(@GUID + 4, 24837, 584, 22662, 19.20459, -7.213135, 6.097228, 3.667171, 867), -- Navigator Mehran <The Lady Mehley> - 75962
+(@GUID + 5, 24838, 584, 22663, -27.50586, -3.588379, 21.17929, 2.405203, 804), -- Sailor Henders <The Lady Mehley> - 75963
+(@GUID + 6, 24839, 584, 22664, 6.123779, 10.77246, 11.47038, 1.539951, 804), -- Sailor Wicks <The Lady Mehley> - 75964
+(@GUID + 7, 24840, 584, 22665, 28.74146, 6.708008, 6.096051, 1.087228, 804), -- Sailor Vines <The Lady Mehley> - 75965
+(@GUID + 8, 24841, 584, 1858, -9.322998, -1.669921, 6.09808, 0.01745319, 10236), -- Marine Halters - 75966
+(@GUID + 9, 24842, 584, 22666, 14.44629, 0.1442871, 12.0214, 3.309605, 10236), -- Marine Anderson - 75967
+(@GUID + 10, 24843, 584, 22667, 6.350558, 8.718207, 6.180843, 5.427974, 928); -- Engineer Combs <The Lady Mehley> - 75968
+
+-- Pathing for Entry: 24833 'TDB FORMAT'
+SET @NPC := @GUID;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=37.03026,`position_y`=4.622362,`position_z`=6.176411, `orientation`=1.00 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,1,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,37.03026,4.622362,6.176411,1.00,35000,0,0,100,0),
+(@PATH,2,33.79711,3.379296,6.136233,0,0,0,0,100,0),
+(@PATH,3,30.11437,1.977602,6.346729,0,0,0,0,100,0),
+(@PATH,4,28.86437,2.977602,6.346729,0,0,0,0,100,0),
+(@PATH,5,26.34205,5.299405,6.347331,0,0,0,0,100,0),
+(@PATH,6,23.84205,5.299405,6.347331,0,0,0,0,100,0),
+(@PATH,7,17.09205,5.049405,6.347331,0,0,0,0,100,0),
+(@PATH,8,10.25663,4.995337,6.348217,0,0,0,0,100,0),
+(@PATH,9,7.917565,0.5690584,6.348763,0,0,0,0,100,0),
+(@PATH,10,8.917565,-0.9309416,6.348763,0,0,0,0,100,0),
+(@PATH,11,11.10869,-4.599314,6.348672,0,0,0,0,100,0),
+(@PATH,12,18.60869,-4.849314,6.348672,0,0,0,0,100,0),
+(@PATH,13,24.60869,-5.099314,6.348672,0,0,0,0,100,0),
+(@PATH,14,26.69126,-5.140297,6.623405,0,0,0,0,100,0),
+(@PATH,15,26.69126,-3.640297,6.623405,0,0,0,0,100,0),
+(@PATH,16,26.69126,3.859703,11.3734,0,0,0,0,100,0),
+(@PATH,17,26.56619,3.997062,11.49595,0,0,0,0,100,0),
+(@PATH,18,26.56619,5.497062,11.49595,0,0,0,0,100,0),
+(@PATH,19,24.06619,5.497062,11.49595,0,0,0,0,100,0),
+(@PATH,20,22.81619,5.497062,11.99595,0,0,0,0,100,0),
+(@PATH,21,21.56619,5.497062,12.24595,0,0,0,0,100,0),
+(@PATH,22,5.473877,5.844482,11.85669,0,25000,0,0,100,0),
+(@PATH,23,7.723877,-1.405518,11.85669,0,0,0,0,100,0),
+(@PATH,24,10.47388,-6.155518,11.85669,0,0,0,0,100,0),
+(@PATH,25,10.43553,-5.953337,11.88334,0,0,0,0,100,0),
+(@PATH,26,10.93553,-6.953337,11.88334,0,0,0,0,100,0),
+(@PATH,27,5.371088,-7.016384,11.77661,0,0,0,0,100,0),
+(@PATH,28,2.413238,-4.390701,11.56228,0,0,0,0,100,0),
+(@PATH,29,1.163238,-4.390701,11.31228,0,0,0,0,100,0),
+(@PATH,30,-3.086762,-5.140701,6.562281,0,0,0,0,100,0);
+-- 0x1C15A0002018404000004000006049B5 .go 37.03026 4.622362 6.176411
+
+-- Pathing for Entry: 24835 'TDB FORMAT'
+SET @NPC := @GUID + 2;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=24.61543,`position_y`=5.468647,`position_z`=16.12396 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,24.61543,5.468647,16.12396,3.246287,0,0,0,100,0),
+(@PATH,2,24.59153,3.553659,16.31282,0,0,0,0,100,0),
+(@PATH,3,24.59153,0.05365944,16.31282,0,0,0,0,100,0),
+(@PATH,4,24.59153,-3.446341,16.06282,0,0,0,0,100,0),
+(@PATH,5,24.57548,-5.133168,16.0891,0,0,0,0,100,0),
+(@PATH,6,23.32548,-5.383168,16.0891,0,0,0,0,100,0),
+(@PATH,7,20.07548,-5.883168,12.5891,0,0,0,0,100,0),
+(@PATH,8,19.97622,-5.8692,12.62369,0,0,0,0,100,0),
+(@PATH,9,19.22622,-5.8692,12.62369,0,0,0,0,100,0),
+(@PATH,10,18.97622,-4.6192,12.62369,0,0,0,0,100,0),
+(@PATH,11,17.54005,-0.2464206,12.32892,0,0,0,0,100,0),
+(@PATH,12,18.04005,3.753579,12.32892,0,0,0,0,100,0),
+(@PATH,13,18.07397,3.926754,12.37037,0,0,0,0,100,0),
+(@PATH,14,18.32397,5.676754,12.12037,0,0,0,0,100,0),
+(@PATH,15,20.28442,3.827637,12.37757,0,0,0,0,100,0),
+(@PATH,16,19.53442,-0.1723633,12.37757,0,0,0,0,100,0),
+(@PATH,17,19.03442,-4.672363,12.12757,0,0,0,0,100,0),
+(@PATH,18,18.88482,-4.669163,12.44052,0,0,0,0,100,0),
+(@PATH,19,18.88482,-5.669163,12.44052,0,0,0,0,100,0),
+(@PATH,20,20.13482,-5.669163,12.69052,0,0,0,0,100,0),
+(@PATH,21,23.13482,-5.169163,15.94052,0,0,0,0,100,0),
+(@PATH,22,25.75478,-4.782483,16.3373,0,0,0,0,100,0),
+(@PATH,23,25.75478,-3.282483,16.3373,0,0,0,0,100,0),
+(@PATH,24,26.00478,-0.03248262,16.5873,0,0,0,0,100,0),
+(@PATH,25,26.25478,3.467517,16.5873,0,0,0,0,100,0),
+(@PATH,26,24.61548,5.46875,16.04771,0,0,0,0,100,0),
+(@PATH,27,24.61548,5.46875,16.04771,3.176499,80000,0,0,100,0);
+-- 0x1C15A000201840C000004000006048CF .go 24.61543 5.468647 16.12396
+
+-- Pathing for Entry: 24836 'TDB FORMAT'
+SET @NPC := @GUID + 3;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-2.233398,`position_y`=2.553833,`position_z`=6.099016 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-2.233398,2.553833,6.099016,0,0,0,0,100,0),
+(@PATH,2,-2.233398,2.553833,6.099016,2.059489,0,0,0,100,0),
+(@PATH,3,1.698853,3.417053,6.348891,0,0,0,0,100,0),
+(@PATH,4,3.448853,4.167053,6.348891,0,0,0,0,100,0),
+(@PATH,5,7.448853,-0.5829468,6.348891,0,0,0,0,100,0),
+(@PATH,6,9.774704,-2.902952,6.349678,0,0,0,0,100,0),
+(@PATH,7,9.800768,-3.249776,6.348591,0,0,0,0,100,0),
+(@PATH,8,13.55077,-3.999776,6.348591,0,0,0,0,100,0),
+(@PATH,9,18.30077,-4.749776,6.348591,0,0,0,0,100,0),
+(@PATH,10,20.13506,-5.121357,6.347137,0,0,0,0,100,0),
+(@PATH,11,24.38506,-5.371357,6.347137,0,0,0,0,100,0),
+(@PATH,12,24.58777,-5.452598,6.623333,0,0,0,0,100,0),
+(@PATH,13,26.83777,-5.702598,6.623333,0,0,0,0,100,0),
+(@PATH,14,26.58777,-3.452598,6.623333,0,0,0,0,100,0),
+(@PATH,15,26.58777,3.797402,11.37333,0,0,0,0,100,0),
+(@PATH,16,26.85096,4.066658,11.19734,0,0,0,0,100,0),
+(@PATH,17,26.85096,5.566658,11.19734,0,0,0,0,100,0),
+(@PATH,18,26.86504,5.718296,11.3996,0,0,0,0,100,0),
+(@PATH,19,30.61504,5.718296,11.3996,0,0,0,0,100,0),
+(@PATH,20,30.61504,3.718296,11.3996,0,0,0,0,100,0),
+(@PATH,21,29.54675,3.707764,11.3996,0,0,0,0,100,0),
+(@PATH,22,28.29675,4.207764,11.3996,0,0,0,0,100,0),
+(@PATH,23,24.39871,5.605234,11.61975,0,0,0,0,100,0),
+(@PATH,24,23.39871,5.605234,11.61975,0,0,0,0,100,0),
+(@PATH,25,22.14871,5.605234,12.11975,0,0,0,0,100,0),
+(@PATH,26,21.82304,5.810547,12.27328,0,0,0,0,100,0),
+(@PATH,27,20.07304,5.810547,12.27328,0,0,0,0,100,0),
+(@PATH,28,17.32304,3.810547,12.27328,0,0,0,0,100,0),
+(@PATH,29,17.06653,3.683082,12.10866,0,0,0,0,100,0),
+(@PATH,30,14.56653,1.933082,12.10866,0,0,0,0,100,0),
+(@PATH,31,13.06653,-1.066918,12.10866,0,0,0,0,100,0),
+(@PATH,32,9.639757,-6.127687,11.82736,0,0,0,0,100,0),
+(@PATH,33,3.298409,-6.022044,11.54611,0,0,0,0,100,0),
+(@PATH,34,2.798409,-4.272044,11.54611,0,0,0,0,100,0),
+(@PATH,35,1.048409,-4.522044,11.29611,0,0,0,0,100,0),
+(@PATH,36,-2.951591,-5.022044,6.546112,0,0,0,0,100,0),
+(@PATH,37,-4.002031,-4.848095,6.186443,0,0,0,0,100,0),
+(@PATH,38,-4.002031,-0.0980947,6.186443,0,0,0,0,100,0),
+(@PATH,39,-2.233643,2.553955,6.099016,0,0,0,0,100,0);
+-- 0x1C15A0000018410000002F0000604858 .go -2.233398 2.553833 6.099016
+
+-- Pathing for Entry: 24837 'TDB FORMAT'
+SET @NPC := @GUID + 4;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=21.28821,`position_y`=-6.498474,`position_z`=6.346781 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,21.28821,-6.498474,6.346781,0,0,0,0,100,0),
+(@PATH,2,24.28821,-6.248474,6.346781,0,0,0,0,100,0),
+(@PATH,3,24.5675,-5.887867,6.623326,0,0,0,0,100,0),
+(@PATH,4,26.3175,-5.637867,6.623326,0,0,0,0,100,0),
+(@PATH,5,26.5675,-3.637867,6.623326,0,0,0,0,100,0),
+(@PATH,6,26.8175,3.862133,11.37333,0,0,0,0,100,0),
+(@PATH,7,27.0207,5.456285,11.61129,0,0,0,0,100,0),
+(@PATH,8,24.0207,5.456285,11.61129,0,0,0,0,100,0),
+(@PATH,9,22.7707,5.706285,11.86129,0,0,0,0,100,0),
+(@PATH,10,21.5207,5.706285,12.36129,0,0,0,0,100,0),
+(@PATH,11,21.19737,5.743245,12.28643,0,0,0,0,100,0),
+(@PATH,12,19.69737,5.743245,12.28643,0,0,0,0,100,0),
+(@PATH,13,18.44737,3.743245,12.28643,0,0,0,0,100,0),
+(@PATH,14,16.32088,0.3530575,12.37261,0,0,0,0,100,0),
+(@PATH,15,18.57088,-4.646943,12.37261,0,0,0,0,100,0),
+(@PATH,16,18.82599,-4.72204,12.55197,0,0,0,0,100,0),
+(@PATH,17,19.32599,-5.72204,12.55197,0,0,0,0,100,0),
+(@PATH,18,23.32599,-5.22204,16.05197,0,0,0,0,100,0),
+(@PATH,19,24.89713,-4.957284,16.51354,0,0,0,0,100,0),
+(@PATH,20,27.89713,-4.707284,17.01354,0,0,0,0,100,0),
+(@PATH,21,35.14713,-3.957284,18.26354,0,0,0,0,100,0),
+(@PATH,22,35.03859,-3.71197,18.26312,0,0,0,0,100,0),
+(@PATH,23,35.53859,-3.71197,18.51312,0,0,0,0,100,0),
+(@PATH,24,36.03859,-2.71197,18.51312,0,0,0,0,100,0),
+(@PATH,25,36.78859,-1.21197,18.51312,0,0,0,0,100,0),
+(@PATH,26,36.83167,-1.03315,18.61353,0,0,0,0,100,0),
+(@PATH,27,37.33167,-0.0331502,18.61353,0,0,0,0,100,0),
+(@PATH,28,35.83167,-0.0331502,18.36353,0,0,0,0,100,0),
+(@PATH,29,33.81982,0.05114746,18.28621,0,80000,0,0,100,0);
+-- 0x1C15A0000018414000002F0000604858 .go 21.28821 -6.498474 6.346781
+
+-- Pathing for Entry: 24838 'TDB FORMAT'
+SET @NPC := @GUID + 5;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-27.21704,`position_y`=-0.001220703,`position_z`=21.58302 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-27.21704,-0.001220703,21.58302,3.141593,15000,0,0,100,0),
+(@PATH,2,-26.7854,3.492676,21.49658,0,0,0,0,100,0),
+(@PATH,3,-27.21509,0.02246094,21.582,0,0,0,0,100,0),
+(@PATH,4,-27.21509,0.02246094,21.582,3.141593,15000,0,0,100,0),
+(@PATH,5,-27.31982,-3.39917,21.29024,0,0,0,0,100,0),
+(@PATH,6,-23.06238,-6.165868,20.58522,0,0,0,0,100,0);
+-- 0x1C15A0000018418000002F0000604859 .go -27.21704 -0.001220703 21.58302
+
+-- Pathing for Entry: 24839 'TDB FORMAT'
+SET @NPC := @GUID + 6;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=9.595876,`position_y`=-1.214922,`position_z`=11.80095 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,9.595876,-1.214922,11.80095,0,10000,0,0,100,0),
+(@PATH,2,10.84588,3.285078,12.05095,0,0,0,0,100,0),
+(@PATH,3,10.78306,3.165822,11.99681,0,0,0,0,100,0),
+(@PATH,4,11.03306,4.415822,11.99681,0,0,0,0,100,0),
+(@PATH,5,9.130737,-1.28125,11.96241,0,0,0,0,100,0),
+(@PATH,6,9.877741,-6.322785,11.91132,0,0,0,0,100,0),
+(@PATH,7,6.444749,-7.275679,11.82178,0,0,0,0,100,0),
+(@PATH,8,6.444749,-9.525679,11.57178,0,0,0,0,100,0),
+(@PATH,9,7.006714,-9.58252,11.59527,0,0,0,0,100,0),
+(@PATH,10,8.256714,-8.08252,11.84527,0,10000,0,0,100,0),
+(@PATH,11,9.506714,-6.58252,11.84527,0,0,0,0,100,0),
+(@PATH,12,9.757862,-6.227444,12.01764,0,0,0,0,100,0),
+(@PATH,13,10.25786,-5.227444,11.76764,0,0,0,0,100,0),
+(@PATH,14,11.50786,-1.227444,12.01764,0,0,0,0,100,0),
+(@PATH,15,10.53357,-1.442627,12.06874,0,0,0,0,100,0),
+(@PATH,16,9.107422,-2.769531,11.71875,3.385939,10000,0,0,100,0),
+(@PATH,17,9.595581,-1.214111,11.99324,0,0,0,0,100,0),
+(@PATH,18,10.84558,3.285889,11.99324,0,0,0,0,100,0),
+(@PATH,19,10.78296,3.167067,11.99682,0,0,0,0,100,0),
+(@PATH,20,11.03296,4.417067,11.99682,0,10000,0,0,100,0);
+-- 0x1C15A000201841C000004000006049B5 .go 9.595876 -1.214922 11.80095
+
+-- Pathing for Entry: 24840 'TDB FORMAT'
+SET @NPC := @GUID + 7;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-12.18092,`position_y`=5.488965,`position_z`=6.140242 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,-12.18092,5.488965,6.140242,0,0,0,0,100,0),
+(@PATH,2,-11.93092,4.238965,6.140242,0,0,0,0,100,0),
+(@PATH,3,1.66333,3.382568,6.347836,0,0,0,0,100,0),
+(@PATH,4,3.41333,4.132568,6.347836,0,0,0,0,100,0),
+(@PATH,5,16.41333,5.132568,6.347836,0,0,0,0,100,0),
+(@PATH,6,23.91333,5.632568,6.347836,0,0,0,0,100,0),
+(@PATH,7,27.02629,5.782645,6.348631,0,0,0,0,100,0),
+(@PATH,8,28.7417,6.706543,6.096051,0,0,0,0,100,0),
+(@PATH,9,23.86475,6.410645,6.347143,0,0,0,0,100,0),
+(@PATH,10,18.36475,6.160645,6.347143,0,0,0,0,100,0),
+(@PATH,11,16.61475,5.910645,6.347143,0,0,0,0,100,0),
+(@PATH,12,15.36475,5.910645,6.347143,0,0,0,0,100,0),
+(@PATH,13,3.364746,5.410645,6.347143,0,0,0,0,100,0),
+(@PATH,14,3.131845,5.415648,6.349216,0,0,0,0,100,0),
+(@PATH,15,1.881845,5.415648,6.349216,0,0,0,0,100,0),
+(@PATH,16,-8.868155,6.665648,6.349216,0,0,0,0,100,0),
+(@PATH,17,-9.868155,6.915648,6.349216,0,0,0,0,100,0),
+(@PATH,18,-12.56714,7.07666,6.098746,0,0,0,0,100,0),
+(@PATH,19,-12.56714,7.07666,6.098746,3.525565,0,0,0,100,0),
+(@PATH,20,-12.18091,5.489014,6.348577,0,0,0,0,100,0),
+(@PATH,21,-11.93091,4.239014,6.348577,0,0,0,0,100,0),
+(@PATH,22,1.663208,3.382813,6.347836,0,0,0,0,100,0),
+(@PATH,23,3.413208,4.132813,6.347836,0,0,0,0,100,0),
+(@PATH,24,16.41321,5.132813,6.347836,0,0,0,0,100,0),
+(@PATH,25,23.91321,5.632813,6.347836,0,0,0,0,100,0);
+-- 0x1C15A0002018420000004000006049B5 .go -12.18092 5.488965 6.140242
+
+-- Pathing for Entry: 24842 'TDB FORMAT'
+SET @NPC := @GUID + 9;
+SET @PATH := @NPC * 10;
+UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=20.11769,`position_y`=-6.318613,`position_z`=6.388871 WHERE `guid`=@NPC;
+DELETE FROM `creature_addon` WHERE `guid`=@NPC;
+INSERT INTO `creature_addon` (`guid`,`path_id`,`mount`,`bytes1`,`bytes2`,`emote`,`auras`) VALUES (@NPC,@PATH,0,0,1,0, '');
+DELETE FROM `waypoint_data` WHERE `id`=@PATH;
+INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_type`,`action`,`action_chance`,`wpguid`) VALUES
+(@PATH,1,20.11769,-6.318613,6.388871,0,0,0,0,100,0),
+(@PATH,2,24.36769,-6.068613,6.138871,0,0,0,0,100,0),
+(@PATH,3,26.54725,-5.752126,6.622897,0,0,0,0,100,0),
+(@PATH,4,26.54725,-3.502126,6.622897,0,0,0,0,100,0),
+(@PATH,5,26.79725,3.747874,11.3729,0,0,0,0,100,0),
+(@PATH,6,26.79725,5.497874,11.3729,0,0,0,0,100,0),
+(@PATH,7,26.84597,3.878396,11.42881,0,0,0,0,100,0),
+(@PATH,8,26.84597,5.378396,11.42881,0,0,0,0,100,0),
+(@PATH,9,26.84597,6.128396,11.42881,0,0,0,0,100,0),
+(@PATH,10,24.09597,5.878396,11.42881,0,0,0,0,100,0),
+(@PATH,11,22.59597,5.878396,11.92881,0,0,0,0,100,0),
+(@PATH,12,21.59597,5.878396,12.42881,0,0,0,0,100,0),
+(@PATH,13,21.2122,5.86385,12.2945,0,0,0,0,100,0),
+(@PATH,14,18.7122,5.61385,12.2945,0,0,0,0,100,0),
+(@PATH,15,17.7122,3.61385,12.2945,0,0,0,0,100,0),
+(@PATH,16,14.01855,0.09912109,12.00374,0,0,0,0,100,0),
+(@PATH,17,15.29224,0.3544922,12.05542,0,0,0,0,100,0),
+(@PATH,18,14.146,0.02685547,12.00965,0,0,0,0,100,0),
+(@PATH,19,20.63428,3.088379,12.32969,0,0,0,0,100,0),
+(@PATH,20,21.63428,4.088379,12.07969,0,0,0,0,100,0),
+(@PATH,21,23.38428,4.838379,11.57969,0,0,0,0,100,0),
+(@PATH,22,26.57771,5.543217,11.23778,0,0,0,0,100,0),
+(@PATH,23,26.57771,3.793216,11.23778,0,0,0,0,100,0),
+(@PATH,24,26.32771,-3.456784,6.487778,0,0,0,0,100,0),
+(@PATH,25,26.43777,-3.82635,6.296148,0,0,0,0,100,0),
+(@PATH,26,26.43777,-5.32635,6.296148,0,0,0,0,100,0),
+(@PATH,27,24.43777,-5.32635,6.296148,0,0,0,0,100,0),
+(@PATH,28,19.93777,-5.57635,6.296148,0,0,0,0,100,0),
+(@PATH,29,6.767334,-6.272217,6.347435,0,0,0,0,100,0),
+(@PATH,30,6.116943,-6.608887,6.097135,2.286381,10000,0,0,100,0);
+-- 0x1C15A0002018428000004000006049B5 .go 20.11769 -6.318613 6.388871
+
+SET @Sailor := 24838;
+SET @Kowalski := 24835;
+SET @Mehran := 24837;
+SET @Stash := 24833;
+-- Add text
+DELETE FROM `creature_text` WHERE `entry` IN (@Sailor, @Kowalski, @Mehran, @Stash);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextID`) VALUES
+(@Sailor, 0, 0, 'Land ho, Mr. Kowalski! Port is in sight, sir!', 12, 7, 100, 0, 0, 0, 'Sailor Henders', 23941),
+(@Kowalski, 0, 0, 'Thank you, Mr. Henders.', 12, 7, 100, 0, 0, 0, 'First Mate Kowalski', 23942),
+(@Kowalski, 1, 0, 'Bring us into port, please, Mr. Mehran.', 12, 7, 100, 0, 0, 0, 'First Mate Kowalski', 23943),
+(@Mehran, 0, 0, 'Aye aye, Mr. Kowalski.', 12, 0, 100, 0, 0, 0, 'Navigator Mehran', 23951),
+(@Kowalski, 2, 0, 'Captain Stash! We''ll be arriving shortly, sir!', 12, 7, 100, 0, 0, 0, 'First Mate Kowalski', 23944),
+(@Stash, 0, 0, 'Thank you, Mr. Kowalski! You may return to your post to oversee docking!', 12, 7, 100, 0, 0, 0, 'Captain "Stash" Torgoley', 23945),
+(@Stash, 1, 0, 'Well done, all. Please bring us safely to our next port. ', 12, 7, 100, 0, 0, 0, 'Captain "Stash" Torgoley', 23946);
+
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (@Sailor, @Kowalski, @Mehran, @Stash);
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Sailor AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Stash AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Kowalski AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Stash*100 AND `source_type`=9;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@Kowalski*100 AND `source_type`=9;
+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
+(@Sailor,0,0,0,25,0,100,0,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sailor - on reset - Say Line 0"),
+(@Stash,0,0,0,25,0,100,0,0,0,0,0,80,@Stash*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - on reset - action list"),
+(@Stash*100,9,0,0,0,0,100,0,36000,36000,0,0,91,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - action list - Stand up"),
+(@Stash*100,9,1,0,0,0,100,0,49000,49000,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - action list - Say Line 1"),
+(@Stash*100,9,2,0,0,0,100,0,0,0,0,0,5,21,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stash - action list - Play emote applaud"),
+(@Kowalski,0,0,0,25,0,100,0,0,0,0,0,80,@Kowalski*100,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kowalski - On reset - Action list"),
+(@Kowalski*100,9,0,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kowalski- ooc los - Say Line 0"),
+(@Kowalski*100,9,1,0,0,0,100,0,3000,3000,0,0,1,1,0,0,0,0,0,1,0,40,0,0,0,0,0,"Kowalski - ooc los - Say Line 1"),
+(@Kowalski*100,9,2,0,0,0,100,0,3000,3000,0,0,1,0,0,0,0,0,0,19,@Mehran,40,0,0,0,0,0,"Kowalski- ooc los - Say Line 0"),
+(@Kowalski*100,9,3,0,0,0,100,0,3000,3000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kowalski - ooc los - Say Line 2"),
+(@Kowalski*100,9,4,0,0,0,100,0,4000,4000,0,0,1,0,0,0,0,0,0,19,@Stash,40,0,0,0,0,0,"Kowalski - ooc los - Say Line 0");
diff --git a/sql/updates/world/2015_09_05_01_world.sql b/sql/updates/world/2015_09_05_01_world.sql
new file mode 100644
index 00000000000..cabdd4b9057
--- /dev/null
+++ b/sql/updates/world/2015_09_05_01_world.sql
@@ -0,0 +1,6 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21719 AND `source_type`=0 AND `id`=15;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21720 AND `source_type`=0 AND `id`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21717 AND `source_type`=0 AND `id`=3;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=21718 AND `source_type`=0 AND `id`=13;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22331 AND `source_type`=0 AND `id`=20;
diff --git a/sql/updates/world/2015_09_05_02_world_335.sql b/sql/updates/world/2015_09_05_02_world_335.sql
new file mode 100644
index 00000000000..20d2a79a63a
--- /dev/null
+++ b/sql/updates/world/2015_09_05_02_world_335.sql
@@ -0,0 +1,110 @@
+--
+UPDATE `creature` SET `spawntimesecs`=60 WHERE `guid`=50005;
+
+-- Kindal Moonweaver SAI
+SET @ENTRY := 7956;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=795601 AND `source_type`=9;
+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,19,0,100,0,2969,0,0,0,29,4,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Start Follow Invoker"),
+(@ENTRY,0,1,2,61,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Remove Flag Standstate Kneel"),
+(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,2,774,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Set Faction 774"),
+(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Say Line 0"),
+(@ENTRY,0,4,5,61,0,100,0,0,0,0,0,19,512,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Remove unit flag 512"),
+(@ENTRY,0,5,6,61,0,100,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Remove npcflag 2"),
+(@ENTRY,0,6,7,61,0,100,0,0,0,0,0,8,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - React def"),
+(@ENTRY,0,7,8,61,0,100,0,0,0,0,0,64,1,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Store target"),
+(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,41,360000,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Quest 'Freedom for All Creatures' Taken - Despawn In 360000 ms"),
+(@ENTRY,0,9,0,4,0,100,0,0,0,0,0,1,1,0,1,0,0,0,7,0,0,0,0,0,0,0,"Kindal Moonweaver - On Aggro - Say Line 1"),
+(@ENTRY,0,10,0,38,0,100,1,1,1,0,0,80,@ENTRY*100+00,2,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Data Set 1 1 - Action list"),
+(@ENTRY,0,11,0,7,0,100,0,0,0,0,0,90,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Evade - Set stand state"),
+(@ENTRY,0,12,0,77,0,100,0,1,5,0,0,80,795601,2,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On counter=5 - Action ist"),
+(795601,9,0,0,0,0,100,0,1000,1000,0,0,1,3,0,0,0,0,0,12,1,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Say Line 3"),
+(795601,9,1,0,0,0,100,0,0,0,0,0,6,2969,0,0,0,0,0,18,20,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Quest fails"),
+(795601,9,2,0,0,0,100,0,3000,3000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Despawn");
+
+-- Actionlist SAI
+SET @ENTRY := 795600;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+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,9,0,0,0,0,100,0,1000,1000,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Say Line 2"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,15,2969,0,0,0,0,0,18,20,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Quest Credit 'Freedom for All Creatures'"),
+(@ENTRY,9,2,0,0,0,100,0,5000,5000,0,0,41,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Kindal Moonweaver - On Script - Despawn In 3000 ms");
+
+/* Script for the Door, it will start the event for the creatures */
+UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=143979;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=143979;
+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
+(143979, 1, 0, 0, 70, 0, 100, 0, 2, 0, 0, 0, 80, 143979*100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'bambus door - On activate - start script');
+-- Actionlist SAI
+SET @ENTRY := 14397900;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+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,9,0,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,11,7997,20,0,0,0,0,0,"On Script - Set Data 1 1");
+
+-- Captured Sprite Darter SAI
+SET @ENTRY := 7997;
+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,38,0,100,0,1,1,0,0,80,@ENTRY*100,2,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Sprite Darter - On Data Set 1 1 - Run Script"),
+(@ENTRY,0,1,2,40,0,100,0,13,7997,0,0,45,1,1,0,0,0,0,19,7956,50,0,0,0,0,0,"Captured Sprite Darter - On Waypoint 13 Reached - Set Data 1 1"),
+(@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,"Captured Sprite Darter - On Waypoint 13 Reached - Despawn In 3s"),
+(@ENTRY,0,3,0,11,0,100,0,0,0,0,0,2,534,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Sprite Darter - On Respawn - Set Faction 534"),
+(@ENTRY,0,4,0,6,0,100,0,0,0,0,0,63,1,1,0,0,0,0,19,7956,50,0,0,0,0,0,"Captured Sprite Darter - On Death - set counter");
+
+/* Call script for waypoint-start */
+
+-- Actionlist SAI
+SET @ENTRY := 799700;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+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,9,0,0,0,0,100,0,2000,2000,0,0,53,0,7997,0,0,0,1,1,0,0,0,0,0,0,0,"On Script - Start Waypoint"),
+(@ENTRY,9,1,0,0,0,100,0,100,100,0,0,2,774,0,0,0,0,0,1,0,0,0,0,0,0,0,"Captured Sprite Darter - On Script - Set Faction 774");
+
+/* Texts for Kindal Moonweaver */
+DELETE FROM `creature_text` WHERE `entry` in (7956);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `comment`, `BroadcastTextId`) VALUES
+(7956, 0, 0, 'I''m ready when you are, $n. Lead the way!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4079),
+(7956, 1, 0, 'Die, $n. Elune will not have you harm her creatures any longer!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4123),
+(7956, 1, 1, 'You dare touch me?!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4125),
+(7956, 1, 2, 'Death to you, $n. How dare you come within a bow''s shot of me!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4124),
+(7956, 1, 3, 'Quickly! $n attacks!', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4122),
+(7956, 2, 0, 'We\'ve done it! Meet me back by Jer\'kai above the Grim Totem camp.', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4080),
+(7956, 3, 0, 'No! The faerie dragons aren''t making it, $n! I must return to Jer''kai to make sure she hasn''t been found. Elune be with you.', 12, 0, 100, 0, 0, 0, 'Kindal Moonweaver', 4081);
+
+/* Waypoints for Captured Sprite Darter */
+DELETE FROM `waypoints` WHERE `entry`=7997;
+INSERT INTO `waypoints` (`entry`, `pointid`, `position_x`, `position_y`, `position_z`, `point_comment`) VALUES
+(7997, 1, -4532.19, 807.833, 59.9749, 'Captured Sprite Darter'),
+(7997, 2, -4526.04, 799.328, 59.4271, 'Captured Sprite Darter'),
+(7997, 3, -4518.87, 786.24, 59.9261, 'Captured Sprite Darter'),
+(7997, 4, -4516.6, 766.617, 60.6654, 'Captured Sprite Darter'),
+(7997, 5, -4516.79, 749.124, 60.4805, 'Captured Sprite Darter'),
+(7997, 6, -4517.52, 731.643, 60.9822, 'Captured Sprite Darter'),
+(7997, 7, -4522.3, 710.707, 60.8061, 'Captured Sprite Darter'),
+(7997, 8, -4530.08, 695.036, 60.6917, 'Captured Sprite Darter'),
+(7997, 9, -4537.26, 679.979, 60.5726, 'Captured Sprite Darter'),
+(7997, 10, -4541.54, 655.429, 58.551, 'Captured Sprite Darter'),
+(7997, 11, -4539.33, 649.443, 57.9488, 'Captured Sprite Darter'),
+(7997, 12, -4526.54, 639.678, 56.2069, 'Captured Sprite Darter'),
+(7997, 13, -4507.92, 627.417, 55.6034, 'Captured Sprite Darter');
+
+UPDATE `creature_template_addon` SET `auras`= "" WHERE entry=7726;
+SET @ENTRY := 7726;
+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,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Aggro - Set Event Phase 1 (No Repeat)"),
+(@ENTRY,0,1,0,4,1,100,1,0,0,0,0,11,9739,0,0,0,0,0,2,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Aggro - Cast 'Wrath' (Phase 1) (No Repeat)"),
+(@ENTRY,0,2,0,9,1,100,0,0,40,3400,4700,11,9739,0,0,0,0,0,2,0,0,0,0,0,0,0,"Grimtotem Naturalist - Within 0-40 Range - Cast 'Wrath' (Phase 1)"),
+(@ENTRY,0,3,0,3,1,100,0,0,15,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 0-15% Mana - Set Event Phase 2 (Phase 1)"),
+(@ENTRY,0,4,0,3,2,100,0,30,100,100,100,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 30-100% Mana - Set Event Phase 1 (Phase 2)"),
+(@ENTRY,0,5,0,7,1,100,1,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Evade - Set Event Phase 0 (Phase 1) (No Repeat)"),
+(@ENTRY,0,6,7,2,0,100,1,0,50,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 0-50% Health - Set Event Phase 3 (Phase 1) (No Repeat)"),
+(@ENTRY,0,7,0,61,0,100,1,0,50,0,0,11,19030,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - Between 0-50% Health - Cast 'Bear Form' (Phase 1) (No Repeat)"),
+(@ENTRY,0,8,0,0,4,100,0,3000,4500,12000,13000,11,12161,0,0,0,0,0,2,0,0,0,0,0,0,0,"Grimtotem Naturalist - In Combat - Cast 'Maul' (Phase 4)"),
+(@ENTRY,0,9,0,0,4,100,0,8000,9000,25000,26000,11,15727,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - In Combat - Cast 'Demoralizing Roar' (Phase 4)"),
+(@ENTRY,0,10,0,7,4,100,1,0,0,0,0,28,19030,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Evade - Remove Aura (Phase 4) (No Repeat)"),
+(@ENTRY,0,11,0,7,4,100,1,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Grimtotem Naturalist - On Evade - Set Event Phase 0 (Phase 4) (No Repeat)");
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22331 AND `source_type`=0 AND `id`=20;
diff --git a/sql/updates/world/2015_09_06_00_world.sql b/sql/updates/world/2015_09_06_00_world.sql
new file mode 100644
index 00000000000..79f9ae687c0
--- /dev/null
+++ b/sql/updates/world/2015_09_06_00_world.sql
@@ -0,0 +1,73 @@
+SET @CGUID := 136178;
+
+DELETE FROM `creature` WHERE `id`=23311;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 23311, 530, 1, 1, -5076.106, 25.09657, 80.35052, 6.236346, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+1, 23311, 530, 1, 1, -5233.175, 64.53071, 64.41123, 0.7679449, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+2, 23311, 530, 1, 1, -5185.78, 143.9119, 71.66191, 1.692969, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+3, 23311, 530, 1, 1, -5275.489, 149.1322, 58.53136, 2.443461, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+4, 23311, 530, 1, 1, -5091.079, -114.7144, 64.35689, 1.239184, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+5, 23311, 530, 1, 1, -4979.629, -99.6888, 42.13466, 4.049164, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+6, 23311, 530, 1, 1, -5214.68, 221.5429, 72.53944, 4.380776, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+7, 23311, 530, 1, 1, -5227.612, 271.558, 70.12395, 0.3334433, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+8, 23311, 530, 1, 1, -5286.284, 241.2294, 67.83147, 4.598778, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+9, 23311, 530, 1, 1, -5269.888, 303.3626, 73.55891, 0.05235988, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+10, 23311, 530, 1, 1, -5285.691, 388.9862, 54.89359, 5.131268, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+11, 23311, 530, 1, 1, -5329.144, 192.1793, 52.40875, 0.5977584, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40714 - 40714)
+(@CGUID+12, 23311, 530, 1, 1, -5313.125, 170.9132, 54.45731, 2.199115, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+13, 23311, 530, 1, 1, -4988.237, 135.2316, 79.1295, 4.974188, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+14, 23311, 530, 1, 1, -4926.947, 217.0098, 65.26778, 3.333579, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+15, 23311, 530, 1, 1, -4922.614, 151.7855, 56.78815, 1.780236, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+16, 23311, 530, 1, 1, -4993.667, 235.146, 80.8679, 5.72468, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+17, 23311, 530, 1, 1, -4991.519, 300.2075, 82.21542, 4.956735, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40732 - 40732) (possible waypoints or random movement)
+(@CGUID+18, 23311, 530, 1, 1, -4849.121, 450.1942, 60.71572, 1.780236, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+19, 23311, 530, 1, 1, -4982.719, -33.12109, 69.65373, 2.86234, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+20, 23311, 530, 1, 1, -5073.178, 478.2025, 84.05375, 0.4363323, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40735 - 40735) (possible waypoints or random movement)
+(@CGUID+21, 23311, 530, 1, 1, -5037.911, 538.4877, 88.20789, 5.393067, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+22, 23311, 530, 1, 1, -4993.51, 508.6491, 85.82965, 5.986479, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+23, 23311, 530, 1, 1, -4962.048, 525.7373, 79.19551, 3.764333, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+24, 23311, 530, 1, 1, -5005.264, 532.8912, 87.46109, 4.386611, 120, 10, 1), -- 23311 (Area: -1) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+25, 23311, 530, 1, 1, -4892.17, 276.9066, 64.75311, 0.4014257, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40732 - 40732)
+(@CGUID+26, 23311, 530, 1, 1, -5141.98, 473.9572, 78.60102, 0.4886922, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+27, 23311, 530, 1, 1, -5200.688, 589.4948, 60.42498, 2.792527, 120, 0, 0), -- 23311 (Area: -1) (Auras: 40735 - 40735)
+(@CGUID+28, 23311, 530, 1, 1, -5281.205, 653.8297, 41.3046, 4.782202, 120, 0, 0), -- 23311 (Area: 3759) (Auras: 40735 - 40735)
+(@CGUID+29, 23311, 530, 1, 1, -5221.946, 685.913, 60.32657, 4.27563, 120, 10, 1), -- 23311 (Area: 3759) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+30, 23311, 530, 1, 1, -5148.24, 737.8401, 73.05395, 4.782202, 120, 0, 0), -- 23311 (Area: 3965) (Auras: 40732 - 40732)
+(@CGUID+31, 23311, 530, 1, 1, -5013.051, 702.1115, 82.42272, 3.435459, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+32, 23311, 530, 1, 1, -4969.671, 576.4045, 77.05217, 0.5155401, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+33, 23311, 530, 1, 1, -4876.813, 515.5291, 60.59084, 5.581461, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+34, 23311, 530, 1, 1, -4943.457, 693.7371, 71.826, 1.425557, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+-- Below are what existed in TC previously
+(@CGUID+35, 23311, 530, 1, 1, -5241.89, 110.241, 58.1161, 5.43882, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+36, 23311, 530, 1, 1, -5231.88, 73.5107, 64.2172, 2.70563, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+37, 23311, 530, 1, 1, -5223.67, 41.7543, 68.7341, 5.06183, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+38, 23311, 530, 1, 1, -5315.02, 241.323, 59.5668, 4.75553, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+39, 23311, 530, 1, 1, -5135.13, 472.366, 78.4078, 3.1219, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+40, 23311, 530, 1, 1, -5172.18, 449.631, 76.6452, 4.06438, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+41, 23311, 530, 1, 1, -5200.65, 414.947, 74.4594, 4.13114, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+42, 23311, 530, 1, 1, -5248.11, 369.244, 68.7189, 3.43999, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+43, 23311, 530, 1, 1, -5289.96, 304.915, 67.6901, 3.63634, 120, 10, 1), -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+(@CGUID+44, 23311, 530, 1, 1, -5043.44, 498.824, 86.5357, 3.86411, 120, 10, 1); -- 23311 (Area: 3965) (Auras: 40714 - 40714) (possible waypoints or random movement)
+
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=23311;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN(2331100,2331101,2331102);
+
+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
+(23311, 0, 0, 1, 8, 0, 100, 1, 40742, 0, 0, 0, 33, 23311, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - On Spell Hit (Booterang) - Give Kill Credit'),
+(23311, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 28, 40714, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Remove Aura Dazed and Confused'),
+(23311, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 28, 40732, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Remove Aura Lazy and Good for Nothing'),
+(23311, 0, 3, 4, 61, 0, 100, 0, 0, 0, 0, 0, 28, 40735, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Remove Aura Defiant and Enraged'),
+(23311, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Say'),
+(23311, 0, 5, 6, 61, 0, 100, 0, 0, 0, 0, 0, 59, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Set Run'),
+(23311, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 19, 23308, 200, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Move to closest Dragonmaw Peon Work Node'),
+(23311, 0, 7, 8, 61, 0, 100, 0, 0, 0, 0, 0, 11, 39160, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Cast Booterang'),
+(23311, 0, 8, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 30000, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Despawn After 30 seconds'),
+(23311, 0, 9, 10, 38, 0, 100, 0, 1, 1, 0, 0, 45, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - On Data Set - Set Data'),
+(23311, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 5, 233, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Play emote'),
+(23311, 0, 11, 0, 11, 0, 100, 0, 0, 0, 0, 0, 87, 2331100, 2331101, 2331102, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - On Spawn - Run Random Script'),
+(2331100, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 75, 40714, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Add Aura Dazed and Confused'),
+(2331101, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 75, 40732, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 2 - Add Aura Lazy and Good for Nothing'),
+(2331102, 9, 0, 0, 0, 0, 100, 0, 0, 0, 0, 0, 75, 40735, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 3 - Add Aura Defiant and Enraged');
+
+
+
diff --git a/sql/updates/world/2015_09_07_00_world.sql b/sql/updates/world/2015_09_07_00_world.sql
new file mode 100644
index 00000000000..46c7c4a66bd
--- /dev/null
+++ b/sql/updates/world/2015_09_07_00_world.sql
@@ -0,0 +1,10 @@
+--
+UPDATE `smart_scripts` SET `action_param2`=2 WHERE `entryorguid` IN (2991401) AND `source_type`=9 AND `id`=0;
+UPDATE `creature_template` SET `AIName`="SmartAI" WHERE `entry` IN (30208);
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (30208) AND `source_type`=0;
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (2991401, 2991400) AND `source_type`=9 AND id>1;
+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
+(2991400,9,2,0,0,0,100,0,0,0,0,0,11,56230,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dead Iron Giant - On Script - Cast 'Create Fireforged Eyes'"),
+(2991401,9,2,0,0,0,100,0,0,0,0,0,11,56243,2,0,0,0,0,1,0,0,0,0,0,0,0,"Dead Iron Giant - On Script - Cast 'Summon Iron Dwarf'"),
+(2991401,9,3,0,0,0,100,0,0,0,0,0,11,56243,2,0,0,0,0,1,0,0,0,0,0,0,0,"Dead Iron Giant - On Script - Cast 'Summon Iron Dwarf'"),
+(30208,0,0,0,54,0,100,0,0,0,0,0,49,0,0,0,0,0,0,21,30,0,0,0,0,0,0,"Stormforged Ambusher - Just summoned - Start attack");
diff --git a/sql/updates/world/2015_09_07_01_world.sql b/sql/updates/world/2015_09_07_01_world.sql
new file mode 100644
index 00000000000..ae43bc753ed
--- /dev/null
+++ b/sql/updates/world/2015_09_07_01_world.sql
@@ -0,0 +1,7 @@
+UPDATE `creature` SET `spawndist`=0, `MovementType`=0 WHERE `id`=23311;
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN(2331100,2331101,2331102) AND `id`>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
+(2331100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Set Faction'),
+(2331100, 9, 2, 0, 0, 0, 100, 0, 0, 0, 0, 0, 89, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Set Random Movement'),
+(2331101, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 35, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 2 - Set Faction');
diff --git a/sql/updates/world/2015_09_07_02_world.sql b/sql/updates/world/2015_09_07_02_world.sql
new file mode 100644
index 00000000000..3edb064e696
--- /dev/null
+++ b/sql/updates/world/2015_09_07_02_world.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22143 AND `source_type`=0 AND `id`=4;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22144 AND `source_type`=0 AND `id`=4;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=22148 AND `source_type`=0 AND `id`=2;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=23022 AND `source_type`=0 AND `id`=12;
diff --git a/sql/updates/world/2015_09_07_03_world.sql b/sql/updates/world/2015_09_07_03_world.sql
new file mode 100644
index 00000000000..495d42c3136
--- /dev/null
+++ b/sql/updates/world/2015_09_07_03_world.sql
@@ -0,0 +1,163 @@
+--
+-- DK Faction Endquest - Implement Reaction for Orgrimmar and Alliance Guards
+
+DELETE FROM `creature_text` WHERE `entry` IN (68,1756,1976,3296) AND `groupid`>1;
+DELETE FROM `creature_text` WHERE `entry` IN (14304);
+INSERT INTO `creature_text` (`entry`, `groupid`, `id`, `text`, `type`, `language`, `probability`, `emote`, `duration`, `sound`, `BroadcastTextId`, `comment`) VALUES
+(68, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Stormwind City Guard'),
+(68, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Stormwind City Guard'),
+(68, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Stormwind City Guard'),
+(68, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Stormwind City Guard'),
+(68, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Stormwind City Guard'),
+(68, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Stormwind City Guard'),
+(68, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Stormwind City Guard'),
+(68, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Stormwind City Guard'),
+(68, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Stormwind City Guard'),
+(68, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Stormwind City Guard'),
+(68, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Stormwind City Guard'),
+(14304, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Kor''kron Elite'),
+(14304, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Kor''kron Elite'),
+(14304, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Kor''kron Elite'),
+(14304, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Kor''kron Elite'),
+(14304, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Kor''kron Elite'),
+(14304, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Kor''kron Elite'),
+(14304, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Kor''kron Elite'),
+(14304, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Kor''kron Elite'),
+(14304, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Kor''kron Elite'),
+(14304, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Kor''kron Elite'),
+(14304, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Kor''kron Elite'),
+(1756, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Stormwind Royal Guard'),
+(1756, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Stormwind Royal Guard'),
+(1756, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Stormwind Royal Guard'),
+(1756, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Stormwind Royal Guard'),
+(1756, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Stormwind Royal Guard'),
+(1756, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Stormwind Royal Guard'),
+(1756, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Stormwind Royal Guard'),
+(1756, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Stormwind Royal Guard'),
+(1756, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Stormwind Royal Guard'),
+(1756, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Stormwind Royal Guard'),
+(1756, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Stormwind Royal Guard'),
+(1976, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Stormwind City Patroller'),
+(1976, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Stormwind City Patroller'),
+(1976, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Stormwind City Patroller'),
+(1976, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Stormwind City Patroller'),
+(1976, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Stormwind City Patroller'),
+(1976, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Stormwind City Patroller'),
+(1976, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Stormwind City Patroller'),
+(1976, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Stormwind City Patroller'),
+(1976, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Stormwind City Patroller'),
+(1976, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Stormwind City Patroller'),
+(1976, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Stormwind City Patroller'),
+(3296, 2, 0, '%s throws a rotten apple at $n.', 16, 0, 100, 0, 0, 0, 31671, 'Orgrimmar Grunt'),
+(3296, 3, 0, '%s throws rotten banana on $n.', 16, 0, 100, 0, 0, 0, 31672, 'Orgrimmar Grunt'),
+(3296, 4, 0, '%s spits on $n.', 16, 0, 100, 0, 0, 0, 31673, 'Orgrimmar Grunt'),
+(3296, 5, 0, 'Monster!', 12, 0, 100, 0, 0, 0, 31662, 'Orgrimmar Grunt'),
+(3296, 5, 1, 'Murderer!', 12, 0, 100, 0, 0, 0, 31679, 'Orgrimmar Grunt'),
+(3296, 5, 2, 'GET A ROPE!', 12, 0, 100, 0, 0, 0, 31669, 'Orgrimmar Grunt'),
+(3296, 5, 3, 'How dare you set foot in our city!', 12, 0, 100, 0, 0, 0, 31684, 'Orgrimmar Grunt'),
+(3296, 5, 4, 'You disgust me.', 12, 0, 100, 0, 0, 0, 31680, 'Orgrimmar Grunt'),
+(3296, 5, 5, 'Looks like we''re going to have ourselves an execution.', 12, 0, 100, 0, 0, 0, 31682, 'Orgrimmar Grunt'),
+(3296, 5, 6, 'Traitorous dog.', 12, 0, 100, 0, 0, 0, 31665, 'Orgrimmar Grunt'),
+(3296, 5, 7, 'My family was wiped out by the Scourge! MONSTER!', 12, 0, 100, 0, 0, 0, 31667, 'Orgrimmar Grunt'),
+(14304, 0, 0, 'Taste blade, mongrel!', 12, 0, 100, 0, 0, 0, 10950, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 1, 'Please tell me that you didn''t just do what I think you just did. Please tell me that I''m not going to have to hurt you... ', 12, 0, 100, 0, 0, 0, 10951, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 2, 'As if we don''t have enough problems, you go and create more!', 12, 0, 100, 0, 0, 0, 10953, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 3, 'You dare spill blood on neutral ground? OUT! OUT, I SAY!', 12, 0, 100, 0, 0, 0, 10948, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 4, 'We don''t take kindly to miscreants, $r.', 12, 0, 100, 0, 0, 0, 10949, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 5, 'Get a rope!',12, 0, 100, 0, 0, 0, 10952, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 6, 'Believe me when I tell you this: You''re gonna wish you weren''t born, sissy!', 12, 0, 100, 0, 0, 0, 10954, 'Kor''kron Elite - On Aggro'),
+(14304, 0, 7, 'Your actions shame us all, $c. I hurt inside as I beat you senseless.', 12, 0, 100, 0, 0, 0, 10955, 'Kor''kron Elite - On Aggro');
+
+-- AIs
+-- Stormwind City Guard SAI
+SET @ENTRY := 68;
+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,0,10,0,100,0,1,10,10000,10000,87,@ENTRY*100+00,@ENTRY*100+01,@ENTRY*100+02,@ENTRY*100+03,0,0,1,0,0,0,0,0,0,0,"Stormwind City Guard - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=68;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,68,0,0,28,0,13188,0,0,0,"","Only Run script if quest is completed");
+
+-- Kor''kron Elite SAI
+SET @ENTRY := 14304;
+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,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Kor''kron Elite - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Kor''kron Elite - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=14304;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,14304,0,0,28,0,13189,0,0,0,"","Only Run script if quest is completed");
+
+-- Stormwind City Patroller SAI
+SET @ENTRY := 1976;
+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,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Stormwind City Patroller - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Patroller - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=1976;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,1976,0,0,28,0,13188,0,0,0,"","Only Run script if quest is completed");
+
+-- Stormwind Royal Guard SAI
+SET @ENTRY := 1756;
+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,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Stormwind Royal Guard - Within 1-10 Range Out of Combat LoS - Run Random Script");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=1756;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,1756,0,0,28,0,13188,0,0,0,"","Only Run script if quest is completed");
+
+-- Orgrimmar Grunt SAI
+SET @ENTRY := 3296;
+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,0,10,0,100,0,1,10,10000,10000,87,68*100+00,68*100+01,68*100+02,68*100+03,0,0,1,0,0,0,0,0,0,0,"Orgrimmar Grunt - Within 1-10 Range Out of Combat LoS - Run Random Script"),
+(@ENTRY,0,1,0,4,0,100,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,"Orgrimmar Grunt - On aggro - Say text1");
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=22 AND `SourceGroup`=1 AND `SourceEntry`=3296;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(22,1,3296,0,0,28,0,13189,0,0,0,"","Only Run script if quest is completed");
+
+-- Actionlist SAI
+SET @ENTRY := 6800;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+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,9,0,0,0,0,100,0,0,0,0,0,11,58509,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Cast ''Rotten Apple Toss'"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,1,2,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 2");
+
+-- Actionlist SAI
+SET @ENTRY := 6801;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+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,9,0,0,0,0,100,0,0,0,0,0,11,58513,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Cast 'Rotten Banana Toss'"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,1,3,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 3");
+
+-- Actionlist SAI
+SET @ENTRY := 6802;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+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,9,0,0,0,0,100,0,0,0,0,0,11,58520,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Cast 'Spit'"),
+(@ENTRY,9,1,0,0,0,100,0,0,0,0,0,1,4,0,0,0,0,0,7,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 4");
+
+-- Actionlist SAI
+SET @ENTRY := 6803;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY AND `source_type`=9;
+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,9,0,0,0,0,100,0,0,0,0,0,1,5,0,0,0,0,0,1,0,0,0,0,0,0,0,"Stormwind City Guard - On Script - Say Line 5");
+
+
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` IN (58509, 58513, 58520);
+INSERT INTO `spell_linked_spell` (`spell_trigger`, `spell_effect`, `type`, `comment`) VALUES
+(58509, 58511, 0, 'Rotten Apple - Rotten Apple'),
+(58513, 58514, 0, 'Rotten Banana - Rotten Banana'),
+(58520, 58519, 0, 'Spit - Spit');
diff --git a/sql/updates/world/2015_09_07_04_world.sql b/sql/updates/world/2015_09_07_04_world.sql
new file mode 100644
index 00000000000..bfae5b6eafd
--- /dev/null
+++ b/sql/updates/world/2015_09_07_04_world.sql
@@ -0,0 +1,8 @@
+DELETE FROM `smart_scripts` WHERE `source_type`=9 AND `entryorguid` IN(2331100,2331101,2331102) AND `id`>0;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid` =23311 AND `id`=12;
+UPDATE `smart_scripts` SET `link`=12 WHERE `entryorguid`=23311 AND `source_type`=0 AND `id`=8 AND `link`=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
+(2331100, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 89, 10, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 1 - Set Random Movement'),
+(2331102, 9, 1, 0, 0, 0, 100, 0, 0, 0, 0, 0, 2, 14, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Script 3 - Set Faction'),
+(23311, 0, 12, 0, 61, 0, 100, 0, 0, 0, 0, 0, 2, 62, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Disobedient Dragonmaw Peon - Linked with Previous Event - Set Faction');
diff --git a/sql/updates/world/2015_09_07_05_world.sql b/sql/updates/world/2015_09_07_05_world.sql
new file mode 100644
index 00000000000..6ddd137c60d
--- /dev/null
+++ b/sql/updates/world/2015_09_07_05_world.sql
@@ -0,0 +1,5 @@
+--
+DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 57387;
+INSERT INTO `spell_linked_spell` VALUES (57387, 57608, 0, 'Argent Cannon - Powering Up The Core');
+UPDATE `creature` SET `curhealth`=126000 WHERE `id`=30236;
+UPDATE `creature_template` SET `unit_flags2`=0, `RegenHealth`=0 WHERE `entry`=30236;
diff --git a/sql/updates/world/2015_09_08_00_world.sql b/sql/updates/world/2015_09_08_00_world.sql
new file mode 100644
index 00000000000..1b000429a1a
--- /dev/null
+++ b/sql/updates/world/2015_09_08_00_world.sql
@@ -0,0 +1,15 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry` IN (58203);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17,0,58203,0,0,31,1,3,31075,0,0,0,'','Iron Chain');
+
+UPDATE `smart_scripts` SET `event_param1`=500, `event_param2`=500, `action_type`=51 WHERE `entryorguid` IN (3092000) AND `source_type`=9 AND `id`=5;
+UPDATE `smart_scripts` SET `event_param1`=2000, `event_param2`=2000, `action_param1`=52520 WHERE `entryorguid` IN (3092000) AND `source_type`=9 AND `id`=0;
+UPDATE `smart_scripts` SET `event_param1`=2000, `event_param2`=2000, `action_param1`=58231, `target_type`=1, `target_param1`=0 WHERE `entryorguid` IN (3107500) AND `source_type`=9 AND `id`=0;
+UPDATE `smart_scripts` SET `event_type`=38, `event_param1`=1, `event_param2`=1, `event_param3`=0, `event_param4`=0, `action_type`=103, `action_param1`=1, `comment`="Scourge Bomb - On Data Set 1 1 - Root" WHERE `entryorguid` IN (31075) AND `source_type`=0 AND `id`=3;
+UPDATE `smart_scripts` SET `event_param1`=1000, `event_param2`=1000, `action_param1`=0 WHERE `entryorguid` IN (3107500) AND `source_type`=9 AND `id`=1;
+UPDATE `smart_scripts` SET `event_param3`=3 WHERE `entryorguid` IN (30920) AND `source_type`=0 AND `id`=1;
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (58231);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,2,58231,0,0,31,0,3,31075,0,1,0,'','Exploding Abomination');
diff --git a/sql/updates/world/2015_09_08_01_world.sql b/sql/updates/world/2015_09_08_01_world.sql
new file mode 100644
index 00000000000..ac4c458096e
--- /dev/null
+++ b/sql/updates/world/2015_09_08_01_world.sql
@@ -0,0 +1,39 @@
+--
+-- Weapon Master Hanashi: add the missing linked IDs in `action_menu_id`
+UPDATE `gossip_menu_option` SET `action_menu_id`= 5262 WHERE `menu_id`= 5263 AND `OptionBroadcastTextID`= 8812;
+
+-- Hanashi is a troll, using Low Common "Troll" speech, so link the correct text lines for him:
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8603 WHERE `menu_id`= 5262 AND `option_text`= 'Crossbow';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8604 WHERE `menu_id`= 5262 AND `option_text`= 'Dagger';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8605 WHERE `menu_id`= 5262 AND `option_text`= 'Fist Weapon';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8606 WHERE `menu_id`= 5262 AND `option_text`= 'Gun';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8607 WHERE `menu_id`= 5262 AND `option_text`= 'Mace';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8608 WHERE `menu_id`= 5262 AND `option_text`= 'Polearm';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8609 WHERE `menu_id`= 5262 AND `option_text`= 'Sword';
+
+-- Weapon Master Archibald: add missing linked IDs to `action_menu_id` (using default gossip from npc_text)
+UPDATE `gossip_menu_option` SET `action_menu_id`= 5268 WHERE `menu_id`= 5269 AND `OptionBroadcastTextID`= 8812;
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8592 WHERE `menu_id`= 5268 AND `option_text`= 'Axe';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8593 WHERE `menu_id`= 5268 AND `option_text`= 'Bow';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8596 WHERE `menu_id`= 5268 AND `option_text`= 'Fist Weapon';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8597 WHERE `menu_id`= 5268 AND `option_text`= 'Gun';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8598 WHERE `menu_id`= 5268 AND `option_text`= 'Mace';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8600 WHERE `menu_id`= 5268 AND `option_text`= 'Staff';
+UPDATE `gossip_menu_option` SET `action_menu_id`= 8602 WHERE `menu_id`= 5268 AND `option_text`= 'Thrown';
+
+-- Weapon Master Sayoc: add the gossip link ID 5220 in `action_menu_id` and link it in `gossip_menu` too
+UPDATE `gossip_menu_option` SET `action_menu_id` = 5222 WHERE `menu_id` = 5221 AND `OptionBroadcastTextID`= 8812;
+-- Sayoc needs new lines in `gossip_menu_option` as well as the linked lines from npc_text :
+DELETE FROM `gossip_menu_option` WHERE `menu_id` = 5222 AND `OptionBroadcastTextID` IN (20582,20585,20586,20587,20588,20589);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
+(5222,0,0,'Crossbow',20582,1,1,8594,0,0,0,'',0),
+(5222,1,0,'Gun',20585,1,1,8597,0,0,0,'',0),
+(5222,2,0,'Mace',20586,1,1,8598,0,0,0,'',0),
+(5222,3,0,'Polearm',20587,1,1,8599,0,0,0,'',0),
+(5222,4,0,'Staff',20588,1,1,8610,0,0,0,'',0), --
+(5222,5,0,'Sword',20589,1,1,8601,0,0,0,'',0);
+
+UPDATE `creature_template` SET `type_flags`=134217728 WHERE `entry` IN (17005);
+DELETE FROM `gossip_menu_option` WHERE (`menu_id`=7337);
+INSERT INTO `gossip_menu_option` (`menu_id`,`id`,`option_icon`,`option_text`,`OptionBroadcastTextID`,`option_id`,`npc_option_npcflag`,`action_menu_id`,`action_poi_id`,`box_coded`,`box_money`,`box_text`,`BoxBroadcastTextID`) VALUES
+(7337,0,3,'Show me what you know, Larenis.',13168,5,16,0,0,0,0,'',0);
diff --git a/sql/updates/world/2015_09_08_02_world.sql b/sql/updates/world/2015_09_08_02_world.sql
new file mode 100644
index 00000000000..5fbf0df3488
--- /dev/null
+++ b/sql/updates/world/2015_09_08_02_world.sql
@@ -0,0 +1,2 @@
+--
+UPDATE `creature_template` SET `type_flags`=`type_flags`|134217728 WHERE `npcflag`>16 AND `gossip_menu_id`!= 0;
diff --git a/sql/updates/world/2015_09_09_00_world.sql b/sql/updates/world/2015_09_09_00_world.sql
new file mode 100644
index 00000000000..697123fefac
--- /dev/null
+++ b/sql/updates/world/2015_09_09_00_world.sql
@@ -0,0 +1,8 @@
+--
+DELETE FROM `creature` WHERE `guid` IN (120831,120833,123124);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `VerifiedBuild`) VALUES
+(120831, 32769, 571, 1, 1, 25753, 0, 7523.09, 1852.78, 491.641, 3.23212, 300, 0, 0, 12600, 3994, 0, 0, 0, 0, 0),
+(120833, 32769, 571, 1, 1, 25753, 0, 7703.2, 1822.89, 469.378, 3.94286, 300, 0, 0, 12600, 3994, 0, 0, 0, 0, 0),
+(123124, 32769, 571, 1, 1, 25753, 0, 7733.55, 1578.02, 469.378, 2.51066, 300, 0, 0, 12600, 3994, 0, 0, 0, 0, 0);
+
+DELETE FROM pool_creature WHERE guid = 151994;
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index ba9cb5b23b4..437ec221e94 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -182,7 +182,7 @@ Updates.EnableDatabases = 0
Updates.SourcePath = ""
#
-# Updates.SourcePath
+# Updates.MySqlCLIPath
# Description: The path to your mysql cli binary.
# If the path is left empty, built-in path from cmake is used.
# Example: "C:/Program Files/MySQL/MySQL Server 5.6/bin/mysql.exe"
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index 5a74ad05b66..0d6816fc80d 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -186,13 +186,33 @@ bool ChatHandler::hasStringAbbr(const char* name, const char* part)
return true;
}
-void ChatHandler::SendSysMessage(const char *str)
+void ChatHandler::SendSysMessage(const char *str, bool escapeCharacters)
{
WorldPacket data;
// need copy to prevent corruption by strtok call in LineFromMessage original string
- char* buf = strdup(str);
- char* pos = buf;
+ char* buf;
+ char* pos;
+
+ if (escapeCharacters && strchr(str, '|'))
+ {
+ size_t startPos = 0;
+ std::ostringstream o;
+ while (const char* charPos = strchr(str + startPos, '|'))
+ {
+ o.write(str + startPos, charPos - str - startPos);
+ o << "||";
+ startPos = charPos - str + 1;
+ }
+ o.write(str + startPos, strlen(str) - startPos);
+ buf = strdup(o.str().c_str());
+ }
+ else
+ {
+ buf = strdup(str);
+ }
+
+ pos = buf;
while (char* line = LineFromMessage(pos))
{
@@ -1223,7 +1243,7 @@ bool CliHandler::isAvailable(ChatCommand const& cmd) const
return cmd.AllowConsole;
}
-void CliHandler::SendSysMessage(const char *str)
+void CliHandler::SendSysMessage(const char *str, bool /*escapeCharacters*/)
{
m_print(m_callbackArg, str);
m_print(m_callbackArg, "\r\n");
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 1b095534ad0..72d80aba7e6 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -66,7 +66,7 @@ class ChatHandler
// function with different implementation for chat/console
virtual char const* GetTrinityString(uint32 entry) const;
- virtual void SendSysMessage(char const* str);
+ virtual void SendSysMessage(char const* str, bool escapeCharacters = false);
void SendSysMessage(uint32 entry);
@@ -166,7 +166,7 @@ class CliHandler : public ChatHandler
char const* GetTrinityString(uint32 entry) const override;
bool isAvailable(ChatCommand const& cmd) const override;
bool HasPermission(uint32 /*permission*/) const override { return true; }
- void SendSysMessage(const char *str) override;
+ void SendSysMessage(const char *str, bool escapeCharacters) override;
std::string GetNameLink() const override;
bool needReportToTarget(Player* chr) const override;
LocaleConstant GetSessionDbcLocale() const override;
diff --git a/src/server/game/DungeonFinding/LFGQueue.cpp b/src/server/game/DungeonFinding/LFGQueue.cpp
index d2140a96a46..86b010a9ace 100644
--- a/src/server/game/DungeonFinding/LFGQueue.cpp
+++ b/src/server/game/DungeonFinding/LFGQueue.cpp
@@ -72,7 +72,7 @@ char const* GetCompatibleString(LfgCompatibility compatibles)
case LFG_INCOMPATIBLES_NO_ROLES:
return "Incompatible roles";
case LFG_INCOMPATIBLES_TOO_MUCH_PLAYERS:
- return "Too much players";
+ return "Too many players";
case LFG_INCOMPATIBLES_WRONG_GROUP_SIZE:
return "Wrong group size";
default:
@@ -80,7 +80,7 @@ char const* GetCompatibleString(LfgCompatibility compatibles)
}
}
-std::string LFGQueue::GetDetailedMatchRoles(GuidList const& check)
+std::string LFGQueue::GetDetailedMatchRoles(GuidList const& check) const
{
if (check.empty())
return "";
@@ -92,31 +92,25 @@ std::string LFGQueue::GetDetailedMatchRoles(GuidList const& check)
GuidSet::const_iterator it = guids.begin();
o << it->GetRawValue();
- LfgQueueDataContainer::iterator itQueue = QueueDataStore.find(*it);
- if (itQueue == QueueDataStore.end())
- {
- TC_LOG_ERROR("lfg.queue.data.details", "Queue data not found for [%s]", it->ToString().c_str());
- o << ' ' << GetRolesString(PLAYER_ROLE_NONE);
- }
- else
+ LfgQueueDataContainer::const_iterator itQueue = QueueDataStore.find(*it);
+ if (itQueue != QueueDataStore.end())
{
// skip leader flag, log only dps/tank/healer
- o << ' ' << GetRolesString(itQueue->second.roles[*it] & uint8(~PLAYER_ROLE_LEADER));
+ auto role = itQueue->second.roles.find(*it);
+ if (role != itQueue->second.roles.end())
+ o << ' ' << GetRolesString(itQueue->second.roles.at(*it) & uint8(~PLAYER_ROLE_LEADER));
}
for (++it; it != guids.end(); ++it)
{
o << '|' << it->GetRawValue();
itQueue = QueueDataStore.find(*it);
- if (itQueue == QueueDataStore.end())
- {
- TC_LOG_ERROR("lfg.queue.data.details", "Queue data not found for [%s]", it->ToString().c_str());
- o << ' ' << GetRolesString(PLAYER_ROLE_NONE);
- }
- else
+ if (itQueue != QueueDataStore.end())
{
// skip leader flag, log only dps/tank/healer
- o << ' ' << GetRolesString(itQueue->second.roles[*it] & uint8(~PLAYER_ROLE_LEADER));
+ auto role = itQueue->second.roles.find(*it);
+ if (role != itQueue->second.roles.end())
+ o << ' ' << GetRolesString(itQueue->second.roles.at(*it) & uint8(~PLAYER_ROLE_LEADER));
}
}
@@ -438,7 +432,7 @@ LfgCompatibility LFGQueue::CheckCompatibility(GuidList check)
if (numPlayers > MAXGROUPSIZE)
{
- TC_LOG_DEBUG("lfg.queue.match.compatibility.check", "Guids: (%s) Too much players (%u)", GetDetailedMatchRoles(check).c_str(), numPlayers);
+ TC_LOG_DEBUG("lfg.queue.match.compatibility.check", "Guids: (%s) Too many players (%u)", GetDetailedMatchRoles(check).c_str(), numPlayers);
SetCompatibles(strGuids, LFG_INCOMPATIBLES_TOO_MUCH_PLAYERS);
return LFG_INCOMPATIBLES_TOO_MUCH_PLAYERS;
}
@@ -666,7 +660,23 @@ std::string LFGQueue::DumpCompatibleInfo(bool full /* = false */) const
o << "Compatible Map size: " << CompatibleMapStore.size() << "\n";
if (full)
for (LfgCompatibleContainer::const_iterator itr = CompatibleMapStore.begin(); itr != CompatibleMapStore.end(); ++itr)
- o << "(" << itr->first << "): " << GetCompatibleString(itr->second.compatibility) << "\n";
+ {
+ o << "(" << itr->first << "): " << GetCompatibleString(itr->second.compatibility);
+ if (!itr->second.roles.empty())
+ {
+ o << " (";
+ bool first = true;
+ for (const auto& role : itr->second.roles)
+ {
+ if (!first)
+ o << "|";
+ o << role.first.GetRawValue() << " " << GetRolesString(role.second & uint8(~PLAYER_ROLE_LEADER));
+ first = false;
+ }
+ o << ")";
+ }
+ o << "\n";
+ }
return o.str();
}
diff --git a/src/server/game/DungeonFinding/LFGQueue.h b/src/server/game/DungeonFinding/LFGQueue.h
index 77683614d49..f72e9b4fd6d 100644
--- a/src/server/game/DungeonFinding/LFGQueue.h
+++ b/src/server/game/DungeonFinding/LFGQueue.h
@@ -88,7 +88,7 @@ class LFGQueue
public:
// Add/Remove from queue
- std::string GetDetailedMatchRoles(GuidList const& check);
+ std::string GetDetailedMatchRoles(GuidList const& check) const;
void AddToQueue(ObjectGuid guid);
void RemoveFromQueue(ObjectGuid guid);
void AddQueueData(ObjectGuid guid, time_t joinTime, LfgDungeonSet const& dungeons, LfgRolesMap const& rolesMap);
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 88d7dfa6381..25531760b69 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -8335,9 +8335,6 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8
return;
}
- // use triggered flag only for items with many spell casts and for not first cast
- uint8 count = 0;
-
// item spells cast at use
for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
{
@@ -8358,13 +8355,12 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8
continue;
}
- Spell* spell = new Spell(this, spellInfo, (count > 0) ? TRIGGERED_FULL_MASK : TRIGGERED_NONE);
+ Spell* spell = new Spell(this, spellInfo, TRIGGERED_NONE);
spell->m_CastItem = item;
spell->m_cast_count = cast_count; // set count of casts
spell->m_glyphIndex = glyphIndex; // glyph index
spell->prepare(&targets);
-
- ++count;
+ return;
}
// Item enchantments spells cast at use
@@ -8386,13 +8382,12 @@ void Player::CastItemUseSpell(Item* item, SpellCastTargets const& targets, uint8
continue;
}
- Spell* spell = new Spell(this, spellInfo, (count > 0) ? TRIGGERED_FULL_MASK : TRIGGERED_NONE);
+ Spell* spell = new Spell(this, spellInfo, TRIGGERED_NONE);
spell->m_CastItem = item;
spell->m_cast_count = cast_count; // set count of casts
spell->m_glyphIndex = glyphIndex; // glyph index
spell->prepare(&targets);
-
- ++count;
+ return;
}
}
}
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index d02a22d43f4..0978adc1814 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -13171,6 +13171,10 @@ bool Unit::IsInFeralForm() const
bool Unit::IsInDisallowedMountForm() const
{
+ if (SpellInfo const* transformSpellInfo = sSpellMgr->GetSpellInfo(getTransForm()))
+ if (transformSpellInfo->HasAttribute(SPELL_ATTR0_CASTABLE_WHILE_MOUNTED))
+ return false;
+
if (ShapeshiftForm form = GetShapeshiftForm())
{
SpellShapeshiftEntry const* shapeshift = sSpellShapeshiftStore.LookupEntry(form);
diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp
index d1662f3a97c..8bb64a454d2 100644
--- a/src/server/scripts/Commands/cs_lfg.cpp
+++ b/src/server/scripts/Commands/cs_lfg.cpp
@@ -150,7 +150,7 @@ public:
static bool HandleLfgQueueInfoCommand(ChatHandler* handler, char const* args)
{
- handler->SendSysMessage(sLFGMgr->DumpQueueInfo(*args != '\0').c_str());
+ handler->SendSysMessage(sLFGMgr->DumpQueueInfo(*args != '\0').c_str(), true);
return true;
}