diff --git a/sql/world/base/zone_alterac_valley.sql b/sql/world/base/zone_alterac_valley.sql
index 42d1edc..2b66a25 100644
--- a/sql/world/base/zone_alterac_valley.sql
+++ b/sql/world/base/zone_alterac_valley.sql
@@ -4,62 +4,62 @@ DELETE FROM `creature` WHERE `map` = 30 AND `spawnMask` = 1 AND `id1` IN (10986,
 INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `wander_distance`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`, `ScriptName`, `VerifiedBuild`, `CreateObject`, `Comment`) VALUES 
 
 -- Snowblind Harpy
-(630001, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 103.903, 83.4279, 3.3603, 5.97373, 300, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630002, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 168.224, 147.643, 3.9871, 1.91086, 300, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630003, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 145.274, 169.01, 3.0828, 4.64404, 300, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630004, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 30.5084, 162.463, 12.0949, 0.49714, 300, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630005, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 25.8352, 40.6015, 0.54559, 1.15295, 300, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630006, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 8.11963, 12.8868, -3.36273, 0.0808925, 300, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630007, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 37.2934, -17.1303, -4.09621, 2.58316, 300, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630008, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 318.397, 9.70777, 0.43861, 5.21425, 300, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630009, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 61.1865, 51.7627, -1.07853, 2.40249, 300, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630001, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 103.903, 83.4279, 3.3603, 5.97373, 120, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630002, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 168.224, 147.643, 3.9871, 1.91086, 120, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630003, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 145.274, 169.01, 3.0828, 4.64404, 120, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630004, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 30.5084, 162.463, 12.0949, 0.49714, 120, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630005, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 25.8352, 40.6015, 0.54559, 1.15295, 120, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630006, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 8.11963, 12.8868, -3.36273, 0.0808925, 120, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630007, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 37.2934, -17.1303, -4.09621, 2.58316, 120, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630008, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 318.397, 9.70777, 0.43861, 5.21425, 120, 2, 0, 3083, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630009, 10986, 0, 0, 30, 0, 0, 1, 1, 0, 61.1865, 51.7627, -1.07853, 2.40249, 120, 2, 0, 3189, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 -- Snowblind Windcaller
-(630010, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 188.177, 90.8812, 17.5997, 0.785365, 300, 3, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630011, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 113.59, 100.078, 3.36813, 4.47126, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630012, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 135.881, 145.187, 2.36159, 0.933032, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630013, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 156.415, 185.196, 4.0752, 4.59299, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630014, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 52.0286, 163.914, 10.9313, 6.05383, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630015, 11675, 0, 0, 30, 0, 0, 1, 1, 0, -5.77763, 134.47, 10.1745, 4.52624, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630016, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 72.4666, 14.5812, -4.09621, 4.62441, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630017, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 284.532, 45.4699, 17.9127, 5.61087, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630010, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 188.177, 90.8812, 17.5997, 0.785365, 120, 3, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630011, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 113.59, 100.078, 3.36813, 4.47126, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630012, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 135.881, 145.187, 2.36159, 0.933032, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630013, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 156.415, 185.196, 4.0752, 4.59299, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630014, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 52.0286, 163.914, 10.9313, 6.05383, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630015, 11675, 0, 0, 30, 0, 0, 1, 1, 0, -5.77763, 134.47, 10.1745, 4.52624, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630016, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 72.4666, 14.5812, -4.09621, 4.62441, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630017, 11675, 0, 0, 30, 0, 0, 1, 1, 0, 284.532, 45.4699, 17.9127, 5.61087, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
 -- Snowblind Ambusher
-(630018, 11678, 0, 0, 30, 0, 0, 1, 1, 0, 45.4201, 14.1114, -4.09621, 4.73045, 300, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630019, 11678, 0, 0, 30, 0, 0, 1, 1, 0, 67.1214, -15.1557, -4.09621, 3.43611, 300, 2, 0, 1690, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630018, 11678, 0, 0, 30, 0, 0, 1, 1, 0, 45.4201, 14.1114, -4.09621, 4.73045, 120, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630019, 11678, 0, 0, 30, 0, 0, 1, 1, 0, 67.1214, -15.1557, -4.09621, 3.43611, 120, 2, 0, 1690, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 -- Wildpaw Gnoll
-(630020, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1475.79, -432.495, 70.3163, 4.13278, 300, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630021, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1496.05, -437.624, 69.6389, 2.92326, 300, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630022, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1474.22, -464.361, 69.447, 2.05538, 300, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630023, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1500.82, -467.571, 69.4121, 0.869434, 300, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630024, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1494.17, -459.994, 69.4469, 2.09465, 300, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630025, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1528.5, -440.531, 70.7168, 5.00062, 300, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630026, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1524.05, -464.603, 69.447, 0.853721, 300, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630027, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1569, -445.065, 67.8267, 4.59222, 300, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630028, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1559.23, -506.199, 62.2367, 1.80407, 300, 0, 0, 1690, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630029, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1560.75, -499.938, 60.6631, 4.87891, 300, 0, 0, 1690, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630020, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1475.79, -432.495, 70.3163, 4.13278, 120, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630021, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1496.05, -437.624, 69.6389, 2.92326, 120, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630022, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1474.22, -464.361, 69.447, 2.05538, 120, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630023, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1500.82, -467.571, 69.4121, 0.869434, 120, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630024, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1494.17, -459.994, 69.4469, 2.09465, 120, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630025, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1528.5, -440.531, 70.7168, 5.00062, 120, 0, 0, 1660, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630026, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1524.05, -464.603, 69.447, 0.853721, 120, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630027, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1569, -445.065, 67.8267, 4.59222, 120, 2, 0, 1660, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630028, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1559.23, -506.199, 62.2367, 1.80407, 120, 0, 0, 1690, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630029, 10991, 0, 0, 30, 0, 0, 1, 1, 1, -1560.75, -499.938, 60.6631, 4.87891, 120, 0, 0, 1690, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
 -- Wildpaw Shaman
-(630030, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1490.24, -427.518, 70.3212, 4.21524, 300, 0, 0, 2634, 2041, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630031, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1503.67, -438.017, 69.9852, 1.25036, 300, 0, 0, 2551, 1982, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630032, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1482.39, -473.656, 69.447, 1.21893, 300, 0, 0, 2551, 1982, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630033, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1530.05, -444.52, 70.7168, 5.82921, 300, 0, 0, 2634, 2041, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630034, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1544.47, -485.93, 71.3506, 4.7925, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630035, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1561.54, -480.946, 59.7903, 2.95074, 300, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630030, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1490.24, -427.518, 70.3212, 4.21524, 120, 0, 0, 2634, 2041, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630031, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1503.67, -438.017, 69.9852, 1.25036, 120, 0, 0, 2551, 1982, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630032, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1482.39, -473.656, 69.447, 1.21893, 120, 0, 0, 2551, 1982, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630033, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1530.05, -444.52, 70.7168, 5.82921, 120, 0, 0, 2634, 2041, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630034, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1544.47, -485.93, 71.3506, 4.7925, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630035, 11837, 0, 0, 30, 0, 0, 1, 1, 1, -1561.54, -480.946, 59.7903, 2.95074, 120, 2, 0, 2551, 1982, 1, 0, 0, 0, '', NULL, 0, NULL),
 -- Wildpaw Mystic
 (630036, 11838, 0, 0, 30, 0, 0, 1, 1, 1, -1590.14, -420.42, 71.3415, 6.22587, 120, 2, 0, 2915, 2163, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630037, 11838, 0, 0, 30, 0, 0, 1, 1, 1, -1614.75, -362.396, 68.8996, 6.0248, 120, 0, 0, 2915, 2163, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630038, 11838, 0, 0, 30, 0, 0, 1, 1, 1, -1605.77, -364.978, 69.0308, 3.24842, 120, 0, 0, 2915, 2163, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630039, 11838, 0, 0, 30, 0, 0, 1, 1, 1, -1611.59, -444.632, 80.3348, 0.680151, 120, 0, 0, 2915, 2163, 0, 0, 0, 0, '', NULL, 0, NULL),
 -- Wildpaw Brute
-(630040, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1620.91, -434.778, 51.0353, 5.6918, 300, 2, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630040, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1620.91, -434.778, 51.0353, 5.6918, 120, 2, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630041, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1624.87, -393.428, 53.5776, 4.31342, 120, 1, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630042, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1612.47, -384.653, 58.215, 4.22621, 120, 1, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630043, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1568.74, -400.288, 66.0698, 4.06995, 120, 0, 0, 3759, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630044, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1577.87, -365.575, 64.1424, 5.5033, 120, 2, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630045, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1595.37, -354.048, 63.9569, 5.8528, 120, 2, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630046, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1645.36, -444.486, 49.6154, 4.77207, 300, 2, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630046, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1645.36, -444.486, 49.6154, 4.77207, 120, 2, 0, 3759, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630047, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1603.65, -444.62, 78.9545, 0.762618, 120, 0, 0, 3759, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630048, 11839, 0, 0, 30, 0, 0, 1, 1, 1, -1614.85, -437.836, 80.361, 0.318868, 120, 0, 0, 3759, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
 -- Wildpaw Alpha
-(630049, 11840, 0, 0, 30, 0, 0, 1, 1, 1, -1639.39, -425.25, 48.7485, 5.78998, 300, 2, 0, 3876, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630049, 11840, 0, 0, 30, 0, 0, 1, 1, 1, -1639.39, -425.25, 48.7485, 5.78998, 120, 2, 0, 3876, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630050, 11840, 0, 0, 30, 0, 0, 1, 1, 1, -1549.74, -362.008, 66.2869, 1.73338, 120, 2, 0, 3876, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630051, 11840, 0, 0, 30, 0, 0, 1, 1, 1, -1548.03, -379.397, 64.4866, 3.30811, 120, 2, 0, 3876, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 -- Alterac Yeti
@@ -142,31 +142,31 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`,
 (630115, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1668.89, -420.42, 45.59, 6.10021, 300, 0, 0, 3914, 2846, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630116, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1665.86, -424.064, 45.59, 3.46128, 300, 1, 0, 3914, 2846, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630117, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1656.75, -421.53, 45.8812, 0.0683548, 300, 1, 0, 3914, 2846, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630118, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1584.58, -381.567, 65.3961, 0.315744, 120, 2, 0, 4026, 2933, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630119, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1590.14, -420.42, 71.3415, 6.22587, 120, 2, 0, 4026, 2933, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630120, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1614.75, -362.396, 68.8996, 6.0248, 120, 0, 0, 4026, 2933, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630121, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1605.77, -364.978, 69.0308, 3.24842, 120, 0, 0, 4026, 2933, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630122, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1611.59, -444.632, 80.3348, 0.680151, 120, 0, 0, 4026, 2933, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630118, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1584.58, -381.567, 65.3961, 0.315744, 300, 2, 0, 4026, 2933, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630119, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1590.14, -420.42, 71.3415, 6.22587, 300, 2, 0, 4026, 2933, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630120, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1614.75, -362.396, 68.8996, 6.0248, 300, 0, 0, 4026, 2933, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630121, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1605.77, -364.978, 69.0308, 3.24842, 300, 0, 0, 4026, 2933, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630122, 11838, 0, 0, 30, 0, 0, 2, 1, 1, -1611.59, -444.632, 80.3348, 0.680151, 300, 0, 0, 4026, 2933, 0, 0, 0, 0, '', NULL, 0, NULL),
 -- Wildpaw Brute
 (630123, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1620.91, -434.778, 51.0353, 5.6918, 300, 2, 0, 5033, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630124, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1624.87, -393.428, 53.5776, 4.31342, 120, 1, 0, 5033, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630125, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1612.47, -384.653, 58.215, 4.22621, 120, 1, 0, 4893, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630126, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1568.74, -400.288, 66.0698, 4.06995, 120, 0, 0, 5033, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630127, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1577.87, -365.575, 64.1424, 5.5033, 120, 2, 0, 4893, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630128, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1595.37, -354.048, 63.9569, 5.8528, 120, 2, 0, 5033, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630129, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1587.13, -431.516, 72.5603, 0.700599, 120, 2, 0, 4893, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630124, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1624.87, -393.428, 53.5776, 4.31342, 300, 1, 0, 5033, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630125, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1612.47, -384.653, 58.215, 4.22621, 300, 1, 0, 4893, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630126, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1568.74, -400.288, 66.0698, 4.06995, 300, 0, 0, 5033, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630127, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1577.87, -365.575, 64.1424, 5.5033, 300, 2, 0, 4893, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630128, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1595.37, -354.048, 63.9569, 5.8528, 300, 2, 0, 5033, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630129, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1587.13, -431.516, 72.5603, 0.700599, 300, 2, 0, 4893, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630130, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1645.36, -444.486, 49.6154, 4.77207, 300, 2, 0, 4893, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630131, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1603.65, -444.62, 78.9545, 0.762618, 120, 0, 0, 4893, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630132, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1614.85, -437.836, 80.361, 0.318868, 120, 0, 0, 4893, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630131, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1603.65, -444.62, 78.9545, 0.762618, 300, 0, 0, 4893, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630132, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1614.85, -437.836, 80.361, 0.318868, 300, 0, 0, 4893, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630133, 11839, 0, 0, 30, 0, 0, 2, 1, 1, -1593.92, -368.206, 68.9732, 5.33757, 300, 0, 0, 4893, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol'),
 -- Wildpaw Alpha
 (630134, 11840, 0, 0, 30, 0, 0, 2, 1, 1, -1639.39, -425.25, 48.7485, 5.78998, 300, 2, 0, 5322, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630135, 11840, 0, 0, 30, 0, 0, 2, 1, 1, -1549.74, -362.008, 66.2869, 1.73338, 120, 2, 0, 5176, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630136, 11840, 0, 0, 30, 0, 0, 2, 1, 1, -1536.38, -366.213, 64.6282, 6.26121, 120, 2, 0, 5176, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630137, 11840, 0, 0, 30, 0, 0, 2, 1, 1, -1548.03, -379.397, 64.4866, 3.30811, 120, 2, 0, 5322, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630135, 11840, 0, 0, 30, 0, 0, 2, 1, 1, -1549.74, -362.008, 66.2869, 1.73338, 300, 2, 0, 5176, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630136, 11840, 0, 0, 30, 0, 0, 2, 1, 1, -1536.38, -366.213, 64.6282, 6.26121, 300, 2, 0, 5176, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630137, 11840, 0, 0, 30, 0, 0, 2, 1, 1, -1548.03, -379.397, 64.4866, 3.30811, 300, 2, 0, 5322, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 -- Alterac Yeti
 (630138, 13959, 0, 0, 30, 0, 0, 2, 1, 0, -1643.68, -453.017, 50.4985, 1.89516, 430, 0, 0, 29141, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol'),
-(630139, 13959, 0, 0, 30, 0, 0, 2, 1, 0, 41.9884, 102.338, 21.7582, 3.81227, 300, 0, 0, 29141, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol');
+(630139, 13959, 0, 0, 30, 0, 0, 2, 1, 0, 41.9884, 102.338, 21.7582, 3.81227, 430, 0, 0, 29141, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol');
 
 DELETE FROM `creature_addon` WHERE `guid` IN (630088, 630089, 630105, 630106, 630114, 630133, 630138, 630139);
 INSERT INTO `creature_addon` (`guid`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES 
@@ -309,31 +309,31 @@ INSERT INTO `creature` (`guid`, `id1`, `id2`, `id3`, `map`, `zoneId`, `areaId`,
 (630191, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1668.89, -420.42, 45.59, 6.10021, 300, 0, 0, 6713, 3643, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630192, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1665.86, -424.064, 45.59, 3.46128, 300, 1, 0, 6713, 3643, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630193, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1656.75, -421.53, 45.8812, 0.0683548, 300, 1, 0, 6713, 3643, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630194, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1584.58, -381.567, 65.3961, 0.315744, 120, 2, 0, 6903, 3725, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630195, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1590.14, -420.42, 71.3415, 6.22587, 120, 2, 0, 6903, 3725, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630196, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1614.75, -362.396, 68.8996, 6.0248, 120, 0, 0, 6903, 3725, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630197, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1605.77, -364.978, 69.0308, 3.24842, 120, 0, 0, 6903, 3725, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630198, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1611.59, -444.632, 80.3348, 0.680151, 120, 0, 0, 6903, 3725, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630194, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1584.58, -381.567, 65.3961, 0.315744, 300, 2, 0, 6903, 3725, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630195, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1590.14, -420.42, 71.3415, 6.22587, 300, 2, 0, 6903, 3725, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630196, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1614.75, -362.396, 68.8996, 6.0248, 300, 0, 0, 6903, 3725, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630197, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1605.77, -364.978, 69.0308, 3.24842, 300, 0, 0, 6903, 3725, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630198, 11838, 0, 0, 30, 0, 0, 4, 1, 1, -1611.59, -444.632, 80.3348, 0.680151, 300, 0, 0, 6903, 3725, 0, 0, 0, 0, '', NULL, 0, NULL),
 -- Wildpaw Brute
 (630199, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1620.91, -434.778, 51.0353, 5.6918, 300, 2, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630200, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1624.87, -393.428, 53.5776, 4.31342, 120, 1, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630201, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1612.47, -384.653, 58.215, 4.22621, 120, 1, 0, 8628, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630202, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1568.74, -400.288, 66.0698, 4.06995, 120, 0, 0, 8867, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630203, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1577.87, -365.575, 64.1424, 5.5033, 120, 2, 0, 8628, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630204, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1595.37, -354.048, 63.9569, 5.8528, 120, 2, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630205, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1587.13, -431.516, 72.5603, 0.700599, 120, 2, 0, 8628, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630200, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1624.87, -393.428, 53.5776, 4.31342, 300, 1, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630201, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1612.47, -384.653, 58.215, 4.22621, 300, 1, 0, 8628, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630202, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1568.74, -400.288, 66.0698, 4.06995, 300, 0, 0, 8867, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630203, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1577.87, -365.575, 64.1424, 5.5033, 300, 2, 0, 8628, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630204, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1595.37, -354.048, 63.9569, 5.8528, 300, 2, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630205, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1587.13, -431.516, 72.5603, 0.700599, 300, 2, 0, 8628, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 (630206, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1645.36, -444.486, 49.6154, 4.77207, 300, 2, 0, 8628, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630207, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1603.65, -444.62, 78.9545, 0.762618, 120, 0, 0, 8628, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
-(630208, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1614.85, -437.836, 80.361, 0.318868, 120, 0, 0, 8628, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630207, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1603.65, -444.62, 78.9545, 0.762618, 300, 0, 0, 8628, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
+(630208, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1614.85, -437.836, 80.361, 0.318868, 300, 0, 0, 8628, 0, 0, 0, 0, 0, '', NULL, 0, NULL),
 (630209, 11839, 0, 0, 30, 0, 0, 4, 1, 1, -1593.92, -368.206, 68.9732, 5.33757, 300, 0, 0, 8628, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol'),
 -- Wildpaw Alpha
 (630210, 11840, 0, 0, 30, 0, 0, 4, 1, 1, -1639.39, -425.25, 48.7485, 5.78998, 300, 2, 0, 9116, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630211, 11840, 0, 0, 30, 0, 0, 4, 1, 1, -1549.74, -362.008, 66.2869, 1.73338, 120, 2, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630212, 11840, 0, 0, 30, 0, 0, 4, 1, 1, -1536.38, -366.213, 64.6282, 6.26121, 120, 2, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
-(630213, 11840, 0, 0, 30, 0, 0, 4, 1, 1, -1548.03, -379.397, 64.4866, 3.30811, 120, 2, 0, 9116, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630211, 11840, 0, 0, 30, 0, 0, 4, 1, 1, -1549.74, -362.008, 66.2869, 1.73338, 300, 2, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630212, 11840, 0, 0, 30, 0, 0, 4, 1, 1, -1536.38, -366.213, 64.6282, 6.26121, 300, 2, 0, 8867, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
+(630213, 11840, 0, 0, 30, 0, 0, 4, 1, 1, -1548.03, -379.397, 64.4866, 3.30811, 300, 2, 0, 9116, 0, 1, 0, 0, 0, '', NULL, 0, NULL),
 -- Alterac Yeti
 (630214, 13959, 0, 0, 30, 0, 0, 4, 1, 0, -1643.68, -453.017, 50.4985, 1.89516, 430, 0, 0, 49978, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol'),
-(630215, 13959, 0, 0, 30, 0, 0, 4, 1, 0, 41.9884, 102.338, 21.7582, 3.81227, 300, 0, 0, 49978, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol');
+(630215, 13959, 0, 0, 30, 0, 0, 4, 1, 0, 41.9884, 102.338, 21.7582, 3.81227, 430, 0, 0, 49978, 0, 2, 0, 0, 0, '', NULL, 0, 'patrol');
 
 -- Using the same waypoints as in the TBC version
 DELETE FROM `creature_addon` WHERE `guid` IN (630164, 630165, 630181, 630182, 630190, 630209, 630214, 630215);