From 6bd5b21ad4c963f07397e0f6c23f51676b20a846 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 18 Jul 2024 16:33:48 +0200 Subject: [PATCH] Add Shaaloani side quests --- .../Gridania/449_Renewing the Covenant.json | 10 - .../Il Mheg/3395_The Forbidden Lran.json | 70 ++++++ .../Il Mheg/3398_Delightful Decorations.json | 221 +++++++++++++++++ .../Il Mheg/3404_The Path to Popularity.json | 110 +++++++++ .../B-Il Mheg/3312_The Key to the Castle.json | 29 ++- .../B-Il Mheg/3313_A Visit to the Nu Mou.json | 96 ++++++++ .../MSQ/B-Il Mheg/3314_A Fitting Payment.json | 32 +++ .../Pixies/Dailies/3701_Amazing Graze.json | 43 ++-- .../Pixies/Dailies/3701_Amazing Graze.md | 7 + .../Pixies/Dailies/3702_Pure Imagination.json | 22 +- .../Pixies/Dailies/3702_Pure Imagination.md | 7 + .../3703_Raiders of the Lost Pork.json | 15 ++ .../Dailies/3703_Raiders of the Lost Pork.md | 1 + .../Arkasodara/Dailies/4563_Seedy Affair.json | 23 ++ .../Arkasodara/Dailies/4563_Seedy Affair.md | 1 + .../Shaaloani/5138_Rroneek Seeker.json | 1 - .../Physical Ranged/4837_Bandits Abound.json | 86 +++++++ .../4838_Take Me to Your Leader.json | 211 +++++++++++++++++ .../4839_The Milk of Mamool Ja Kindness.json | 21 ++ .../4840_Ally in the Alley.json | 21 ++ .../Shaaloani/5119_A Private Delivery.json | 87 +++++++ .../5120_A Sobering Proposition.json | 155 ++++++++++++ .../Shaaloani/5121_Taste of the Wilds.json | 114 +++++++++ .../Shaaloani/5122_Fruitful Endeavors.json | 73 ++++++ .../Shaaloani/5123_Gentle Giants.json | 112 +++++++++ .../Shaaloani/5124_Waiting One's Turn.json | 111 +++++++++ .../Shaaloani/5125_Bomb Disposal.json | 57 +++++ .../Shaaloani/5126_A Refined Perspective.json | 69 ++++++ .../5127_Surprising Source of Fiber.json | 84 +++++++ .../Shaaloani/5128_A Grave Matter.json | 69 ++++++ .../5129_Working on a Full Stomach.json | 53 +++++ .../Shaaloani/5131_Watching Big Brother.json | 72 ++++++ .../Shaaloani/5132_Death by Popoto.json | 127 ++++++++++ .../Shaaloani/5133_A Tool Tale.json | 53 +++++ .../Shaaloani/5134_Tastes Like Home.json | 53 +++++ .../5135_Snakes on a Train(line).json | 71 ++++++ .../5136_It's a Terrible Ring to Lose.json | 93 ++++++++ .../Shaaloani/5137_A Mount with a View.json | 69 ++++++ .../5139_The Horns That Bind Us.json | 69 ++++++ .../Shaaloani/5141_Broken Record.json | 64 +++++ .../Shaaloani/5142_Back on Stage.json | 183 ++++++++++++++ .../Shaaloani/5143_A Family's Worth.json | 88 +++++++ .../Shaaloani/5145_Down in the Mouth.json | 86 +++++++ .../Shaaloani/5146_Listen to Your Elders.json | 102 ++++++++ .../Shaaloani/5147_Back in Blue.json | 74 ++++++ .../Shaaloani/5148_Dig for Victory.json | 224 ++++++++++++++++++ QuestPaths/QuestPaths.csproj | 1 - QuestPaths/quest-v1.json | 3 +- .../V1/Converter/EmoteConverter.cs | 1 + Questionable.Model/V1/EEmote.cs | 1 + Questionable.Model/V1/QuestSequence.cs | 3 + Questionable.sln.DotSettings | 40 +++- .../MovementOverrideController.cs | 10 +- .../Controller/Steps/Common/MountTask.cs | 3 +- Questionable/GameFunctions.cs | 9 + Questionable/Windows/QuestSelectionWindow.cs | 2 + Questionable/Windows/QuestWindow.cs | 6 + 57 files changed, 3483 insertions(+), 35 deletions(-) create mode 100644 QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3395_The Forbidden Lran.json create mode 100644 QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json create mode 100644 QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json create mode 100644 QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3313_A Visit to the Nu Mou.json create mode 100644 QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3314_A Fitting Payment.json create mode 100644 QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.md create mode 100644 QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.md create mode 100644 QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4838_Take Me to Your Leader.json create mode 100644 QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4839_The Milk of Mamool Ja Kindness.json create mode 100644 QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4840_Ally in the Alley.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5119_A Private Delivery.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5120_A Sobering Proposition.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5121_Taste of the Wilds.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5122_Fruitful Endeavors.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5123_Gentle Giants.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5124_Waiting One's Turn.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5125_Bomb Disposal.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5126_A Refined Perspective.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5127_Surprising Source of Fiber.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5128_A Grave Matter.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5129_Working on a Full Stomach.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5131_Watching Big Brother.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5133_A Tool Tale.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5134_Tastes Like Home.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5135_Snakes on a Train(line).json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5136_It's a Terrible Ring to Lose.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5137_A Mount with a View.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5139_The Horns That Bind Us.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5141_Broken Record.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5145_Down in the Mouth.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5146_Listen to Your Elders.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5147_Back in Blue.json create mode 100644 QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/449_Renewing the Covenant.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/449_Renewing the Covenant.json index af340e0e..5ede4596 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/449_Renewing the Covenant.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/449_Renewing the Covenant.json @@ -25,16 +25,6 @@ "InteractionType": "EquipItem", "ItemId": 2651 }, - { - "Position": { - "X": 49.65071, - "Y": -8.046952, - "Z": 102.32186 - }, - "TerritoryId": 132, - "InteractionType": "WalkTo", - "$": "New Gridania Navmesh workaround" - }, { "DataId": 1000286, "Position": { diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3395_The Forbidden Lran.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3395_The Forbidden Lran.json new file mode 100644 index 00000000..335f5b05 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3395_The Forbidden Lran.json @@ -0,0 +1,70 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030266, + "Position": { + "X": -367.66614, + "Y": 66.863594, + "Z": 557.1526 + }, + "TerritoryId": 816, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1030267, + "Position": { + "X": -161.30316, + "Y": 34.21811, + "Z": 607.38525 + }, + "TerritoryId": 816, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009997, + "Position": { + "X": -40.116028, + "Y": 24.063354, + "Z": 739.25366 + }, + "TerritoryId": 816, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_LUCKZC012_03395_SYSTEM_000_013" + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030266, + "Position": { + "X": -367.66614, + "Y": 66.863594, + "Z": 557.1526 + }, + "TerritoryId": 816, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Il Mheg - Lydha Lran" + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json new file mode 100644 index 00000000..7db687df --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3398_Delightful Decorations.json @@ -0,0 +1,221 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030618, + "Position": { + "X": -613.39746, + "Y": 36.54754, + "Z": -215.41168 + }, + "TerritoryId": 816, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -469.05124, + "Y": -0.60001665, + "Z": -194.937 + }, + "TerritoryId": 816, + "InteractionType": "WaitForManualProgress", + "Comment": "Dive (manually)" + }, + { + "DataId": 2010160, + "Position": { + "X": -456.80933, + "Y": -41.153625, + "Z": -232.01343 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2010161, + "Position": { + "X": -341.02393, + "Y": -34.62274, + "Z": -211.4748 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + }, + { + "DataId": 2010159, + "Position": { + "X": -341.78687, + "Y": -56.992493, + "Z": -159.96033 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2010158, + "Position": { + "X": -347.43274, + "Y": -48.264343, + "Z": -120.3479 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2010158, + "Position": { + "X": -347.43274, + "Y": 0, + "Z": -120.3479 + }, + "TerritoryId": 816, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "Position": { + "X": -438.7658, + "Y": 0.09470785, + "Z": -86.849434 + }, + "TerritoryId": 816, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "DataId": 1030618, + "Position": { + "X": -613.39746, + "Y": 36.54754, + "Z": -215.41168 + }, + "TerritoryId": 816, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2010163, + "Position": { + "X": -659.9985, + "Y": 38.864624, + "Z": -227.25269 + }, + "TerritoryId": 816, + "InteractionType": "UseItem", + "ItemId": 2002637, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2010164, + "Position": { + "X": -664.02686, + "Y": 40.66516, + "Z": -225.08588 + }, + "TerritoryId": 816, + "InteractionType": "UseItem", + "ItemId": 2002637, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2010162, + "Position": { + "X": -667.6585, + "Y": 42.74048, + "Z": -228.62598 + }, + "TerritoryId": 816, + "InteractionType": "UseItem", + "ItemId": 2002637, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030618, + "Position": { + "X": -613.39746, + "Y": 36.54754, + "Z": -215.41168 + }, + "TerritoryId": 816, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json new file mode 100644 index 00000000..746d5e35 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Aether Currents/Il Mheg/3404_The Path to Popularity.json @@ -0,0 +1,110 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1030838, + "Position": { + "X": -285.90833, + "Y": 40.324036, + "Z": 444.41882 + }, + "TerritoryId": 816, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2010362, + "Position": { + "X": -622.4308, + "Y": 37.369263, + "Z": -232.3797 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2010363, + "Position": { + "X": -621.8815, + "Y": 37.338745, + "Z": -234.33282 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2010364, + "Position": { + "X": -627.7409, + "Y": 37.094604, + "Z": -245.65503 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1030839, + "Position": { + "X": -628.1377, + "Y": 35.861557, + "Z": -238.20862 + }, + "TerritoryId": 816, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1030838, + "Position": { + "X": -285.90833, + "Y": 40.324036, + "Z": 444.41882 + }, + "TerritoryId": 816, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json index 90c3e455..b837aec7 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json @@ -41,7 +41,34 @@ { "TerritoryId": 816, "InteractionType": "Duty", - "ContentFinderConditionId": 619 + "ContentFinderConditionId": 649 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2010056, + "Position": { + "X": -231.4141, + "Y": 4.701926, + "Z": 160.8437 + }, + "TerritoryId": 816, + "InteractionType": "AttuneAetherCurrent", + "AetherCurrentId": 2818270 + }, + { + "DataId": 1031669, + "Position": { + "X": -300.0077, + "Y": 1.4994799, + "Z": 182.8794 + }, + "TerritoryId": 816, + "InteractionType": "CompleteQuest", + "Mount": false } ] } diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3313_A Visit to the Nu Mou.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3313_A Visit to the Nu Mou.json new file mode 100644 index 00000000..1849f289 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3313_A Visit to the Nu Mou.json @@ -0,0 +1,96 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1029162, + "Position": { + "X": -300.67908, + "Y": 1.528771, + "Z": 182.2384 + }, + "StopDistance": 5, + "TerritoryId": 816, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1030577, + "Position": { + "X": -547.57, + "Y": 26.358929, + "Z": -229.11426 + }, + "TerritoryId": 816, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1030578, + "Position": { + "X": -413.99255, + "Y": 86.60777, + "Z": -444.5716 + }, + "TerritoryId": 816, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1030579, + "Position": { + "X": -517.2656, + "Y": 76.02325, + "Z": -416.67816 + }, + "TerritoryId": 816, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": -214.34406, + "Y": 55.06957, + "Z": -562.23914 + }, + "TerritoryId": 816, + "InteractionType": "WalkTo" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1029562, + "Position": { + "X": -130.69354, + "Y": 58.754936, + "Z": -680.4761 + }, + "TerritoryId": 816, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3314_A Fitting Payment.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3314_A Fitting Payment.json new file mode 100644 index 00000000..77291509 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3314_A Fitting Payment.json @@ -0,0 +1,32 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1029564, + "Position": { + "X": -143.26697, + "Y": 100.184166, + "Z": -848.90515 + }, + "StopDistance": 7, + "TerritoryId": 816, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "TerritoryId": 816, + "InteractionType": "AttuneAetheryte", + "Aetheryte": "Il Mheg - Pia Enni" + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.json index b67f3856..0e493b84 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.json @@ -1,6 +1,7 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -36,6 +37,16 @@ { "Sequence": 2, "Steps": [ + { + "Position": { + "X": 718.28796, + "Y": 188.06738, + "Z": 296.77258 + }, + "TerritoryId": 816, + "InteractionType": "WalkTo", + "Fly": true + }, { "DataId": 2010895, "Position": { @@ -45,14 +56,21 @@ }, "TerritoryId": 816, "InteractionType": "Interact", - "Fly": true, - "CompletionQuestVariablesFlags": [ - null, - null, - null, - null, - null, - 128 + "SkipIf": [ + "NotTargetable" + ] + }, + { + "DataId": 2010896, + "Position": { + "X": 743.5569, + "Y": 189.83752, + "Z": 260.4867 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "SkipIf": [ + "NotTargetable" ] }, { @@ -64,13 +82,8 @@ }, "TerritoryId": 816, "InteractionType": "Interact", - "CompletionQuestVariablesFlags": [ - null, - null, - null, - null, - null, - 64 + "SkipIf": [ + "NotTargetable" ] } ] diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.md b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.md new file mode 100644 index 00000000..cbeef753 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3701_Amazing Graze.md @@ -0,0 +1,7 @@ +## Amazing Graze + +Sequence 2: +``` +0 x 0 0 0 0 + 2 → 2010895, 2010896 +``` diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.json index e3500f97..5f236019 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.json @@ -1,6 +1,7 @@ { "$schema": "https://carvel.li/questionable/quest-1.0", "Author": "liza", + "Disabled": true, "QuestSequence": [ { "Sequence": 0, @@ -29,7 +30,23 @@ }, "TerritoryId": 816, "InteractionType": "Interact", - "Fly": true + "Fly": true, + "SkipIf": [ + "NotTargetable" + ] + }, + { + "DataId": 2010899, + "Position": { + "X": 783.2302, + "Y": 187.30444, + "Z": 151.995 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "SkipIf": [ + "NotTargetable" + ] } ] }, @@ -44,7 +61,8 @@ }, "TerritoryId": 816, "InteractionType": "WalkTo", - "Comment": "TODO it probably isn't necessary to walk that far" + "Comment": "TODO it probably isn't necessary to walk that far", + "Mount": false }, { "DataId": 1031809, diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.md b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.md new file mode 100644 index 00000000..afe2b686 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3702_Pure Imagination.md @@ -0,0 +1,7 @@ +## Pure Imagination + +QuestWork: +``` +0 0 0 x 0 0 + 1 → 2010899 +``` diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.json b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.json index 49f7f0ee..f8e2bd26 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.json +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.json @@ -36,6 +36,21 @@ ], "$": "Only if QW: 0 48 0 0 0 0" }, + { + "DataId": 1032168, + "Position": { + "X": -431.3573, + "Y": 24.720499, + "Z": 251.60596 + }, + "TerritoryId": 816, + "InteractionType": "Interact", + "Fly": true, + "SkipIf": [ + "NotTargetable" + ], + "$": "Only if QW: 0 32 0 0 0 0" + }, { "DataId": 1032167, "Position": { diff --git a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.md b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.md index e1306912..493ab110 100644 --- a/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.md +++ b/QuestPaths/5.x - Shadowbringers/Tribal/Pixies/Dailies/3703_Raiders of the Lost Pork.md @@ -3,6 +3,7 @@ QuestWork: ``` 0 x 0 0 0 0 + 32 → 1032168 48 → Elegant Eulmoran (1032169) ?? → 1032167 ``` diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json index 3215d4c5..0b2f9730 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json @@ -33,6 +33,19 @@ "ItemId": 2003420, "Fly": true, "AetheryteShortcut": "Thavnair - Palaka's Stand" + }, + { + "DataId": 2012886, + "Position": { + "X": 135.91211, + "Y": 6.4850464, + "Z": -327.5349 + }, + "TerritoryId": 957, + "InteractionType": "UseItem", + "ItemId": 2003420, + "Fly": true, + "AetheryteShortcut": "Thavnair - Palaka's Stand" } ] }, @@ -48,6 +61,16 @@ }, "TerritoryId": 957, "InteractionType": "Interact" + }, + { + "DataId": 2012886, + "Position": { + "X": 135.91211, + "Y": 6.4850464, + "Z": -327.5349 + }, + "TerritoryId": 957, + "InteractionType": "Interact" } ] }, diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md index 17a1c889..3a9f3bf7 100644 --- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md +++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md @@ -3,5 +3,6 @@ QuestWork: ``` 0 ?? 0 0 0 0 + 17 → 2012886 19 → 2012884 ``` diff --git a/QuestPaths/7.x - Dawntrail/Aether Currents/Shaaloani/5138_Rroneek Seeker.json b/QuestPaths/7.x - Dawntrail/Aether Currents/Shaaloani/5138_Rroneek Seeker.json index 6fece033..1cb14826 100644 --- a/QuestPaths/7.x - Dawntrail/Aether Currents/Shaaloani/5138_Rroneek Seeker.json +++ b/QuestPaths/7.x - Dawntrail/Aether Currents/Shaaloani/5138_Rroneek Seeker.json @@ -34,7 +34,6 @@ }, { "Sequence": 2, - "Comment": "TODO: Verify; Swimming in the lake avoids combat", "Steps": [ { "Position": { diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json index e494b3b3..8d55b0b6 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4837_Bandits Abound.json @@ -20,6 +20,92 @@ ] } ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1048313, + "Position": { + "X": -621.973, + "Y": 41.999973, + "Z": -2.02948 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "AetheryteShortcut": "Lochs - Porta Praetoria" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1048315, + "Position": { + "X": -403.46387, + "Y": 9.080914, + "Z": 10.940674 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2013705, + "Position": { + "X": -379.0799, + "Y": 6.149353, + "Z": -83.237976 + }, + "TerritoryId": 621, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 17621, + 17622, + 17623 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1048315, + "Position": { + "X": -403.46387, + "Y": 9.080914, + "Z": 10.940674 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1048314, + "Position": { + "X": -622.03406, + "Y": 41.999973, + "Z": -3.6469727 + }, + "TerritoryId": 621, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Lochs - Porta Praetoria", + "NextQuestId": 4838 + } + ] } ] } diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4838_Take Me to Your Leader.json b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4838_Take Me to Your Leader.json new file mode 100644 index 00000000..ac544d61 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4838_Take Me to Your Leader.json @@ -0,0 +1,211 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1048314, + "Position": { + "X": -622.03406, + "Y": 41.999973, + "Z": -3.6469727 + }, + "TerritoryId": 621, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1048316, + "Position": { + "X": -537.3159, + "Y": 8.282911, + "Z": 11.612061 + }, + "TerritoryId": 621, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1048317, + "Position": { + "X": -281.48322, + "Y": 263.00684, + "Z": 633.8445 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "AetheryteShortcut": "Peaks - Ala Ghiri", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1048318, + "Position": { + "X": -232.29796, + "Y": 264.9192, + "Z": 613.139 + }, + "TerritoryId": 620, + "InteractionType": "WaitForNpcAtPosition", + "StopDistance": 50, + "Mount": false, + "Sprint": false + }, + { + "Position": { + "X": -241.38339, + "Y": 264.6151, + "Z": 617.0616 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "Mount": false, + "Sprint": false + }, + { + "DataId": 1048318, + "Position": { + "X": -256.2343, + "Y": 264.3857, + "Z": 607.0586 + }, + "TerritoryId": 620, + "InteractionType": "WaitForNpcAtPosition", + "StopDistance": 50, + "Mount": false, + "Sprint": false + }, + { + "Position": { + "X": -245.83409, + "Y": 265.36874, + "Z": 597.0437 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "Mount": false, + "Sprint": false + }, + { + "DataId": 1048318, + "Position": { + "X": -241.25351, + "Y": 264.14194, + "Z": 622.3978 + }, + "TerritoryId": 620, + "InteractionType": "WaitForNpcAtPosition", + "StopDistance": 50, + "Mount": false, + "Sprint": false + }, + { + "Position": { + "X": -249.86191, + "Y": 264.12744, + "Z": 618.1598 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "Mount": false, + "Sprint": false + }, + { + "DataId": 1048318, + "Position": { + "X": -246.00586, + "Y": 265.5263, + "Z": 587.24493 + }, + "TerritoryId": 620, + "InteractionType": "WaitForNpcAtPosition", + "StopDistance": 50, + "Mount": false, + "Sprint": false + }, + { + "Position": { + "X": -239.25114, + "Y": 265.31882, + "Z": 605.55786 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "Mount": false, + "Sprint": false + }, + { + "DataId": 1048318, + "Position": { + "X": -264.12643, + "Y": 263.13184, + "Z": 563.91364 + }, + "TerritoryId": 620, + "InteractionType": "WaitForNpcAtPosition", + "StopDistance": 50, + "Mount": false, + "Sprint": false + }, + { + "DataId": 1048317, + "Position": { + "X": -256.79233, + "Y": 264.02664, + "Z": 550.90546 + }, + "TerritoryId": 620, + "InteractionType": "WalkTo", + "Mount": false, + "Sprint": false + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1048319, + "Position": { + "X": -311.32983, + "Y": 257.52652, + "Z": 741.1459 + }, + "TerritoryId": 620, + "InteractionType": "Interact", + "AetheryteShortcut": "Peaks - Ala Ghiri" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1048310, + "Position": { + "X": -310.96362, + "Y": 257.52652, + "Z": 739.4979 + }, + "TerritoryId": 620, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4839_The Milk of Mamool Ja Kindness.json b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4839_The Milk of Mamool Ja Kindness.json new file mode 100644 index 00000000..b8bb77da --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4839_The Milk of Mamool Ja Kindness.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1048310, + "Position": { + "X": -310.96362, + "Y": 257.52652, + "Z": 739.4979 + }, + "TerritoryId": 620, + "InteractionType": "AcceptQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4840_Ally in the Alley.json b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4840_Ally in the Alley.json new file mode 100644 index 00000000..b8bb77da --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4840_Ally in the Alley.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1048310, + "Position": { + "X": -310.96362, + "Y": 257.52652, + "Z": 739.4979 + }, + "TerritoryId": 620, + "InteractionType": "AcceptQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5119_A Private Delivery.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5119_A Private Delivery.json new file mode 100644 index 00000000..f3d04ac8 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5119_A Private Delivery.json @@ -0,0 +1,87 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049284, + "Position": { + "X": 378.43884, + "Y": -0.2627956, + "Z": 425.55872 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1050706, + "Position": { + "X": 248.27954, + "Y": 15.999974, + "Z": 746.4866 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "AetheryteShortcut": "Tuliyollal", + "AethernetShortcut": [ + "[Tuliyollal] Aetheryte Plaza", + "[Tuliyollal] Xak Tural Skygate (Shaaloani)" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014065, + "Position": { + "X": 250.04956, + "Y": 16.281311, + "Z": 744.3502 + }, + "StopDistance": 4, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2014065, + "Position": { + "X": 250.04956, + "Y": 16.281311, + "Z": 744.3502 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049284, + "Position": { + "X": 378.43884, + "Y": -0.2627956, + "Z": 425.55872 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5120_A Sobering Proposition.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5120_A Sobering Proposition.json new file mode 100644 index 00000000..b1a37c83 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5120_A Sobering Proposition.json @@ -0,0 +1,155 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049285, + "Position": { + "X": 372.70154, + "Y": -0.26279598, + "Z": 425.55872 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2014074, + "Position": { + "X": 323.44543, + "Y": -0.6867676, + "Z": 488.2428 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1050639, + "Position": { + "X": 377.92017, + "Y": -0.2627951, + "Z": 432.48633 + }, + "TerritoryId": 1190, + "InteractionType": "UseItem", + "ItemId": 2003580, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1050638, + "Position": { + "X": 368.42908, + "Y": -0.26279587, + "Z": 419.69934 + }, + "TerritoryId": 1190, + "InteractionType": "UseItem", + "ItemId": 2003580, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "Position": { + "X": 359.11545, + "Y": 1.9823306, + "Z": 419.5714 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (bottom)" + }, + { + "Position": { + "X": 369.3906, + "Y": 5.9371996, + "Z": 417.16574 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (top)", + "DisableNavmesh": true + }, + { + "DataId": 1050640, + "Position": { + "X": 377.03516, + "Y": 6.07724, + "Z": 423.02576 + }, + "TerritoryId": 1190, + "InteractionType": "UseItem", + "ItemId": 2003580, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 369.3906, + "Y": 5.9371996, + "Z": 417.16574 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (top)" + }, + { + "Position": { + "X": 359.11545, + "Y": 1.9823306, + "Z": 419.5714 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (bottom)", + "DisableNavmesh": true + }, + { + "DataId": 1049285, + "Position": { + "X": 372.70154, + "Y": -0.26279598, + "Z": 425.55872 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5121_Taste of the Wilds.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5121_Taste of the Wilds.json new file mode 100644 index 00000000..32fc8774 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5121_Taste of the Wilds.json @@ -0,0 +1,114 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049289, + "Position": { + "X": 347.37158, + "Y": -0.8616793, + "Z": 503.04407 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 363.75098, + "Y": -0.25793338, + "Z": 435.93985 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ] + }, + { + "DataId": 1049284, + "Position": { + "X": 378.43884, + "Y": -0.2627956, + "Z": 425.55872 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "Position": { + "X": 363.75098, + "Y": -0.25793338, + "Z": 435.93985 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -64 + ] + }, + { + "DataId": 1049275, + "Position": { + "X": 267.44482, + "Y": 10.96981, + "Z": 659.4796 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049289, + "Position": { + "X": 347.37158, + "Y": -0.8616793, + "Z": 503.04407 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5122_Fruitful Endeavors.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5122_Fruitful Endeavors.json new file mode 100644 index 00000000..7e5a987d --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5122_Fruitful Endeavors.json @@ -0,0 +1,73 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049286, + "Position": { + "X": 347.46313, + "Y": -2.0447416, + "Z": 397.177 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2014043, + "Position": { + "X": 416.3119, + "Y": 7.248047, + "Z": 217.73096 + }, + "TerritoryId": 1190, + "InteractionType": "UseItem", + "ItemId": 2003581, + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014044, + "Position": { + "X": 415.7931, + "Y": 7.4005737, + "Z": 229.0531 + }, + "TerritoryId": 1190, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 17733 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049286, + "Position": { + "X": 347.46313, + "Y": -2.0447416, + "Z": 397.177 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5123_Gentle Giants.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5123_Gentle Giants.json new file mode 100644 index 00000000..8be2a92f --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5123_Gentle Giants.json @@ -0,0 +1,112 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049287, + "Position": { + "X": 342.61072, + "Y": -1.0227159, + "Z": 482.2307 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1049288, + "Position": { + "X": 333.2417, + "Y": -1.1408321, + "Z": 478.47717 + }, + "TerritoryId": 1190, + "InteractionType": "Emote", + "Emote": "pet" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1049288, + "Position": { + "X": 333.2417, + "Y": -1.1408321, + "Z": 478.47717 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1049287, + "Position": { + "X": 342.61072, + "Y": -1.0227159, + "Z": 482.2307 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2014045, + "Position": { + "X": 341.1764, + "Y": 0.1373291, + "Z": 457.969 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1049288, + "Position": { + "X": 333.2417, + "Y": -1.1408321, + "Z": 478.47717 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049287, + "Position": { + "X": 342.61072, + "Y": -1.0227159, + "Z": 482.2307 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5124_Waiting One's Turn.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5124_Waiting One's Turn.json new file mode 100644 index 00000000..178f2a0e --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5124_Waiting One's Turn.json @@ -0,0 +1,111 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049407, + "Position": { + "X": 267.01758, + "Y": 15.999971, + "Z": 770.8705 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1049284, + "Position": { + "X": 378.43884, + "Y": -0.2627956, + "Z": 425.55872 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "AetheryteShortcut": "Shaaloani - Hhusatahwi" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 359.11545, + "Y": 1.9823306, + "Z": 419.5714 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (bottom)" + }, + { + "Position": { + "X": 369.3906, + "Y": 5.9371996, + "Z": 417.16574 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (top)", + "DisableNavmesh": true + }, + { + "DataId": 1050718, + "Position": { + "X": 365.5603, + "Y": 5.957231, + "Z": 424.58215 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1050719, + "Position": { + "X": 384.51196, + "Y": -1.5122339, + "Z": 383.6881 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049407, + "Position": { + "X": 267.01758, + "Y": 15.999971, + "Z": 770.8705 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Tuliyollal", + "AethernetShortcut": [ + "[Tuliyollal] Aetheryte Plaza", + "[Tuliyollal] Xak Tural Skygate (Shaaloani)" + ] + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5125_Bomb Disposal.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5125_Bomb Disposal.json new file mode 100644 index 00000000..cc3b8ecd --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5125_Bomb Disposal.json @@ -0,0 +1,57 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049373, + "Position": { + "X": -375.66187, + "Y": 18.211061, + "Z": -114.21387 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2014075, + "Position": { + "X": -446.06702, + "Y": 17.868286, + "Z": 34.286987 + }, + "TerritoryId": 1190, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [ + 17734 + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049373, + "Position": { + "X": -375.66187, + "Y": 18.211061, + "Z": -114.21387 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5126_A Refined Perspective.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5126_A Refined Perspective.json new file mode 100644 index 00000000..5b67efc9 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5126_A Refined Perspective.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049374, + "Position": { + "X": -345.2049, + "Y": 18.198153, + "Z": -163.50049 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2014046, + "Position": { + "X": -344.65558, + "Y": 18.051392, + "Z": -141.92426 + }, + "TerritoryId": 1190, + "InteractionType": "Instruction", + "Comment": "(from left to right) pump, middle of the connecting pipes, barrels" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049374, + "Position": { + "X": -345.2049, + "Y": 18.198153, + "Z": -163.50049 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGZE008_05126_Q1_000_000", + "Answer": "TEXT_KINGZE008_05126_A1_000_001" + }, + { + "Type": "List", + "Prompt": "TEXT_KINGZE008_05126_Q1_000_000", + "Answer": "TEXT_KINGZE008_05126_A1_000_002" + }, + { + "Type": "List", + "Prompt": "TEXT_KINGZE008_05126_Q1_000_000", + "Answer": "TEXT_KINGZE008_05126_A1_000_003" + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5127_Surprising Source of Fiber.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5127_Surprising Source of Fiber.json new file mode 100644 index 00000000..3ffcd886 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5127_Surprising Source of Fiber.json @@ -0,0 +1,84 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050641, + "Position": { + "X": -398.6725, + "Y": 21.668707, + "Z": -168.23071 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1050641, + "Position": { + "X": -398.6725, + "Y": 21.668707, + "Z": -168.23071 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1050642, + "Position": { + "X": -290.82172, + "Y": 16.40523, + "Z": -51.041504 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1050642, + "Position": { + "X": -290.82172, + "Y": 16.40523, + "Z": -51.041504 + }, + "TerritoryId": 1190, + "InteractionType": "Emote", + "Emote": "dance" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050641, + "Position": { + "X": -398.6725, + "Y": 21.668707, + "Z": -168.23071 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5128_A Grave Matter.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5128_A Grave Matter.json new file mode 100644 index 00000000..c53ff73d --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5128_A Grave Matter.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050643, + "Position": { + "X": -250.56848, + "Y": 22.956224, + "Z": -140.30676 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1050644, + "Position": { + "X": -525.81067, + "Y": 29.416107, + "Z": -174.09027 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014050, + "Position": { + "X": -527.1229, + "Y": 29.526123, + "Z": -175.64667 + }, + "StopDistance": 4, + "TerritoryId": 1190, + "InteractionType": "Emote", + "Emote": "respect" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050644, + "Position": { + "X": -525.81067, + "Y": 29.416107, + "Z": -174.09027 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5129_Working on a Full Stomach.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5129_Working on a Full Stomach.json new file mode 100644 index 00000000..f77fbf58 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5129_Working on a Full Stomach.json @@ -0,0 +1,53 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1049375, + "Position": { + "X": -318.98987, + "Y": 18.789532, + "Z": -143.26697 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1049323, + "Position": { + "X": -227.49683, + "Y": -1.2980607, + "Z": 298.6648 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1049375, + "Position": { + "X": -318.98987, + "Y": 18.789532, + "Z": -143.26697 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5131_Watching Big Brother.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5131_Watching Big Brother.json new file mode 100644 index 00000000..ab609bb6 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5131_Watching Big Brother.json @@ -0,0 +1,72 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050646, + "Position": { + "X": -150.68292, + "Y": -2.4235957, + "Z": 408.43823 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -111.25304, + "Y": -27.185633, + "Z": 723.9165 + }, + "TerritoryId": 1190, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 17736 + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1050647, + "Position": { + "X": -113.93915, + "Y": -27.518993, + "Z": 725.1239 + }, + "StopDistance": 7, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050648, + "Position": { + "X": -149.34009, + "Y": -2.7338073, + "Z": 409.04858 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json new file mode 100644 index 00000000..ff36fac3 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5132_Death by Popoto.json @@ -0,0 +1,127 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050649, + "Position": { + "X": 350.1792, + "Y": -1.6156614, + "Z": 413.0464 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 357.06458, + "Y": 2.9521801, + "Z": 391.37265 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Fly": true, + "SkipIf": [ + "FlyingLocked" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ] + }, + { + "DataId": 2014051, + "Position": { + "X": 334.88965, + "Y": 6.3934937, + "Z": 263.1112 + }, + "TerritoryId": 1190, + "InteractionType": "UseItem", + "ItemId": 2003587, + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2014053, + "Position": { + "X": 440.66528, + "Y": 5.874695, + "Z": 254.93237 + }, + "TerritoryId": 1190, + "InteractionType": "Combat", + "EnemySpawnType": "AfterItemUse", + "ItemId": 2003587, + "KillEnemyDataIds": [ + 17737 + ], + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 2014052, + "Position": { + "X": 545.5862, + "Y": 8.377136, + "Z": 293.01892 + }, + "TerritoryId": 1190, + "InteractionType": "UseItem", + "ItemId": 2003587, + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050649, + "Position": { + "X": 350.1792, + "Y": -1.6156614, + "Z": 413.0464 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5133_A Tool Tale.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5133_A Tool Tale.json new file mode 100644 index 00000000..642e5d3a --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5133_A Tool Tale.json @@ -0,0 +1,53 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050650, + "Position": { + "X": -375.14313, + "Y": 20.084345, + "Z": -54.825745 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2014054, + "Position": { + "X": -756.1608, + "Y": 35.8739, + "Z": 67.52112 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050650, + "Position": { + "X": -375.14313, + "Y": 20.084345, + "Z": -54.825745 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5134_Tastes Like Home.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5134_Tastes Like Home.json new file mode 100644 index 00000000..e5371a5f --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5134_Tastes Like Home.json @@ -0,0 +1,53 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051375, + "Position": { + "X": 376.15015, + "Y": -1.4395642, + "Z": 379.26294 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051376, + "Position": { + "X": 420.98108, + "Y": 0.41827834, + "Z": 466.20886 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051377, + "Position": { + "X": 419.02795, + "Y": 0.2806556, + "Z": 468.43665 + }, + "StopDistance": 7, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5135_Snakes on a Train(line).json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5135_Snakes on a Train(line).json new file mode 100644 index 00000000..0ae39294 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5135_Snakes on a Train(line).json @@ -0,0 +1,71 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050651, + "Position": { + "X": -56.10742, + "Y": 15.709401, + "Z": -259.05243 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -335.70532, + "Y": 18.652002, + "Z": -543.8954 + }, + "TerritoryId": 1190, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 17274, + "MinimumKillCount": 2, + "CompletionQuestVariablesFlags": [ + null, + 2, + null, + null, + null, + null + ] + }, + { + "DataId": 17738, + "MinimumKillCount": 1 + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050651, + "Position": { + "X": -56.10742, + "Y": 15.709401, + "Z": -259.05243 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5136_It's a Terrible Ring to Lose.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5136_It's a Terrible Ring to Lose.json new file mode 100644 index 00000000..0ed4fac4 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5136_It's a Terrible Ring to Lose.json @@ -0,0 +1,93 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050652, + "Position": { + "X": 622.4917, + "Y": -17.334448, + "Z": -441.42828 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 528.5589, + "Y": -18.217268, + "Z": -243.5277 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Mount": true, + "Fly": true + }, + { + "Position": { + "X": 557.73425, + "Y": -71.68169, + "Z": -220.66245 + }, + "TerritoryId": 1190, + "InteractionType": "UseItem", + "ItemId": 2003590, + "Fly": true, + "DisableNavmesh": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014055, + "Position": { + "X": 568.0475, + "Y": -77.16492, + "Z": -219.92828 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "DisableNavmesh": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 528.5589, + "Y": -18.217268, + "Z": -243.5277 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Mount": true, + "Fly": true, + "DisableNavmesh": true + }, + { + "DataId": 1050652, + "Position": { + "X": 622.4917, + "Y": -17.334448, + "Z": -441.42828 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5137_A Mount with a View.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5137_A Mount with a View.json new file mode 100644 index 00000000..8f62bcf1 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5137_A Mount with a View.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050653, + "Position": { + "X": -133.74536, + "Y": 16.289755, + "Z": -285.1454 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1050654, + "Position": { + "X": -509.05627, + "Y": 62.947567, + "Z": -438.68164 + }, + "StopDistance": 0.25, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014056, + "Position": { + "X": -509.60556, + "Y": 62.91284, + "Z": -437.15576 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050653, + "Position": { + "X": -133.74536, + "Y": 16.289755, + "Z": -285.1454 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5139_The Horns That Bind Us.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5139_The Horns That Bind Us.json new file mode 100644 index 00000000..23691706 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5139_The Horns That Bind Us.json @@ -0,0 +1,69 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1050702, + "Position": { + "X": 267.3838, + "Y": -16.116768, + "Z": -495.71985 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1050703, + "Position": { + "X": 387.9911, + "Y": -1.4394518, + "Z": 373.95276 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "AetheryteShortcut": "Shaaloani - Hhusatahwi", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014058, + "Position": { + "X": 389.7306, + "Y": -1.1139526, + "Z": 368.8258 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1050702, + "Position": { + "X": 267.3838, + "Y": -16.116768, + "Z": -495.71985 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Shaaloani - Mehwahhetsoan" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5141_Broken Record.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5141_Broken Record.json new file mode 100644 index 00000000..d0d5260b --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5141_Broken Record.json @@ -0,0 +1,64 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051288, + "Position": { + "X": 274.52502, + "Y": -4.49502, + "Z": 463.5537 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051289, + "Position": { + "X": 246.57043, + "Y": 15.999963, + "Z": 761.2573 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "AetheryteShortcut": "Tuliyollal", + "AethernetShortcut": [ + "[Tuliyollal] Aetheryte Plaza", + "[Tuliyollal] Xak Tural Skygate (Shaaloani)" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051293, + "Position": { + "X": 245.89917, + "Y": 15.999965, + "Z": 758.1139 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGZE202_05141_Q1_000_000", + "Answer": "TEXT_KINGZE202_05141_A1_000_001" + } + ], + "NextQuestId": 5142 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json new file mode 100644 index 00000000..f7e865e6 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5142_Back on Stage.json @@ -0,0 +1,183 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051293, + "Position": { + "X": 245.89917, + "Y": 15.999965, + "Z": 758.1139 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051294, + "Position": { + "X": 279.92664, + "Y": -4.184075, + "Z": 461.53955 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "AetheryteShortcut": "Shaaloani - Hhusatahwi", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 450.56, + "Y": 7.0377436, + "Z": 489.10336 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -64 + ], + "SkipIf": [ + "FlyingLocked" + ] + }, + { + "DataId": 1051297, + "Position": { + "X": 470.84766, + "Y": 2.6501055, + "Z": 478.08032 + }, + "TerritoryId": 1190, + "InteractionType": "Emote", + "Emote": "dance", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "Position": { + "X": 364.1419, + "Y": 5.9295864, + "Z": 435.2963 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ], + "SkipIf": [ + "FlyingLocked" + ], + "$": "Shaaloani Saloon Balcony" + }, + { + "DataId": 1051296, + "Position": { + "X": 369.92432, + "Y": 5.9371996, + "Z": 434.71423 + }, + "TerritoryId": 1190, + "InteractionType": "Emote", + "Emote": "dance", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "Position": { + "X": 364.1419, + "Y": 5.9295864, + "Z": 435.2963 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -32 + ], + "SkipIf": [ + "FlyingLocked" + ], + "$": "Shaaloani Saloon Balcony" + }, + { + "DataId": 1051298, + "Position": { + "X": 375.6007, + "Y": -1.619559, + "Z": 387.62476 + }, + "TerritoryId": 1190, + "InteractionType": "Emote", + "Emote": "dance", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051313, + "Position": { + "X": 279.469, + "Y": -4.1346755, + "Z": 460.28845 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 5143 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json new file mode 100644 index 00000000..93bf4651 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5143_A Family's Worth.json @@ -0,0 +1,88 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051295, + "Position": { + "X": 279.62158, + "Y": -4.1182456, + "Z": 460.31885 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 374.1434, + "Y": -0.26282632, + "Z": 438.94763 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "Fly": true, + "SkipIf": [ + "FlyingLocked" + ] + }, + { + "DataId": 1051283, + "Position": { + "X": 374.19702, + "Y": -0.24794838, + "Z": 437.2472 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGZE204_05143_Q1_000_000", + "Answer": "TEXT_KINGZE204_05143_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014319, + "Position": { + "X": 290.76062, + "Y": -2.6704102, + "Z": 455.34436 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051314, + "Position": { + "X": 279.62158, + "Y": -4.1182456, + "Z": 460.31885 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5145_Down in the Mouth.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5145_Down in the Mouth.json new file mode 100644 index 00000000..55eba30b --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5145_Down in the Mouth.json @@ -0,0 +1,86 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051301, + "Position": { + "X": -284.1383, + "Y": 17.312117, + "Z": -76.676636 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051320, + "Position": { + "X": -379.04938, + "Y": 18.055899, + "Z": -117.387695 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1051303, + "Position": { + "X": -150.80493, + "Y": 2.3364508, + "Z": 42.86255 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2014321, + "Position": { + "X": -120.561584, + "Y": -4.0131226, + "Z": 117.69275 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051303, + "Position": { + "X": -150.80493, + "Y": 2.3364508, + "Z": 42.86255 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 5146 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5146_Listen to Your Elders.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5146_Listen to Your Elders.json new file mode 100644 index 00000000..f6592ae7 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5146_Listen to Your Elders.json @@ -0,0 +1,102 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051303, + "Position": { + "X": -150.80493, + "Y": 2.3364508, + "Z": 42.86255 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051305, + "Position": { + "X": -220.7218, + "Y": -1.1039281, + "Z": 244.00696 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1051306, + "Position": { + "X": -230.9148, + "Y": -1.2759173, + "Z": 291.9203 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1051307, + "Position": { + "X": -207.69055, + "Y": -1.8966466, + "Z": 329.7932 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1051308, + "Position": { + "X": -170.45856, + "Y": 1.6625541, + "Z": 365.6825 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051309, + "Position": { + "X": -130.02216, + "Y": 1.8320833, + "Z": 318.6847 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 5147 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5147_Back in Blue.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5147_Back in Blue.json new file mode 100644 index 00000000..e6c4914f --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5147_Back in Blue.json @@ -0,0 +1,74 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051333, + "Position": { + "X": -127.82489, + "Y": 1.8010846, + "Z": 318.13525 + }, + "StopDistance": 5, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051334, + "Position": { + "X": -156.87805, + "Y": 9.228875, + "Z": 9.262146 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": -73.8012, + "Y": 8.56271, + "Z": -61.943523 + }, + "TerritoryId": 1190, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 17742 + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051302, + "Position": { + "X": -380.33118, + "Y": 18.1636, + "Z": -118.54736 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 5148 + } + ] + } + ] +} diff --git a/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json new file mode 100644 index 00000000..ec187dc7 --- /dev/null +++ b/QuestPaths/7.x - Dawntrail/Side Quests/Shaaloani/5148_Dig for Victory.json @@ -0,0 +1,224 @@ +{ + "$schema": "https://carvel.li/questionable/quest-1.0", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1051302, + "Position": { + "X": -380.33118, + "Y": 18.1636, + "Z": -118.54736 + }, + "TerritoryId": 1190, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1051339, + "Position": { + "X": -529.0761, + "Y": -17.160866, + "Z": 444.23596 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2014323, + "Position": { + "X": -600.3052, + "Y": -13.382202, + "Z": 379.99524 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 2014322, + "Position": { + "X": -619.01276, + "Y": -14.114624, + "Z": 379.65967 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 2014324, + "Position": { + "X": -639.30725, + "Y": -12.863403, + "Z": 369.46667 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1051310, + "Position": { + "X": -638.1476, + "Y": -11.576093, + "Z": 350.8506 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_KINGZE401_05148_Q2_000_000", + "Answer": "TEXT_KINGZE401_05148_A2_000_000" + } + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 364.1419, + "Y": 5.9295864, + "Z": 435.2963 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Shaaloani - Hhusatahwi", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + -128 + ], + "SkipIf": [ + "FlyingLocked" + ], + "$": "Shaaloani Saloon Balcony" + }, + { + "DataId": 1051315, + "Position": { + "X": 362.87476, + "Y": 5.9371996, + "Z": 427.2068 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "Position": { + "X": 369.3906, + "Y": 5.9371996, + "Z": 417.16574 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (top)", + "Mount": true + }, + { + "Position": { + "X": 359.11545, + "Y": 1.9823306, + "Z": 419.5714 + }, + "TerritoryId": 1190, + "InteractionType": "WalkTo", + "$": "Shaaloani Hhusatahwi Saloon Stairs (bottom)", + "DisableNavmesh": true + }, + { + "DataId": 1051321, + "Position": { + "X": 357.7782, + "Y": -1.0164845, + "Z": 438.37634 + }, + "TerritoryId": 1190, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1051302, + "Position": { + "X": -380.33118, + "Y": 18.1636, + "Z": -118.54736 + }, + "TerritoryId": 1190, + "InteractionType": "Interact", + "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1051302, + "Position": { + "X": -380.33118, + "Y": 18.1636, + "Z": -118.54736 + }, + "TerritoryId": 1190, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/QuestPaths.csproj b/QuestPaths/QuestPaths.csproj index 63d2b074..0be93b07 100644 --- a/QuestPaths/QuestPaths.csproj +++ b/QuestPaths/QuestPaths.csproj @@ -42,7 +42,6 @@ - diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index b672916c..65a34d35 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -500,7 +500,8 @@ "welcome", "imperialsalute", "pet", - "dance" + "dance", + "respect" ] } } diff --git a/Questionable.Model/V1/Converter/EmoteConverter.cs b/Questionable.Model/V1/Converter/EmoteConverter.cs index 0d9ef58f..9238427d 100644 --- a/Questionable.Model/V1/Converter/EmoteConverter.cs +++ b/Questionable.Model/V1/Converter/EmoteConverter.cs @@ -24,5 +24,6 @@ public sealed class EmoteConverter() : EnumConverter(Values) { EEmote.ImperialSalute, "imperialsalute" }, { EEmote.Pet, "pet" }, { EEmote.Dance, "dance" }, + { EEmote.Respect, "respect" }, }; } diff --git a/Questionable.Model/V1/EEmote.cs b/Questionable.Model/V1/EEmote.cs index 9f2dc037..f986e209 100644 --- a/Questionable.Model/V1/EEmote.cs +++ b/Questionable.Model/V1/EEmote.cs @@ -26,4 +26,5 @@ public enum EEmote ImperialSalute = 59, Pet = 105, Dance = 11, + Respect = 140, } diff --git a/Questionable.Model/V1/QuestSequence.cs b/Questionable.Model/V1/QuestSequence.cs index 62736416..73807e0b 100644 --- a/Questionable.Model/V1/QuestSequence.cs +++ b/Questionable.Model/V1/QuestSequence.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Linq; namespace Questionable.Model.V1; @@ -15,4 +16,6 @@ public sealed class QuestSequence return Steps[step]; } + + public QuestStep? LastStep() => Steps.LastOrDefault(); } diff --git a/Questionable.sln.DotSettings b/Questionable.sln.DotSettings index 381b5868..3588f8f8 100644 --- a/Questionable.sln.DotSettings +++ b/Questionable.sln.DotSettings @@ -1,2 +1,40 @@  - True \ No newline at end of file + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True + True \ No newline at end of file diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs index 2bb5d8a2..f0837b4e 100644 --- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs +++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs @@ -8,9 +8,15 @@ namespace Questionable.Controller.NavigationOverrides; internal sealed class MovementOverrideController { - private static readonly List BlacklistedLocations = [ + private static readonly List BlacklistedLocations = + [ new BlacklistedArea(1191, new(-223.0412f, 31.937134f, -584.03906f), 5f, 7.75f), - new BlacklistedPoint(128, new Vector3(2f, 40.25f, 36.5f), new Vector3(0.25f, 40.25f, 36.5f)) + + // New Gridania Navmesh workaround + new BlacklistedPoint(128, new(2f, 40.25f, 36.5f), new(0.25f, 40.25f, 36.5f)), + + new BlacklistedPoint(132, new(45.5f, -8f, 101f), new(50.53978f, -8.046954f, 101.06045f)), + new BlacklistedPoint(1189, new(574f, -142.25f, 504.25f), new(574.44183f, -142.12766f, 507.60065f)), ]; private readonly IClientState _clientState; diff --git a/Questionable/Controller/Steps/Common/MountTask.cs b/Questionable/Controller/Steps/Common/MountTask.cs index 15585a2f..bcf489d1 100644 --- a/Questionable/Controller/Steps/Common/MountTask.cs +++ b/Questionable/Controller/Steps/Common/MountTask.cs @@ -2,6 +2,7 @@ using System.Numerics; using Dalamud.Game.ClientState.Conditions; using Dalamud.Plugin.Services; +using FFXIVClientStructs.FFXIV.Client.Game; using Microsoft.Extensions.Logging; using Questionable.Data; @@ -53,7 +54,7 @@ internal sealed class MountTask( { Vector3 playerPosition = clientState.LocalPlayer?.Position ?? Vector3.Zero; float distance = (playerPosition - _position.GetValueOrDefault()).Length(); - if (_territoryId == clientState.TerritoryType && distance < 30f) + if (_territoryId == clientState.TerritoryType && distance < 30f && !Conditions.IsDiving) { logger.LogInformation("Not using mount, as we're close to the target"); return false; diff --git a/Questionable/GameFunctions.cs b/Questionable/GameFunctions.cs index 04ed5516..227d0c3e 100644 --- a/Questionable/GameFunctions.cs +++ b/Questionable/GameFunctions.cs @@ -507,6 +507,15 @@ internal sealed unsafe class GameFunctions if (playerState != null && !playerState->IsMountUnlocked(1)) return true; + var localPlayer = _clientState.LocalPlayer; + if (localPlayer == null) + return false; + + var battleChara = (BattleChara*)localPlayer.Address; + StatusManager* statusManager = battleChara->GetStatusManager(); + if (statusManager->HasStatus(1151)) + return true; + return HasCharacterStatusPreventingMountOrSprint(); } diff --git a/Questionable/Windows/QuestSelectionWindow.cs b/Questionable/Windows/QuestSelectionWindow.cs index 569fd28b..4ff4c3c0 100644 --- a/Questionable/Windows/QuestSelectionWindow.cs +++ b/Questionable/Windows/QuestSelectionWindow.cs @@ -17,6 +17,7 @@ using LLib.ImGui; using Questionable.Controller; using Questionable.Data; using Questionable.Model; +using Questionable.Model.V1; namespace Questionable.Windows; @@ -207,6 +208,7 @@ internal sealed class QuestSelectionWindow : LWindow ImGui.SameLine(); if (knownQuest != null && + knownQuest.FindSequence(0)?.LastStep()?.InteractionType == EInteractionType.AcceptQuest && !_gameFunctions.IsQuestAccepted(quest.QuestId) && !_gameFunctions.IsQuestLocked(quest.QuestId) && (quest.IsRepeatable || !_gameFunctions.IsQuestAcceptedOrComplete(quest.QuestId))) diff --git a/Questionable/Windows/QuestWindow.cs b/Questionable/Windows/QuestWindow.cs index 73f242e0..0ebe5517 100644 --- a/Questionable/Windows/QuestWindow.cs +++ b/Questionable/Windows/QuestWindow.cs @@ -174,6 +174,12 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig { ImGui.TextUnformatted( $"Quest: {currentQuest.Quest.Info.Name} / {currentQuest.Sequence} / {currentQuest.Step}"); + + if (currentQuest.Quest.Root.Disabled) + { + ImGui.SameLine(); + ImGui.TextColored(ImGuiColors.DalamudRed, "Disabled"); + } }