From 08317daba777ddd6880d14b8611e41aa10c67159 Mon Sep 17 00:00:00 2001 From: Aldric Ducreux Date: Fri, 20 Dec 2024 00:21:23 +0100 Subject: [PATCH] Add Lingering shadow + siren isle route (#362) --- .vscode/settings.json | 2 +- APR-Core/ChangeLog.lua | 5 + APR-Core/database/AllianceRoutes.lua | 2 + APR-Core/database/HordeRoutes.lua | 2 + Routes/TheWarWithin/TheWarWithin.lua | 653 +++++++++++++++++++++++++++ 5 files changed, 663 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 7c413dc9..abfc8db1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -27,6 +27,6 @@ "utf8": "disable" }, "Lua.workspace.library": [ - "~\\.vscode\\extensions\\ketho.wow-api-0.17.6\\Annotations" + "~\\.vscode\\extensions\\ketho.wow-api-0.18.1\\Annotations" ] } diff --git a/APR-Core/ChangeLog.lua b/APR-Core/ChangeLog.lua index 9fc20330..b984010f 100644 --- a/APR-Core/ChangeLog.lua +++ b/APR-Core/ChangeLog.lua @@ -79,6 +79,11 @@ end function APR.changelog:SetChangeLog() local news = { + { "v4.6.0", "2024-12-20" }, + "#TWW", + "- Added Lingering Shadow Storyline route", + "- Added Siren Isle Intro route", + { "v4.5.6", "2024-12-10" }, "#Bugs", "- Removed `Renown of Khaz Algar` quest (84446)", diff --git a/APR-Core/database/AllianceRoutes.lua b/APR-Core/database/AllianceRoutes.lua index 53e7364c..61bf1141 100644 --- a/APR-Core/database/AllianceRoutes.lua +++ b/APR-Core/database/AllianceRoutes.lua @@ -110,6 +110,8 @@ if (APR.Faction == "Alliance") then ["2248-TWW-News-from-Below-storyline"] = "TWW - 08 - News from Below Storyline", ["2248-TWW-The-Machines-March-to-War-storyline"] = "TWW - 09 - The Machines March to War Storyline", ["2248-TWW-Light-in-the-Dark-storyline"] = "TWW - 10 - Light in the Dark Storyline", + ["2248-TWW-Lingering-Shadow-Storyline"] = "TWW - 11 - Lingering Shadow Storyline", + ["2248-TWW-Siren-Isle-Intro"] = "TWW - Siren Isle Intro", ["2248-TWW-Isle-of-Dorn-campaign-only"] = "TWW - Isle of Dorn - Campaign Only", ["2214-TWW-Ringing-Deeps-campaign-only"] = "TWW - Ringing Deeps - Campaign Only", ["2215-TWW-Hallowfall-campaign-only"] = "TWW - Hallowfall - Campaign Only", diff --git a/APR-Core/database/HordeRoutes.lua b/APR-Core/database/HordeRoutes.lua index 8ed137b7..a154b339 100644 --- a/APR-Core/database/HordeRoutes.lua +++ b/APR-Core/database/HordeRoutes.lua @@ -86,6 +86,8 @@ if (APR.Faction == "Horde") then ["2248-TWW-News-from-Below-storyline"] = "TWW - 08 - News from Below Storyline", ["2248-TWW-The-Machines-March-to-War-storyline"] = "TWW - 09 - The Machines March to War Storyline", ["2248-TWW-Light-in-the-Dark-storyline"] = "TWW - 10 - Light in the Dark Storyline", + ["2248-TWW-Lingering-Shadow-Storyline"] = "TWW - 11 - Lingering Shadow Storyline", + ["2248-TWW-Siren-Isle-Intro"] = "TWW - Siren Isle Intro", ["2248-TWW-Isle-of-Dorn-campaign-only"] = "TWW - Isle of Dorn - Campaign Only", ["2214-TWW-Ringing-Deeps-campaign-only"] = "TWW - Ringing Deeps - Campaign Only", ["2215-TWW-Hallowfall-campaign-only"] = "TWW - Hallowfall - Campaign Only", diff --git a/Routes/TheWarWithin/TheWarWithin.lua b/Routes/TheWarWithin/TheWarWithin.lua index aa616494..775dbfab 100644 --- a/Routes/TheWarWithin/TheWarWithin.lua +++ b/Routes/TheWarWithin/TheWarWithin.lua @@ -23063,3 +23063,656 @@ APR.RouteQuestStepList["2214-TWW-Ringing-Deeps-Full"] = { _index = 585, }, } + +APR.RouteQuestStepList["2248-TWW-Lingering-Shadow-Storyline"] = { + { + PickUp = { 82690 }, + Coord = { x = -2422.4, y = 2923.1 }, + Zone = 2248, + _index = 1, + }, + { + Waypoint = 82690, + Coord = { x = -2868.9, y = 2570.6 }, + ExtraLineText = "TAKE_TELEPORT_TO_AZJ_KAHET", + Range = 10, + Zone = 2248, + _index = 2, + }, + { + Waypoint = 82690, + Coord = { x = -1784.5, y = 1604.7 }, + ExtraLineText = "HEAD_TO_HALLOWFALL", + Range = 5, + Zone = 2274, + _index = 3, + }, + { + Qpart = { [82690] = { 1 } }, + Coord = { x = -859.1, y = 1219.8 }, + Range = 30, + Zone = 2215, + _index = 4, + }, + { + Done = { 82690 }, + Coord = { x = -830, y = 1204.3 }, + Zone = 2215, + _index = 5, + }, + { + PickUp = { 82692, 82693, 82691 }, + Coord = { x = -830, y = 1204.3 }, + Zone = 2215, + _index = 6, + }, + { + Qpart = { [82693] = { 1 } }, + Coord = { x = -1071.9, y = 1310.6 }, + Fillers = { [82691] = { 1 }, [82692] = { 1 } }, + GossipOptionIDs = { 123066, 123067, 123068 }, + Range = 10, + RaidIcon = 224580, + Zone = 2215, + _index = 7, + }, + { + Qpart = { [82691] = { 1 }, [82692] = { 1 } }, + Coord = { x = -988.2, y = 1268.4 }, + GossipOptionIDs = { 123066, 123067, 123068 }, + Range = 50, + Zone = 2215, + _index = 8, + }, + { + Done = { 82692, 82693, 82691 }, + Coord = { x = -830.3, y = 1202.8 }, + Zone = 2215, + _index = 9, + }, + { + PickUp = { 82694 }, + Coord = { x = -830.3, y = 1202.8 }, + Zone = 2215, + _index = 10, + }, + { + Qpart = { [82694] = { 1, 2 } }, + Coord = { x = -488.3, y = 2370 }, + GossipOptionIDs = { 123866 }, + Range = 10, + Zone = 2215, + _index = 11, + }, + { + Done = { 82694 }, + Coord = { x = 2332.1, y = 2083.9 }, + Zone = 2215, + _index = 12, + }, + { + PickUp = { 82695 }, + Coord = { x = 2332.1, y = 2083.9 }, + Zone = 2215, + _index = 13, + }, + { + Qpart = { [82695] = { 1, 2 } }, + Coord = { x = 2332.1, y = 2083.9 }, + GossipOptionIDs = { 124955 }, + Range = 30, + Zone = 2215, + _index = 14, + }, + { + Done = { 82695 }, + Coord = { x = 2332.3, y = 2084 }, + Zone = 2215, + _index = 15, + }, + { + PickUp = { 82696 }, + Coord = { x = 2332.3, y = 2084 }, + Zone = 2215, + _index = 16, + }, + { + PickUp = { 82957 }, + Coord = { x = -2210.1, y = 2630.5 }, + Zone = 2214, + _index = 17, + }, + { + LeaveQuests = { 82957 }, + Zone = 2215, + _index = 18, + }, + { + Waypoint = 82957, + Coord = { x = -2176.3, y = 2615.5 }, + ExtraLineText = "HEAD_TO_RINGING_DEEPS", + Range = 5, + Zone = 2215, + _index = 19, + }, + { + PickUp = { 82957 }, + Coord = { x = -2311.4, y = 2696.7 }, + Zone = 2214, + _index = 20, + }, + { + Done = { 82696 }, + Coord = { x = -3588.6, y = 718.3 }, + Zone = 2214, + _index = 21, + }, + { + PickUp = { 82697 }, + Coord = { x = -3569.6, y = 718.7 }, + Zone = 2214, + _index = 22, + }, + { + Qpart = { [82697] = { 1 } }, + Coord = { x = -3856, y = 221 }, + Range = 30, + Zone = 2214, + _index = 23, + }, + { + Done = { 82697 }, + Coord = { x = -4007, y = -3.9 }, + Zone = 2214, + _index = 24, + }, + { + PickUp = { 82699 }, + Coord = { x = -4007, y = -3.9 }, + Zone = 2214, + _index = 25, + }, + { + PickUp = { 82698 }, + Coord = { x = -4001.1, y = -4.1 }, + Zone = 2214, + _index = 26, + }, + { + Qpart = { [82699] = { 1, 2 } }, + Coord = { x = -3820.2, y = -391.4 }, + Fillers = { [82698] = { 1 } }, + GossipOptionIDs = { 123125 }, + Range = 50, + Zone = 2214, + _index = 27, + }, + { + Qpart = { [82698] = { 1 } }, + Coord = { x = -3656.3, y = -575.1 }, + Range = 30, + Zone = 2214, + _index = 28, + }, + { + Qpart = { [82699] = { 3 } }, + Coord = { x = -3706.9, y = -364.7 }, + Range = 10, + Zone = 2214, + _index = 29, + }, + { + Done = { 82699, 82698 }, + Coord = { x = -3708.2, y = -360.5 }, + Zone = 2214, + _index = 30, + }, + { + PickUp = { 82700 }, + Coord = { x = -3708.2, y = -360.5 }, + Zone = 2214, + _index = 31, + }, + { + Qpart = { [82700] = { 1 } }, + Coord = { x = -3573.4, y = -320.3 }, + Range = 10, + RaidIcon = 224918, + Zone = 2214, + _index = 32, + }, + { + Done = { 82700 }, + Coord = { x = -4001.5, y = -4 }, + Zone = 2214, + _index = 33, + }, + { + PickUp = { 82701 }, + Coord = { x = -4001.1, y = -3.9 }, + Zone = 2214, + _index = 34, + }, + { + Qpart = { [82701] = { 1 } }, + Coord = { x = -4001.1, y = -3.9 }, + GossipOptionIDs = { 123172 }, + ExtraLineText = "SPEAK_TO_ORWEYNA", + Range = 5, + Zone = 2214, + _index = 35, + }, + { + QpartPart = { [82701] = { 2 } }, + Coord = { x = -3989.2, y = -15.5 }, + ExtraLineText = "ON_TOP_OF_TOWER", + Range = 10, + TrigText = "1/4", + Zone = 2214, + _index = 36, + }, + { + QpartPart = { [82701] = { 2 } }, + Coord = { x = -3898.6, y = -54.2 }, + ExtraLineText = "ON_BRIDGE", + Range = 10, + TrigText = "2/4", + Zone = 2214, + _index = 37, + }, + { + QpartPart = { [82701] = { 2 } }, + Coord = { x = -3928.7, y = 39 }, + ExtraLineText = "UNDER_4_POST_BUILDING", + Range = 10, + TrigText = "3/4", + Zone = 2214, + _index = 38, + }, + { + QpartPart = { [82701] = { 2 } }, + Coord = { x = -4074.9, y = 114.3 }, + ExtraLineText = "TOWER_WITH_GEARS_AND_CHAINS", + Range = 10, + TrigText = "4/4", + Zone = 2214, + _index = 39, + }, + { + Qpart = { [82701] = { 3 } }, + Coord = { x = -4156.9, y = 60.7 }, + Range = 10, + Zone = 2214, + _index = 40, + }, + { + Qpart = { [82701] = { 4 } }, + Coord = { x = -3761.5, y = -340.2 }, + Range = 30, + ExtraActionB = 1, + Zone = 2214, + _index = 41, + }, + { + Qpart = { [82701] = { 5 } }, + Coord = { x = -3721.1, y = -351.8 }, + Range = 30, + Zone = 2214, + _index = 42, + }, + { + Done = { 82701 }, + Coord = { x = -4000.5, y = -4.7 }, + Zone = 2214, + _index = 43, + }, + { + PickUp = { 82702 }, + Coord = { x = -4008.2, y = -5.4 }, + Zone = 2214, + _index = 44, + }, + { + Waypoint = 82702, + Coord = { x = -4008.2, y = -5.4 }, + ExtraLineText = "USE_ELEVATOR_UP_TO_ISLE_DORN", + _index = 45, + }, + { + Qpart = { [82702] = { 2 } }, + Coord = { x = -2423.3, y = 2892.3 }, + Range = 30, + Zone = 2248, + _index = 46, + }, + { + Qpart = { [82702] = { 2 } }, + Coord = { x = -2423.3, y = 2892.3 }, + Range = 30, + Zone = 2248, + _index = 47, + }, + { + Done = { 82702 }, + Coord = { x = -2422, y = 2922.8 }, + Zone = 2248, + _index = 48, + }, + { + PickUp = { 84701 }, + Coord = { x = -2421.9, y = 2917.5 }, + Zone = 2248, + _index = 49, + }, + { + Done = { 84701 }, + Coord = { x = -2279.5, y = 2157 }, + Zone = 2248, + _index = 50, + }, + { + RouteCompleted = 1, + _index = 51, + }, +} + +APR.RouteQuestStepList["2248-TWW-Siren-Isle-Intro"] = { + { + PickUp = { 84719 }, + Coord = { x = -2411.9, y = 2933.1 }, + Zone = 2248, + _index = 1, + }, + { + Done = { 84719 }, + Coord = { x = -3072.7, y = 3214.7 }, + Zone = 2248, + _index = 2, + }, + { + PickUp = { 84720 }, + Coord = { x = -3072.7, y = 3214.7 }, + Zone = 2248, + _index = 3, + }, + { + Qpart = { [84720] = { 1 } }, + Coord = { x = -3072.7, y = 3214.7 }, + GossipOptionIDs = { 124305 }, + Range = 30, + Zone = 2248, + _index = 4, + }, + { + Qpart = { [84720] = { 2 } }, + Coord = { x = 12.4, y = 2010.5 }, + Range = 30, + Zone = 2369, + _index = 5, + }, + { + Done = { 84720 }, + Coord = { x = 25.5, y = 2023.8 }, + Zone = 2369, + _index = 6, + }, + { + PickUp = { 84940 }, + Coord = { x = 25.5, y = 2023.8 }, + Zone = 2369, + _index = 7, + }, + { + Done = { 84940 }, + Coord = { x = 52.2, y = 2087.3 }, + Zone = 2369, + _index = 8, + }, + { + PickUp = { 84721 }, + Coord = { x = 52.2, y = 2087.3 }, + Zone = 2369, + _index = 9, + }, + { + Qpart = { [84721] = { 1 } }, + Coord = { x = 51.1, y = 2102.8 }, + Range = 10, + Zone = 2369, + _index = 10, + }, + { + Qpart = { [84721] = { 2 } }, + Coord = { x = 1.1, y = 2103.6 }, + GossipOptionIDs = { 124803 }, + Zone = 2369, + _index = 11, + }, + { + Qpart = { [84721] = { 3 } }, + Coord = { x = -4.8, y = 2046.2 }, + Range = 10, + Zone = 2369, + _index = 12, + }, + { + Qpart = { [84721] = { 4 } }, + Coord = { x = 52.6, y = 2087.1 }, + GossipOptionIDs = { 124801 }, + Zone = 2369, + _index = 13, + }, + { + Done = { 84721 }, + Coord = { x = 52.6, y = 2087.1 }, + Zone = 2369, + _index = 14, + }, + { + PickUp = { 84722 }, + Coord = { x = 52.6, y = 2087.1 }, + Zone = 2369, + _index = 15, + }, + { + Qpart = { [84722] = { 1 } }, + Coord = { x = 339.2, y = 2060 }, + Range = 5, + Zone = 2369, + _index = 16, + }, + { + Qpart = { [84722] = { 2 } }, + Coord = { x = 346.4, y = 2061 }, + Range = 5, + Zone = 2369, + _index = 17, + }, + { + Qpart = { [84722] = { 3 } }, + Coord = { x = 396.9, y = 2093.1 }, + Range = 5, + Zone = 2369, + _index = 18, + }, + { + Qpart = { [84722] = { 4 } }, + Coord = { x = 406, y = 2066.1 }, + Range = 5, + Zone = 2369, + _index = 19, + }, + { + Done = { 84722 }, + Coord = { x = 355.9, y = 2067.2 }, + Zone = 2369, + _index = 20, + }, + { + PickUp = { 84727 }, + Coord = { x = 355.9, y = 2067.2 }, + Zone = 2369, + _index = 21, + }, + { + Done = { 84727 }, + Coord = { x = 426.1, y = 2226.7 }, + Zone = 2369, + _index = 22, + }, + { + PickUp = { 84941 }, + Coord = { x = 426.1, y = 2226.7 }, + Zone = 2369, + _index = 23, + }, + { + Qpart = { [84941] = { 1 } }, + Coord = { x = 420.6, y = 2282.6 }, + Range = 30, + Zone = 2369, + _index = 24, + }, + { + Qpart = { [84941] = { 2 } }, + Coord = { x = 355.8, y = 2335.6 }, + Range = 5, + Zone = 2369, + _index = 25, + }, + { + Done = { 84941 }, + Coord = { x = 343.9, y = 2333.3 }, + Zone = 2369, + _index = 26, + }, + { + PickUp = { 84723 }, + Coord = { x = 343.9, y = 2333.3 }, + Zone = 2369, + _index = 27, + }, + { + Qpart = { [84723] = { 1, 3 } }, + Coord = { x = 322.7, y = 2361.9 }, + Range = 30, + Zone = 2369, + _index = 28, + }, + { + Qpart = { [84723] = { 4 } }, + Coord = { x = 384.2, y = 2255.6 }, + Range = 30, + Zone = 2369, + _index = 29, + }, + { + Qpart = { [84723] = { 5 } }, + Coord = { x = 415.5, y = 2178.7 }, + Range = 5, + Zone = 2369, + _index = 30, + }, + { + Done = { 84723 }, + Coord = { x = 434.5, y = 2140.3 }, + Zone = 2369, + _index = 31, + }, + { + PickUp = { 84724 }, + Coord = { x = 434.5, y = 2140.3 }, + Zone = 2369, + _index = 32, + }, + { + Qpart = { [84724] = { 1, 2, 3, 4, 5 } }, + Coord = { x = 451.7, y = 2109.5 }, + GossipOptionIDs = { 124399, 124775 }, + Range = 30, + Zone = 2369, + _index = 33, + }, + { + Done = { 84724 }, + Coord = { x = -3, y = 2065.3 }, + Zone = 2369, + _index = 34, + }, + { + PickUp = { 84728 }, + Coord = { x = -3, y = 2065.3 }, + Zone = 2369, + _index = 35, + }, + { + Qpart = { [84728] = { 1 } }, + Coord = { x = -3, y = 2065.3 }, + GossipOptionIDs = { 124757 }, + Range = 30, + Zone = 2369, + _index = 36, + }, + { + Done = { 84728 }, + Coord = { x = -3, y = 2065.3 }, + Zone = 2369, + _index = 37, + }, + { + PickUp = { 84725 }, + Coord = { x = -3, y = 2065.3 }, + Zone = 2369, + _index = 38, + }, + { + Qpart = { [84725] = { 1, 2, 3 } }, + Coord = { x = -3, y = 2065.3 }, + Range = 30, + Zone = 2369, + _index = 39, + }, + { + Done = { 84725 }, + Coord = { x = -3, y = 2065.3 }, + Zone = 2369, + _index = 40, + }, + { + PickUp = { 84726 }, + Coord = { x = -3, y = 2065.3 }, + Zone = 2369, + _index = 41, + }, + { + Qpart = { [84726] = { 1 } }, + Coord = { x = 41.9, y = 1760.1 }, + Range = 30, + Zone = 2369, + _index = 42, + }, + { + Qpart = { [84726] = { 2 } }, + Coord = { x = 597.6, y = 1804.3 }, + Range = 30, + Zone = 2369, + _index = 43, + }, + { + Qpart = { [84726] = { 3 } }, + Coord = { x = 490.1, y = 2312.1 }, + Range = 30, + Zone = 2369, + _index = 44, + }, + { + Done = { 84726 }, + Coord = { x = -3.6, y = 2064.6 }, + Zone = 2369, + _index = 45, + }, + { + RouteCompleted = 1, + _index = 46, + }, +}