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

3 files changed, 218 insertions, 0 deletions

diff --git a/sql/updates/world/2014_04_28_10_world_misc.sql b/sql/updates/world/2014_04_28_10_world_misc.sql
new file mode 100644
index 00000000000..3739f63cdd9
--- /dev/null
+++ b/sql/updates/world/2014_04_28_10_world_misc.sql
@@ -0,0 +1,175 @@
+DELETE FROM `gameobject` WHERE `guid` IN (5494, 50458);
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES
+(5494, 185292, 547, 3, 1, -297.0662, -459.9854, 3.035661, 0.1047193, 0, 0, 0, 1, 7200, 255, 1), -- Skar'this's Prison
+(50458, 182094, 547, 3, 1, -192.2968, -799.3084, 43.80826, 5.98648, 0, 0, 0, 1, 7200, 255, 1); -- Cage
+
+
+UPDATE `creature` SET `id`=17816 WHERE `guid`=79524;
+UPDATE `creature` SET `id`=17817 WHERE `guid` IN (79495, 79851, 79856, 79858);
+
+UPDATE `creature` SET `spawndist`=5, `MovementType`=1 WHERE `guid` IN (52363, 79428, 79438, 79691, 79708, 79712);
+
+UPDATE `waypoint_data` SET `move_flag`=1 WHERE `id` IN (795240, 798500, 798510, 798520, 798550, 798560, 798580, 800440, 802190, 802350);
+
+DELETE FROM `creature_formations` WHERE `leaderGUID` IN (79524, 80219, 80235);
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`) VALUES
+(79524, 79524, 4, 0, 2),
+(79524, 79852, 4, 0, 2),
+(79524, 79851, 4, 90, 2),
+(79524, 80044, 4, 180, 2),
+(80219, 80219, 4, 0, 2),
+(80219, 79850, 4, 90, 2),
+(80219, 79858, 4, 180, 2),
+(80235, 80235, 4, 0, 2),
+(80235, 79855, 4, 90, 2),
+(80235, 79856, 4, 180, 2);
+
+
+SET @CGUID := 135042;
+
+DELETE FROM `creature_addon` WHERE `guid` IN (@CGUID+2, @CGUID+3, 52359, 52361);
+INSERT INTO `creature_addon` (`guid`, `mount`, `bytes1`, `bytes2`, `emote`, `auras`) VALUES
+(@CGUID+2, 0, 0x3000001, 0x1, 0, ''), -- Wastewalker Captive
+(@CGUID+3, 0, 0x3000001, 0x1, 0, ''), -- Wastewalker Captive
+(52359, 0, 0x0, 0x1, 69, '5301'), -- Coilfang Collaborator - Revenge Trigger
+(52361, 0, 0x0, 0x1, 69, '5301'); -- Coilfang Collaborator - Revenge Trigger
+
+
+DELETE FROM `creature_template_addon` WHERE `entry`=17962;
+INSERT INTO `creature_template_addon` (`entry`, `mount`, `bytes1`, `bytes2`, `auras`) VALUES
+(17962, 0, 0x0, 0x1, '5301'); -- Coilfang Collaborator - Revenge Trigger
+
+
+DELETE FROM `creature` WHERE `guid` BETWEEN @CGUID+0 AND @CGUID+62;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(@CGUID+0, 13321, 547, 3, 1, 108.5413, -93.65434, -1.498286, 5.641585, 7200, 5, 1), -- Small Frog
+(@CGUID+1, 13321, 547, 3, 1, 0.7285497, -66.80369, -1.59056, 4.962676, 7200, 5, 1), -- Small Frog
+(@CGUID+2, 18206, 547, 3, 1, 7.689064, -10.21175, 0.9106051, 3.159046, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+3, 18206, 547, 3, 1, 9.391239, -11.7804, 0.6854159, 4.625123, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+4, 13321, 547, 3, 1, -14.80215, -9.449524, -1.451238, 2.552285, 7200, 5, 1), -- Small Frog
+(@CGUID+5, 18206, 547, 3, 1, -26.60198, 8.733533, 1.752648, 5.288348, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+6, 18206, 547, 3, 1, -41.43275, 9.405079, 1.371649, 5.410521, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+7, 18206, 547, 3, 1, -88.38076, -148.3378, 24.94725, 1.117011, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+8, 18206, 547, 3, 1, -91.83733, -148.0196, 24.94726, 2.303835, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+9, 18206, 547, 3, 1, -70.57574, -138.288, 1.37165, 2.181662, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+10, 18206, 547, 3, 1, -70.36482, -139.9095, 1.371652, 3.979351, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+11, 13321, 547, 3, 1, -98.55703, -155.8409, -2.537082, 2.743803, 7200, 5, 1), -- Small Frog
+(@CGUID+12, 18206, 547, 3, 1, -155.7575, -196.1139, -3.747556, 1.570796, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+13, 18206, 547, 3, 1, -154.6465, -197.7915, -3.747561, 0.1396263, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+14, 13321, 547, 3, 1, -72.17783, -260.2528, -1.327836, 5.296387, 7200, 5, 1), -- Small Frog
+(@CGUID+15, 18206, 547, 3, 1, -141.5576, -269.821, 1.229008, 2.129302, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+16, 18206, 547, 3, 1, -139.6963, -270.7644, 1.229008, 0.5235988, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+17, 17963, 547, 3, 1, -95.53171, -293.335, -1.42634, 5.462881, 7200, 0, 0), -- Wastewalker Slave
+(@CGUID+18, 18206, 547, 3, 1, -131.4032, -284.4102, 1.229006, 0.3665192, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+19, 18206, 547, 3, 1, -132.8301, -283.2076, 1.229015, 0.9075712, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+20, 18206, 547, 3, 1, -95.01682, -267.8548, 1.467276, 5.899213, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+21, 18206, 547, 3, 1, -39.31921, -248.708, 0.6584353, 3.159046, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+22, 18206, 547, 3, 1, -36.5463, -247.2646, 0.3471813, 5.72468, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+23, 18206, 547, 3, 1, -96.20238, -266.5772, 1.467276, 1.64061, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+24, 18206, 547, 3, 1, -89.40193, -297.0217, 1.22901, 0.9773844, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+25, 18206, 547, 3, 1, -91.98604, -297.5824, 1.22901, 2.286381, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+26, 2110, 547, 3, 1, 41.23739, -384.438, 3.035556, 2.865832, 7200, 5, 1), -- Black Rat
+(@CGUID+27, 2110, 547, 3, 1, -54.96066, -377.6979, 81.26734, 0.9852618, 7200, 5, 1), -- Black Rat
+(@CGUID+28, 2110, 547, 3, 1, -224.6407, -358.3843, 3.03559, 1.281962, 7200, 5, 1), -- Black Rat
+(@CGUID+29, 2110, 547, 3, 1, -264.8192, -423.4044, 3.033602, 5.388705, 7200, 5, 1), -- Black Rat
+(@CGUID+30, 18206, 547, 3, 1, -33.7396, -539.5004, 30.43043, 2.356194, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+31, 18206, 547, 3, 1, -29.99723, -536.3927, 1.163641, 4.101524, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+32, 18206, 547, 3, 1, -15.92518, -546.9789, 1.163645, 3.228859, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+33, 18206, 547, 3, 1, -152.0757, -585.8268, 8.971064, 0.3665192, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+34, 18206, 547, 3, 1, -152.9591, -588.3441, 8.971066, 5.131268, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+35, 18206, 547, 3, 1, -163.2083, -573.244, 13.99786, 0.296706, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+36, 18206, 547, 3, 1, -164.0016, -575.6511, 13.99786, 5.096361, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+37, 18206, 547, 3, 1, -37.74952, -590.5631, 1.16364, 1.53589, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+38, 18206, 547, 3, 1, -39.8357, -592.4739, 1.163639, 3.071779, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+39, 18206, 547, 3, 1, -14.05406, -560.0514, 28.04964, 2.827433, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+40, 18206, 547, 3, 1, -22.29612, -582.496, 1.163641, 2.460914, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+41, 18206, 547, 3, 1, -68.60107, -590.7484, 37.56314, 3.630285, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+42, 18206, 547, 3, 1, -67.34998, -588.6846, 37.56313, 1.448623, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+43, 18206, 547, 3, 1, -14.16554, -566.9521, 1.16364, 4.380776, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+44, 18206, 547, 3, 1, -16.15083, -565.0188, 1.16364, 3.141593, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+45, 18206, 547, 3, 1, -176.8808, -700.3074, 40.88328, 4.660029, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+46, 13321, 547, 3, 1, -175.3171, -720.527, 37.89232, 2.827228, 7200, 5, 1), -- Small Frog
+(@CGUID+47, 18206, 547, 3, 1, -188.2369, -694.4863, 40.88328, 5.166174, 7200, 0, 0), -- Wastewalker Captive
+(@CGUID+48, 3300, 547, 3, 1, -106.7319, -61.30008, -3.362401, 0.1478606, 7200, 5, 1), -- Adder
+(@CGUID+49, 3300, 547, 3, 1, -72.26672, -318.7746, -1.512328, 1.468673, 7200, 5, 1), -- Adder
+(@CGUID+50, 3300, 547, 3, 1, -59.9993, -542.4127, -1.593513, 1.952262, 7200, 5, 1), -- Adder
+(@CGUID+51, 3300, 547, 3, 1, -92.25909, -682.5776, 32.75705, 1.602903, 7200, 5, 1), -- Adder
+(@CGUID+52, 17817, 547, 3, 1, 7.252286, -251.2889, 0.3395844, 3.368485, 7200, 5, 1), -- Greater Bogstrok
+(@CGUID+53, 17817, 547, 3, 1, 15.67841, -233.7075, -0.5607645, 0.3084831, 7200, 5, 1), -- Greater Bogstrok
+(@CGUID+54, 17816, 547, 3, 1, 20.42247, -245.9672, 2.037554, 0.2054878, 7200, 5, 1), -- Bogstrok
+(@CGUID+55, 17816, 547, 3, 1, 27.51504, -244.3523, 2.890243, 4.876865, 7200, 5, 1), -- Bogstrok
+(@CGUID+56, 17817, 547, 3, 1, 35.86108, -254.7482, 5.748631, 5.541633, 7200, 5, 1), -- Greater Bogstrok
+(@CGUID+57, 17816, 547, 3, 1, 40.02773, -232.9289, -0.2917374, 5.831529, 7200, 5, 1), -- Bogstrok
+(@CGUID+58, 17817, 547, 3, 1, -203.7054, -734.4595, 35.6812, 4.970519, 7200, 0, 0), -- Greater Bogstrok
+(@CGUID+59, 17817, 547, 3, 1, -207.3565, -724.6968, 36.44803, 5.07027, 7200, 0, 0), -- Greater Bogstrok
+(@CGUID+60, 17816, 547, 3, 1, -206.1612, -714.8032, 37.3086, 4.836682, 7200, 0, 0), -- Bogstrok
+(@CGUID+61, 17958, 547, 3, 1, -67.22121, -380.6276, 79.47726, 6.27036, 7200, 0, 0), -- Coilfang Defender
+(@CGUID+62, 17958, 547, 3, 1, -74.04443, -378.5399, 78.72163, 6.27036, 7200, 0, 0); -- Coilfang Defender
+
+
+DELETE FROM `creature` WHERE `guid` IN (12403, 52352, 52353, 52355, 52356, 52357, 52359, 52360, 52361, 52365, 52366, 52367, 52368, 52369, 52370, 52371, 52372, 52373, 52374, 52375, 52376, 52377, 52378, 52379, 52380, 52381, 52382, 52383, 52384, 52385, 52386, 52387, 52388, 52389, 52390, 52391, 52392, 52393, 52394, 52395, 52396, 52397, 52398, 79429, 79435, 79437, 79440, 79441, 79449, 79461, 79463, 79469, 79471, 79472, 79475, 79482, 79488, 79490, 79536, 79547, 79633, 79699, 79701, 79703, 79709, 79710, 79711, 79713, 79718, 79719, 79722, 79745, 79790, 79842, 79843, 79844, 79845, 80260);
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `MovementType`) VALUES
+(12403, 22421, 547, 2, 1, -296.4931, -459.0429, 6.146773, 0.7679449, 7200, 0, 0), -- Skar'this the Heretic
+(52352, 17938, 547, 3, 1, -119.4284, -595.8055, 8.456528, 5.323254, 7200, 0, 0), -- Coilfang Observer
+(52353, 17938, 547, 3, 1, -127.1415, -144.4277, -1.803136, 0.8552113, 7200, 0, 0), -- Coilfang Observer
+(52359, 17962, 547, 3, 1, 33.9016, -379.3725, 3.118852, 1.605703, 7200, 0, 0), -- Coilfang Collaborator
+(52361, 17962, 547, 3, 1, 39.15127, -395.5019, 3.118883, 4.799655, 7200, 0, 0), -- Coilfang Collaborator
+(52365, 17963, 547, 3, 1, -54.63998, -280.2335, -1.283369, 3.996804, 7200, 0, 0), -- Wastewalker Slave
+(52366, 17964, 547, 3, 1, -54.29192, -248.0854, -3.691535, 1.972222, 7200, 0, 0), -- Wastewalker Worker
+(52367, 17963, 547, 3, 1, -89.17553, -91.53407, -2.22339, 6.073746, 7200, 0, 0), -- Wastewalker Slave
+(52368, 17963, 547, 3, 1, -120.7097, -65.83062, -2.223061, 3.159046, 7200, 0, 0), -- Wastewalker Slave
+(52370, 17964, 547, 3, 1, -57.08875, -27.93377, -1.772427, 3.176499, 7200, 0, 0), -- Wastewalker Worker
+(52371, 17963, 547, 3, 1, -78.01715, -191.155, -3.423848, 5.934119, 7200, 0, 0), -- Wastewalker Slave
+(52372, 17964, 547, 3, 1, -113.1554, -8.017564, -8.669127, 1.762783, 7200, 0, 0), -- Wastewalker Worker
+(52373, 17963, 547, 3, 1, -69.62327, -245.9392, -3.536769, 0.7679449, 7200, 0, 0), -- Wastewalker Slave
+(52374, 17963, 547, 3, 1, -45.51907, -293.7432, -1.349522, 3.403392, 7200, 0, 0), -- Wastewalker Slave
+(52375, 17964, 547, 3, 1, -47.75424, -285.9099, -1.310401, 3.752458, 7200, 0, 0), -- Wastewalker Worker
+(52376, 17964, 547, 3, 1, -108.3841, -755.4068, 37.9846, 5.078908, 7200, 0, 0), -- Wastewalker Worker
+(52377, 17964, 547, 3, 1, -114.9684, -747.1564, 37.98458, 0.8901179, 7200, 0, 0), -- Wastewalker Worker
+(52378, 17964, 547, 3, 1, -73.0294, -718.7322, 38.98584, 5.480334, 7200, 0, 0), -- Wastewalker Worker
+(52379, 17964, 547, 3, 1, -94.14198, -721.347, 38.1964, 2.827433, 7200, 0, 0), -- Wastewalker Worker
+(52380, 17964, 547, 3, 1, -101.7542, -14.13979, -7.868871, 4.677482, 7200, 0, 0), -- Wastewalker Worker
+(52381, 17964, 547, 3, 1, -77.18946, -284.4292, -1.241735, 5.654867, 7200, 0, 0), -- Wastewalker Worker
+(52382, 17963, 547, 3, 1, -83.51007, -290.5829, -1.381121, 5.393067, 7200, 0, 0), -- Wastewalker Slave
+(52384, 17964, 547, 3, 1, -38.74315, 3.089242, -1.204552, 1.850049, 7200, 0, 0), -- Wastewalker Worker
+(52385, 17964, 547, 3, 1, -47.47281, 3.605731, -1.507226, 1.692969, 7200, 0, 0), -- Wastewalker Worker
+(52387, 17964, 547, 3, 1, -96.44904, -62.15407, -1.792045, 0.1396263, 7200, 0, 0), -- Wastewalker Worker
+(52389, 17964, 547, 3, 1, -61.51235, -20.17615, -2.663957, 4.18879, 7200, 0, 0), -- Wastewalker Worker
+(52393, 17964, 547, 3, 1, -73.61772, -182.1575, -5.111982, 5.148721, 7200, 0, 0), -- Wastewalker Worker
+(52394, 17963, 547, 3, 1, -60.16751, -176.9379, -4.0791, 4.660029, 7200, 0, 0), -- Wastewalker Slave
+(52395, 17963, 547, 3, 1, -112.2143, -105.2496, -4.700827, 2.75762, 7200, 0, 0), -- Wastewalker Slave
+(52396, 17963, 547, 3, 1, -71.8825, -19.18774, -4.44727, 4.153883, 7200, 0, 0), -- Wastewalker Slave
+(52397, 17964, 547, 3, 1, -61.51586, -248.3638, -3.940233, 0.9948376, 7200, 0, 0), -- Wastewalker Worker
+(52398, 17964, 547, 3, 1, -27.17291, 1.65894, -0.7652907, 1.815142, 7200, 0, 0), -- Wastewalker Worker
+(79429, 17957, 547, 3, 1, -162.7924, -463.4172, 3.205104, 1.919862, 7200, 0, 0), -- Coilfang Champion
+(79435, 17957, 547, 3, 1, -158.5233, -447.8588, 3.040779, 3.665191, 7200, 0, 0), -- Coilfang Champion
+(79440, 17890, 547, 3, 1, -294.5036, -380.8706, 30.58193, 1.32645, 7200, 0, 0), -- Weeder Greenthumb
+(79441, 17893, 547, 3, 1, -192.1564, -799.5793, 43.89159, 1.239184, 7200, 0, 0), -- Naturalist Bite
+(79449, 17960, 547, 3, 1, -79.08044, -584.6921, 1.512077, 1.082104, 7200, 0, 0), -- Coilfang Soothsayer
+(79461, 18206, 547, 3, 1, -190.9466, -693.8201, 40.88328, 3.787364, 7200, 0, 0), -- Wastewalker Captive
+(79463, 18206, 547, 3, 1, -43.76052, 9.132533, 1.371655, 4.433136, 7200, 0, 0), -- Wastewalker Captive
+(79469, 18206, 547, 3, 1, -28.65155, 8.898226, 1.752653, 3.630285, 7200, 0, 0), -- Wastewalker Captive
+(79471, 18206, 547, 3, 1, -22.36813, -585.0342, 1.16364, 3.804818, 7200, 0, 0), -- Wastewalker Captive
+(79472, 18206, 547, 3, 1, -178.7577, -698.3421, 40.88328, 3.281219, 7200, 0, 0), -- Wastewalker Captive
+(79475, 18206, 547, 3, 1, -29.96552, -534.0687, 1.163646, 2.565634, 7200, 0, 0), -- Wastewalker Captive
+(79482, 18206, 547, 3, 1, -14.36809, -548.7775, 1.163643, 4.485496, 7200, 0, 0), -- Wastewalker Captive
+(79488, 18206, 547, 3, 1, -18.79482, -577.8669, 18.76408, 2.722714, 7200, 0, 0), -- Wastewalker Captive
+(79490, 18206, 547, 3, 1, -33.75176, -585.9126, 23.79086, 2.96706, 7200, 0, 0), -- Wastewalker Captive
+(79547, 17957, 547, 3, 1, -118.9584, -152.85, -1.957283, 0.4886922, 7200, 0, 0), -- Coilfang Champion
+(79699, 21126, 547, 3, 1, -88.22562, -497.4428, -1.507759, 2.722714, 7200, 0, 0), -- Coilfang Scale-Healer
+(79701, 17938, 547, 3, 1, -84.87788, -503.3429, -1.509169, 3.281219, 7200, 0, 0), -- Coilfang Observer
+(79703, 17940, 547, 3, 1, 122.6974, -297.8582, 3.119044, 3.700098, 7200, 0, 0), -- Coilfang Technician
+(79709, 17957, 547, 3, 1, -83.79871, -585.3203, 1.376997, 1.37881, 7200, 0, 0), -- Coilfang Champion
+(79710, 17957, 547, 3, 1, -77.88522, -592.5287, 2.310318, 5.951573, 7200, 0, 0), -- Coilfang Champion
+(79711, 21126, 547, 3, 1, -175.4446, -771.7658, 42.21755, 4.796402, 7200, 3, 1), -- Coilfang Scale-Healer
+(79713, 17938, 547, 3, 1, -187.0115, -762.9409, 41.79701, 5.734584, 7200, 3, 1), -- Coilfang Observer
+(79718, 17958, 547, 3, 1, -6.498472, -296.8441, 3.15944, 2.932153, 7200, 0, 0), -- Coilfang Defender
+(79719, 17958, 547, 3, 1, -11.27964, -312.923, 2.95958, 2.86234, 7200, 0, 0), -- Coilfang Defender
+(79722, 21126, 547, 3, 1, -121.849, -147.4496, -1.981267, 1.082104, 7200, 0, 0), -- Coilfang Scale-Healer
+(79745, 17961, 547, 3, 1, -76.53473, -588.3738, 1.945644, 0.4363323, 7200, 0, 0), -- Coilfang Enchantress
+(79790, 21127, 547, 3, 1, -82.17294, -494.0059, -1.509497, 2.391101, 7200, 0, 0), -- Coilfang Tempest
+(79842, 21127, 547, 3, 1, -116.9161, -585.9364, 5.483181, 0.3839724, 7200, 0, 0), -- Coilfang Tempest
+(79843, 21127, 547, 3, 1, -114.4843, -592.073, 6.581903, 6.161012, 7200, 0, 0), -- Coilfang Tempest
+(79844, 21127, 547, 3, 1, -197.8177, -765.5336, 42.99123, 4.607836, 7200, 3, 1), -- Coilfang Tempest
+(79845, 21127, 547, 3, 1, -168.9964, -778.1722, 42.36605, 0.5759587, 7200, 3, 1), -- Coilfang Tempest
+(80260, 17942, 547, 3, 1, -281.0958, -667.1385, 9.402116, 5.846853, 7200, 0, 0); -- Quagmirran
diff --git a/sql/updates/world/2014_04_29_00_world_misc.sql b/sql/updates/world/2014_04_29_00_world_misc.sql
new file mode 100644
index 00000000000..0a82d40a24c
--- /dev/null
+++ b/sql/updates/world/2014_04_29_00_world_misc.sql
@@ -0,0 +1,7 @@
+--
+INSERT INTO `battlemaster_entry` (`entry`, `bg_template`) VALUES (31979, 1);
+INSERT INTO `battlemaster_entry` (`entry`, `bg_template`) VALUES (37413, 1);
+INSERT INTO `battlemaster_entry` (`entry`, `bg_template`) VALUES (37298, 1);
+INSERT INTO `battlemaster_entry` (`entry`, `bg_template`) VALUES (32092, 1);
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=35410;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`) VALUES (35410, 43671, 1);
diff --git a/sql/updates/world/2014_04_29_01_world_misc.sql b/sql/updates/world/2014_04_29_01_world_misc.sql
new file mode 100644
index 00000000000..92e9589d3e3
--- /dev/null
+++ b/sql/updates/world/2014_04_29_01_world_misc.sql
@@ -0,0 +1,36 @@
+--
+UPDATE `creature_template` SET `minlevel`=71, `maxlevel`=71 WHERE `entry`=22635;
+UPDATE `creature_template` SET `minlevel`=81, `maxlevel`=81 WHERE `entry`=32096;
+UPDATE `creature_template` SET `minlevel`=81, `maxlevel`=81 WHERE `entry`=37417;
+UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=70 WHERE `entry`=22625;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=31998;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=37317;
+UPDATE `creature_template` SET `minlevel`=56, `maxlevel`=56 WHERE `entry`=22611;
+UPDATE `creature_template` SET `minlevel`=66, `maxlevel`=66 WHERE `entry`=31942;
+UPDATE `creature_template` SET `minlevel`=76, `maxlevel`=76 WHERE `entry`=37260;
+UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=70 WHERE `entry`=22591;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=31905;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=37460;
+UPDATE `creature_template` SET `minlevel`=69, `maxlevel`=69 WHERE `entry`=22717;
+UPDATE `creature_template` SET `minlevel`=79, `maxlevel`=79 WHERE `entry`=32072;
+UPDATE `creature_template` SET `minlevel`=79, `maxlevel`=79 WHERE `entry`=37393;
+UPDATE `creature_template` SET `minlevel`=66, `maxlevel`=66 WHERE `entry`=22692;
+UPDATE `creature_template` SET `minlevel`=76, `maxlevel`=76 WHERE `entry`=32102;
+UPDATE `creature_template` SET `minlevel`=76, `maxlevel`=76 WHERE `entry`=37423;
+UPDATE `creature_template` SET `minlevel`=71, `maxlevel`=71 WHERE `entry`=22610;
+UPDATE `creature_template` SET `minlevel`=81, `maxlevel`=81 WHERE `entry`=31941;
+UPDATE `creature_template` SET `minlevel`=81, `maxlevel`=81 WHERE `entry`=37259;
+UPDATE `creature_template` SET `minlevel`=70, `maxlevel`=70 WHERE `entry`=22590;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=31906;
+UPDATE `creature_template` SET `minlevel`=80, `maxlevel`=80 WHERE `entry`=37459;
+UPDATE `creature_template` SET `minlevel`=69, `maxlevel`=69 WHERE `entry`=22716;
+UPDATE `creature_template` SET `minlevel`=79, `maxlevel`=79 WHERE `entry`=32071;
+UPDATE `creature_template` SET `minlevel`=79, `maxlevel`=79 WHERE `entry`=37392;
+UPDATE `creature_template` SET `minlevel`=66, `maxlevel`=66 WHERE `entry`=22675;
+UPDATE `creature_template` SET `minlevel`=76, `maxlevel`=76 WHERE `entry`=31985;
+UPDATE `creature_template` SET `minlevel`=76, `maxlevel`=76 WHERE `entry`=37304;
+UPDATE `creature_template` SET `minlevel`=59 WHERE `entry`=22776;
+UPDATE `creature_template` SET `minlevel`=69, `maxlevel`=69 WHERE `entry`=32130;
+UPDATE `creature_template` SET `minlevel`=79, `maxlevel`=79 WHERE `entry`=37455;
+DELETE FROM `creature_addon` WHERE `guid`=79437;
+DELETE FROM `linked_respawn` WHERE `guid` IN (52355,52356,52357,52360,52383,52386,52388,79536,79633);