Merge [SD2]

r1245 Update escortAI MAX_PLAYER_DISTANCE from 50 to 66 yards - skip
r1246 Not call JustDied() AI function when escortAI max range is over limit(not regular death). Some additional cleanup to apply code style.
r1247 Implement automated FailQuest in escortAI (if npc has specific death events, call npc_escortAI::JustDied()). Clean up scripts related to it.
      Restore original faction at escortAI's JustRespawned() in case faction changed (normal case for escorts). Remove in scripts where defined.
r1248 Add small delay before move to first point in escortAI.
r1249 Add support for quest 898
r1250 Add support for quest 10451. Original patch by Lightguard

--HG--
branch : trunk

1 files changed, 112 insertions, 0 deletions

diff --git a/sql/updates/5001_world_scripts.sql b/sql/updates/5001_world_scripts.sql
new file mode 100644
index 00000000000..37a4a8620ac
--- /dev/null
+++ b/sql/updates/5001_world_scripts.sql
@@ -0,0 +1,112 @@
+UPDATE creature_template SET ScriptName='npc_gilthares' WHERE entry=3465;
+
+DELETE FROM script_waypoint WHERE entry=3465;
+INSERT INTO script_waypoint VALUES
+(3465, 0, -2095.840820, -3650.001221, 61.716, 0, ''),
+(3465, 1, -2100.193604, -3613.949219, 61.604, 0, ''),
+(3465, 2, -2098.549561, -3601.557129, 59.154, 0, ''),
+(3465, 3, -2093.796387, -3595.234375, 56.658, 0, ''),
+(3465, 4, -2072.575928, -3578.827637, 48.844, 0, ''),
+(3465, 5, -2023.858398, -3568.146240, 24.636, 0, ''),
+(3465, 6, -2013.576416, -3571.499756, 22.203, 0, ''),
+(3465, 7, -2009.813721, -3580.547852, 21.791, 0, ''),
+(3465, 8, -2015.296021, -3597.387695, 21.760, 0, ''),
+(3465, 9, -2020.677368, -3610.296143, 21.759, 0, ''),
+(3465, 10, -2019.990845, -3640.155273, 21.759, 0, ''),
+(3465, 11, -2016.110596, -3664.133301, 21.758, 0, ''),
+(3465, 12, -1999.397095, -3679.435059, 21.316, 0, ''),
+(3465, 13, -1987.455811, -3688.309326, 18.495, 0, ''),
+(3465, 14, -1973.966553, -3687.666748, 14.996, 0, ''),
+(3465, 15, -1949.163940, -3678.054932, 11.293, 0, ''),
+(3465, 16, -1934.091187, -3682.859619, 9.897, 30000, 'SAY_GIL_AT_LAST'),
+(3465, 17, -1935.383911, -3682.322021, 10.029, 1500, 'SAY_GIL_PROCEED'),
+(3465, 18, -1879.039185, -3699.498047, 6.582, 7500, 'SAY_GIL_FREEBOOTERS'),
+(3465, 19, -1852.728149, -3703.778809, 6.875, 0, ''),
+(3465, 20, -1812.989990, -3718.500732, 10.572, 0, ''),
+(3465, 21, -1788.171265, -3722.867188, 9.663, 0, ''),
+(3465, 22, -1767.206665, -3739.923096, 10.082, 0, ''),
+(3465, 23, -1750.194580, -3747.392090, 10.390, 0, ''),
+(3465, 24, -1729.335571, -3776.665527, 11.779, 0, ''),
+(3465, 25, -1715.997925, -3802.404541, 12.618, 0, ''),
+(3465, 26, -1690.711548, -3829.262451, 13.905, 0, ''),
+(3465, 27, -1674.700684, -3842.398682, 13.872, 0, ''),
+(3465, 28, -1632.726318, -3846.109619, 14.401, 0, ''),
+(3465, 29, -1592.734497, -3842.225342, 14.981, 0, ''),
+(3465, 30, -1561.614746, -3839.320801, 19.118, 0, ''),
+(3465, 31, -1544.567627, -3834.393311, 18.761, 0, ''),
+(3465, 32, -1512.514404, -3831.715820, 22.914, 0, ''),
+(3465, 33, -1486.889771, -3836.639893, 23.964, 0, ''),
+(3465, 34, -1434.193604, -3852.702881, 18.843, 0, ''),
+(3465, 35, -1405.794678, -3854.488037, 17.276, 0, ''),
+(3465, 36, -1366.592041, -3852.383789, 19.273, 0, ''),
+(3465, 37, -1337.360962, -3837.827148, 17.352, 2000, 'SAY_GIL_ALMOST'),
+(3465, 38, -1299.744507, -3810.691406, 20.801, 0, ''),
+(3465, 39, -1277.144409, -3782.785156, 25.918, 0, ''),
+(3465, 40, -1263.686768, -3781.251953, 26.447, 0, ''),
+(3465, 41, -1243.674438, -3786.328125, 25.281, 0, ''),
+(3465, 42, -1221.875488, -3784.124512, 24.051, 0, ''),
+(3465, 43, -1204.011230, -3775.943848, 24.437, 0, ''),
+(3465, 44, -1181.706787, -3768.934082, 23.368, 0, ''),
+(3465, 45, -1156.913818, -3751.559326, 21.074, 0, ''),
+(3465, 46, -1138.830688, -3741.809326, 17.843, 0, ''),
+(3465, 47, -1080.101196, -3738.780029, 19.805, 0, 'SAY_GIL_SWEET'),
+(3465, 48, -1069.065186, -3735.006348, 19.302, 0, ''),
+(3465, 49, -1061.941040, -3724.062256, 21.086, 0, ''),
+(3465, 50, -1053.593262, -3697.608643, 27.320, 0, ''),
+(3465, 51, -1044.110474, -3690.133301, 24.856, 0, ''),
+(3465, 52, -1040.260986, -3690.739014, 25.342, 0, ''),
+(3465, 53, -1028.146606, -3688.718750, 23.843, 7500, 'SAY_GIL_FREED');
+
+DELETE FROM script_waypoint WHERE entry=21027;
+INSERT INTO script_waypoint VALUES
+(21027, 0, -2714.697266, 1326.879395, 34.306953, 0, ''),
+(21027, 1, -2666.364990, 1348.222656, 34.445557, 0, ''),
+(21027, 2, -2693.789307, 1336.964966, 34.445557, 0, ''),
+(21027, 3, -2715.495361, 1328.054443, 34.106014, 0, ''),
+(21027, 4, -2742.530762, 1314.138550, 33.606144, 0, ''),
+(21027, 5, -2745.077148, 1311.108765, 33.630898, 0, ''),
+(21027, 6, -2749.855225, 1302.737915, 33.475632, 0, ''),
+(21027, 7, -2753.639648, 1294.059448, 33.314930, 0, ''),
+(21027, 8, -2756.796387, 1285.122192, 33.391262, 0, ''),
+(21027, 9, -2750.042969, 1273.661987, 33.188259, 0, ''),
+(21027, 10, -2740.378418, 1258.846680, 33.212521, 0, ''),
+(21027, 11, -2733.629395, 1248.259766, 33.640598, 0, ''),
+(21027, 12, -2727.212646, 1238.606445, 33.520847, 0, ''),
+(21027, 13, -2726.377197, 1237.264526, 33.461823, 3000, 'SAY_WIL_PROGRESS1'),
+(21027, 14, -2746.383301, 1266.390625, 33.191952, 2000, ''),
+(21027, 15, -2746.383301, 1266.390625, 33.191952, 4000, 'SAY_WIL_FIND_EXIT'),
+(21027, 16, -2758.927734, 1285.134155, 33.341728, 0, ''),
+(21027, 17, -2761.845703, 1292.313599, 33.209042, 0, ''),
+(21027, 18, -2758.871826, 1300.677612, 33.285332, 0, ''),
+(21027, 19, -2753.928955, 1307.755859, 33.452457, 0, ''),
+(21027, 20, -2738.612061, 1316.191284, 33.482975, 0, ''),
+(21027, 21, -2727.897461, 1320.013916, 33.381111, 0, ''),
+(21027, 22, -2709.458740, 1315.739990, 33.301838, 0, ''),
+(21027, 23, -2704.658936, 1301.620361, 32.463303, 0, ''),
+(21027, 24, -2704.120117, 1298.922607, 32.768162, 0, ''),
+(21027, 25, -2691.798340, 1292.846436, 33.852642, 0, ''),
+(21027, 26, -2682.879639, 1288.853882, 32.995399, 0, ''),
+(21027, 27, -2661.869141, 1279.682495, 26.686783, 0, ''),
+(21027, 28, -2648.943604, 1270.272827, 24.147522, 0, ''),
+(21027, 29, -2642.506836, 1262.938721, 23.512444, 0, ''),
+(21027, 30, -2636.984863, 1252.429077, 20.418257, 0, ''),
+(21027, 31, -2648.113037, 1224.984863, 8.691818, 0, ''),
+(21027, 32, -2658.393311, 1200.136719, 5.492243, 0, ''),
+(21027, 33, -2668.504395, 1190.450562, 3.127407, 0, ''),
+(21027, 34, -2685.930420, 1174.360840, 5.163924, 0, ''),
+(21027, 35, -2701.613770, 1160.026367, 5.611311, 0, ''),
+(21027, 36, -2714.659668, 1149.980347, 4.342373, 0, ''),
+(21027, 37, -2721.443359, 1145.002808, 1.913474, 0, ''),
+(21027, 38, -2733.962158, 1143.436279, 2.620415, 0, ''),
+(21027, 39, -2757.876709, 1146.937500, 6.184002, 2000, 'SAY_WIL_JUST_AHEAD'),
+(21027, 40, -2772.300537, 1166.052734, 6.331811, 0, ''),
+(21027, 41, -2790.265381, 1189.941650, 5.207958, 0, ''),
+(21027, 42, -2805.448975, 1208.663940, 5.557623, 0, ''),
+(21027, 43, -2820.617676, 1225.870239, 6.266103, 0, ''),
+(21027, 44, -2831.926758, 1237.725830, 5.808506, 0, ''),
+(21027, 45, -2842.578369, 1252.869629, 6.807481, 0, ''),
+(21027, 46, -2846.344971, 1258.727295, 7.386168, 0, ''),
+(21027, 47, -2847.556396, 1266.771729, 8.208790, 0, ''),
+(21027, 48, -2841.654541, 1285.809204, 7.933223, 0, ''),
+(21027, 49, -2841.754883, 1289.832520, 6.990304, 0, ''),
+(21027, 50, -2871.398438, 1302.348145, 6.807335, 7500, 'SAY_WIL_END');