diff options
3 files changed, 146 insertions, 195 deletions
diff --git a/sql/updates/2802_world_SD2_scripts.sql b/sql/updates/2802_world_SD2_scripts.sql new file mode 100644 index 00000000000..150e6bb0a8c --- /dev/null +++ b/sql/updates/2802_world_SD2_scripts.sql @@ -0,0 +1,142 @@ +DELETE FROM script_waypoint WHERE entry=17876; +INSERT INTO script_waypoint VALUES +(17876, 0, 2230.91, 118.765, 82.2947,5000, ''), +(17876, 1, 2230.33, 114.980, 82.2946, 0, ''), +(17876, 2, 2233.36, 111.057, 82.2996, 0, ''), +(17876, 3, 2231.17, 108.486, 82.6624, 0, ''), +(17876, 4, 2220.22, 114.605, 89.4264, 0, ''), +(17876, 5, 2215.23, 115.990, 89.4549, 0, ''), +(17876, 6, 2210.00, 106.849, 89.4549, 0, ''), +(17876, 7, 2205.66, 105.234, 89.4549, 0, ''), +(17876, 8, 2192.26, 112.618, 89.4549, 0, 'spawn armorer'), +(17876, 9, 2181.28, 118.612, 89.4549,8000, 'get weapon'), +(17876, 10, 2181.62, 120.385, 89.4549,5000, 'get armor'), +(17876, 11, 2189.44, 113.922, 89.4549, 0, ''), +(17876, 12, 2195.63, 110.584, 89.4549, 0, ''), +(17876, 13, 2201.09, 115.115, 89.4549, 0, ''), +(17876, 14, 2204.34, 121.036, 89.4355, 0, ''), +(17876, 15, 2208.66, 129.127, 87.9560, 0, 'first ambush'), +(17876, 16, 2193.09, 137.940, 88.2164, 0, ''), +(17876, 17, 2173.39, 149.064, 87.9227, 0, ''), +(17876, 18, 2164.25, 137.965, 85.0595, 0, ''), +(17876, 19, 2149.31, 125.645, 77.0858, 0, ''), +(17876, 20, 2142.78, 127.173, 75.5954, 0, ''), +(17876, 21, 2139.28, 133.952, 73.6386, 0, 'second ambush'), +(17876, 22, 2139.54, 155.235, 67.1269, 0, ''), +(17876, 23, 2145.38, 167.551, 64.8974, 0, ''), +(17876, 24, 2134.28, 175.304, 67.9446, 0, ''), +(17876, 25, 2118.08, 187.387, 68.8141, 0, ''), +(17876, 26, 2105.88, 195.461, 65.1854, 0, 'third ambush'), +(17876, 27, 2096.77, 196.939, 65.2117, 0, ''), +(17876, 28, 2083.90, 209.395, 64.8736, 0, ''), +(17876, 29, 2067.84, 224.376, 64.8022,30000, 'meeting scarloc'), +(17876, 30, 2055.40, 242.90, 63.3418, 0, 'after skarloc'), +(17876, 31, 2039.20, 266.460, 63.0182,10000, 'mount up'), +(17876, 32, 2011.77, 278.478, 65.3388, 0, ''), +(17876, 33, 2005.08, 289.676, 66.1179, 0, ''), +(17876, 34, 2033.11, 337.450, 66.0948, 0, ''), +(17876, 35, 2070.30, 416.208, 66.0893, 0, ''), +(17876, 36, 2086.76, 469.768, 65.9182, 0, ''), +(17876, 37, 2101.70, 497.955, 61.7881, 0, 'road ambush'), +(17876, 38, 2133.39, 530.933, 55.3700,5000, ''), +(17876, 39, 2157.91, 559.635, 48.5157, 0, ''), +(17876, 40, 2167.34, 586.191, 42.4394, 0, ''), +(17876, 41, 2174.17, 637.643, 33.9002, 0, ''), +(17876, 42, 2179.31, 656.053, 34.723, 0, ''), +(17876, 43, 2183.65, 670.941, 34.0318, 0, ''), +(17876, 44, 2201.50, 668.616, 36.1236, 0, ''), +(17876, 45, 2221.56, 652.747, 36.6153, 0, ''), +(17876, 46, 2238.97, 640.125, 37.2214, 0, ''), +(17876, 47, 2251.17, 620.574, 40.1473, 0, ''), +(17876, 48, 2261.98, 595.303, 41.4117, 0, ''), +(17876, 49, 2278.67, 560.172, 38.9090, 0, ''), +(17876, 50, 2336.72, 528.327, 40.9369, 0, ''), +(17876, 51, 2381.04, 519.612, 37.7312, 0, ''), +(17876, 52, 2412.20, 515.425, 39.2068, 0, ''), +(17876, 53, 2452.39, 516.174, 42.9387, 0, ''), +(17876, 54, 2467.38, 539.389, 47.4992, 0, ''), +(17876, 55, 2470.70, 554.333, 46.6668, 0, ''), +(17876, 56, 2478.07, 575.321, 55.4549, 0, ''), +(17876, 57, 2480.00, 585.408, 56.6921, 0, ''), +(17876, 58, 2482.67, 608.817, 55.6643, 0, ''), +(17876, 59, 2485.62, 626.061, 58.0132, 2000, 'dismount'), +(17876, 60, 2486.91, 626.356, 58.0761, 0, 'scare horse'), +(17876, 61, 2488.58, 660.940, 57.3913, 0, ''), +(17876, 62, 2502.56, 686.059, 55.6252, 0, ''), +(17876, 63, 2502.08, 694.360, 55.5083, 0, ''), +(17876, 64, 2491.46, 694.321, 55.7163, 0, ''), +(17876, 65, 2491.10, 703.300, 55.7630, 0, ''), +(17876, 66, 2485.64, 702.992, 55.7917, 0, ''), +(17876, 67, 2479.10, 695.291, 55.7901, 10000, ''), +(17876, 68, 2476.75, 693.689, 55.7960, 0, 'spawn mobs'), +(17876, 69, 2475.39, 695.983, 55.8146, 0, ''), +(17876, 70, 2477.75, 694.473, 55.7945, 0, ''), +(17876, 71, 2481.27, 697.747, 55.7910, 0, 'mobs in doorway'), +(17876, 72, 2486.31, 703.131, 55.7861, 5000, ''), +(17876, 73, 2490.76, 703.511, 55.7662, 0, ''), +(17876, 74, 2491.30, 694.792, 55.7195, 0, ''), +(17876, 75, 2518.69, 693.876, 55.1383, 0, ''), +(17876, 76, 2531.33, 681.914, 55.1383, 0, ''), +(17876, 77, 2568.25, 682.654, 55.1778, 0, ''), +(17876, 78, 2589.61, 689.981, 55.1421, 0, ''), +(17876, 79, 2634.74, 679.833, 54.6613, 0, ''), +(17876, 80, 2630.41, 661.464, 54.2761, 0, ''), +(17876, 81, 2629.00, 656.982, 56.0651, 0, ''), +(17876, 82, 2620.84, 633.007, 56.0300, 3000, 'stop in church'), +(17876, 83, 2622.99, 639.178, 56.0300, 0, 'summon'), +(17876, 84, 2628.73, 656.693, 56.0610, 5000, ''), +(17876, 85, 2630.34, 661.135, 54.2738, 0, ''), +(17876, 86, 2635.38, 672.243, 54.4508, 0, ''), +(17876, 87, 2644.13, 668.158, 55.3797, 0, ''), +(17876, 88, 2646.82, 666.740, 56.9898, 0, ''), +(17876, 89, 2658.22, 665.432, 57.1725, 0, ''), +(17876, 90, 2661.88, 674.849, 57.1725, 0, ''), +(17876, 91, 2656.23, 677.208, 57.1725, 0, ''), +(17876, 92, 2652.28, 670.270, 61.9353, 0, ''), +(17876, 93, 2650.79, 664.290, 61.9302, 0, 'summon inn'), +(17876, 94, 2658.19, 660.454, 61.9320, 5000, ''), +(17876, 95, 2660.57, 659.173, 61.9370, 0, 'speak with Taretha'), +(17876, 96, 2658.19, 660.454, 61.9320, 5000, 'epoch calls'), +(17876, 97, 2659.84, 659.482, 61.9361, 5000, 'taretha "dies"'), +(17876, 98, 2654.28, 662.722, 61.9313, 0, ''), +(17876, 99, 2652.37, 670.561, 61.9368, 0, ''), +(17876, 100, 2656.05, 676.761, 57.1727, 0, ''), +(17876, 101, 2658.49, 677.166, 57.1727, 0, ''), +(17876, 102, 2659.28, 667.117, 57.1727, 0, ''), +(17876, 103, 2649.71, 665.387, 57.1727, 0, ''), +(17876, 104, 2634.79, 672.964, 54.4577, 0, 'outside inn'), +(17876, 105, 2635.06, 673.892, 54.4713, 30000, 'getting ready'), +(17876, 106, 2634.79, 672.964, 54.4577, 60000, 'when all dead and meet Taretha'), +(17876, 107, 2631.72, 665.629, 54.2923, 0, 'run off'), +(17876, 108, 2647.40, 640.530, 55.7634, 0, ''); + +DELETE FROM script_waypoint WHERE entry=18887; +INSERT INTO script_waypoint VALUES +(18887, 0, 2650.06, 665.473, 61.9305, 0, ''), +(18887, 1, 2652.44, 670.761, 61.9370, 0, ''), +(18887, 2, 2655.96, 676.913, 57.1725, 0, ''), +(18887, 3, 2659.40, 677.317, 57.1725, 0, ''), +(18887, 4, 2651.75, 664.482, 57.1725, 0, ''), +(18887, 5, 2647.49, 666.595, 57.0824, 0, ''), +(18887, 6, 2644.37, 668.167, 55.4182, 0, ''), +(18887, 7, 2640.96, 669.890, 54.7567, 60000, ''); + +DELETE FROM script_waypoint WHERE entry=10096; +INSERT INTO script_waypoint VALUES +(10096, 0, 604.802673, -191.081985, -54.058590, 0,'ring'), +(10096, 1, 604.072998, -222.106918, -52.743759, 0,'first gate'), +(10096, 2, 621.400391, -214.499054, -52.814453, 0,'hiding in corner'), +(10096, 3, 601.300781, -198.556992, -53.950256, 0,'ring'), +(10096, 4, 631.818359, -180.548126, -52.654770, 0,'second gate'), +(10096, 5, 627.390381, -201.075974, -52.692917, 0,'hiding in corner'); + +DELETE FROM script_waypoint WHERE entry=9503; +INSERT INTO script_waypoint VALUES +(9503, 0, 883.294861, -188.926300, -43.703655, 0,''), +(9503, 1, 872.763550, -185.605621, -43.703655, 5000,'b1'), +(9503, 2, 867.923401, -188.006393, -43.703655, 5000,'b2'), +(9503, 3, 863.295898, -190.795212, -43.703655, 5000,'b3'), +(9503, 4, 856.139587, -194.652756, -43.703655, 5000,'b4'), +(9503, 5, 851.878906, -196.928131, -43.703655, 15000,'b5'), +(9503, 6, 877.035217, -187.048080, -43.703655, 0,''), +(9503, 7, 891.198000, -197.924000, -43.620400, 0,'home'); diff --git a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp index fa1b86da5c8..667f646d0ba 100644 --- a/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp +++ b/src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp @@ -65,16 +65,6 @@ uint32 RingBoss[]= 9032, // Hedrum }; -float RingLocations[6][3]= -{ - {604.802673, -191.081985, -54.058590}, // ring - {604.072998, -222.106918, -52.743759}, // first gate - {621.400391, -214.499054, -52.814453}, // hiding in corner - {601.300781, -198.556992, -53.950256}, // ring - {631.818359, -180.548126, -52.654770}, // second gate - {627.390381, -201.075974, -52.692917} // hiding in corner -}; - bool AreaTrigger_at_ring_of_law(Player *player, AreaTriggerEntry *at) { ScriptedInstance* pInstance = ((ScriptedInstance*)player->GetInstanceData()); @@ -323,11 +313,9 @@ CreatureAI* GetAI_npc_grimstone(Creature *_Creature) { npc_grimstoneAI* Grimstone_AI = new npc_grimstoneAI(_Creature); - for(uint8 i = 0; i < 6; ++i) - Grimstone_AI->AddWaypoint(i, RingLocations[i][0], RingLocations[i][1], RingLocations[i][2]); + Grimstone_AI->FillPointMovementListForCreature(); return (CreatureAI*)Grimstone_AI; - } /*###### @@ -1096,30 +1084,6 @@ bool GossipSelect_npc_tobias_seecher(Player *player, Creature *_Creature, uint32 #define SPELL_DRUNKEN_RAGE 14872 #define QUEST_ALE 4295 -float BarWpLocations[8][3]= -{ - {883.294861, -188.926300, -43.703655}, - {872.763550, -185.605621, -43.703655}, //b1 - {867.923401, -188.006393, -43.703655}, //b2 - {863.295898, -190.795212, -43.703655}, //b3 - {856.139587, -194.652756, -43.703655}, //b4 - {851.878906, -196.928131, -43.703655}, //b5 - {877.035217, -187.048080, -43.703655}, - {891.198000, -197.924000, -43.620400} //home -}; - -uint32 BarWpWait[8]= -{ - 0, - 5000, - 5000, - 5000, - 5000, - 15000, - 0, - 0 -}; - struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI { npc_rocknotAI(Creature *c) : npc_escortAI(c) @@ -1217,8 +1181,7 @@ CreatureAI* GetAI_npc_rocknot(Creature *_Creature) { npc_rocknotAI* Rocknot_AI = new npc_rocknotAI(_Creature); - for(uint8 i = 0; i < 8; ++i) - Rocknot_AI->AddWaypoint(i, BarWpLocations[i][0], BarWpLocations[i][1], BarWpLocations[i][2], BarWpWait[i]); + Rocknot_AI->FillPointMovementListForCreature(); return (CreatureAI*)Rocknot_AI; } diff --git a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp index 6ed4609e3b9..c7b14a0b7ff 100644 --- a/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp +++ b/src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp @@ -515,154 +515,7 @@ CreatureAI* GetAI_npc_thrall_old_hillsbrad(Creature *_Creature) { npc_thrall_old_hillsbradAI* thrall_walkAI = new npc_thrall_old_hillsbradAI(_Creature); - thrall_walkAI->AddWaypoint(0, 2230.91, 118.765, 82.2947,5000); - thrall_walkAI->AddWaypoint(1, 2230.33, 114.980, 82.2946); - thrall_walkAI->AddWaypoint(2, 2233.36, 111.057, 82.2996); - thrall_walkAI->AddWaypoint(3, 2231.17, 108.486, 82.6624); - thrall_walkAI->AddWaypoint(4, 2220.22, 114.605, 89.4264); - thrall_walkAI->AddWaypoint(5, 2215.23, 115.990, 89.4549); - thrall_walkAI->AddWaypoint(6, 2210.00, 106.849, 89.4549); - thrall_walkAI->AddWaypoint(7, 2205.66, 105.234, 89.4549); - //spawn armorer - thrall_walkAI->AddWaypoint(8, 2192.26, 112.618, 89.4549); - - //get weapon - thrall_walkAI->AddWaypoint(9, 2181.28, 118.612, 89.4549,8000); - //get armor - thrall_walkAI->AddWaypoint(10, 2181.62, 120.385, 89.4549,5000); - - thrall_walkAI->AddWaypoint(11, 2189.44, 113.922, 89.4549); - thrall_walkAI->AddWaypoint(12, 2195.63, 110.584, 89.4549); - thrall_walkAI->AddWaypoint(13, 2201.09, 115.115, 89.4549); - thrall_walkAI->AddWaypoint(14, 2204.34, 121.036, 89.4355); - //first ambush - thrall_walkAI->AddWaypoint(15, 2208.66, 129.127, 87.9560); - thrall_walkAI->AddWaypoint(16, 2193.09, 137.940, 88.2164); - thrall_walkAI->AddWaypoint(17, 2173.39, 149.064, 87.9227); - thrall_walkAI->AddWaypoint(18, 2164.25, 137.965, 85.0595); - thrall_walkAI->AddWaypoint(19, 2149.31, 125.645, 77.0858); - thrall_walkAI->AddWaypoint(20, 2142.78, 127.173, 75.5954); - //second ambush - thrall_walkAI->AddWaypoint(21, 2139.28, 133.952, 73.6386); - thrall_walkAI->AddWaypoint(22, 2139.54, 155.235, 67.1269); - thrall_walkAI->AddWaypoint(23, 2145.38, 167.551, 64.8974); - thrall_walkAI->AddWaypoint(24, 2134.28, 175.304, 67.9446); - thrall_walkAI->AddWaypoint(25, 2118.08, 187.387, 68.8141); - //third ambush - thrall_walkAI->AddWaypoint(26, 2105.88, 195.461, 65.1854); - thrall_walkAI->AddWaypoint(27, 2096.77, 196.939, 65.2117); - thrall_walkAI->AddWaypoint(28, 2083.90, 209.395, 64.8736); - //in front of keeps gate, meeting scarloc - thrall_walkAI->AddWaypoint(29, 2067.84, 224.376, 64.8022,30000); - - //ref point after skarloc fight - thrall_walkAI->AddWaypoint(30, 2055.40, 242.90, 63.3418); - - //mount up! - thrall_walkAI->AddWaypoint(31, 2039.20, 266.460, 63.0182,10000); - thrall_walkAI->AddWaypoint(32, 2011.77, 278.478, 65.3388); - thrall_walkAI->AddWaypoint(33, 2005.08, 289.676, 66.1179); - thrall_walkAI->AddWaypoint(34, 2033.11, 337.450, 66.0948); - thrall_walkAI->AddWaypoint(35, 2070.30, 416.208, 66.0893); - thrall_walkAI->AddWaypoint(36, 2086.76, 469.768, 65.9182); - //possible road ambush - thrall_walkAI->AddWaypoint(37, 2101.70, 497.955, 61.7881); - - thrall_walkAI->AddWaypoint(38, 2133.39, 530.933, 55.3700,5000); - thrall_walkAI->AddWaypoint(39, 2157.91, 559.635, 48.5157); - thrall_walkAI->AddWaypoint(40, 2167.34, 586.191, 42.4394); - thrall_walkAI->AddWaypoint(41, 2174.17, 637.643, 33.9002); - thrall_walkAI->AddWaypoint(42, 2179.31, 656.053, 34.723); - thrall_walkAI->AddWaypoint(43, 2183.65, 670.941, 34.0318); - thrall_walkAI->AddWaypoint(44, 2201.50, 668.616, 36.1236); - thrall_walkAI->AddWaypoint(45, 2221.56, 652.747, 36.6153); - thrall_walkAI->AddWaypoint(46, 2238.97, 640.125, 37.2214); - thrall_walkAI->AddWaypoint(47, 2251.17, 620.574, 40.1473); - thrall_walkAI->AddWaypoint(48, 2261.98, 595.303, 41.4117); - thrall_walkAI->AddWaypoint(49, 2278.67, 560.172, 38.9090); - thrall_walkAI->AddWaypoint(50, 2336.72, 528.327, 40.9369); - thrall_walkAI->AddWaypoint(51, 2381.04, 519.612, 37.7312); - thrall_walkAI->AddWaypoint(52, 2412.20, 515.425, 39.2068); - thrall_walkAI->AddWaypoint(53, 2452.39, 516.174, 42.9387); - thrall_walkAI->AddWaypoint(54, 2467.38, 539.389, 47.4992); - thrall_walkAI->AddWaypoint(55, 2470.70, 554.333, 46.6668); - thrall_walkAI->AddWaypoint(56, 2478.07, 575.321, 55.4549); - thrall_walkAI->AddWaypoint(57, 2480.00, 585.408, 56.6921); - thrall_walkAI->AddWaypoint(58, 2482.67, 608.817, 55.6643); - //demount - thrall_walkAI->AddWaypoint(59, 2485.62, 626.061, 58.0132,2000); - //scare the shit out of horse, so it'll run off - thrall_walkAI->AddWaypoint(60, 2486.91, 626.356, 58.0761); - - thrall_walkAI->AddWaypoint(61, 2488.58, 660.940, 57.3913); - thrall_walkAI->AddWaypoint(62, 2502.56, 686.059, 55.6252); - thrall_walkAI->AddWaypoint(63, 2502.08, 694.360, 55.5083); - thrall_walkAI->AddWaypoint(64, 2491.46, 694.321, 55.7163); - thrall_walkAI->AddWaypoint(65, 2491.10, 703.300, 55.7630); - thrall_walkAI->AddWaypoint(66, 2485.64, 702.992, 55.7917); - - thrall_walkAI->AddWaypoint(67, 2479.10, 695.291, 55.7901,10000); - //spawn mobs - thrall_walkAI->AddWaypoint(68, 2476.75, 693.689, 55.7960); - thrall_walkAI->AddWaypoint(69, 2475.39, 695.983, 55.8146); - thrall_walkAI->AddWaypoint(70, 2477.75, 694.473, 55.7945); - //meet mobs in doorway - thrall_walkAI->AddWaypoint(71, 2481.27, 697.747, 55.7910); - - thrall_walkAI->AddWaypoint(72, 2486.31, 703.131, 55.7861,5000); - thrall_walkAI->AddWaypoint(73, 2490.76, 703.511, 55.7662); - thrall_walkAI->AddWaypoint(74, 2491.30, 694.792, 55.7195); - thrall_walkAI->AddWaypoint(75, 2518.69, 693.876, 55.1383); - thrall_walkAI->AddWaypoint(76, 2531.33, 681.914, 55.1383); - thrall_walkAI->AddWaypoint(77, 2568.25, 682.654, 55.1778); - thrall_walkAI->AddWaypoint(78, 2589.61, 689.981, 55.1421); - thrall_walkAI->AddWaypoint(79, 2634.74, 679.833, 54.6613); - thrall_walkAI->AddWaypoint(80, 2630.41, 661.464, 54.2761); - thrall_walkAI->AddWaypoint(81, 2629.00, 656.982, 56.0651); - //stop in church - thrall_walkAI->AddWaypoint(82, 2620.84, 633.007, 56.0300,3000); - //summon - thrall_walkAI->AddWaypoint(83, 2622.99, 639.178, 56.0300); - - thrall_walkAI->AddWaypoint(84, 2628.73, 656.693, 56.0610,5000); - thrall_walkAI->AddWaypoint(85, 2630.34, 661.135, 54.2738); - thrall_walkAI->AddWaypoint(86, 2635.38, 672.243, 54.4508); - thrall_walkAI->AddWaypoint(87, 2644.13, 668.158, 55.3797); - thrall_walkAI->AddWaypoint(88, 2646.82, 666.740, 56.9898); - thrall_walkAI->AddWaypoint(89, 2658.22, 665.432, 57.1725); - thrall_walkAI->AddWaypoint(90, 2661.88, 674.849, 57.1725); - thrall_walkAI->AddWaypoint(91, 2656.23, 677.208, 57.1725); - - thrall_walkAI->AddWaypoint(92, 2652.28, 670.270, 61.9353); - //summon inn - thrall_walkAI->AddWaypoint(93, 2650.79, 664.290, 61.9302); - thrall_walkAI->AddWaypoint(94, 2658.19, 660.454, 61.9320,5000); - //speak with Taretha - thrall_walkAI->AddWaypoint(95, 2660.57, 659.173, 61.9370); - - //epoch calls - thrall_walkAI->AddWaypoint(96, 2658.19, 660.454, 61.9320,5000); - //taretha "dies" - thrall_walkAI->AddWaypoint(97, 2659.84, 659.482, 61.9361,5000); - - thrall_walkAI->AddWaypoint(98, 2654.28, 662.722, 61.9313); - thrall_walkAI->AddWaypoint(99, 2652.37, 670.561, 61.9368); - thrall_walkAI->AddWaypoint(100, 2656.05, 676.761, 57.1727); - thrall_walkAI->AddWaypoint(101, 2658.49, 677.166, 57.1727); - thrall_walkAI->AddWaypoint(102, 2659.28, 667.117, 57.1727); - thrall_walkAI->AddWaypoint(103, 2649.71, 665.387, 57.1727); - //he's outside inn here - thrall_walkAI->AddWaypoint(104, 2634.79, 672.964, 54.4577); - - //getting ready here, must start attack before 30secs up - thrall_walkAI->AddWaypoint(105, 2635.06, 673.892, 54.4713,30000); - - //ref point, will move here when all dead and meet Taretha - thrall_walkAI->AddWaypoint(106, 2634.79, 672.964, 54.4577,60000); - - //run off - thrall_walkAI->AddWaypoint(107, 2631.72, 665.629, 54.2923); - thrall_walkAI->AddWaypoint(108, 2647.40, 640.530, 55.7634); + thrall_walkAI->FillPointMovementListForCreature(); return (CreatureAI*)thrall_walkAI; } @@ -783,14 +636,7 @@ CreatureAI* GetAI_npc_taretha(Creature *_Creature) { npc_tarethaAI* taretha_walkAI = new npc_tarethaAI(_Creature); - taretha_walkAI->AddWaypoint(0, 2650.06, 665.473, 61.9305); - taretha_walkAI->AddWaypoint(1, 2652.44, 670.761, 61.9370); - taretha_walkAI->AddWaypoint(2, 2655.96, 676.913, 57.1725); - taretha_walkAI->AddWaypoint(3, 2659.40, 677.317, 57.1725); - taretha_walkAI->AddWaypoint(4, 2651.75, 664.482, 57.1725); - taretha_walkAI->AddWaypoint(5, 2647.49, 666.595, 57.0824); - taretha_walkAI->AddWaypoint(6, 2644.37, 668.167, 55.4182); - taretha_walkAI->AddWaypoint(7, 2640.96, 669.890, 54.7567,60000); + taretha_walkAI->FillPointMovementListForCreature(); return (CreatureAI*)taretha_walkAI; } |