*Merge

--HG--
branch : trunk

4 files changed, 398 insertions, 3 deletions

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index e833bc9024d..fd2cc390d85 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -2030,4 +2030,5 @@ INSERT INTO `npc_text` (`ID`, `text0_0`, `text0_1`, `lang0`, `prob0`, `em0_0`, `
 
 -- Dual Spec `npc_option` change
 UPDATE `npc_option` SET `id`=52,`action`=19 WHERE `id`=51 AND `action`=18 AND `option_text`='UNIT_NPC_FLAG_OUTDOORPVP';
+DELETE FROM `npc_option` WHERE `id`=51 AND `action`=16 AND `option_text`='Purchase a Dual Talent Specialization.';
 INSERT INTO `npc_option` (`id`, `gossip_id`, `npcflag`, `icon`, `action`, `box_money`, `coded`, `option_text`, `box_text`) values('51','0','16','2','18','10000000','0','Purchase a Dual Talent Specialization.','Are you sure you wish to purchase a Dual Talent Specialization?');
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index e6884155154..940ef9920ce 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -13,6 +13,396 @@ CREATE TABLE script_waypoint (
   PRIMARY KEY (entry, pointid)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints';
 
+DELETE FROM script_waypoint WHERE entry = 20415;
+INSERT INTO script_waypoint VALUES
+(20415 ,0, 2488.77, 2184.89, 104.64, 0, ''),
+(20415 ,1, 2478.72, 2184.77, 98.58, 0, ''),
+(20415 ,2, 2473.52, 2184.71, 99.00, 0, ''),
+(20415 ,3, 2453.15, 2184.96, 97.09,4000, ''),
+(20415 ,4, 2424.18, 2184.15, 94.11, 0, ''),
+(20415 ,5, 2413.18, 2184.15, 93.42, 0, ''),
+(20415 ,6, 2402.02, 2183.90, 87.59, 0, ''),
+(20415 ,7, 2333.31, 2181.63, 90.03,4000, ''),
+(20415 ,8, 2308.73, 2184.34, 92.04, 0, ''),
+(20415 ,9, 2303.10, 2196.89, 94.94, 0, ''),
+(20415 ,10, 2304.58, 2272.23, 96.67, 0, ''),
+(20415 ,11, 2297.09, 2271.40, 95.16, 0, ''),
+(20415 ,12, 2297.68, 2266.79, 95.07,4000, ''),
+(20415 ,13, 2297.67, 2266.76, 95.07,4000, '');
+
+DELETE FROM script_waypoint WHERE entry = 18760;
+INSERT INTO script_waypoint VALUES
+(18760 ,0, -2265.21, 3091.14, 13.91, 0, ''),
+(18760 ,1, -2266.80, 3091.33, 13.82, 1000, ''),
+(18760 ,2, -2268.20, 3091.14, 13.82, 7000, 'progress1'),
+(18760 ,3, -2278.32, 3098.98, 13.82, 0, ''),
+(18760 ,4, -2294.82, 3110.59, 13.82, 0, ''),
+(18760 ,5, -2300.71, 3114.60, 13.82, 20000, 'progress2'),
+(18760 ,6, -2300.71, 3114.60, 13.82, 3000, 'progress3'),
+(18760 ,7, -2307.36, 3122.76, 13.79, 0, ''),
+(18760 ,8, -2312.83, 3130.55, 12.04, 0, ''),
+(18760 ,9, -2345.02, 3151.00, 8.38, 0, ''),
+(18760 ,10, -2351.97, 3157.61, 6.27, 0, ''),
+(18760 ,11, -2360.35, 3171.48, 3.31, 0, ''),
+(18760 ,12, -2371.44, 3185.41, 0.89, 0, ''),
+(18760 ,13, -2371.21, 3197.92, -0.96, 0, ''),
+(18760 ,14, -2380.35, 3210.45, -1.08, 0, ''),
+(18760 ,15, -2384.74, 3221.25, -1.17, 0, ''),
+(18760 ,16, -2386.15, 3233.39, -1.29, 0, ''),
+(18760 ,17, -2383.45, 3247.79, -1.32, 0, ''),
+(18760 ,18, -2367.50, 3265.64, -1.33, 0, ''),
+(18760 ,19, -2354.90, 3273.30, -1.50, 0, ''),
+(18760 ,20, -2348.88, 3280.58, -0.09, 0, ''),
+(18760 ,21, -2349.06, 3295.86, -0.95, 0, ''),
+(18760 ,22, -2350.43, 3328.27, -2.10, 0, ''),
+(18760 ,23, -2346.76, 3356.27, -2.82, 0, ''),
+(18760 ,24, -2340.56, 3370.68, -4.02, 0, ''),
+(18760 ,25, -2318.84, 3384.60, -7.61, 0, ''),
+(18760 ,26, -2313.99, 3398.61, -10.40, 0, ''),
+(18760 ,27, -2320.85, 3414.49, -11.49, 0, ''),
+(18760 ,28, -2338.26, 3426.06, -11.46, 0, ''),
+(18760 ,29, -2342.67, 3439.44, -11.32, 12000, 'progress4'),
+(18760 ,30, -2342.67, 3439.44, -11.32, 7000, 'emote bye'),
+(18760 ,31, -2342.67, 3439.44, -11.32, 5000, 'cat form'),
+(18760 ,32, -2344.60, 3461.27, -10.44, 0, ''),
+(18760 ,33, -2396.81, 3517.17, -3.55, 0, ''),
+(18760 ,34, -2439.23, 3523.00, -1.05, 0, '');
+
+DELETE FROM script_waypoint WHERE entry = 9623;
+INSERT INTO script_waypoint VALUES
+(9623 ,1, -6380.38, -1965.14, -258.292, 5000, ''),
+(9623 ,2, -6383.06, -1962.9, -258.936, 0, ''),
+(9623 ,3, -6391.09, -1956.13, -260.291, 0, ''),
+(9623 ,4, -6395.29, -1933.58, -262.949, 0, ''),
+(9623 ,5, -6396.58, -1919.93, -263.838, 0, ''),
+(9623 ,6, -6389.01, -1912.64, -260.689, 0, ''),
+(9623 ,7, -6369.19, -1892.87, -255.924, 0, ''),
+(9623 ,8, -6373.77, -1879.36, -259.268, 0, ''),
+(9623 ,9, -6377.55, -1869.56, -260.503, 0, ''),
+(9623 ,10, -6376.58, -1860.79, -260.026, 0, ''),
+(9623 ,11, -6373.13, -1847.22, -259.249, 0, ''),
+(9623 ,12, -6370.54, -1837.04, -260.007, 0, ''),
+(9623 ,13, -6372.52, -1829.16, -260.071, 0, ''),
+(9623 ,14, -6377.13, -1815.94, -262.632, 0, ''),
+(9623 ,15, -6380.27, -1806.95, -265.53, 0, ''),
+(9623 ,16, -6386.04, -1790.43, -268.546, 0, ''),
+(9623 ,17, -6386.72, -1776.29, -269.851, 0, ''),
+(9623 ,18, -6385.92, -1762.31, -271.494, 0, ''),
+(9623 ,19, -6384.69, -1744.86, -272.196, 0, ''),
+(9623 ,20, -6383.8, -1732.66, -272.222, 0, ''),
+(9623 ,21, -6382.66, -1716.96, -272.235, 0, ''),
+(9623 ,22, -6381.5, -1703.01, -272.964, 0, ''),
+(9623 ,23, -6379.96, -1685.58, -272.842, 0, ''),
+(9623 ,24, -6379.34, -1678.61, -272.34, 0, ''),
+(9623 ,25, -6364.45, -1636.27, -271.065, 0, ''),
+(9623 ,26, -6371.85, -1626.36, -272.188, 0, ''),
+(9623 ,27, -6383.5, -1629.01, -272.206, 0, ''),
+(9623 ,28, -6388.09, -1635.37, -272.105, 5000, ''),
+(9623 ,29, -6375.42, -1637.33, -272.193, 0, ''),
+(9623 ,30, -6365.46, -1617.25, -272.141, 0, ''),
+(9623 ,31, -6353.79, -1603.48, -271.932, 0, ''),
+(9623 ,32, -6340.24, -1592.41, -269.435, 0, ''),
+(9623 ,33, -6329.45, -1566.89, -269.895, 0, ''),
+(9623 ,34, -6312.2, -1499.06, -269.507, 0, ''),
+(9623 ,35, -6304.55, -1468.5, -269.431, 0, ''),
+(9623 ,36, -6310.36, -1440.94, -268.427, 0, ''),
+(9623 ,37, -6321, -1418.91, -266.525, 0, ''),
+(9623 ,38, -6358.76, -1389.97, -267.522, 0, ''),
+(9623 ,39, -6378.65, -1375.67, -271.749, 0, ''),
+(9623 ,40, -6387.22, -1360.95, -272.109, 0, ''),
+(9623 ,41, -6406.95, -1323.87, -271.586, 0, ''),
+(9623 ,42, -6405, -1311.92, -271.906, 0, ''),
+(9623 ,43, -6395.56, -1303.62, -271.902, 0, ''),
+(9623 ,44, -6375.97, -1296.08, -271.865, 0, ''),
+(9623 ,45, -6364.39, -1281.23, -269.012, 0, ''),
+(9623 ,46, -6353.71, -1263.19, -267.95, 0, ''),
+(9623 ,47, -6340.09, -1248.65, -267.441, 0, ''),
+(9623 ,48, -6338.21, -1237.11, -267.844, 0, ''),
+(9623 ,49, -6336.6, -1219.69, -269.196, 0, ''),
+(9623 ,50, -6334.44, -1202.33, -271.527, 0, ''),
+(9623 ,51, -6329.56, -1189.82, -270.947, 0, ''),
+(9623 ,52, -6324.66, -1179.46, -270.103, 0, ''),
+(9623 ,53, -6315.08, -1176.74, -269.735, 0, ''),
+(9623 ,54, -6308.49, -1179.12, -269.57, 0, ''),
+(9623 ,55, -6302.43, -1181.32, -269.328, 5000, ''),
+(9623 ,56, -6298.87, -1185.79, -269.278, 0, '');
+
+DELETE FROM script_waypoint WHERE entry = 4508;
+INSERT INTO script_waypoint VALUES
+(4508 ,0, 2194.38, 1791.65, 65.48, 5000, ''),
+(4508 ,1, 2188.56, 1805.87, 64.45, 0, ''),
+(4508 ,2, 2187, 1843.49, 59.33, 0, ''),
+(4508 ,3, 2163.27, 1851.67, 56.73, 5000, ''),
+(4508 ,4, 2137.66, 1843.98, 48.08, 5000, ''),
+(4508 ,5, 2140.22, 1845.02, 48.32, 0, ''),
+(4508 ,6, 2131.5, 1804.29, 46.85, 0, ''),
+(4508 ,7, 2096.18, 1789.03, 51.13, 0, ''),
+(4508 ,8, 2074.46, 1780.09, 55.64, 3000, ''),
+(4508 ,9, 2055.12, 1768.67, 58.46, 5000, ''),
+(4508 ,10, 2037.83, 1748.62, 60.27, 0, ''),
+(4508 ,11, 2037.51, 1728.94, 60.85, 0, ''),
+(4508 ,12, 2044.7, 1711.71, 59.71, 0, ''),
+(4508 ,13, 2067.66, 1701.84, 57.77, 3000, ''),
+(4508 ,14, 2078.91, 1704.54, 56.77, 3000, ''),
+(4508 ,15, 2097.65, 1715.24, 54.74, 0, ''),
+(4508 ,16, 2106.44, 1720.98, 54.41, 0, ''),
+(4508 ,17, 2123.96, 1732.56, 52.27, 0, ''),
+(4508 ,18, 2153.82, 1728.73, 51.92, 0, ''),
+(4508 ,19, 2163.49, 1706.33, 54.42, 0, ''),
+(4508 ,20, 2158.75, 1695.98, 55.70, 0, ''),
+(4508 ,21, 2142.6, 1680.72, 58.24, 0, ''),
+(4508 ,22, 2118.31, 1671.54, 59.21, 0, ''),
+(4508 ,23, 2086.02, 1672.04, 61.24, 0, ''),
+(4508 ,24, 2068.81, 1658.93, 61.24, 0, ''),
+(4508 ,25, 2062.82, 1633.31, 64.35, 3000, ''),
+(4508 ,26, 2063.05, 1589.16, 63.26, 0, ''),
+(4508 ,27, 2063.67, 1577.22, 65.89, 0, ''),
+(4508 ,28, 2057.94, 1560.68, 68.40, 0, ''),
+(4508 ,29, 2052.56, 1548.05, 73.35, 0, ''),
+(4508 ,30, 2045.22, 1543.4, 76.65, 0, ''),
+(4508 ,31, 2034.35, 1543.01, 79.70, 0, ''),
+(4508 ,32, 2029.95, 1542.94, 80.79, 0, ''),
+(4508 ,33, 2021.34, 1538.67, 80.8, 0, ''),
+(4508 ,34, 2012.45, 1549.48, 79.93, 0, ''),
+(4508 ,35, 2008.05, 1554.92, 80.44, 0, ''),
+(4508 ,36, 2006.54, 1562.72, 81.11, 0, ''),
+(4508 ,37, 2003.8, 1576.43, 81.57, 0, ''),
+(4508 ,38, 2000.57, 1590.06, 80.62, 0, ''),
+(4508 ,39, 1998.96, 1596.87, 80.22, 0, ''),
+(4508 ,40, 1991.19, 1600.82, 79.39, 0, ''),
+(4508 ,41, 1980.71, 1601.44, 79.77, 3000, ''),
+(4508 ,42, 1967.22, 1600.18, 80.62, 3000, ''),
+(4508 ,43, 1956.43, 1596.97, 81.75, 3000, ''),
+(4508 ,44, 1954.87, 1592.02, 82.18, 0, ''),
+(4508 ,45, 1948.35, 1571.35, 80.96, 30000, ''),
+(4508 ,46, 1947.02, 1566.42, 81.80, 30000, '');
+
+DELETE FROM script_waypoint WHERE entry = 7784;
+INSERT INTO script_waypoint VALUES
+(7784 ,0, -8843.73, -4374.44, 43.71, 0, ''),
+(7784 ,1, -8834.68, -4373.88, 45.71, 0, ''),
+(7784 ,2, -8832.93, -4373.85, 45.67, 0, ''),
+(7784 ,3, -8829.21, -4373.72, 44.14, 0, ''),
+(7784 ,4, -8825.10, -4373.56, 41.44, 0, ''),
+(7784 ,5, -8818.88, -4372.75, 36.43, 0, ''),
+(7784 ,6, -8803.37, -4369.68, 30.06, 0, ''),
+(7784 ,7, -8786.68, -4366.18, 23.91, 0, ''),
+(7784 ,8, -8764.97, -4366.94, 25.23, 0, ''),
+(7784 ,9, -8745.49, -4363.16, 22.80, 0, ''),
+(7784 ,10, -8724.13, -4353.55, 20.72, 0, ''),
+(7784 ,11, -8706.77, -4346.14, 16.12, 0, ''),
+(7784 ,12, -8688.27, -4372.85, 13.64, 0, ''),
+(7784 ,13, -8668.76, -4380.38, 11.69, 0, ''),
+(7784 ,14, -8645.19, -4388.62, 12.56, 0, ''),
+(7784 ,15, -8614.73, -4398.60, 9.86, 0, ''),
+(7784 ,16, -8560.33, -4411.27, 13.17, 0, ''),
+(7784 ,17, -8536.45, -4416.49, 11.84, 0, ''),
+(7784 ,18, -8503.48, -4423.70, 13.59, 0, ''),
+(7784 ,19, -8471.91, -4430.60, 9.56, 0, ''),
+(7784 ,20, -8441.36, -4435.31, 9.40, 0, ''),
+(7784 ,21, -8403.41, -4441.16, 11.83, 0, ''),
+(7784 ,22, -8371.24, -4446.13, 9.47, 0, ''),
+(7784 ,23, -8353.96, -4448.79, 10.10, 0, 'Scorpid'),
+(7784 ,24, -8336.40, -4446.39, 8.98, 0, ''),
+(7784 ,25, -8303.78, -4441.96, 11.89, 0, ''),
+(7784 ,26, -8272.20, -4433.31, 9.60, 0, ''),
+(7784 ,27, -8224.76, -4419.39, 13.03, 0, ''),
+(7784 ,28, -8193.31, -4406.04, 10.17, 0, ''),
+(7784 ,29, -8155.65, -4397.74, 8.99, 0, ''),
+(7784 ,30, -8129.25, -4394.57, 10.92, 0, ''),
+(7784 ,31, -8104.86, -4399.03, 8.93, 0, ''),
+(7784 ,32, -8063.15, -4423.40, 10.07, 0, ''),
+(7784 ,33, -8032.15, -4443.47, 9.97, 0, ''),
+(7784 ,34, -8015.39, -4454.33, 9.39, 0, ''),
+(7784 ,35, -7981.64, -4482.44, 10.32, 0, ''),
+(7784 ,36, -7958.83, -4503.98, 9.69, 0, ''),
+(7784 ,37, -7932.45, -4528.91, 10.08, 0, ''),
+(7784 ,38, -7904.09, -4566.67, 12.59, 0, ''),
+(7784 ,39, -7883.33, -4593.91, 12.15, 0, ''),
+(7784 ,40, -7862.83, -4624.53, 10.21, 0, ''),
+(7784 ,41, -7840.79, -4654.26, 9.45, 0, ''),
+(7784 ,42, -7826.17, -4673.99, 10.61, 0, ''),
+(7784 ,43, -7807.86, -4698.69, 11.24, 0, ''),
+(7784 ,44, -7793.88, -4717.55, 10.48, 0, ''),
+(7784 ,45, -7778.68, -4738.05, 8.89, 0, ''),
+(7784 ,46, -7746.42, -4780.39, 9.84, 0, ''),
+(7784 ,47, -7724.11, -4772.75, 10.28, 0, ''),
+(7784 ,48, -7697.98, -4763.80, 9.52, 0, ''),
+(7784 ,49, -7665.33, -4752.62, 10.56, 0, ''),
+(7784 ,50, -7641.47, -4750.33, 8.94, 0, ''),
+(7784 ,51, -7620.08, -4753.96, 8.93, 0, ''),
+(7784 ,52, -7603.15, -4757.53, 9.06, 0, ''),
+(7784 ,53, -7579.43, -4767.07, 8.93, 0, ''),
+(7784 ,54, -7558.51, -4779.01, 9.64, 0, ''),
+(7784 ,55, -7536.40, -4789.32, 8.92, 0, ''),
+(7784 ,56, -7512.07, -4793.50, 9.35, 0, 'Wastewander'),
+(7784 ,57, -7490.79, -4788.80, 10.53, 0, ''),
+(7784 ,58, -7469.10, -4785.11, 10.42, 0, ''),
+(7784 ,59, -7453.18, -4782.41, 9.15, 0, ''),
+(7784 ,60, -7426.27, -4777.83, 9.54, 0, ''),
+(7784 ,61, -7393.84, -4770.19, 12.57, 0, ''),
+(7784 ,62, -7367.25, -4764.17, 11.92, 0, ''),
+(7784 ,63, -7341.00, -4752.11, 10.17, 0, ''),
+(7784 ,64, -7321.62, -4744.97, 11.58, 0, ''),
+(7784 ,65, -7302.35, -4744.35, 11.97, 0, ''),
+(7784 ,66, -7281.00, -4743.66, 11.21, 0, ''),
+(7784 ,67, -7258.33, -4742.93, 9.64, 0, ''),
+(7784 ,68, -7236.70, -4742.24, 10.16, 0, ''),
+(7784 ,69, -7217.52, -4743.87, 10.79, 0, ''),
+(7784 ,70, -7201.86, -4746.32, 9.58, 0, ''),
+(7784 ,71, -7182.01, -4749.41, 9.09, 0, ''),
+(7784 ,72, -7159.61, -4752.90, 9.52, 0, ''),
+(7784 ,73, -7139.58, -4756.02, 9.53, 0, ''),
+(7784 ,74, -7122.60, -4754.91, 9.66, 0, ''),
+(7784 ,75, -7101.06, -4753.87, 8.92, 0, ''),
+(7784 ,76, -7082.79, -4752.99, 9.97, 0, ''),
+(7784 ,77, -7061.81, -4751.98, 9.26, 0, ''),
+(7784 ,78, -7035.12, -4754.39, 9.19, 0, ''),
+(7784 ,79, -7013.90, -4758.64, 10.28, 0, ''),
+(7784 ,80, -7001.71, -4769.73, 10.59, 0, ''),
+(7784 ,81, -6984.95, -4788.61, 9.30, 0, ''),
+(7784 ,82, -6970.41, -4788.77, 9.42, 0, ''),
+(7784 ,83, -6957.16, -4788.92, 6.26, 0, ''),
+(7784 ,84, -6951.29, -4802.73, 4.45, 0, ''),
+(7784 ,85, -6944.81, -4816.58, 1.60, 0, ''),
+(7784 ,86, -6942.06, -4839.40, 0.66, 5000, '');
+
+DELETE FROM script_waypoint WHERE entry = 1978;
+INSERT INTO script_waypoint VALUES
+(1978, 0, 1406.32, 1083.10, 52.55, 0, ''),
+(1978, 1, 1400.49, 1080.42, 52.50, 0, 'first say'),
+(1978, 2, 1388.48, 1083.10, 52.52, 0, ''),
+(1978, 3, 1370.16, 1084.02, 52.30, 0, ''),
+(1978, 4, 1359.02, 1080.85, 52.46, 0, ''),
+(1978, 5, 1341.43, 1087.39, 52.69, 0, ''),
+(1978, 6, 1321.93, 1090.51, 50.66, 0, ''),
+(1978, 7, 1312.98, 1095.91, 47.49, 0, ''),
+(1978, 8, 1301.09, 1102.94, 47.76, 0, ''),
+(1978, 9, 1297.73, 1106.35, 50.18, 0, ''),
+(1978, 10, 1295.49, 1124.32, 50.49, 0, ''),
+(1978, 11, 1294.84, 1137.25, 51.75, 0, ''),
+(1978, 12, 1292.89, 1158.99, 52.65, 0, ''),
+(1978, 13, 1290.75, 1168.67, 52.56, 1000, 'complete quest and say last'),
+(1978, 14, 1287.12, 1203.49, 52.66, 5000, ''),
+(1978, 15, 1287.12, 1203.49, 52.66, 4000, ''),
+(1978, 16, 1287.12, 1203.49, 52.66, 5000, ''),
+(1978, 17, 1287.12, 1203.49, 52.66, 4000, ''),
+(1978, 18, 1290.72, 1207.44, 52.69, 0, ''),
+(1978, 19, 1297.50, 1207.18, 53.74, 0, ''),
+(1978, 20, 1301.32, 1220.90, 53.74, 0, ''),
+(1978, 21, 1298.55, 1220.43, 53.74, 0, ''),
+(1978, 22, 1297.59, 1211.23, 58.47, 0, ''),
+(1978, 23, 1305.01, 1206.10, 58.51, 0, ''),
+(1978, 24, 1310.51, 1207.36, 58.51, 5000, ''),
+(1978, 25, 1310.51, 1207.36, 58.51, 5000, ''),
+(1978, 26, 1310.51, 1207.36, 58.51, 2000, '');
+
+DELETE FROM script_waypoint WHERE entry=3439;
+INSERT INTO script_waypoint VALUES
+(3439, 0, 1105.090332, -3101.254150, 82.706, 1000, 'SAY_STARTUP1'),
+(3439, 1, 1103.204468, -3104.345215, 83.113, 1000, ''),
+(3439, 2, 1107.815186, -3106.495361, 82.739, 1000, ''),
+(3439, 3, 1104.733276, -3100.830811, 82.747, 1000, ''),
+(3439, 4, 1103.242554, -3106.270020, 83.133, 1000, ''),
+(3439, 5, 1112.807373, -3106.285400, 82.320, 1000, ''),
+(3439, 6, 1112.826782, -3108.908691, 82.377, 1000, ''),
+(3439, 7, 1108.053955, -3115.156738, 82.894, 0, ''),
+(3439, 8, 1108.355591, -3104.365234, 82.377, 5000, ''),
+(3439, 9, 1100.306763, -3097.539063, 83.150, 0, 'SAY_STARTUP2'),
+(3439, 10, 1100.562378, -3082.721924, 82.768, 0, ''),
+(3439, 11, 1097.512939, -3069.226563, 82.206, 0, ''),
+(3439, 12, 1092.964966, -3053.114746, 82.351, 0, ''),
+(3439, 13, 1094.010986, -3036.958496, 82.888, 0, ''),
+(3439, 14, 1095.623901, -3025.760254, 83.392, 0, ''),
+(3439, 15, 1107.656494, -3013.530518, 85.653, 0, ''),
+(3439, 16, 1119.647705, -3006.928223, 87.019, 0, ''),
+(3439, 17, 1129.991211, -3002.410645, 91.232, 7000, 'SAY_MERCENARY'),
+(3439, 18, 1133.328735, -2997.710693, 91.675, 1000, 'SAY_PROGRESS_1'),
+(3439, 19, 1131.799316, -2987.948242, 91.976, 1000, ''),
+(3439, 20, 1122.028687, -2993.397461, 91.536, 0, ''),
+(3439, 21, 1116.614868, -2981.916748, 92.103, 0, ''),
+(3439, 22, 1102.239136, -2994.245117, 92.074, 0, ''),
+(3439, 23, 1096.366211, -2978.306885, 91.873, 0, ''),
+(3439, 24, 1091.971558, -2985.919189, 91.730, 40000, 'SAY_PROGRESS_2');
+
+DELETE FROM script_waypoint WHERE entry=7806;
+INSERT INTO script_waypoint VALUES
+(7806, 0, 495.404358, -3478.350830, 114.837, 0, ''),
+(7806, 1, 492.704742, -3486.112549, 108.627, 0, ''),
+(7806, 2, 487.249756, -3485.764404, 107.890, 0, ''),
+(7806, 3, 476.851959, -3489.875977, 99.985, 0, ''),
+(7806, 4, 467.212402, -3493.355469, 99.819, 0, ''),
+(7806, 5, 460.017029, -3496.984375, 104.481, 0, ''),
+(7806, 6, 439.619446, -3500.730225, 110.534, 0, ''),
+(7806, 7, 428.326385, -3495.874756, 118.662, 0, ''),
+(7806, 8, 424.664032, -3489.381592, 121.999, 0, ''),
+(7806, 9, 424.137299, -3470.952637, 124.333, 0, ''),
+(7806, 10, 421.791107, -3449.242676, 119.126, 0, ''),
+(7806, 11, 404.247070, -3429.376953, 117.644, 0, ''),
+(7806, 12, 335.465271, -3430.717773, 116.456, 0, ''),
+(7806, 13, 317.160126, -3426.708984, 116.226, 0, ''),
+(7806, 14, 331.180115, -3464.002197, 117.143, 0, ''),
+(7806, 15, 336.393616, -3501.877441, 118.201, 0, ''),
+(7806, 16, 337.251312, -3544.764648, 117.284, 0, ''),
+(7806, 17, 337.748932, -3565.415527, 116.797, 0, ''),
+(7806, 18, 336.010925, -3597.363037, 118.225, 0, ''),
+(7806, 19, 324.619141, -3622.884033, 119.811, 0, ''),
+(7806, 20, 308.027466, -3648.600098, 123.047, 0, ''),
+(7806, 21, 276.325409, -3685.738525, 128.356, 0, ''),
+(7806, 22, 239.981064, -3717.330811, 131.874, 0, ''),
+(7806, 23, 224.950974, -3730.169678, 132.125, 0, ''),
+(7806, 24, 198.707870, -3768.292725, 129.420, 0, ''),
+(7806, 25, 183.758316, -3791.068848, 128.045, 0, ''),
+(7806, 26, 178.110657, -3801.575439, 128.370, 3000, 'SAY_OOX_DANGER'),
+(7806, 27, 162.215225, -3827.014160, 129.424, 0, ''),
+(7806, 28, 141.664734, -3864.519287, 131.419, 0, ''),
+(7806, 29, 135.301697, -3880.089111, 132.120, 0, ''),
+(7806, 30, 122.461151, -3910.071533, 135.605, 0, ''),
+(7806, 31, 103.376175, -3937.725098, 137.342, 0, ''),
+(7806, 32, 81.414474, -3958.614258, 138.469, 0, ''),
+(7806, 33, 55.378139, -3982.004639, 136.520, 0, ''),
+(7806, 34, 13.983131, -4013.952881, 126.903, 0, ''),
+(7806, 35, -21.658007, -4048.713623, 118.068, 0, ''),
+(7806, 36, -52.443058, -4081.209717, 117.477, 0, ''),
+(7806, 37, -102.710854, -4116.760742, 118.666, 0, ''),
+(7806, 38, -92.996193, -4135.847168, 119.310, 0, ''),
+(7806, 39, -86.391273, -4153.331055, 122.502, 0, ''),
+(7806, 40, -85.746086, -4163.600586, 121.892, 0, ''),
+(7806, 41, -90.544006, -4183.577637, 117.587, 0, ''),
+(7806, 42, -110.223564, -4205.861328, 121.878, 0, ''),
+(7806, 43, -115.257607, -4211.962402, 121.878, 3000, 'SAY_OOX_DANGER'),
+(7806, 44, -128.594650, -4233.343750, 117.766, 0, ''),
+(7806, 45, -135.358917, -4258.120117, 117.562, 0, ''),
+(7806, 46, -156.832428, -4258.961914, 120.059, 0, ''),
+(7806, 47, -167.119873, -4274.102539, 117.062, 0, ''),
+(7806, 48, -176.291016, -4287.594727, 118.721, 0, ''),
+(7806, 49, -196.992981, -4315.815430, 117.588, 0, ''),
+(7806, 50, -209.329300, -4331.671387, 115.142, 0, ''),
+(7806, 51, -232.292236, -4356.015625, 108.543, 0, ''),
+(7806, 52, -232.159683, -4370.904297, 102.815, 0, ''),
+(7806, 53, -210.271133, -4389.896973, 84.167, 0, ''),
+(7806, 54, -187.940186, -4407.532715, 70.987, 0, ''),
+(7806, 55, -181.353577, -4418.771973, 64.778, 0, ''),
+(7806, 56, -170.529861, -4440.438965, 58.943, 0, ''),
+(7806, 57, -141.428543, -4465.323242, 45.963, 0, ''),
+(7806, 58, -120.993629, -4487.088379, 32.075, 0, ''),
+(7806, 59, -104.134621, -4501.837402, 25.051, 0, ''),
+(7806, 60, -84.154663, -4529.436523, 11.952, 0, ''),
+(7806, 61, -88.698898, -4544.626465, 9.055, 0, ''),
+(7806, 62, -100.603447, -4575.034180, 11.388, 0, ''),
+(7806, 63, -106.908669, -4600.407715, 11.046, 0, ''),
+(7806, 64, -106.831703, -4620.503418, 11.057, 3000, 'SAY_OOX_COMPLETE');
+
+DELETE FROM script_waypoint WHERE entry=4962;
+INSERT INTO script_waypoint VALUES
+(4962, 0, -3804.438965, -828.048035, 10.093068, 0, ''),
+(4962, 1, -3803.934326, -835.772400, 10.077722, 0, ''),
+(4962, 2, -3792.629150, -835.670898,  9.655657, 0, ''),
+(4962, 3, -3772.433838, -835.345947, 10.868981, 0, ''),
+(4962, 4, -3765.937256, -840.128601, 10.885593, 0, ''),
+(4962, 5, -3738.633789, -830.997498, 11.057384, 0, ''),
+(4962, 6, -3690.224121, -862.261597,  9.960449, 0, '');
+
 DELETE FROM script_waypoint WHERE entry=10638;
 INSERT INTO script_waypoint VALUES
 (10638, 0, -4903.521973, -1368.339844, -52.611, 5000, 'SAY_KAN_START'),
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 81350d1cd44..ae503cd4e47 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -550,10 +550,12 @@ UPDATE `creature_template` SET `ScriptName`='npc_wounded_blood_elf' WHERE `entry
 UPDATE `creature_template` SET `ScriptName`='npc_aeranas' WHERE `entry`=17085;
 UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=181606;
 UPDATE `creature_template` SET `ScriptName`='npc_naladu' WHERE `entry`=19361;
+UPDATE `creature_template` SET `ScriptName`='npc_tracy_proudwell' WHERE `entry`=18266;
 
 /* HILLSBRAD FOOTHILLS */
 
 /* HINTERLANDS */
+UPDATE `creature_template` SET `ScriptName`='npc_00x09hl' WHERE `entry`=7806;
 UPDATE `creature_template` SET `ScriptName`='npc_rinji' WHERE `entry`=7780;
 
 /* ICECROWN */
@@ -1085,6 +1087,8 @@ UPDATE `creature_template` SET `ScriptName`='npc_defias_traitor' WHERE `entry`=4
 UPDATE `creature_template` SET `ScriptName`='npc_daphne_stilwell' WHERE `entry`=6182;
 
 /* WETLANDS */
+UPDATE creature_template SET ScriptName='npc_tapoke_slim_jahn' WHERE entry=4962;
+UPDATE creature_template SET ScriptName='npc_mikhail' WHERE entry=4963;
 
 /* WINTERSPRING */
 UPDATE `creature_template` SET `ScriptName`='npc_lorax' WHERE `entry`=10918;
diff --git a/sql/FULL/world_spell_full.sql b/sql/FULL/world_spell_full.sql
index 7c760a8df2f..3b3f5a6e672 100644
--- a/sql/FULL/world_spell_full.sql
+++ b/sql/FULL/world_spell_full.sql
@@ -1066,9 +1066,9 @@ INSERT INTO `spell_proc_event` (`entry`, `SchoolMask`, `SpellFamilyName`, `Spell
 ( 44472, 0x00,   3, 0x20E21277, 0x00019048, 0x00000000, 0x00000000, 0x00000002,   0,   0,   0), -- Burnout (Rank 5)
 ( 44543, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00010000, 0x00000000,   0,   7,   0), -- Fingers of Frost (Rank 1)
 ( 44545, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00010000, 0x00000000,   0,  15,   0), -- Fingers of Frost (Rank 2)
-( 44546, 0x00,   3, 0x020002A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 1)
-( 44548, 0x00,   3, 0x020002A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 2)
-( 44549, 0x00,   3, 0x020002A0, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 3)
+( 44546, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 1)
+( 44548, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 2)
+( 44549, 0x00,   3, 0x00100220, 0x00001000, 0x00000000, 0x00000000, 0x00000000,   0,   0,   0), -- Brain Freeze (Rank 3)
 ( 44745, 0x00,   3, 0x00000000, 0x00000001, 0x00000000, 0x00004000, 0x00002000,   0,   0,   0), -- Shattered Barrier (Rank 1)
 ( 44835, 0x00,   7, 0x00000000, 0x00000080, 0x00000000, 0x00000010, 0x00000000,   0,   0,   0), -- Maim Interrupt 
 ( 45054, 0x00,   0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,   0,   0,  15), -- Augment Pain