From 32d170cfdaaca80b90997facfc95f44257911f01 Mon Sep 17 00:00:00 2001 From: Aldric Ducreux Date: Mon, 3 Jun 2024 20:26:57 +0200 Subject: [PATCH] Fix MoP Waypoint, USeHS, UseFlightPath questID for reset and forceReset --- Routes/MistsOfPandaria/MistsOfPandaria.lua | 68 +++++------ .../MistsOfPandaria_Alliance.lua | 100 ++++++++--------- .../MistsOfPandaria/MistsOfPandaria_Horde.lua | 106 +++++++++--------- 3 files changed, 137 insertions(+), 137 deletions(-) diff --git a/Routes/MistsOfPandaria/MistsOfPandaria.lua b/Routes/MistsOfPandaria/MistsOfPandaria.lua index e7138948..16303113 100644 --- a/Routes/MistsOfPandaria/MistsOfPandaria.lua +++ b/Routes/MistsOfPandaria/MistsOfPandaria.lua @@ -137,8 +137,8 @@ APR.RouteQuestStepList["378-WanderingIsle"] = { { Done = { 29783 }, Coord = { y = 1078.4, x = 4181.2 } }, { Done = { 29778 }, Coord = { y = 1132.2, x = 4152.6 } }, { PickUp = { 29780, 29781, 29779 }, Coord = { y = 1132, x = 4152.5 } }, - { Waypoint = 29779, Range = 14.51, Coord = { y = 1084, x = 4180.2 } }, - { Waypoint = 29779, Range = 16.72, Coord = { y = 1124.2, x = 4238.7 } }, + { Waypoint = 29780, Range = 14.51, Coord = { y = 1084, x = 4180.2 } }, + { Waypoint = 29780, Range = 16.72, Coord = { y = 1124.2, x = 4238.7 } }, { PickUp = { 29782 }, Coord = { y = 1186, x = 4273.2 } }, { Qpart = { [29780] = { 1 } }, Fillers = { [29781] = { 1 }, [29779] = { 1 } }, Range = 0.75, Coord = { y = 1174, x = 4418.1 } }, { Qpart = { [29781] = { 1 }, [29779] = { 1 } }, Range = 42, Coord = { y = 1173.5, x = 4420 } }, @@ -200,7 +200,7 @@ APR.RouteQuestStepList["378-WanderingIsle"] = { { Qpart = { [29799] = { 1 } }, Range = 101.28, Coord = { y = 253.1, x = 3928.8 } }, { Done = { 29799 }, Coord = { y = 251.6, x = 3929.9 } }, { PickUp = { 29800 }, Coord = { y = 249.9, x = 3943.3 } }, - { ExtraLineText = "USE_CART", Waypoint = 29800, Range = 24.94, Coord = { y = 263.2, x = 3867.1 } }, + { ExtraLineText = "USE_CART", Waypoint = 29799, Range = 24.94, Coord = { y = 263.2, x = 3867.1 } }, { Done = { 29799 }, Coord = { y = 251.6, x = 3929.9 } }, { PickUp = { 29800 }, Coord = { y = 249.9, x = 3943.3 } }, { Waypoint = 29800, Range = 24.94, Coord = { y = 263.2, x = 3867.1 } }, @@ -346,7 +346,7 @@ APR.RouteQuestStepList["378-Panda Starting Zone"] = { { PickUp = { 29769 }, Coord = { y = 628.79998779297, x = 3137.4001464844 }, Zone = 378 }, { PickUp = { 29770 }, Coord = { y = 603.60003662109, x = 3157.5 }, Zone = 378 }, { Coord = { y = 501.10000610352, x = 3005.8000488281 }, Qpart = { [29769] = { 1 } }, Range = 15, Zone = 378 }, - { Waypoint = 29769, Range = 5, Coord = { y = 557, x = 2975.4001464844 }, Zone = 378 }, + { Waypoint = 29770, Range = 5, Coord = { y = 557, x = 2975.4001464844 }, Zone = 378 }, { Coord = { y = 503.20001220703, x = 2978 }, Qpart = { [29769] = { 1 }, [29770] = { 2 } }, Range = 30, Zone = 378 }, { Coord = { y = 524.60003662109, x = 2877.1999511719 }, Qpart = { [29770] = { 3 } }, Range = 15, Zone = 378 }, { Done = { 29770 }, Coord = { y = 602.70001220703, x = 3158.8000488281 }, Zone = 378 }, @@ -798,8 +798,8 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { { Coord = { x = 276.70001220703, y = 200.80000305176 }, PickUp = { 29577 }, Zone = 376 }, { Coord = { x = 300.89999389648, y = 214.30000305176 }, PickUp = { 29757 }, Zone = 376 }, { Coord = { x = 285.80001831055, y = 235.19999694824 }, PickUp = { 30267 }, Zone = 376 }, - { Coord = { x = 200, y = 239 }, Range = 5, Waypoint = 30267, Zone = 376 }, - { Coord = { x = 223.80000305176, y = 320.10000610352 }, Range = 5, Waypoint = 30267, Zone = 376 }, + { Coord = { x = 200, y = 239 }, Range = 5, Waypoint = 29577, Zone = 376 }, + { Coord = { x = 223.80000305176, y = 320.10000610352 }, Range = 5, Waypoint = 29577, Zone = 376 }, { Coord = { x = 331.39999389648, y = 365.30001831055 }, PickUp = { 29600 }, Zone = 376 }, { Coord = { x = 354.20001220703, y = 375 }, GossipOptionIDs = { 40669 }, Qpart = { [29577] = { 1 } }, Zone = 376 }, { Coord = { x = 330.89999389648, y = 365 }, Done = { 29577 }, Zone = 376 }, @@ -849,20 +849,20 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { Coord = { x = 518.40002441406, y = -138.10000610352 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 1, - Waypoint = 32045, + Waypoint = 30049, Zone = 376 }, { Coord = { x = 462.70001220703, y = -221.19999694824 }, GetFP = 985, Zone = 376 }, { Coord = { x = 508.39999389648, y = -217.69999694824 }, PickUp = { 31255 }, PickUpDB = { 31254, 31255 }, Zone = 376 }, { Coord = { x = 548.90002441406, y = 82.900001525879 }, Done = { 30049 }, Zone = 376 }, { Coord = { x = 548.90002441406, y = 82.900001525879 }, PickUp = { 30051 }, Zone = 376 }, - { - Coord = { x = 548.90002441406, y = 82.900001525879 }, - Qpart = { [30051] = { 1 } }, - Range = 5, - ExtraLineText = "TALK_NPC", - GossipOptionIDs = { 40623 }, - Zone = 376 + { + Coord = { x = 548.90002441406, y = 82.900001525879 }, + Qpart = { [30051] = { 1 } }, + Range = 5, + ExtraLineText = "TALK_NPC", + GossipOptionIDs = { 40623 }, + Zone = 376 }, { Coord = { x = 481.89999389648, y = 209.19999694824 }, @@ -912,7 +912,7 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { ExtraLineText = "GO_INSIDE_CAVE", Fillers = { [30054] = { 1 } }, Range = 5, - Waypoint = 30054, + Waypoint = 30056, Zone = 376 }, { Coord = { x = 1056.8000488281, y = 97.599998474121 }, Done = { 30056 }, Fillers = { [30054] = { 1 } }, Zone = 376 }, @@ -1099,7 +1099,7 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { Coord = { x = 1845.2000732422, y = -851.10003662109 }, ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Range = 5, - Waypoint = 29981, + Waypoint = 30186, Zone = 376 }, { @@ -1113,7 +1113,7 @@ APR.RouteQuestStepList["376-Valley of the four winds"] = { Coord = { x = 1850.3000488281, y = -850.10003662109 }, ExtraLineText = "EXIT_CAVE", Range = 5, - Waypoint = 29981, + Waypoint = 30186, Zone = 376 }, { Coord = { x = 2051.8000488281, y = -1063.2000732422 }, Done = { 30186 }, Zone = 376 }, @@ -1353,7 +1353,7 @@ APR.RouteQuestStepList["388-Townlong Steppes"] = { Coord = { x = 2249.4001464844, y = 1768.5999755859 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Waypoint = 30779, + Waypoint = 30778, Zone = 388 }, { Coord = { x = 2332.9001464844, y = 1763.4000244141 }, Done = { 30778, 30779, 30781, 30780 }, Zone = 388 }, @@ -1670,7 +1670,7 @@ APR.RouteQuestStepList["388-Townlong Steppes"] = { Coord = { x = 4911, y = 2149.6999511719 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Waypoint = 30932, + Waypoint = 30926, Zone = 388 }, { Coord = { x = 4915.8002929688, y = 2110.4001464844 }, Qpart = { [30932] = { 3 } }, Zone = 388 }, @@ -1708,7 +1708,7 @@ APR.RouteQuestStepList["388-Townlong Steppes"] = { Coord = { x = 5200.1000976562, y = 2221.3000488281 }, ExtraLineText = "EXIT_CAVE", Range = 5, - Waypoint = 30927, + Waypoint = 30928, Zone = 388 }, { Coord = { x = 4831.2001953125, y = 2181 }, Done = { 30928 }, Zone = 388 }, @@ -1777,10 +1777,10 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { ExtraLineText = "TAKE_FREE_FLIGHT", GossipOptionIDs = { 35587 }, Range = 0.5, - Waypoint = 31008, + Waypoint = 31009, Zone = 422 }, - { Coord = { x = 4051.6999511719, y = -29.5 }, ETA = 41, Range = 5, Waypoint = 31008, Zone = 422 }, + { Coord = { x = 4051.6999511719, y = -29.5 }, ETA = 41, Range = 5, Waypoint = 31009, Zone = 422 }, { Button = { ["31009-1"] = 83276 }, Coord = { x = 3995.3000488281, y = 22.200000762939 }, @@ -1804,7 +1804,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { Zone = 422 }, { Coord = { x = 3753.5, y = -58 }, PickUp = { 31661 }, Zone = 422 }, - { UseHS = 31661, Zone = 422 }, + { UseHS = 31007, Zone = 422 }, { Coord = { x = 3197.6000976562, y = 199.60000610352 }, Done = { 31007, 31660, 31010 }, Zone = 422 }, { Coord = { x = 3208.1999511719, y = 201.30000305176 }, PickUp = { 31066 }, Zone = 422 }, { Coord = { x = 3194.6999511719, y = 148.5 }, Done = { 31008, 31661 }, Zone = 422 }, @@ -1895,11 +1895,11 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { }, { Coord = { x = 3068.8000488281, y = -646.40002441406 }, Qpart = { [31026] = { 1 } }, Range = 5, Zone = 422 }, { Done = { 31026 }, NoArrow = 1, Zone = 422 }, - { Coord = { x = 2999, y = -707.5 }, Range = 5, Waypoint = 31175, Zone = 422 }, + { Coord = { x = 2999, y = -707.5 }, Range = 5, Waypoint = 31023, Zone = 422 }, { Coord = { x = 3136, y = -1087.9000244141 }, GetFP = 1071, Zone = 422 }, { UseHS = 31023, Zone = 422 }, { Coord = { x = 3195, y = 147.80000305176 }, Done = { 31023 }, Zone = 422 }, - { Coord = { x = 3152.3000488281, y = 172.69999694824 }, ETA = 45, NodeID = 1071, UseFlightPath = 31175, Zone = 422 }, + { Coord = { x = 3152.3000488281, y = 172.69999694824 }, ETA = 45, NodeID = 1071, UseFlightPath = 31265, Zone = 422 }, { Coord = { x = 3210.8000488281, y = -1158.5 }, PickUp = { 31265 }, Zone = 422 }, { Button = { ["31265-1"] = 85869 }, Coord = { x = 3210.8000488281, y = -1158.5 }, Qpart = { [31265] = { 1 } }, Zone = 422 }, { Coord = { x = 3210.8000488281, y = -1158.5 }, Done = { 31265 }, Zone = 422 }, @@ -1993,7 +1993,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { { Coord = { x = 3112.8000488281, y = -1293.5 }, Done = { 31190 }, VehicleExit = 1, Zone = 422 }, { Coord = { x = 3112.1999511719, y = -1289.2000732422 }, PickUp = { 31354 }, Zone = 422 }, { Coord = { x = 3201.1999511719, y = -1181.9000244141 }, Done = { 31354 }, Zone = 422 }, - { Coord = { x = 3668.5, y = -484.10000610352 }, Range = 5, Waypoint = 31175, Zone = 422 }, + { Coord = { x = 3668.5, y = -484.10000610352 }, Range = 5, Waypoint = 31087, Zone = 422 }, { Coord = { x = 3564.3000488281, y = -359.80001831055 }, Qpart = { [31087] = { 1, 2, 3 } }, Range = 5, Zone = 422 }, { Coord = { x = 3564.6000976562, y = -356.5 }, Done = { 31087 }, Zone = 422 }, { Coord = { x = 3564.6000976562, y = -356.5 }, PickUp = { 31088, 31090 }, Zone = 422 }, @@ -2055,7 +2055,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { Coord = { x = 4762.8999023438, y = -518.60003662109 }, ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Range = 5, - Waypoint = 31730, + Waypoint = 31175, Zone = 422 }, { Coord = { x = 4763.8002929688, y = -379.89999389648 }, Qpart = { [31175] = { 1 } }, Range = 2, Zone = 422 }, @@ -2069,7 +2069,7 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { Range = 100, Zone = 422 }, - { Coord = { x = 4763, y = -506.10000610352 }, Range = 5, Waypoint = 31178, Zone = 422 }, + { Coord = { x = 4763, y = -506.10000610352 }, Range = 5, Waypoint = 31176, Zone = 422 }, { Coord = { x = 4763.7001953125, y = -389.70001220703 }, Done = { 31176, 31177, 31178 }, Zone = 422 }, { Coord = { x = 4763.7001953125, y = -389.70001220703 }, PickUp = { 31179 }, Zone = 422 }, { Coord = { x = 4765.2001953125, y = -412.30001831055 }, Qpart = { [31179] = { 1, 2 } }, Range = 15, Zone = 422 }, @@ -2078,17 +2078,17 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { { Coord = { x = 3150.9001464844, y = 170.90000915527 }, ETA = 36, NodeID = 1072, UseFlightPath = 31730, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1010.1000366211 }, Done = { 31730 }, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1010.1000366211 }, PickUp = { 31067 }, Zone = 422 }, - { Coord = { x = 3270.1000976562, y = 861.29998779297 }, Range = 5, Waypoint = 31067, Zone = 422 }, + { Coord = { x = 3270.1000976562, y = 861.29998779297 }, Range = 5, Waypoint = 31068, Zone = 422 }, { Coord = { x = 3298.5, y = 975.40002441406 }, PickUp = { 31068 }, Zone = 422 }, { Coord = { x = 3317.3000488281, y = 1050.5999755859 }, Qpart = { [31067] = { 1 } }, Range = 5, Zone = 422 }, { Coord = { x = 3328, y = 1057.8000488281 }, ExtraLineText = "INTERACT_WITH_SCROLL", Range = 2, - Waypoint = 31067, + Waypoint = 31068, Zone = 422 }, - { Coord = { x = 3270.5, y = 862.90002441406 }, Range = 5, Waypoint = 31067, Zone = 422 }, + { Coord = { x = 3270.5, y = 862.90002441406 }, Range = 5, Waypoint = 31068, Zone = 422 }, { Coord = { x = 3424.4001464844, y = 998.90002441406 }, Done = { 31068 }, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1009.9000244141 }, Done = { 31067 }, Zone = 422 }, { Coord = { x = 3398.9001464844, y = 1009.9000244141 }, PickUp = { 31069 }, Zone = 422 }, @@ -2153,10 +2153,10 @@ APR.RouteQuestStepList["390-Dread Wastes"] = { { Coord = { x = 3620.5, y = 816.20001220703 }, ExtraLineText = "EXIT_CAVE", Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3741.9001464844, y = 851.20001220703 }, Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3756.3000488281, y = 819.10003662109 }, Qpart = { [31074] = { 1 } }, Range = 2, Zone = 422 }, - { Coord = { x = 3742.8000488281, y = 850.60003662109 }, Range = 5, Waypoint = 31074, Zone = 422 }, - { Coord = { x = 3835.5, y = 920.5 }, Range = 5, Waypoint = 31074, Zone = 422 }, + { Coord = { x = 3742.8000488281, y = 850.60003662109 }, Range = 5, Waypoint = 31133, Zone = 422 }, + { Coord = { x = 3835.5, y = 920.5 }, Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3835.6000976562, y = 884.79998779297 }, Qpart = { [31074] = { 2 } }, Range = 5, Zone = 422 }, - { Coord = { x = 3835.1000976562, y = 918.79998779297 }, Range = 5, Waypoint = 31074, Zone = 422 }, + { Coord = { x = 3835.1000976562, y = 918.79998779297 }, Range = 5, Waypoint = 31133, Zone = 422 }, { Coord = { x = 3764.8000488281, y = 1046.5999755859 }, Qpart = { [31073] = { 1 } }, Range = 60, Zone = 422 }, { Coord = { x = 3452.9001464844, y = 972.90002441406 }, Done = { 31133 }, Zone = 422 }, { Coord = { x = 3424.5, y = 998.90002441406 }, Done = { 31074 }, Zone = 422 }, diff --git a/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua b/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua index 522a17ba..b4138329 100644 --- a/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua +++ b/Routes/MistsOfPandaria/MistsOfPandaria_Alliance.lua @@ -86,7 +86,7 @@ if APR.Faction == "Alliance" then { Coord = { x = -1308.8000488281, y = -538.40002441406 }, Done = { 31739 }, Zone = 371 }, { Coord = { x = -1308.8000488281, y = -538.40002441406 }, PickUp = { 31740 }, Zone = 371 }, { Coord = { x = -1295.2000732422, y = -532.10003662109 }, Qpart = { [31740] = { 1 } }, Range = 5, Zone = 371 }, - { UseHS = 31740, Zone = 371 }, + { UseHS = 29552, Zone = 371 }, { Coord = { x = -1770.3000488281, y = -283.60000610352 }, Done = { 29552 }, Zone = 371 }, { Coord = { x = -1779, y = -291.5 }, Done = { 31738, 31740 }, Zone = 371 }, { Coord = { x = -1779, y = -291.5 }, PickUp = { 31741, 31744 }, Zone = 371 }, @@ -206,7 +206,7 @@ if APR.Faction == "Alliance" then { Coord = { x = -2663.1999511719, y = -161.19999694824 }, Done = { 29883, 29885 }, Zone = 371 }, { Coord = { x = -2665.6999511719, y = -150.40000915527 }, PickUp = { 29762 }, Zone = 371 }, { Coord = { x = -2651.1999511719, y = -130.60000610352 }, PickUp = { 29887 }, Zone = 371 }, - { Coord = { x = -2768, y = -257.5 }, Range = 5, Waypoint = 29887, Zone = 371 }, + { Coord = { x = -2768, y = -257.5 }, Range = 5, Waypoint = 29762, Zone = 371 }, { Coord = { x = -3157.6999511719, y = -423.30001831055 }, ExtraLineText = "INTERACT_WITH_SCROLL", @@ -389,7 +389,7 @@ if APR.Faction == "Alliance" then { PickUp = { 29865 }, Zone = 371, Coord = { y = 1520.2000732422, x = -1793 } }, { PickUp = { 29866 }, Zone = 371, Coord = { y = 1543.2000732422, x = -1805 } }, { Coord = { y = 1371, x = -1598.7000732422 }, Qpart = { [29865] = { 1 }, [29866] = { 1 } }, Range = 69, Zone = 371 }, - { Waypoint = 29865, Coord = { y = 1382.9000244141, x = -1389.0999755859 }, Range = 5, Zone = 371 }, + { Waypoint = 29716, Coord = { y = 1382.9000244141, x = -1389.0999755859 }, Range = 5, Zone = 371 }, { GossipOptionIDs = { 39304 }, Qpart = { [29716] = { 1 }, [29717] = { 1 } }, @@ -402,7 +402,7 @@ if APR.Faction == "Alliance" then { GossipOptionIDs = { 39810 }, Zone = 371, - Waypoint = 29723, + Waypoint = 29865, Range = 2, Coord = { y = 1500.8000488281, x = -1294.3000488281 } }, @@ -413,9 +413,9 @@ if APR.Faction == "Alliance" then Range = 5, Coord = { y = 1497.5, x = -1321.8000488281 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1393.3000488281, x = -1364.2000732422 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1376.9000244141, x = -1526.5999755859 } }, - { Waypoint = 29723, Zone = 371, Range = 5, Coord = { y = 1477.8000488281, x = -1803.2000732422 } }, + { Waypoint = 29865, Zone = 371, Range = 5, Coord = { y = 1393.3000488281, x = -1364.2000732422 } }, + { Waypoint = 29865, Zone = 371, Range = 5, Coord = { y = 1376.9000244141, x = -1526.5999755859 } }, + { Waypoint = 29865, Zone = 371, Range = 5, Coord = { y = 1477.8000488281, x = -1803.2000732422 } }, { Done = { 29865 }, Zone = 371, Coord = { y = 1519.8000488281, x = -1793.5999755859 } }, { Done = { 29866 }, Zone = 371, Coord = { y = 1540.7000732422, x = -1803.3000488281 } }, { Done = { 29723 }, Zone = 371, Coord = { y = 1593.2000732422, x = -1792.2000732422 } }, @@ -470,16 +470,16 @@ if APR.Faction == "Alliance" then }, { Done = { 29928 }, Zone = 371, Coord = { y = 2393, x = -2106.4001464844 } }, { PickUp = { 29926, 29927 }, Zone = 371, Coord = { y = 2393, x = -2106.4001464844 } }, - { Waypoint = 29926, Zone = 371, Range = 5, Coord = { y = 2295.6000976562, x = -1768.0999755859 } }, + { Waypoint = 29927, Zone = 371, Range = 5, Coord = { y = 2295.6000976562, x = -1768.0999755859 } }, { Zone = 372, Qpart = { [29927] = { 1 } }, Range = 30, Coord = { y = 2311, x = -1730.2000732422 } }, { Done = { 29927 }, Zone = 372, Coord = { y = 2301.1000976562, x = -1721.0999755859 } }, { PickUp = { 29929 }, Zone = 372, Coord = { y = 2301.1000976562, x = -1721.0999755859 } }, { Coord = { y = 2270, x = -1709.2000732422 }, Qpart = { [29926] = { 1, 2 }, [29929] = { 1 } }, Range = 45, Zone = 372 }, - { Waypoint = 29926, Zone = 373, Range = 5, Coord = { y = 2279, x = -1688.0999755859 } }, - { Waypoint = 29926, Zone = 373, Range = 5, Coord = { y = 2288.4001464844, x = -1675.5 } }, - { Waypoint = 29926, Zone = 372, Range = 5, Coord = { y = 2302.1999511719, x = -1688.7000732422 } }, - { Waypoint = 29926, Zone = 372, Range = 5, Coord = { y = 2290.6999511719, x = -1705.4000244141 } }, - { Waypoint = 29926, Zone = 371, Range = 5, Coord = { y = 2310, x = -1750.3000488281 } }, + { Waypoint = 29929, Zone = 373, Range = 5, Coord = { y = 2279, x = -1688.0999755859 } }, + { Waypoint = 29929, Zone = 373, Range = 5, Coord = { y = 2288.4001464844, x = -1675.5 } }, + { Waypoint = 29929, Zone = 372, Range = 5, Coord = { y = 2302.1999511719, x = -1688.7000732422 } }, + { Waypoint = 29929, Zone = 372, Range = 5, Coord = { y = 2290.6999511719, x = -1705.4000244141 } }, + { Waypoint = 29929, Zone = 371, Range = 5, Coord = { y = 2310, x = -1750.3000488281 } }, { Done = { 29929 }, Zone = 371, Coord = { y = 2285, x = -1780.5 } }, { PickUp = { 29930 }, Zone = 371, Coord = { y = 2285, x = -1780.5 } }, { Qpart = { [29930] = { 1 } }, Zone = 371, ExtraLineText = "USE_CART", Range = 2, Coord = { y = 2285, x = -1780.5 } }, @@ -569,10 +569,10 @@ if APR.Faction == "Alliance" then Coord = { y = 3167.1000976562, x = -1517.2000732422 } }, { Done = { 29755 }, Coord = { y = 3069.1999511719, x = -1610.7000732422 }, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 3038.9001464844, x = -1179.5999755859 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2670.5, x = -1153.5999755859 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2519.1999511719, x = -1220.7000732422 }, Range = 5, Zone = 371 }, - { Waypoint = 29931, Coord = { y = 2487.6000976562, x = -1538.2000732422 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 3038.9001464844, x = -1179.5999755859 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 2670.5, x = -1153.5999755859 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 2519.1999511719, x = -1220.7000732422 }, Range = 5, Zone = 371 }, + { Waypoint = 29617, Coord = { y = 2487.6000976562, x = -1538.2000732422 }, Range = 5, Zone = 371 }, { GetFP = 971, Coord = { y = 2507.6000976562, x = -1588.0999755859 }, Zone = 371 }, { Done = { 29617 }, Coord = { y = 2489.5, x = -1689.3000488281 }, Zone = 371 }, { PickUp = { 29618 }, Coord = { y = 2489.5, x = -1689.3000488281 }, Zone = 371 }, @@ -724,16 +724,16 @@ if APR.Faction == "Alliance" then { Waypoint = 29647, Zone = 371, Range = 5, Coord = { y = 2487.8000488281, x = -1530.2000732422 } }, { Waypoint = 29647, Zone = 371, Range = 5, Coord = { y = 2524.4001464844, x = -1573.7000732422 } }, { Zone = 371, Done = { 29647 }, Coord = { y = 2572.5, x = -1533.2000732422 } }, - { UseFlightPath = 29931, ETA = 39, Zone = 371, NodeID = 895, Coord = { y = 2508.5, x = -1589.8000488281 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 1478.5, x = -1803.9000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 1292, x = -1774.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 991.29998779297, x = -1756.0999755859 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 844.20001220703, x = -1611.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 843, x = -1488.4000244141 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 764.70001220703, x = -1463.3000488281 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 551.79998779297, x = -1488.2000732422 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 437.89999389648, x = -1449.5999755859 } }, - { Waypoint = 29931, Zone = 371, Range = 5, Coord = { y = 276.70001220703, x = -1563.2000732422 } }, + { UseFlightPath = 29576, ETA = 39, Zone = 371, NodeID = 895, Coord = { y = 2508.5, x = -1589.8000488281 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 1478.5, x = -1803.9000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 1292, x = -1774.4000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 991.29998779297, x = -1756.0999755859 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 844.20001220703, x = -1611.4000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 843, x = -1488.4000244141 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 764.70001220703, x = -1463.3000488281 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 551.79998779297, x = -1488.2000732422 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 437.89999389648, x = -1449.5999755859 } }, + { Waypoint = 29576, Zone = 371, Range = 5, Coord = { y = 276.70001220703, x = -1563.2000732422 } }, { Zone = 371, Done = { 29576 }, Coord = { y = 118.5, x = -1587.7000732422 } }, { PickUp = { 29578, 29579 }, Zone = 371, Coord = { y = 118.5, x = -1587.7000732422 } }, { PickUp = { 29580, 29585 }, Zone = 371, Coord = { y = 126.80000305176, x = -1570.5 } }, @@ -872,24 +872,24 @@ if APR.Faction == "Alliance" then { PickUp = { 30004 }, Zone = 371, Coord = { y = 839.79998779297, x = -2477 } }, { Zone = 371, - Waypoint = 30004, + Waypoint = 29997, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 870.40002441406, x = -2445.4001464844 } }, { Zone = 371, - Waypoint = 30004, + Waypoint = 29997, ExtraLineText = "UPSTAIRS", Range = 5, Coord = { y = 851.40002441406, x = -2506.5 } }, - { Waypoint = 30004, Coord = { y = 812.40002441406, x = -2488.5 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 832.79998779297, x = -2430.8000488281 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 893.29998779297, x = -2449 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 883.20001220703, x = -2479.9001464844 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 1008.5, x = -2520.1000976562 }, Range = 5, Zone = 371 }, - { Waypoint = 30004, Coord = { y = 1025.3000488281, x = -2488.6999511719 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 812.40002441406, x = -2488.5 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 832.79998779297, x = -2430.8000488281 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 893.29998779297, x = -2449 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 883.20001220703, x = -2479.9001464844 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 1008.5, x = -2520.1000976562 }, Range = 5, Zone = 371 }, + { Waypoint = 29997, Coord = { y = 1025.3000488281, x = -2488.6999511719 }, Range = 5, Zone = 371 }, { Qpart = { [29997] = { 1 } }, Zone = 371, @@ -1062,7 +1062,7 @@ if APR.Faction == "Alliance" then Zone = 418 }, { Coord = { x = -452.70001220703, y = -645.79998779297 }, Qpart = { [30088] = { 1 } }, Range = 30, Zone = 418 }, - { Coord = { x = -363, y = -409.10000610352 }, Range = 5, Waypoint = 30628, Zone = 418 }, + { Coord = { x = -363, y = -409.10000610352 }, Range = 5, Waypoint = 30083, Zone = 418 }, { Coord = { x = -218.80000305176, y = -381.80001831055 }, Fillers = { [30083] = { 1 } }, @@ -1261,7 +1261,7 @@ if APR.Faction == "Alliance" then ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Fillers = { [30671] = { 1 } }, Range = 5, - Waypoint = 30671, + Waypoint = 30691, Zone = 418 }, { @@ -1415,7 +1415,7 @@ if APR.Faction == "Alliance" then Coord = { x = 1882.0999755859, y = -439.10000610352 }, ETA = 79, NodeID = 1052, - UseFlightPath = 31254, + UseFlightPath = 31286, Zone = 376 }, { ZoneDoneSave = 1 } @@ -1614,7 +1614,7 @@ if APR.Faction == "Alliance" then Coord = { x = 1631.5999755859, y = 2310.1000976562 }, ExtraLineText = "TAKE_EXPLOSIVES_BARREL", Range = 2, - Waypoint = 30651, + Waypoint = 30652, Zone = 379 }, { @@ -1649,7 +1649,7 @@ if APR.Faction == "Alliance" then Coord = { x = 1751.7000732422, y = 2234.8000488281 }, ExtraLineText = "TAKE_EXPLOSIVES_BARREL", Range = 2, - Waypoint = 30651, + Waypoint = 30652, Zone = 379 }, { @@ -1685,7 +1685,7 @@ if APR.Faction == "Alliance" then Zone = 379 }, { Coord = { x = 1772.2000732422, y = 2252.1000976562 }, Qpart = { [30650] = { 1 } }, Range = 30, Zone = 379 }, - { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30660, Zone = 379 }, + { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30651, Zone = 379 }, { Coord = { x = 1813.0999755859, y = 2417.1999511719 }, Qpart = { [30660] = { 1 } }, Range = 5, Zone = 379 }, { Coord = { x = 1449.7000732422, y = 2143.9001464844 }, Done = { 30651 }, Zone = 379 }, { Coord = { x = 1469.8000488281, y = 2140.3000488281 }, Done = { 30660, 30650 }, Zone = 379 }, @@ -1782,26 +1782,26 @@ if APR.Faction == "Alliance" then }, { Coord = { x = 538.40002441406, y = 3823.9001464844 }, Done = { 31394 }, Zone = 379 }, { Coord = { x = 538.40002441406, y = 3823.9001464844 }, PickUp = { 31512 }, Zone = 379 }, - { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 31512, Zone = 379 }, + { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 30617, Zone = 379 }, { Coord = { x = 895.79998779297, y = 3109.9001464844 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31512, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 894.10003662109, y = 2993.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31512, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 916.70001220703, y = 2923.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31512, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 1078.5, y = 2878 }, Qpart = { [30617] = { 1 } }, Range = 30, Zone = 379 }, @@ -1822,7 +1822,7 @@ if APR.Faction == "Alliance" then Range = 100, Zone = 379 }, - { UseHS = 30618, Zone = 380 }, + { UseHS = 30621, Zone = 380 }, { Coord = { x = 1251.8000488281, y = 3107 }, Done = { 30621 }, Zone = 379 }, { Coord = { x = 1258.5999755859, y = 3064.9001464844 }, Done = { 30601 }, Zone = 379 }, { Coord = { x = 1227.5999755859, y = 3041.6999511719 }, Done = { 30618 }, Zone = 379 }, @@ -2224,7 +2224,7 @@ if APR.Faction == "Alliance" then { NoArrow = 1, PickUp = { 30746 }, Zone = 379 }, { Coord = { x = 2495, y = 2366.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2470.4001464844, y = 2522 }, Qpart = { [30742] = { 1 }, [30743] = { 1 } }, Range = 69, Zone = 379 }, - { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30742, Zone = 379 }, + { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2527.5, y = 2438.6000976562 }, Done = { 30746 }, Zone = 379 }, { Coord = { x = 2177, y = 2722.4001464844 }, Done = { 30745, 30742, 30743 }, ETA = 20, Zone = 379 }, { Coord = { x = 2180.8000488281, y = 2724.4001464844 }, PickUp = { 30747 }, Zone = 379 }, @@ -2237,7 +2237,7 @@ if APR.Faction == "Alliance" then Zone = 379 }, { Coord = { x = 2178.4001464844, y = 2725.9001464844 }, Done = { 30747 }, Zone = 379 }, - { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31511, Zone = 379 }, + { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31453, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, Done = { 31453 }, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, PickUp = { 30665, 30670 }, Zone = 379 }, { Coord = { x = 2152.1999511719, y = 1932.9000244141 }, ExtraLineText = "INSIDE", PickUp = { 30682 }, Zone = 379 }, @@ -2372,7 +2372,7 @@ if APR.Faction == "Alliance" then ExtraLineText = "TURN_IN_QUEST_INSIDE_DUNGEON_THEN_EXIT", NoArrow = 1 }, - { UseHS = 31847, Zone = 379 }, + { UseHS = 31512, Zone = 379 }, { Coord = { x = 1390.8000488281, y = 1790.8000488281 }, GossipOptionIDs = { 41177 }, @@ -2384,7 +2384,7 @@ if APR.Faction == "Alliance" then Coord = { x = 336.70001220703, y = 894.20001220703 }, ETA = 111, NodeID = 1024, - UseFlightPath = 31030, + UseFlightPath = 31695, Zone = 390 }, { Coord = { x = 2995.1000976562, y = 2363.3000488281 }, GetFP = 1053, Zone = 388 }, diff --git a/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua b/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua index b003c308..7a16303a 100644 --- a/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua +++ b/Routes/MistsOfPandaria/MistsOfPandaria_Horde.lua @@ -4,7 +4,7 @@ if APR.Faction == "Horde" then { Coord = { x = -4214.3002929688, y = 1589.3000488281 }, Range = 5, Waypoint = 60126, Zone = 85 }, { Coord = { x = -4267.3999023438, y = 1607.5999755859 }, Range = 5, Waypoint = 60126, Zone = 85 }, { Coord = { x = -4300.1000976562, y = 1612.2000732422 }, Range = 5, Waypoint = 60126, Zone = 85 }, - { Coord = { x = -4374.7001953125, y = 1608.2000732422 }, Range = 5, Waypoint = 31853, Zone = 85 }, + { Coord = { x = -4374.7001953125, y = 1608.2000732422 }, Range = 5, Waypoint = 60126, Zone = 85 }, { Coord = { x = -4354, y = 1665.7000732422 }, Done = { 60126 }, Zone = 85 }, { Coord = { x = -4354, y = 1665.7000732422 }, PickUp = { 31853 }, Zone = 85 }, { Coord = { x = -4374.7001953125, y = 1608.2000732422 }, Range = 5, Waypoint = 31853, Zone = 85 }, @@ -253,7 +253,7 @@ if APR.Faction == "Horde" then Range = 60, Zone = 371 }, - { Coord = { x = -489, y = 2434.6999511719 }, Range = 5, Waypoint = 29815, Zone = 371 }, + { Coord = { x = -489, y = 2434.6999511719 }, Range = 5, Waypoint = 31112, Zone = 371 }, { Coord = { x = -508.70001220703, y = 2501.9001464844 }, Done = { 31112 }, Zone = 371 }, { Coord = { x = -516.40002441406, y = 2497.5 }, Done = { 29815 }, Zone = 371 }, { Coord = { x = -516.40002441406, y = 2497.5 }, PickUp = { 29827 }, Zone = 371 }, @@ -268,9 +268,9 @@ if APR.Faction == "Horde" then }, { Coord = { x = -516.60003662109, y = 2498.4001464844 }, Done = { 29827 }, Zone = 371 }, { Coord = { x = -531.70001220703, y = 2491.6000976562 }, PickUp = { 29822 }, Zone = 371 }, - { Coord = { x = -442.60000610352, y = 2280.9001464844 }, Range = 5, Waypoint = 29822, Zone = 371 }, + { Coord = { x = -442.60000610352, y = 2280.9001464844 }, Range = 5, Waypoint = 31112, Zone = 371 }, { Coord = { x = -487, y = 2241.6000976562 }, Qpart = { [29822] = { 3 } }, Range = 5, Zone = 371 }, - { Coord = { x = -461, y = 2202.1000976562 }, Range = 5, Waypoint = 29822, Zone = 371 }, + { Coord = { x = -461, y = 2202.1000976562 }, Range = 5, Waypoint = 31112, Zone = 371 }, { Coord = { x = -379.89999389648, y = 2146.6000976562 }, Qpart = { [29822] = { 2 } }, Range = 30, Zone = 371 }, { Coord = { x = -379.89999389648, y = 2146.6000976562 }, Range = 2, Treasure = 31400, Zone = 371 }, { Coord = { x = -777.90002441406, y = 2356.3000488281 }, Qpart = { [29822] = { 1 } }, Range = 30, Zone = 371 }, @@ -282,7 +282,7 @@ if APR.Faction == "Horde" then { Coord = { x = -471.60000610352, y = 2136.3000488281 }, ETA = 75, Qpart = { [31121] = { 1 } }, Range = 1, Zone = 371 }, { Coord = { x = -473.80001831055, y = 2132 }, Done = { 31121 }, Zone = 371 }, { Coord = { x = -473.80001831055, y = 2132 }, PickUp = { 31132 }, Zone = 371 }, - { Coord = { x = -289.70001220703, y = 2059.3000488281 }, Range = 5, Waypoint = 31132, Zone = 371 }, + { Coord = { x = -289.70001220703, y = 2059.3000488281 }, Range = 5, Waypoint = 31404, Zone = 371 }, { Coord = { x = -188.40000915527, y = 2021.4000244141 }, Range = 2, Treasure = 31404, Zone = 371 }, { Coord = { x = -285.5, y = 1950.5999755859 }, Range = 5, Waypoint = 31132, Zone = 371 }, { Coord = { x = -507.89999389648, y = 2060.8000488281 }, Range = 5, Waypoint = 31132, Zone = 371 }, @@ -491,7 +491,7 @@ if APR.Faction == "Horde" then { Coord = { x = -1793, y = 1520.2000732422 }, PickUp = { 29865 }, Zone = 371 }, { Coord = { x = -1805, y = 1543.2000732422 }, PickUp = { 29866 }, Zone = 371 }, { Coord = { x = -1598.7000732422, y = 1371 }, Qpart = { [29865] = { 1 }, [29866] = { 1 } }, Range = 69, Zone = 371 }, - { Coord = { x = -1389.0999755859, y = 1382.9000244141 }, Range = 5, Waypoint = 29865, Zone = 371 }, + { Coord = { x = -1389.0999755859, y = 1382.9000244141 }, Range = 5, Waypoint = 29716, Zone = 371 }, { Coord = { x = -1166.2000732422, y = 1489 }, GossipOptionIDs = { 39304 }, @@ -505,7 +505,7 @@ if APR.Faction == "Horde" then Coord = { x = -1294.3000488281, y = 1500.8000488281 }, GossipOptionIDs = { 39810 }, Range = 2, - Waypoint = 29723, + Waypoint = 29865, Zone = 371 }, { @@ -515,9 +515,9 @@ if APR.Faction == "Horde" then Range = 5, Zone = 371 }, - { Coord = { x = -1364.2000732422, y = 1393.3000488281 }, Range = 5, Waypoint = 29723, Zone = 371 }, - { Coord = { x = -1526.5999755859, y = 1376.9000244141 }, Range = 5, Waypoint = 29723, Zone = 371 }, - { Coord = { x = -1803.2000732422, y = 1477.8000488281 }, Range = 5, Waypoint = 29723, Zone = 371 }, + { Coord = { x = -1364.2000732422, y = 1393.3000488281 }, Range = 5, Waypoint = 29865, Zone = 371 }, + { Coord = { x = -1526.5999755859, y = 1376.9000244141 }, Range = 5, Waypoint = 29865, Zone = 371 }, + { Coord = { x = -1803.2000732422, y = 1477.8000488281 }, Range = 5, Waypoint = 29865, Zone = 371 }, { Coord = { x = -1793.5999755859, y = 1519.8000488281 }, Done = { 29865 }, Zone = 371 }, { Coord = { x = -1803.3000488281, y = 1540.7000732422 }, Done = { 29866 }, Zone = 371 }, { Coord = { x = -1792.2000732422, y = 1593.2000732422 }, Done = { 29723 }, Zone = 371 }, @@ -572,16 +572,16 @@ if APR.Faction == "Horde" then }, { Coord = { x = -2106.4001464844, y = 2393 }, Done = { 29928 }, Zone = 371 }, { Coord = { x = -2106.4001464844, y = 2393 }, PickUp = { 29926, 29927 }, Zone = 371 }, - { Coord = { x = -1768.0999755859, y = 2295.6000976562 }, Range = 5, Waypoint = 29926, Zone = 371 }, + { Coord = { x = -1768.0999755859, y = 2295.6000976562 }, Range = 5, Waypoint = 29927, Zone = 371 }, { Coord = { x = -1730.2000732422, y = 2311 }, Qpart = { [29927] = { 1 } }, Range = 30, Zone = 372 }, { Coord = { x = -1721.0999755859, y = 2301.1000976562 }, Done = { 29927 }, Zone = 372 }, { Coord = { x = -1721.0999755859, y = 2301.1000976562 }, PickUp = { 29929 }, Zone = 372 }, { Coord = { x = -1709.2000732422, y = 2270 }, Qpart = { [29926] = { 1, 2 }, [29929] = { 1 } }, Range = 45, Zone = 372 }, - { Coord = { x = -1688.0999755859, y = 2279 }, Range = 5, Waypoint = 29926, Zone = 373 }, - { Coord = { x = -1675.5, y = 2288.4001464844 }, Range = 5, Waypoint = 29926, Zone = 373 }, - { Coord = { x = -1688.7000732422, y = 2302.1999511719 }, Range = 5, Waypoint = 29926, Zone = 372 }, - { Coord = { x = -1705.4000244141, y = 2290.6999511719 }, Range = 5, Waypoint = 29926, Zone = 372 }, - { Coord = { x = -1750.3000488281, y = 2310 }, Range = 5, Waypoint = 29926, Zone = 371 }, + { Coord = { x = -1688.0999755859, y = 2279 }, Range = 5, Waypoint = 29929, Zone = 373 }, + { Coord = { x = -1675.5, y = 2288.4001464844 }, Range = 5, Waypoint = 29929, Zone = 373 }, + { Coord = { x = -1688.7000732422, y = 2302.1999511719 }, Range = 5, Waypoint = 29929, Zone = 372 }, + { Coord = { x = -1705.4000244141, y = 2290.6999511719 }, Range = 5, Waypoint = 29929, Zone = 372 }, + { Coord = { x = -1750.3000488281, y = 2310 }, Range = 5, Waypoint = 29929, Zone = 371 }, { Coord = { x = -1780.5, y = 2285 }, Done = { 29929 }, Zone = 371 }, { Coord = { x = -1780.5, y = 2285 }, PickUp = { 29930 }, Zone = 371 }, { Coord = { x = -1780.5, y = 2285 }, ExtraLineText = "USE_CART", Qpart = { [29930] = { 1 } }, Range = 2, Zone = 371 }, @@ -671,10 +671,10 @@ if APR.Faction == "Horde" then Zone = 371 }, { Coord = { x = -1610.7000732422, y = 3069.1999511719 }, Done = { 29755 }, Zone = 371 }, - { Coord = { x = -1179.5999755859, y = 3038.9001464844 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1153.5999755859, y = 2670.5 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1220.7000732422, y = 2519.1999511719 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1538.2000732422, y = 2487.6000976562 }, Range = 5, Waypoint = 29931, Zone = 371 }, + { Coord = { x = -1179.5999755859, y = 3038.9001464844 }, Range = 5, Waypoint = 29617, Zone = 371 }, + { Coord = { x = -1153.5999755859, y = 2670.5 }, Range = 5, Waypoint = 29617, Zone = 371 }, + { Coord = { x = -1220.7000732422, y = 2519.1999511719 }, Range = 5, Waypoint = 29617, Zone = 371 }, + { Coord = { x = -1538.2000732422, y = 2487.6000976562 }, Range = 5, Waypoint = 29617, Zone = 371 }, { Coord = { x = -1588.0999755859, y = 2507.6000976562 }, GetFP = 971, Zone = 371 }, { Coord = { x = -1689.3000488281, y = 2489.5 }, Done = { 29617 }, Zone = 371 }, { Coord = { x = -1689.3000488281, y = 2489.5 }, PickUp = { 29618 }, Zone = 371 }, @@ -826,16 +826,16 @@ if APR.Faction == "Horde" then { Coord = { x = -1530.2000732422, y = 2487.8000488281 }, Range = 5, Waypoint = 29647, Zone = 371 }, { Coord = { x = -1573.7000732422, y = 2524.4001464844 }, Range = 5, Waypoint = 29647, Zone = 371 }, { Coord = { x = -1533.2000732422, y = 2572.5 }, Done = { 29647 }, Zone = 371 }, - { Coord = { x = -1589.8000488281, y = 2508.5 }, ETA = 39, NodeID = 895, UseFlightPath = 29931, Zone = 371 }, - { Coord = { x = -1803.9000244141, y = 1478.5 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1774.4000244141, y = 1292 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1756.0999755859, y = 991.29998779297 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1611.4000244141, y = 844.20001220703 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1488.4000244141, y = 843 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1463.3000488281, y = 764.70001220703 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1488.2000732422, y = 551.79998779297 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1449.5999755859, y = 437.89999389648 }, Range = 5, Waypoint = 29931, Zone = 371 }, - { Coord = { x = -1563.2000732422, y = 276.70001220703 }, Range = 5, Waypoint = 29931, Zone = 371 }, + { Coord = { x = -1589.8000488281, y = 2508.5 }, ETA = 39, NodeID = 895, UseFlightPath = 29576, Zone = 371 }, + { Coord = { x = -1803.9000244141, y = 1478.5 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1774.4000244141, y = 1292 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1756.0999755859, y = 991.29998779297 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1611.4000244141, y = 844.20001220703 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1488.4000244141, y = 843 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1463.3000488281, y = 764.70001220703 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1488.2000732422, y = 551.79998779297 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1449.5999755859, y = 437.89999389648 }, Range = 5, Waypoint = 29576, Zone = 371 }, + { Coord = { x = -1563.2000732422, y = 276.70001220703 }, Range = 5, Waypoint = 29576, Zone = 371 }, { Coord = { x = -1587.7000732422, y = 118.5 }, Done = { 29576 }, Zone = 371 }, { Coord = { x = -1587.7000732422, y = 118.5 }, PickUp = { 29578, 29579 }, Zone = 371 }, { Coord = { x = -1570.5, y = 126.80000305176 }, PickUp = { 29580, 29585 }, Zone = 371 }, @@ -976,22 +976,22 @@ if APR.Faction == "Horde" then Coord = { x = -2445.4001464844, y = 870.40002441406 }, ExtraLineText = "UPSTAIRS", Range = 5, - Waypoint = 30004, + Waypoint = 29997, Zone = 371 }, { Coord = { x = -2506.5, y = 851.40002441406 }, ExtraLineText = "UPSTAIRS", Range = 5, - Waypoint = 30004, + Waypoint = 29997, Zone = 371 }, - { Coord = { x = -2488.5, y = 812.40002441406 }, Range = 5, Waypoint = 30004, Zone = 371 }, - { Coord = { x = -2430.8000488281, y = 832.79998779297 }, Range = 5, Waypoint = 30004, Zone = 371 }, - { Coord = { x = -2449, y = 893.29998779297 }, Range = 5, Waypoint = 30004, Zone = 371 }, - { Coord = { x = -2479.9001464844, y = 883.20001220703 }, Range = 5, Waypoint = 30004, Zone = 371 }, - { Coord = { x = -2520.1000976562, y = 1008.5 }, Range = 5, Waypoint = 30004, Zone = 371 }, - { Coord = { x = -2488.6999511719, y = 1025.3000488281 }, Range = 5, Waypoint = 30004, Zone = 371 }, + { Coord = { x = -2488.5, y = 812.40002441406 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2430.8000488281, y = 832.79998779297 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2449, y = 893.29998779297 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2479.9001464844, y = 883.20001220703 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2520.1000976562, y = 1008.5 }, Range = 5, Waypoint = 29997, Zone = 371 }, + { Coord = { x = -2488.6999511719, y = 1025.3000488281 }, Range = 5, Waypoint = 29997, Zone = 371 }, { Coord = { x = -2535.9001464844, y = 1054.9000244141 }, ExtraLineText = "KILL_WATER_ELEMENTS_UNTIL_YOU_DROP_THE_STAFF", @@ -1202,7 +1202,7 @@ if APR.Faction == "Horde" then Zone = 418 }, { Coord = { x = -452.70001220703, y = -645.79998779297 }, Qpart = { [30088] = { 1 } }, Range = 30, Zone = 418 }, - { Coord = { x = -363, y = -409.10000610352 }, Range = 5, Waypoint = 30628, Zone = 418 }, + { Coord = { x = -363, y = -409.10000610352 }, Range = 5, Waypoint = 30083, Zone = 418 }, { Coord = { x = -218.80000305176, y = -381.80001831055 }, Fillers = { [30083] = { 1 } }, @@ -1401,7 +1401,7 @@ if APR.Faction == "Horde" then ExtraLineText = "JUMP_INTO_WATER_AND_ENTER_IN_UNDERWATER_CAVE", Fillers = { [30671] = { 1 } }, Range = 5, - Waypoint = 30671, + Waypoint = 30691, Zone = 418 }, { @@ -1547,7 +1547,7 @@ if APR.Faction == "Horde" then Coord = { x = 1882.0999755859, y = -439.10000610352 }, ETA = 79, NodeID = 1052, - UseFlightPath = 31255, + UseFlightPath = 31286, Zone = 376 }, { ZoneDoneSave = 1 } @@ -1810,7 +1810,7 @@ if APR.Faction == "Horde" then Coord = { x = 1864.8000488281, y = 2275.6000976562 }, ExtraLineText = "TAKE_EXPLOSIVES_BARREL", Range = 1, - Waypoint = 30655, + Waypoint = 30656, Zone = 379 }, { @@ -1822,7 +1822,7 @@ if APR.Faction == "Horde" then Zone = 379 }, { Coord = { x = 1783.2000732422, y = 2251.3000488281 }, Qpart = { [30655] = { 1 } }, Range = 30, Zone = 379 }, - { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30655, Zone = 379 }, + { Coord = { x = 1774.4000244141, y = 2408.9001464844 }, Range = 5, Waypoint = 30656, Zone = 379 }, { Coord = { x = 1810.3000488281, y = 2415.6999511719 }, Qpart = { [30661] = { 1 } }, Range = 5, Zone = 379 }, { Coord = { x = 910.40002441406, y = 2285.4001464844 }, Done = { 30656 }, Zone = 379 }, { Coord = { x = 933.90002441406, y = 2265.4001464844 }, Done = { 30655, 30661 }, Zone = 379 }, @@ -1913,26 +1913,26 @@ if APR.Faction == "Horde" then }, { Coord = { x = 538.40002441406, y = 3823.9001464844 }, Done = { 31395 }, Zone = 379 }, { Coord = { x = 538.40002441406, y = 3823.9001464844 }, PickUp = { 31511 }, Zone = 379 }, - { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 31511, Zone = 379 }, + { Coord = { x = 849.10003662109, y = 3154 }, Fillers = { [30617] = { 1 } }, Range = 5, Waypoint = 30617, Zone = 379 }, { Coord = { x = 895.79998779297, y = 3109.9001464844 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31511, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 894.10003662109, y = 2993.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31511, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 916.70001220703, y = 2923.1000976562 }, Fillers = { [30617] = { 1 } }, Range = 5, - Waypoint = 31511, + Waypoint = 30617, Zone = 379 }, { Coord = { x = 1078.5, y = 2878 }, Qpart = { [30617] = { 1 } }, Range = 30, Zone = 379 }, @@ -1950,7 +1950,7 @@ if APR.Faction == "Horde" then Coord = { x = 1135.3000488281, y = 3396 }, ExtraLineText = "GO_INSIDE_CAVE", Range = 5, - Waypoint = 30618, + Waypoint = 30621, Zone = 379 }, { @@ -1960,7 +1960,7 @@ if APR.Faction == "Horde" then Range = 100, Zone = 379 }, - { UseHS = 30618, Zone = 380 }, + { UseHS = 30621, Zone = 380 }, { Coord = { x = 1251.8000488281, y = 3107 }, Done = { 30621 }, Zone = 379 }, { Coord = { x = 1258.5999755859, y = 3064.9001464844 }, Done = { 30601 }, Zone = 379 }, { Coord = { x = 1227.5999755859, y = 3041.6999511719 }, Done = { 30618 }, Zone = 379 }, @@ -2372,7 +2372,7 @@ if APR.Faction == "Horde" then { NoArrow = 1, PickUp = { 30746 }, Zone = 379 }, { Coord = { x = 2495, y = 2366.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2470.4001464844, y = 2522 }, Qpart = { [30742] = { 1 }, [30743] = { 1 } }, Range = 69, Zone = 379 }, - { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30742, Zone = 379 }, + { Coord = { x = 2507.5, y = 2454.4001464844 }, Range = 5, Waypoint = 30746, Zone = 379 }, { Coord = { x = 2527.5, y = 2438.6000976562 }, Done = { 30746 }, Zone = 379 }, { Coord = { x = 2177, y = 2722.4001464844 }, Done = { 30745, 30742, 30743 }, ETA = 20, Zone = 379 }, { Coord = { x = 2180.8000488281, y = 2724.4001464844 }, PickUp = { 30747 }, Zone = 379 }, @@ -2385,7 +2385,7 @@ if APR.Faction == "Horde" then Zone = 379 }, { Coord = { x = 2178.4001464844, y = 2725.9001464844 }, Done = { 30747 }, Zone = 379 }, - { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31511, Zone = 379 }, + { Coord = { x = 2020.5999755859, y = 1864.0999755859 }, Range = 2, Waypoint = 31453, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, Done = { 31453 }, Zone = 379 }, { Coord = { x = 2056.3000488281, y = 1866.5 }, PickUp = { 30665, 30670 }, Zone = 379 }, { Coord = { x = 2152.1999511719, y = 1932.9000244141 }, ExtraLineText = "INSIDE", PickUp = { 30682 }, Zone = 379 }, @@ -2515,7 +2515,7 @@ if APR.Faction == "Horde" then { Coord = { x = 2543.1999511719, y = 3629.1000976562 }, Done = { 30752 }, Zone = 379 }, { Coord = { x = 2543.1999511719, y = 3629.1000976562 }, PickUp = { 31030 }, PickUpDB = { 31030, 31031 }, Zone = 379 }, { Done = { 31030 }, DoneDB = { 31030, 31031 }, ExtraLineText = "TURN_IN_QUEST_INSIDE_DUNGEON_THEN_EXIT", NoArrow = 1 }, - { UseHS = 31847, Zone = 379 }, + { UseHS = 31511, Zone = 379 }, { Coord = { x = 1322.5999755859, y = 1797.4000244141 }, GossipOptionIDs = { 41178 }, @@ -2531,7 +2531,7 @@ if APR.Faction == "Horde" then }, { Coord = { x = 897.5, y = 1684.2000732422 }, Range = 5, Waypoint = 31511, Zone = 391 }, { Coord = { x = 893.20001220703, y = 1698.5 }, Done = { 31511 }, Zone = 391 }, - { Coord = { x = 889.5, y = 1579.9000244141 }, ETA = 111, NodeID = 1024, UseFlightPath = 1, Zone = 390 }, + { Coord = { x = 889.5, y = 1579.9000244141 }, ETA = 111, NodeID = 1024, UseFlightPath = 31695, Zone = 390 }, { Coord = { x = 2588.4001464844, y = 2124.9001464844 }, GetFP = 1117, Zone = 379 }, { Coord = { x = 2995.1000976562, y = 2363.3000488281 }, GetFP = 1053, Zone = 388 }, { ZoneDoneSave = 1 }