mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-24 10:56:38 +01:00
Merge [SD2]
r1241 Add text to ysondre and also replace manual summon with spell. Clean up script. Patch by Turok r1242 Add support for quest 4770 r1243 Add support for quest 4904 r1244 Update most scripts calling escortAI's Start() from outside creature AI with more safe method. --HG-- branch : trunk
This commit is contained in:
@@ -13,6 +13,86 @@ 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=10646;
|
||||
INSERT INTO script_waypoint VALUES
|
||||
(10646, 0, -4792.401855, -2137.775146, 82.423, 0, ''),
|
||||
(10646, 1, -4813.508301, -2141.543457, 80.774, 0, ''),
|
||||
(10646, 2, -4828.630859, -2154.309814, 82.074, 0, ''),
|
||||
(10646, 3, -4833.772949, -2149.182617, 81.676, 0, ''),
|
||||
(10646, 4, -4846.418945, -2136.045410, 77.871, 0, ''),
|
||||
(10646, 5, -4865.076660, -2116.549561, 76.483, 0, ''),
|
||||
(10646, 6, -4888.434570, -2090.729248, 80.907, 0, ''),
|
||||
(10646, 7, -4893.068359, -2085.468994, 82.094, 0, ''),
|
||||
(10646, 8, -4907.256836, -2074.929932, 84.437, 5000, 'SAY_LAKO_LOOK_OUT'),
|
||||
(10646, 9, -4899.899902, -2062.143555, 83.780, 0, ''),
|
||||
(10646, 10, -4897.762207, -2056.520020, 84.184, 0, ''),
|
||||
(10646, 11, -4888.331543, -2033.182495, 83.654, 0, ''),
|
||||
(10646, 12, -4876.343750, -2003.916138, 90.887, 0, ''),
|
||||
(10646, 13, -4872.227051, -1994.173340, 91.513, 0, ''),
|
||||
(10646, 14, -4879.569336, -1976.985229, 92.185, 5000, 'SAY_LAKO_HERE_COME'),
|
||||
(10646, 15, -4879.049316, -1964.349609, 92.001, 0, ''),
|
||||
(10646, 16, -4874.720215, -1956.939819, 90.737, 0, ''),
|
||||
(10646, 17, -4869.474609, -1952.612671, 89.206, 0, ''),
|
||||
(10646, 18, -4842.466797, -1929.000732, 84.147, 0, ''),
|
||||
(10646, 19, -4804.444824, -1897.302734, 89.362, 0, ''),
|
||||
(10646, 20, -4798.072754, -1892.383545, 89.368, 0, ''),
|
||||
(10646, 21, -4779.447754, -1882.759155, 90.169, 5000, 'SAY_LAKO_MORE'),
|
||||
(10646, 22, -4762.081055, -1866.530640, 89.481, 0, ''),
|
||||
(10646, 23, -4766.267090, -1861.867798, 87.847, 0, ''),
|
||||
(10646, 24, -4782.929688, -1852.174683, 78.354, 0, ''),
|
||||
(10646, 25, -4793.605469, -1850.961182, 77.658, 0, ''),
|
||||
(10646, 26, -4803.323730, -1855.102661, 78.958, 0, ''),
|
||||
(10646, 27, -4807.971680, -1854.501221, 77.743, 0, ''),
|
||||
(10646, 28, -4837.212891, -1848.493408, 64.488, 0, ''),
|
||||
(10646, 29, -4884.619629, -1840.401123, 56.219, 0, ''),
|
||||
(10646, 30, -4889.705566, -1839.623291, 54.417, 0, ''),
|
||||
(10646, 31, -4893.904297, -1843.685791, 53.012, 0, ''),
|
||||
(10646, 32, -4903.142090, -1872.383545, 32.266, 0, ''),
|
||||
(10646, 33, -4910.940918, -1879.864868, 29.940, 0, ''),
|
||||
(10646, 34, -4920.047363, -1880.940796, 30.597, 0, ''),
|
||||
(10646, 35, -4924.457031, -1881.447144, 29.292, 0, ''),
|
||||
(10646, 36, -4966.120117, -1886.033081, 10.977, 0, ''),
|
||||
(10646, 37, -4999.369629, -1890.847290, 4.430, 0, ''),
|
||||
(10646, 38, -5007.271484, -1891.669678, 2.771, 0, ''),
|
||||
(10646, 39, -5013.334473, -1879.588257, -1.947, 0, ''),
|
||||
(10646, 40, -5023.328613, -1855.959961, -17.103, 0, ''),
|
||||
(10646, 41, -5038.513184, -1825.986694, -35.821, 0, ''),
|
||||
(10646, 42, -5048.733887, -1809.798218, -46.457, 0, ''),
|
||||
(10646, 43, -5053.188965, -1791.682983, -57.186, 0, ''),
|
||||
(10646, 44, -5062.093750, -1794.399780, -56.515, 0, ''),
|
||||
(10646, 45, -5052.657227, -1797.044800, -54.734, 5000, 'SAY_LAKO_END');
|
||||
|
||||
DELETE FROM script_waypoint WHERE entry=10427;
|
||||
INSERT INTO script_waypoint VALUES
|
||||
(10427, 0, -5185.463, -1185.927, 45.951, 0, ''),
|
||||
(10427, 1, -5184.880, -1154.210, 45.035, 0, ''),
|
||||
(10427, 2, -5175.880, -1126.526, 43.701, 0, ''),
|
||||
(10427, 3, -5138.651, -1111.874, 44.024, 0, ''),
|
||||
(10427, 4, -5134.728, -1104.796, 47.365, 0, ''),
|
||||
(10427, 5, -5129.681, -1097.878, 49.449, 2500, ''),
|
||||
(10427, 6, -5125.303, -1080.572, 47.033, 0, ''),
|
||||
(10427, 7, -5146.668, -1053.694, 28.415, 0, ''),
|
||||
(10427, 8, -5147.463, -1027.539, 13.818, 0, ''),
|
||||
(10427, 9, -5139.238, -1018.889, 8.220, 0, ''),
|
||||
(10427, 10, -5121.168, -1013.126, -0.619, 0, ''),
|
||||
(10427, 11, -5091.919, -1014.205, -4.902, 0, ''),
|
||||
(10427, 12, -5069.240, -994.299, -4.631, 0, ''),
|
||||
(10427, 13, -5059.975, -944.112, -5.377, 0, ''),
|
||||
(10427, 14, -5013.546, -906.184, -5.490, 0, ''),
|
||||
(10427, 15, -4992.461, -920.983, -4.980, 5000, 'SAY_WYVERN'),
|
||||
(10427, 16, -4976.355, -1002.997, -5.380, 0, ''),
|
||||
(10427, 17, -4958.478, -1033.185, -5.433, 0, ''),
|
||||
(10427, 18, -4953.353, -1052.211, -10.836, 0, ''),
|
||||
(10427, 19, -4937.447, -1056.351, -22.139, 0, ''),
|
||||
(10427, 20, -4908.455, -1050.433, -33.458, 0, ''),
|
||||
(10427, 21, -4905.530, -1056.885, -33.722, 0, ''),
|
||||
(10427, 22, -4920.830, -1073.284, -45.515, 0, ''),
|
||||
(10427, 23, -4933.368, -1082.700, -50.186, 0, ''),
|
||||
(10427, 24, -4935.313, -1092.353, -52.785, 0, ''),
|
||||
(10427, 25, -4929.553, -1101.268, -50.637, 0, ''),
|
||||
(10427, 26, -4920.679, -1100.028, -51.944, 10000, 'SAY_COMPLETE'),
|
||||
(10427, 27, -4920.679, -1100.028, -51.944, 0, 'quest complete');
|
||||
|
||||
DELETE FROM script_waypoint WHERE entry=16812;
|
||||
INSERT INTO script_waypoint VALUES
|
||||
(16812, 0, -10868.260, -1779.836, 90.476, 2500, 'Open door, begin walking'),
|
||||
|
||||
@@ -997,8 +997,9 @@ UPDATE `creature_template` SET `ScriptName`='mob_unkor_the_ruthless' WHERE `entr
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_slim' WHERE `entry`=19679;
|
||||
|
||||
/* THOUSAND NEEDLES */
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_swiftmountain' WHERE `entry`=10427;
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_paoka_swiftmountain' WHERE `entry`=10427;
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_plucky' WHERE `entry`=6626;
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_lakota_windsong' WHERE `entry`=10646;
|
||||
|
||||
/* THUNDER BLUFF */
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_cairne_bloodhoof' WHERE `entry`=3057;
|
||||
|
||||
33
sql/updates/4999_world_scripts.sql
Normal file
33
sql/updates/4999_world_scripts.sql
Normal file
@@ -0,0 +1,33 @@
|
||||
DELETE FROM script_waypoint WHERE entry=10427;
|
||||
INSERT INTO script_waypoint VALUES
|
||||
(10427, 0, -5185.463, -1185.927, 45.951, 0, ''),
|
||||
(10427, 1, -5184.880, -1154.210, 45.035, 0, ''),
|
||||
(10427, 2, -5175.880, -1126.526, 43.701, 0, ''),
|
||||
(10427, 3, -5138.651, -1111.874, 44.024, 0, ''),
|
||||
(10427, 4, -5134.728, -1104.796, 47.365, 0, ''),
|
||||
(10427, 5, -5129.681, -1097.878, 49.449, 2500, ''),
|
||||
(10427, 6, -5125.303, -1080.572, 47.033, 0, ''),
|
||||
(10427, 7, -5146.668, -1053.694, 28.415, 0, ''),
|
||||
(10427, 8, -5147.463, -1027.539, 13.818, 0, ''),
|
||||
(10427, 9, -5139.238, -1018.889, 8.220, 0, ''),
|
||||
(10427, 10, -5121.168, -1013.126, -0.619, 0, ''),
|
||||
(10427, 11, -5091.919, -1014.205, -4.902, 0, ''),
|
||||
(10427, 12, -5069.240, -994.299, -4.631, 0, ''),
|
||||
(10427, 13, -5059.975, -944.112, -5.377, 0, ''),
|
||||
(10427, 14, -5013.546, -906.184, -5.490, 0, ''),
|
||||
(10427, 15, -4992.461, -920.983, -4.980, 5000, 'SAY_WYVERN'),
|
||||
(10427, 16, -4976.355, -1002.997, -5.380, 0, ''),
|
||||
(10427, 17, -4958.478, -1033.185, -5.433, 0, ''),
|
||||
(10427, 18, -4953.353, -1052.211, -10.836, 0, ''),
|
||||
(10427, 19, -4937.447, -1056.351, -22.139, 0, ''),
|
||||
(10427, 20, -4908.455, -1050.433, -33.458, 0, ''),
|
||||
(10427, 21, -4905.530, -1056.885, -33.722, 0, ''),
|
||||
(10427, 22, -4920.830, -1073.284, -45.515, 0, ''),
|
||||
(10427, 23, -4933.368, -1082.700, -50.186, 0, ''),
|
||||
(10427, 24, -4935.313, -1092.353, -52.785, 0, ''),
|
||||
(10427, 25, -4929.553, -1101.268, -50.637, 0, ''),
|
||||
(10427, 26, -4920.679, -1100.028, -51.944, 10000, 'SAY_COMPLETE'),
|
||||
(10427, 27, -4920.679, -1100.028, -51.944, 0, 'quest complete');
|
||||
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_paoka_swiftmountain' WHERE `entry`=10427;
|
||||
UPDATE `creature_template` SET `ScriptName`='npc_lakota_windsong' WHERE `entry`=10646;
|
||||
Reference in New Issue
Block a user