From 963442ba25edc5697f3a13cd29f99ae44fb01627 Mon Sep 17 00:00:00 2001 From: kaiser Date: Tue, 24 Sep 2024 03:18:29 +1000 Subject: [PATCH 01/51] chore: optimize sage focus quest and few others. Don't teleport to Summerford Farms, instead use aethernet and teleport to the gate. --- .../Class Quests/SGE/4067_Sage's Path.json | 14 +++++++------- .../Class Quests/SGE/4068_Sage's Focus.json | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/QuestPaths/6.x - Endwalker/Class Quests/SGE/4067_Sage's Path.json b/QuestPaths/6.x - Endwalker/Class Quests/SGE/4067_Sage's Path.json index 64b7fe95..1cf674ab 100644 --- a/QuestPaths/6.x - Endwalker/Class Quests/SGE/4067_Sage's Path.json +++ b/QuestPaths/6.x - Endwalker/Class Quests/SGE/4067_Sage's Path.json @@ -12,6 +12,7 @@ "Y": 20, "Z": 85.55737 }, + "StopDistance": 5, "TerritoryId": 129, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Limsa Lominsa", @@ -33,15 +34,13 @@ "Y": 42.597717, "Z": 163.7445 }, + "StopDistance": 5, "TerritoryId": 134, "InteractionType": "Interact", - "AetheryteShortcut": "Middle La Noscea - Summerford Farms", - "Fly": true, - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true - } - } + "AethernetShortcut": [ + "[Limsa Lominsa] Aetheryte Plaza", + "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)" + ] } ] }, @@ -55,6 +54,7 @@ "Y": 42.597717, "Z": 163.7445 }, + "StopDistance": 5, "TerritoryId": 134, "InteractionType": "CompleteQuest", "AetheryteShortcut": "Middle La Noscea - Summerford Farms", diff --git a/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json b/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json index 38e37f32..5c731ab8 100644 --- a/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json +++ b/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json @@ -13,6 +13,7 @@ "Y": 42.597717, "Z": 162.65016 }, + "StopDistance": 5, "TerritoryId": 134, "AetheryteShortcut": "Middle La Noscea - Summerford Farms", "Fly": true, @@ -57,6 +58,7 @@ "Y": 42.597717, "Z": 163.7445 }, + "StopDistance": 5, "TerritoryId": 134, "InteractionType": "AcceptQuest", "AetheryteShortcut": "Middle La Noscea - Summerford Farms", @@ -79,6 +81,7 @@ "Y": 207, "Z": 49.332397 }, + "StopDistance": 5, "TerritoryId": 478, "InteractionType": "Interact", "AetheryteShortcut": "Idyllshire", @@ -100,6 +103,7 @@ "Y": 215.44214, "Z": -108.171265 }, + "StopDistance": 2, "TerritoryId": 478, "InteractionType": "Interact", "AetheryteShortcut": "Idyllshire", From c6739b3cced6c441d1246ac41835b2dcb787065f Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Wed, 25 Sep 2024 00:07:34 +0800 Subject: [PATCH 02/51] Updated the following daily quest: - Serpent's Will Be Done --- .../Dailies/3832_Serpent's Will Be Done.json | 36 +++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json index bdbb1696..bd564434 100644 --- a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Dailies/3832_Serpent's Will Be Done.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "Disabled": true, + "Author": "plogon_enjoyer", "QuestSequence": [ { "Sequence": 0, @@ -18,6 +17,39 @@ } ] }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1032663, + "Position": { + "X": 793.97266, + "Y": -45.811764, + "Z": -188.03699 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2010998, + "Position": { + "X": -677.0886, + "Y": 0.32037354, + "Z": 208.69751 + }, + "TerritoryId": 817, + "InteractionType": "Action", + "Action": "Peculiar Light", + "Fly": true + } + ] + }, { "Sequence": 255, "Steps": [ From 225ffe7ba0f5369d97697a3cd4fbcb07d899f10f Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Wed, 25 Sep 2024 00:55:29 +0800 Subject: [PATCH 03/51] Added the following daily quests: - Dance Commander --- .../Dailies/2197_Dance Commander.json | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json new file mode 100644 index 00000000..bbf06ae7 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json @@ -0,0 +1,116 @@ +{ + "$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 650.37317, + "Y": -41.15606, + "Z": -302.4378 + }, + "TerritoryId": 401, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1016362, + "Position": { + "X": 647.57764, + "Y": -41.156067, + "Z": -301.47253 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance" + }, + { + "DataId": 1016365, + "Position": { + "X": 682.36804, + "Y": -11.396843, + "Z": -400.6256 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance", + "Fly": true + }, + { + "DataId": 1016364, + "Position": { + "X": 799.9846, + "Y": -11.396843, + "Z": -416.98334 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance", + "Fly": true + }, + { + "DataId": 1016363, + "Position": { + "X": 776.9131, + "Y": -39.97968, + "Z": -540.24567 + }, + "TerritoryId": 401, + "InteractionType": "Emote", + "Emote": "sundropdance", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu", + "Fly": true + } + ] + } + ] +} From 412a42a0a1e35676e04f612f0686ab1d051eeab5 Mon Sep 17 00:00:00 2001 From: kaiser Date: Wed, 25 Sep 2024 19:54:38 +1000 Subject: [PATCH 04/51] feat: add the /hdance emote unlock. --- .../1425_Saw That One Coming.json | 225 ++++++++++++++++++ 1 file changed, 225 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json new file mode 100644 index 00000000..0ae4dcff --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json @@ -0,0 +1,225 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "kaiser", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": 54.415092, + "Y": -8.047034, + "Z": 104.69259 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "Comment": "We have get here first just to make sure we don't run into walls." + }, + { + "Position": { + "X": 37.72773, + "Y": -8, + "Z": 104.152405 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "Comment": "Cool now go inside" + }, + { + "DataId": 1000375, + "Position": { + "X": 42.313232, + "Y": -8, + "Z": 96.54382 + }, + "TerritoryId": 132, + "InteractionType": "AcceptQuest", + "StopDistance": 5, + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 40.8096, + "Y": -8, + "Z": 104.92199 + }, + "TerritoryId": 132, + "InteractionType": "WalkTo", + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + }, + "StepIf": { + "NearPosition": { + "Position": { + "X": -87.84625, + "Y": -3.3081923, + "Z": 41.70288 + }, + "TerritoryId": 132, + "MaximumDistance": 5 + } + } + } + }, + { + "DataId": 1007792, + "Position": { + "X": -87.84625, + "Y": -3.3081923, + "Z": 41.70288 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "Comment": "Interact with the gal now!" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1000153, + "Position": { + "X": -44.87683, + "Y": -1.2500024, + "Z": 56.839844 + }, + "TerritoryId": 132, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Gridania", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "Comment": "Speak with the man now!" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1007795, + "Position": { + "X": 28.94629, + "Y": 8.45142, + "Z": -96.421814 + }, + "TerritoryId": 133, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Aetheryte Plaza", + "[Gridania] Leatherworkers' Guild & Shaded Bower" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "Comment": "Give the First kid his present" + }, + { + "DataId": 1007794, + "Position": { + "X": -124.864624, + "Y": 6.567382, + "Z": -120.74469 + }, + "TerritoryId": 133, + "InteractionType": "Interact", + "StopDistance": 5, + "AethernetShortcut": [ + "[Gridania] Leatherworkers' Guild & Shaded Bower", + "[Gridania] Mih Khetto's Amphitheatre" + ], + "Comment": "Give the second kid his present." + }, + { + "DataId": 1007793, + "Position": { + "X": -143.3891, + "Y": 4.123518, + "Z": -29.312622 + }, + "TerritoryId": 133, + "InteractionType": "Interact", + "StopDistance": 5, + "AethernetShortcut": [ + "[Gridania] Mih Khetto's Amphitheatre", + "[Gridania] Conjurers' Guild" + ], + "Comment": "Give the third kid his present." + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": -128.09769, + "Y": 5.6480865, + "Z": -36.499104 + }, + "TerritoryId": 133, + "InteractionType": "WalkTo" + }, + { + "DataId": 1007792, + "Position": { + "X": -87.84625, + "Y": -3.3081923, + "Z": 41.70288 + }, + "TerritoryId": 132, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Gridania", + "AethernetShortcut": [ + "[Gridania] Conjurers' Guild", + "[Gridania] Aetheryte Plaza" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + } + ] +} From c60724e3672f136d4dcc40d15fa2387bb86c429d Mon Sep 17 00:00:00 2001 From: kaiser Date: Wed, 25 Sep 2024 19:56:42 +1000 Subject: [PATCH 05/51] chore: bom --- .../Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json index 0ae4dcff..794b3e02 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json @@ -1,4 +1,4 @@ -{ +{ "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "kaiser", "QuestSequence": [ From 4f6914d835f464c4cbff4e3c41a6d8d631c108a7 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Wed, 25 Sep 2024 20:07:40 +0200 Subject: [PATCH 06/51] Extend error toast handling --- .../Controller/GatheringController.cs | 2 +- Questionable/Controller/MiniTaskController.cs | 30 +++++++++++++++++-- Questionable/Controller/QuestController.cs | 24 +-------------- .../Steps/Gathering/MoveToLandingLocation.cs | 4 ++- .../Controller/Steps/Shared/Gather.cs | 11 ++++++- 5 files changed, 43 insertions(+), 28 deletions(-) diff --git a/Questionable/Controller/GatheringController.cs b/Questionable/Controller/GatheringController.cs index 4af7ede2..8c7dedd4 100644 --- a/Questionable/Controller/GatheringController.cs +++ b/Questionable/Controller/GatheringController.cs @@ -51,7 +51,7 @@ internal sealed unsafe class GatheringController : MiniTaskController private readonly IServiceProvider _serviceProvider; private readonly ILogger _logger; + private readonly string _actionCanceledText; + protected MiniTaskController(IChatGui chatGui, ICondition condition, IServiceProvider serviceProvider, - ILogger logger) + IDataManager dataManager, ILogger logger) { _chatGui = chatGui; _logger = logger; _serviceProvider = serviceProvider; _condition = condition; + + _actionCanceledText = dataManager.GetString(1314, x => x.Text)!; } protected virtual void UpdateCurrentTask() @@ -172,4 +180,22 @@ internal abstract class MiniTaskController foreach (ITask task in _taskQueue.RemainingTasks) _logger.LogInformation("- {TaskName}", task); } + + public void OnErrorToast(ref SeString message, ref bool isHandled) + { + if (_taskQueue.CurrentTaskExecutor is IToastAware toastAware) + { + if (toastAware.OnErrorToast(message)) + { + isHandled = true; + } + } + + if (!isHandled) + { + if (GameFunctions.GameStringEquals(_actionCanceledText, message.TextValue) && + !_condition[ConditionFlag.InFlight]) + InterruptQueueWithCombat(); + } + } } diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index b736de2e..fc1734d3 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -43,8 +43,6 @@ internal sealed class QuestController : MiniTaskController, IDi private readonly TaskCreator _taskCreator; private readonly ILogger _logger; - private readonly string _actionCanceledText; - private readonly object _progressLock = new(); private QuestProgress? _startedQuest; @@ -84,7 +82,7 @@ internal sealed class QuestController : MiniTaskController, IDi TaskCreator taskCreator, IServiceProvider serviceProvider, IDataManager dataManager) - : base(chatGui, condition, serviceProvider, logger) + : base(chatGui, condition, serviceProvider, dataManager, logger) { _clientState = clientState; _gameFunctions = gameFunctions; @@ -105,8 +103,6 @@ internal sealed class QuestController : MiniTaskController, IDi _condition.ConditionChange += OnConditionChange; _toastGui.Toast += OnNormalToast; _toastGui.ErrorToast += OnErrorToast; - - _actionCanceledText = dataManager.GetString(1314, x => x.Text)!; } public EAutomationType AutomationType @@ -809,24 +805,6 @@ internal sealed class QuestController : MiniTaskController, IDi _gatheringController.OnNormalToast(message); } - private void OnErrorToast(ref SeString message, ref bool isHandled) - { - if (_taskQueue.CurrentTaskExecutor is IToastAware toastAware) - { - if (toastAware.OnErrorToast(message)) - { - isHandled = true; - } - } - - if (!isHandled) - { - if (GameFunctions.GameStringEquals(_actionCanceledText, message.TextValue) && - !_condition[ConditionFlag.InFlight]) - InterruptQueueWithCombat(); - } - } - public void Dispose() { _toastGui.ErrorToast -= OnErrorToast; diff --git a/Questionable/Controller/Steps/Gathering/MoveToLandingLocation.cs b/Questionable/Controller/Steps/Gathering/MoveToLandingLocation.cs index 14552c21..38fa30cd 100644 --- a/Questionable/Controller/Steps/Gathering/MoveToLandingLocation.cs +++ b/Questionable/Controller/Steps/Gathering/MoveToLandingLocation.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Numerics; using Dalamud.Game.ClientState.Objects.Enums; +using Dalamud.Game.Text.SeStringHandling; using Dalamud.Plugin.Services; using Microsoft.Extensions.Logging; using Questionable.Controller.Steps.Shared; @@ -26,7 +27,7 @@ internal static class MoveToLandingLocation MoveTo.MoveExecutor moveExecutor, GameFunctions gameFunctions, IObjectTable objectTable, - ILogger logger) : TaskExecutor + ILogger logger) : TaskExecutor, IToastAware { private ITask _moveTask = null!; @@ -57,5 +58,6 @@ internal static class MoveToLandingLocation } public override ETaskResult Update() => moveExecutor.Update(); + public bool OnErrorToast(SeString message) => moveExecutor.OnErrorToast(message); } } diff --git a/Questionable/Controller/Steps/Shared/Gather.cs b/Questionable/Controller/Steps/Shared/Gather.cs index 52229aa1..ee5c50a0 100644 --- a/Questionable/Controller/Steps/Shared/Gather.cs +++ b/Questionable/Controller/Steps/Shared/Gather.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using Dalamud.Game.Text; +using Dalamud.Game.Text.SeStringHandling; using Dalamud.Plugin.Services; using FFXIVClientStructs.FFXIV.Application.Network.WorkDefinitions; using FFXIVClientStructs.FFXIV.Client.Game; @@ -124,7 +125,8 @@ internal static class Gather } } - internal sealed class StartGathering(GatheringController gatheringController) : TaskExecutor + internal sealed class StartGathering(GatheringController gatheringController) : TaskExecutor, + IToastAware { protected override bool Start() { @@ -140,6 +142,13 @@ internal static class Gather return ETaskResult.StillRunning; } + + public bool OnErrorToast(SeString message) + { + bool isHandled = false; + gatheringController.OnErrorToast(ref message, ref isHandled); + return isHandled; + } } /// From 228a06723117766b5ba527027baec76773c599f7 Mon Sep 17 00:00:00 2001 From: kaiser Date: Thu, 26 Sep 2024 18:20:00 +1000 Subject: [PATCH 07/51] feat: add Loporrits The Incredible machines --- .../Story/4682_The Incredible Machines.json | 147 ++++++++++++++++++ 1 file changed, 147 insertions(+) create mode 100644 QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json new file mode 100644 index 00000000..caaaa04f --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Story/4682_The Incredible Machines.json @@ -0,0 +1,147 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "kaiser", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "Position": { + "X": -193.89642, + "Y": -49.19972, + "Z": -262.13477 + }, + "TerritoryId": 959, + "InteractionType": "None", + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "StopDistance": 5, + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": -193.89642, + "Y": -49.19972, + "Z": -262.13477 + }, + "TerritoryId": 959, + "MaximumDistance": 100 + } + } + } + } + , + { + "DataId": 1044402, + "Position": { + "X": -193.89642, + "Y": -49.19972, + "Z": -262.13477 + }, + "TerritoryId": 959, + "InteractionType": "AcceptQuest", + "StopDistance": 5, + "Fly": true + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044924, + "Position": { + "X": 344.625, + "Y": -168.00002, + "Z": -403.89105 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044926, + "Position": { + "X": 500.96887, + "Y": -164.43474, + "Z": -698.3902 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1044928, + "Position": { + "X": -172.74744, + "Y": -49.199722, + "Z": -250.8736 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "TerritoryId": 959, + "InteractionType": "Craft", + "ItemId": 38845, + "ItemCount": 2 + }, + { + "DataId": 1044928, + "Position": { + "X": -172.74744, + "Y": -49.199722, + "Z": -250.8736 + }, + "TerritoryId": 959, + "InteractionType": "CompleteQuest", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + } + ] +} From c472cf703dfa158412d0da9f970a84842f30f387 Mon Sep 17 00:00:00 2001 From: kaiser Date: Thu, 26 Sep 2024 18:37:57 +1000 Subject: [PATCH 08/51] feat: add lopporits Pitch Perfect dailies. --- .../Loporrits/Dailies/4694_Pitch Perfect.json | 76 ++++++++++++++++--- 1 file changed, 64 insertions(+), 12 deletions(-) diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json index d731dcbc..0b569942 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json @@ -1,7 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "liza", - "Disabled": true, + "Author": "kaiser", "QuestSequence": [ { "Sequence": 0, @@ -30,20 +29,58 @@ { "Sequence": 1, "Steps": [ + { + "DataId": 1044408, + "Position": { + "X": -164.08032, + "Y": -49.199722, + "Z": -250.75159 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2013257, + "Position": { + "X": -706.41644, + "Y": -140.39832, + "Z": -433.76825 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true + }, + { + "DataId": 2013256, + "Position": { + "X": -739.0097, + "Y": -139.72687, + "Z": -539.0555 + }, + "TerritoryId": 959, + "InteractionType": "Action", + "Action": "Hop-step", + "Fly": true + } ] }, { "Sequence": 255, "Steps": [ - { - "Position": { - "X": -201.42024, - "Y": -49.149708, - "Z": -273.68756 - }, - "TerritoryId": 959, - "InteractionType": "WalkTo" - }, { "DataId": 1044403, "Position": { @@ -52,7 +89,22 @@ "Z": -273.60956 }, "TerritoryId": 959, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "StopDistance": 5, + "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "SkipConditions": { + "AetheryteShortcutIf": { + "NearPosition": { + "Position": { + "X": -203.5401, + "Y": -48.949707, + "Z": -273.60956 + }, + "TerritoryId": 959, + "MaximumDistance": 100 + } + } + } } ] } From 3a1438202d4a97df10955d10f2d96a38a8fe3dbf Mon Sep 17 00:00:00 2001 From: kaiser Date: Thu, 26 Sep 2024 18:40:48 +1000 Subject: [PATCH 09/51] refactor: add landing, we need to land to use tha action. --- .../Loporrits/Dailies/4694_Pitch Perfect.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json index 0b569942..38e7af09 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json @@ -62,7 +62,8 @@ "TerritoryId": 959, "InteractionType": "Action", "Action": "Hop-step", - "Fly": true + "Fly": true, + "Land": true }, { "DataId": 2013256, @@ -74,7 +75,8 @@ "TerritoryId": 959, "InteractionType": "Action", "Action": "Hop-step", - "Fly": true + "Fly": true, + "Land": true } ] }, From d5244689c90fcbebfeeda68c5814972c08514f7b Mon Sep 17 00:00:00 2001 From: kaiser Date: Thu, 26 Sep 2024 18:42:01 +1000 Subject: [PATCH 10/51] refactor: add fly, and increase the max distance. --- .../Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json index 38e7af09..8cdedf70 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json @@ -94,6 +94,7 @@ "InteractionType": "CompleteQuest", "StopDistance": 5, "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", + "Fly": true, "SkipConditions": { "AetheryteShortcutIf": { "NearPosition": { @@ -103,7 +104,7 @@ "Z": -273.60956 }, "TerritoryId": 959, - "MaximumDistance": 100 + "MaximumDistance": 200 } } } From fcf99088a7dee13aa369790b2ed547b698a3d4cd Mon Sep 17 00:00:00 2001 From: kaiser Date: Thu, 26 Sep 2024 18:42:58 +1000 Subject: [PATCH 11/51] chore: remove BOM --- .../Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json index 8cdedf70..0df5b080 100644 --- a/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json +++ b/QuestPaths/6.x - Endwalker/Allied Societies/Loporrits/Dailies/4694_Pitch Perfect.json @@ -1,4 +1,4 @@ -{ +{ "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "kaiser", "QuestSequence": [ From 03d69692d018a5eb798835e1e60bb9d84ac44c03 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Thu, 26 Sep 2024 22:13:56 +0800 Subject: [PATCH 12/51] Added the following daily quests: - Smooth as Silk, Cool as Air - Gaelicat's Out of the Bag - Rotten to the Korrigan --- .../2191_Smooth as Silk, Cool as Air.json | 105 +++++++++++++++ .../2192_Gaelicat's Out of the Bag.json | 120 ++++++++++++++++++ .../Dailies/2193_Rotten to the Korrigan.json | 104 +++++++++++++++ 3 files changed, 329 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json new file mode 100644 index 00000000..e04cb159 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json @@ -0,0 +1,105 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2006687, + "Position": { + "X": -553.97876, + "Y": -58.42682, + "Z": -271.10706 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + }, + { + "DataId": 2006688, + "Position": { + "X": -715.1446, + "Y": -58.640503, + "Z": -342.30566 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 2006689, + "Position": { + "X": -830.3197, + "Y": -14.358765, + "Z": -131.82275 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 2006690, + "Position": { + "X": -857.6333, + "Y": 4.6539917, + "Z": -218.67706 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5246], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json new file mode 100644 index 00000000..62988c55 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2192_Gaelicat's Out of the Bag.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016092, + "Position": { + "X": -792.6299, + "Y": -133.32184, + "Z": -425.5589 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016375, + "Position": { + "X": -627.89355, + "Y": -149.95285, + "Z": 480.15564 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop" + }, + { + "DataId": 1016232, + "Position": { + "X": -452.10956, + "Y": -187.396, + "Z": 734.18774 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + }, + { + "DataId": 1016233, + "Position": { + "X": -359.823, + "Y": -184.95448, + "Z": 796.71924 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + }, + { + "DataId": 1016374, + "Position": { + "X": -343.00757, + "Y": -161.8661, + "Z": 770.01587 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + }, + { + "DataId": 1016231, + "Position": { + "X": -333.79114, + "Y": -184.97446, + "Z": 625.1162 + }, + "TerritoryId": 401, + "InteractionType": "UseItem", + "ItemId": 2001934, + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016092, + "Position": { + "X": -792.6299, + "Y": -133.32184, + "Z": -425.5589 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json new file mode 100644 index 00000000..0d571b1c --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2193_Rotten to the Korrigan.json @@ -0,0 +1,104 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016091, + "Position": { + "X": -804.25726, + "Y": -133.2695, + "Z": -390.89038 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016508, + "Position": { + "X": -261.8601, + "Y": -132.0669, + "Z": 388.66248 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop" + }, + { + "DataId": 1016235, + "Position": { + "X": -229.48047, + "Y": -129.59497, + "Z": 418.44812 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 1016236, + "Position": { + "X": -196.2768, + "Y": -131.82275, + "Z": 333.9436 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 1016216, + "Position": { + "X": -253.62024, + "Y": -130.38837, + "Z": 340.3219 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016091, + "Position": { + "X": -804.25726, + "Y": -133.2695, + "Z": -390.89038 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + } + ] + } + ] +} From 22b9c6f12afc1643a82ede0eea570914f1aeb2d3 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Thu, 26 Sep 2024 22:33:17 +0800 Subject: [PATCH 13/51] Reordered steps in sequence 2 --- .../2191_Smooth as Silk, Cool as Air.json | 47 +++++++++---------- 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json index e04cb159..4471cd3c 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2191_Smooth as Silk, Cool as Air.json @@ -37,26 +37,16 @@ "Sequence": 2, "Steps": [ { - "DataId": 2006687, + "DataId": 2006690, "Position": { - "X": -553.97876, - "Y": -58.42682, - "Z": -271.10706 + "X": -857.6333, + "Y": 4.6539917, + "Z": -218.67706 }, "TerritoryId": 401, - "InteractionType": "Interact", - "Fly": true, - "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" - }, - { - "DataId": 2006688, - "Position": { - "X": -715.1446, - "Y": -58.640503, - "Z": -342.30566 - }, - "TerritoryId": 401, - "InteractionType": "Interact", + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5246], "Fly": true }, { @@ -71,16 +61,25 @@ "Fly": true }, { - "DataId": 2006690, + "DataId": 2006687, "Position": { - "X": -857.6333, - "Y": 4.6539917, - "Z": -218.67706 + "X": -553.97876, + "Y": -58.42682, + "Z": -271.10706 }, "TerritoryId": 401, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [5246], + "InteractionType": "Interact", + "Fly": true + }, + { + "DataId": 2006688, + "Position": { + "X": -715.1446, + "Y": -58.640503, + "Z": -342.30566 + }, + "TerritoryId": 401, + "InteractionType": "Interact", "Fly": true } ] From ac5f7a4e4f19970584f23bf73e172afabe44100b Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Fri, 27 Sep 2024 00:10:33 +0800 Subject: [PATCH 14/51] Added story quest: - Celebratory Smorgasbord --- .../Story/3041_Celebratory Smorgasbord.json | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json new file mode 100644 index 00000000..81c0e3ac --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Story/3041_Celebratory Smorgasbord.json @@ -0,0 +1,98 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024771, + "Position": { + "X": 12.008789, + "Y": 55.97821, + "Z": 237.96448 + }, + "TerritoryId": 612, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1023142, + "Position": { + "X": -642.9083, + "Y": 130.25946, + "Z": -538.29254 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Castrum Oriens" + }, + { + "DataId": 1024937, + "Position": { + "X": 450.88867, + "Y": 114.36421, + "Z": 235.91968 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Fringes - Peering Stones" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024952, + "Position": { + "X": 12.008789, + "Y": 55.97821, + "Z": 237.96448 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1025235, + "Position": { + "X": -155.2301, + "Y": 39.096687, + "Z": 159.0448 + }, + "TerritoryId": 612, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024952, + "Position": { + "X": 12.008789, + "Y": 55.97821, + "Z": 237.96448 + }, + "TerritoryId": 612, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} From eeea9a66f6ec2bf6ae57cc0fe0255f45424334be Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 26 Sep 2024 22:11:05 +0200 Subject: [PATCH 15/51] Fix issues in 'Pussyfooting About' --- .../Vanu Vanu/Dailies/2172_Pussyfooting About.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json index 0771c292..7fd649f6 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2172_Pussyfooting About.json @@ -1,5 +1,5 @@ { - "$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "plogon_enjoyer", "QuestSequence": [ { @@ -100,7 +100,7 @@ "Z": -404.1352 }, "TerritoryId": 401, - "InteractionType": "Interact", + "InteractionType": "CompleteQuest", "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu", "Fly": true } From 22949d0e327ad89276a1cef233803f82dfa97625 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 26 Sep 2024 22:50:05 +0200 Subject: [PATCH 16/51] Fix 'Bringing out the Dead' --- .../MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json index 8db84884..6b4070d0 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json @@ -269,7 +269,8 @@ "Z": -353.6584 }, "TerritoryId": 140, - "InteractionType": "Interact" + "InteractionType": "Interact", + "DisableNavmesh": true } ] }, From d4ae5f95b25942b84f76e56381c5dd522d6dab07 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 28 Sep 2024 16:12:33 +0800 Subject: [PATCH 17/51] Added new daily quests: - Shady Premonitions - Pestered Ancestors --- .../Dailies/2189_Shady Premonitions.json | 138 ++++++++++++++++++ .../Dailies/2190_Pestered Ancestors.json | 86 +++++++++++ 2 files changed, 224 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json new file mode 100644 index 00000000..3f662fcb --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2189_Shady Premonitions.json @@ -0,0 +1,138 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016228, + "Position": { + "X": -547.7836, + "Y": -57.646603, + "Z": -549.76733 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2006684, + "Position": { + "X": -357.29004, + "Y": -56.565247, + "Z": -598.9929 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5243], + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1016229, + "Position": { + "X": -369.31415, + "Y": -54.222214, + "Z": -605.3407 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2006685, + "Position": { + "X": -107.07257, + "Y": -13.5043335, + "Z": -655.6039 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5243], + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1016230, + "Position": { + "X": -114.85474, + "Y": -13.978999, + "Z": -652.8878 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json new file mode 100644 index 00000000..b41fc640 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2190_Pestered Ancestors.json @@ -0,0 +1,86 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016089, + "Position": { + "X": -799.46594, + "Y": -133.2695, + "Z": -404.1352 + }, + "TerritoryId": 401, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2006707, + "Position": { + "X": 72.92273, + "Y": -88.39557, + "Z": 428.82422 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5244], + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop" + }, + { + "DataId": 2006686, + "Position": { + "X": 167.58984, + "Y": -97.428955, + "Z": 455.71057 + }, + "TerritoryId": 401, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [5244], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016088, + "Position": { + "X": -818.143, + "Y": -129.93259, + "Z": -414.02307 + }, + "TerritoryId": 401, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu" + } + ] + } + ] +} From 38f5cd66cdce01880ad3cdd020a8e425b1c025c1 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 28 Sep 2024 16:13:16 +0800 Subject: [PATCH 18/51] Updated "A Hut to Dye For". Added step to run away from spawned enemy to be able to TP away, since defeating it is not required to proceed. --- .../Vanu Vanu/Dailies/2188_A Hut to Dye For.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json index 484d9834..935cc0a3 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2188_A Hut to Dye For.json @@ -84,6 +84,16 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 317.41415, + "Y": 110.85538, + "Z": -34.527588 + }, + "TerritoryId": 401, + "InteractionType": "WalkTo", + "$": "Run away from the enemy to TP" + }, { "DataId": 1016092, "Position": { From 90b543c95ad84e9512747d4dbc80febe04666994 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 28 Sep 2024 17:11:30 +0800 Subject: [PATCH 19/51] Added new daily quests: - A Shell to Scry On - Losing One's Tempered - Blitzing the Beacons --- .../Dailies/1222_A Shell to Scry On.json | 76 ++++++++++++ .../Dailies/1228_Losing One's Tempered.json | 114 ++++++++++++++++++ .../Dailies/1231_Blitzing the Beacons.json | 68 +++++++++++ 3 files changed, 258 insertions(+) create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json create mode 100644 QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json new file mode 100644 index 00000000..afc10e11 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1222_A Shell to Scry On.json @@ -0,0 +1,76 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -84.12953, + "Y": -14.744684, + "Z": -148.0814 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 134, + "MinimumKillCount": 2 + } + ], + "Fly": true + }, + { + "Position": { + "X": -253.56975, + "Y": 6.8785334, + "Z": 162.0949 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 358, + "MinimumKillCount": 1 + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json new file mode 100644 index 00000000..a7c09b47 --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1228_Losing One's Tempered.json @@ -0,0 +1,114 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 2003169, + "Position": { + "X": -191.18036, + "Y": 3.6774292, + "Z": -162.00513 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [80], + "Fly": true + }, + { + "DataId": 80, + "Position": { + "X": -198.6194, + "Y": 4.4395595, + "Z": -156.7357 + }, + "TerritoryId": 146, + "InteractionType": "UseItem", + "ItemId": 2001191 + }, + { + "DataId": 2003168, + "Position": { + "X": -155.44366, + "Y": 3.8604736, + "Z": -132.21948 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [80], + "Fly": true + }, + { + "DataId": 80, + "Position": { + "X": -159.83832, + "Y": 4.2440715, + "Z": -136.43097 + }, + "TerritoryId": 146, + "InteractionType": "UseItem", + "ItemId": 2001191 + }, + { + "DataId": 2003172, + "Position": { + "X": -19.36377, + "Y": 0.47296143, + "Z": 15.182739 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [80], + "Fly": true + }, + { + "DataId": 81, + "Position": { + "X": -19.760498, + "Y": 0.97421986, + "Z": 19.790894 + }, + "TerritoryId": 146, + "InteractionType": "UseItem", + "ItemId": 2001191 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json new file mode 100644 index 00000000..232222cb --- /dev/null +++ b/QuestPaths/2.x - A Realm Reborn/Allied Societies/Amalj'aa/Dailies/1231_Blitzing the Beacons.json @@ -0,0 +1,68 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -9.631764, + "Y": 4.530592, + "Z": -52.115612 + }, + "TerritoryId": 146, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 2452, + "MinimumKillCount": 2 + } + ], + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": -74.8761, + "Y": -1.9533517, + "Z": -51.731575 + }, + "TerritoryId": 146, + "InteractionType": "WalkTo" + }, + { + "DataId": 1005550, + "Position": { + "X": 105.27197, + "Y": 15.359643, + "Z": -357.3816 + }, + "TerritoryId": 146, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} From 619b5431d5b9459df644db4652bafecaee0c916a Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 28 Sep 2024 15:47:48 +0200 Subject: [PATCH 20/51] Skip loading unknown quests (e.g. for CN) shipped with the plugin --- Questionable/Controller/QuestRegistry.cs | 27 +++++++++++++++--------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Questionable/Controller/QuestRegistry.cs b/Questionable/Controller/QuestRegistry.cs index 50263051..724acaf4 100644 --- a/Questionable/Controller/QuestRegistry.cs +++ b/Questionable/Controller/QuestRegistry.cs @@ -92,17 +92,24 @@ internal sealed class QuestRegistry foreach ((ElementId questId, QuestRoot questRoot) in AssemblyQuestLoader.GetQuests()) { - var questInfo = _questData.GetQuestInfo(questId); - if (questInfo is LeveInfo leveInfo) - _leveData.AddQuestSteps(leveInfo, questRoot); - Quest quest = new() + try { - Id = questId, - Root = questRoot, - Info = questInfo, - Source = Quest.ESource.Assembly, - }; - _quests[quest.Id] = quest; + var questInfo = _questData.GetQuestInfo(questId); + if (questInfo is LeveInfo leveInfo) + _leveData.AddQuestSteps(leveInfo, questRoot); + Quest quest = new() + { + Id = questId, + Root = questRoot, + Info = questInfo, + Source = Quest.ESource.Assembly, + }; + _quests[quest.Id] = quest; + } + catch (Exception e) + { + _logger.LogWarning("Not loading unknown quest {QuestId} from assembly: {Message}", questId, e.Message); + } } _logger.LogInformation("Loaded {Count} quests from assembly", _quests.Count); From 17cfda172b8c819a5cc8485c7f15a3c5f7e9c22b Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 28 Sep 2024 23:28:53 +0200 Subject: [PATCH 21/51] Add support for Old Sharlayan leves --- .../6.x - Endwalker/Labyrinthos/886__MIN.json | 160 ++++++++++++++++++ .../Leves/MIN/L1675_Rocks of a Feather.json | 38 +++++ Questionable/Data/LeveData.cs | 29 +++- 3 files changed, 222 insertions(+), 5 deletions(-) create mode 100644 GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json create mode 100644 QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json diff --git a/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json new file mode 100644 index 00000000..8bb59514 --- /dev/null +++ b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json @@ -0,0 +1,160 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 956, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 34281, + "Locations": [ + { + "Position": { + "X": -510.2663, + "Y": -20.72923, + "Z": -119.9257 + }, + "MinimumAngle": -120, + "MaximumAngle": 10 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34283, + "Locations": [ + { + "Position": { + "X": -502.4525, + "Y": -18.55583, + "Z": -139.683 + }, + "MinimumAngle": -95, + "MaximumAngle": -35, + "MinimumDistance": 1, + "MaximumDistance": 1.8 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34284, + "Locations": [ + { + "Position": { + "X": -499.3535, + "Y": -18.75164, + "Z": -141.9256 + }, + "MinimumAngle": -75, + "MaximumAngle": 15, + "MinimumDistance": 1, + "MaximumDistance": 2.3 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34285, + "Locations": [ + { + "Position": { + "X": -495.1168, + "Y": -18.65139, + "Z": -142.5636 + }, + "MinimumAngle": -85, + "MaximumAngle": 45 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34286, + "Locations": [ + { + "Position": { + "X": -491.4826, + "Y": -19.44574, + "Z": -144.2088 + }, + "MinimumAngle": -105, + "MaximumAngle": 25 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34287, + "Locations": [ + { + "Position": { + "X": -488.8665, + "Y": -19.70717, + "Z": -147.403 + }, + "MinimumAngle": 230, + "MaximumAngle": 340 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34289, + "Locations": [ + { + "Position": { + "X": -489.1829, + "Y": -19.91622, + "Z": -153.7781 + }, + "MinimumAngle": 200, + "MaximumAngle": 320 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 34291, + "Locations": [ + { + "Position": { + "X": -490.1324, + "Y": -18.06493, + "Z": -164.4281 + }, + "MinimumAngle": 210, + "MaximumAngle": 310 + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json b/QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json new file mode 100644 index 00000000..7b90c2f7 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Leves/MIN/L1675_Rocks of a Feather.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -506.1484, + "Y": -22.671598, + "Z": -116.16144 + }, + "TerritoryId": 956, + "InteractionType": "InitiateLeve", + "AetheryteShortcut": "Labyrinthos - Aporia", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "TerritoryId": 956, + "InteractionType": "Gather", + "ItemsToGather": [ + { + "ItemId": 2003172, + "AlternativeItemId": 2003173, + "ItemCount": 999 + } + ] + } + ] + } + ] +} diff --git a/Questionable/Data/LeveData.cs b/Questionable/Data/LeveData.cs index a8d5835c..a8084200 100644 --- a/Questionable/Data/LeveData.cs +++ b/Questionable/Data/LeveData.cs @@ -13,7 +13,16 @@ internal sealed class LeveData { private static readonly List Leves = [ - new(EAetheryteLocation.Tuliyollal, 1048390, new(15.243713f, -14.000001f, 85.83191f)), + new( + aetheryteLocation: EAetheryteLocation.OldSharlayan, + aethernetShortcut: new AethernetShortcut + { From = EAetheryteLocation.OldSharlayan, To = EAetheryteLocation.OldSharlayanScholarsHarbor }, + issuerDataId: 1037263, + issuerPosition: new(45.818386f, -15.646993f, 109.40509f)), + new(aetheryteLocation: EAetheryteLocation.Tuliyollal, + aethernetShortcut: null, + issuerDataId: 1048390, + issuerPosition: new(15.243713f, -14.000001f, 85.83191f)), ]; private readonly AetheryteData _aetheryteData; @@ -44,6 +53,7 @@ internal sealed class LeveData TerritoryId = _aetheryteData.TerritoryIds[leveStepData.AetheryteLocation], InteractionType = EInteractionType.AcceptLeve, AetheryteShortcut = leveStepData.AetheryteLocation, + AethernetShortcut = leveStepData.AethernetShortcut, SkipConditions = new() { AetheryteShortcutIf = new() @@ -71,6 +81,7 @@ internal sealed class LeveData TerritoryId = _aetheryteData.TerritoryIds[leveStepData.AetheryteLocation], InteractionType = EInteractionType.CompleteLeve, AetheryteShortcut = leveStepData.AetheryteLocation, + AethernetShortcut = leveStepData.AethernetShortcut, SkipConditions = new() { AetheryteShortcutIf = new() @@ -93,10 +104,16 @@ internal sealed class LeveData private readonly uint? _crafterTurnInDataId; private readonly Vector3? _crafterTurnInPosition; - public LeveStepData(EAetheryteLocation aetheryteLocation, uint issuerDataId, Vector3 issuerPosition, - uint? turnInDataId = null, Vector3? turnInPosition = null, - uint? gathererTurnInDataId = null, Vector3? gathererTurnInPosition = null, - uint? crafterTurnInDataId = null, Vector3? crafterTurnInPosition = null) + public LeveStepData(EAetheryteLocation aetheryteLocation, + AethernetShortcut? aethernetShortcut, + uint issuerDataId, + Vector3 issuerPosition, + uint? turnInDataId = null, + Vector3? turnInPosition = null, + uint? gathererTurnInDataId = null, + Vector3? gathererTurnInPosition = null, + uint? crafterTurnInDataId = null, + Vector3? crafterTurnInPosition = null) { _turnInDataId = turnInDataId; _turnInPosition = turnInPosition; @@ -105,11 +122,13 @@ internal sealed class LeveData _crafterTurnInDataId = crafterTurnInDataId; _crafterTurnInPosition = crafterTurnInPosition; AetheryteLocation = aetheryteLocation; + AethernetShortcut = aethernetShortcut; IssuerDataId = issuerDataId; IssuerPosition = issuerPosition; } public EAetheryteLocation AetheryteLocation { get; } + public AethernetShortcut? AethernetShortcut { get; } public uint IssuerDataId { get; } public Vector3 IssuerPosition { get; } From 2e98c94ca5ac1f603c3a9b3986d14b83c61db493 Mon Sep 17 00:00:00 2001 From: kaiser Date: Sun, 29 Sep 2024 14:09:29 +1000 Subject: [PATCH 22/51] chore: remove comment from ui. --- .../Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json index 794b3e02..076643a9 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json @@ -35,7 +35,7 @@ "InSameTerritory": true } }, - "Comment": "Cool now go inside" + "$": "Cool now go inside" }, { "DataId": 1000375, From ffb65babd61cae2bd56c4739d168cd5deba33a3e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 29 Sep 2024 12:03:57 +0200 Subject: [PATCH 23/51] Fix schema url --- .../Vanu Vanu/Dailies/2197_Dance Commander.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json index bbf06ae7..fbbafa26 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Dailies/2197_Dance Commander.json @@ -1,5 +1,5 @@ { - "$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "plogon_enjoyer", "QuestSequence": [ { From 74ec55ae4b5dd7d56b1da8e99fcc73b3a696aaed Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Mon, 30 Sep 2024 00:05:35 +0800 Subject: [PATCH 24/51] Added new story quest: - What Ails the Forest --- .../Story/3798_What Ails the Forest.json | 131 ++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Story/3798_What Ails the Forest.json diff --git a/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Story/3798_What Ails the Forest.json b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Story/3798_What Ails the Forest.json new file mode 100644 index 00000000..e7e98bf5 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Allied Societies/Qitari/Story/3798_What Ails the Forest.json @@ -0,0 +1,131 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1032735, + "Position": { + "X": 803.7993, + "Y": -45.924515, + "Z": -217.94464 + }, + "TerritoryId": 817, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1032659, + "Position": { + "X": 802.79236, + "Y": -45.91779, + "Z": -218.58557 + }, + "TerritoryId": 817, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1027716, + "Position": { + "X": 494.9873, + "Y": -6.555339, + "Z": -224.93329 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1032967, + "Position": { + "X": 774.8989, + "Y": -45.74954, + "Z": -205.52374 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1032967, + "Position": { + "X": 774.8989, + "Y": -45.74954, + "Z": -205.52374 + }, + "TerritoryId": 817, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "TerritoryId": 817, + "InteractionType": "Gather", + "ItemsToGather": [ + { + "QuestAcceptedAsClass": "Miner", + "ItemId": 29516, + "ItemCount": 3 + }, + { + "QuestAcceptedAsClass": "Botanist", + "ItemId": 29542, + "ItemCount": 3 + } + ] + }, + { + "DataId": 1032967, + "Position": { + "X": 774.8989, + "Y": -45.74954, + "Z": -205.52374 + }, + "TerritoryId": 817, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Rak'tika - Fanow" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1032660, + "Position": { + "X": 804.4098, + "Y": -45.9255, + "Z": -216.41876 + }, + "TerritoryId": 817, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} From 86caa24b06da6899e294369a8e486fca78e0376f Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Fri, 27 Sep 2024 02:26:16 +0800 Subject: [PATCH 25/51] Added new daily quests: - Best Served Foul - A Real Pearler - You Have the Rite --- .../Kojin/Dailies/2979_Best Served Foul.json | 137 ++++++++++++ .../Kojin/Dailies/2980_A Real Pearler.json | 196 ++++++++++++++++++ .../Kojin/Dailies/2981_You Have the Rite.json | 106 ++++++++++ 3 files changed, 439 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json new file mode 100644 index 00000000..2a43a868 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json @@ -0,0 +1,137 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024538, + "Position": { + "X": 703.7003, + "Y": 0.73878324, + "Z": -26.077698 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009241, + "Position": { + "X": 532.6465, + "Y": 0.99176025, + "Z": -201.2818 + }, + "TerritoryId": 613, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8234], + "Fly": true, + "RequiredQuestVariables": [null, null, [34], null, null, null] + }, + { + "DataId": 8234, + "Position": { + "X": 534.78296, + "Y": 1, + "Z": -193.164 + }, + "TerritoryId": 613, + "InteractionType": "UseItem", + "ItemId": 2002398, + "RequiredQuestVariables": [null, null, [34], null, null, null] + }, + { + "DataId": 2009240, + "Position": { + "X": 620.2334, + "Y": 0.10675049, + "Z": -315.9076 + }, + "TerritoryId": 613, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8233], + "Fly": true, + "RequiredQuestVariables": [null, null, [18, 35], null, null, null] + }, + { + "DataId": 8233, + "Position": { + "X": 616.9984, + "Y": 0.04129504, + "Z": -318.1964 + }, + "TerritoryId": 613, + "InteractionType": "UseItem", + "ItemId": 2002398, + "RequiredQuestVariables": [null, null, [18, 35], null, null, null] + }, + { + "DataId": 2009239, + "Position": { + "X": 762.9358, + "Y": 0.44250488, + "Z": -286.7323 + }, + "TerritoryId": 613, + "InteractionType": "Combat", + "EnemySpawnType": "AfterInteraction", + "KillEnemyDataIds": [8232], + "Fly": true, + "RequiredQuestVariables": [null, null, [19], null, null, null] + }, + { + "DataId": 8232, + "Position": { + "X": 760.98267, + "Y": 0.36481446, + "Z": -290.0893 + }, + "TerritoryId": 613, + "InteractionType": "UseItem", + "ItemId": 2002398, + "RequiredQuestVariables": [null, null, [19], null, null, null] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json new file mode 100644 index 00000000..f3ee8c5a --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json @@ -0,0 +1,196 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 317.60394, + "Y": -83.29468, + "Z": -227.42934 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 2009094, + "Position": { + "X": 211.078, + "Y": -135.14917, + "Z": 56.168457 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + [1, 3, 5, 6, 7, 8], + null, + null, + null, + null + ] + }, + { + "DataId": 2009095, + "Position": { + "X": 163.0426, + "Y": -148.05829, + "Z": 72.28198 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [2, 9, 21], null, null, null, null] + }, + { + "DataId": 2009096, + "Position": { + "X": 134.23352, + "Y": -161.21161, + "Z": 70.450806 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [24, 37], null, null, null, null] + }, + { + "DataId": 2009080, + "Position": { + "X": 196.27673, + "Y": -146.685, + "Z": 40.45166 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [4, 19], null, null, null, null] + }, + { + "DataId": 2009081, + "Position": { + "X": 151.56775, + "Y": -168.1087, + "Z": 49.454468 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [22, 23, 40], null, null, null, null] + }, + { + "DataId": 2009082, + "Position": { + "X": 141.86316, + "Y": -170.30597, + "Z": 96.75745 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + [18, 17, 20, 35, 38], + null, + null, + null, + null + ] + }, + { + "DataId": 2009083, + "Position": { + "X": 165.08728, + "Y": -143.54169, + "Z": 116.227905 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [ + null, + [25, 33, 36, 39], + null, + null, + null, + null + ] + }, + { + "DataId": 2009084, + "Position": { + "X": 173.81543, + "Y": -167.3457, + "Z": 114.61047 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [34, 41], null, null, null, null] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 804.21405, + "Y": 1.4000988, + "Z": 720.92487 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1024460, + "Position": { + "X": 873.9298, + "Y": 1.1792068, + "Z": 851.9568 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json new file mode 100644 index 00000000..f20f18c5 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json @@ -0,0 +1,106 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 317.60394, + "Y": -83.29468, + "Z": -227.42934 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "Position": { + "X": -3.8817294, + "Y": -146.96666, + "Z": -155.70833 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1024294, + "Position": { + "X": -24.765442, + "Y": -190.38937, + "Z": -137.10236 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 368.39856, + "Y": -116.624695, + "Z": -291.34058 + }, + "TerritoryId": 613, + "InteractionType": "UseItem", + "ItemId": 2002400, + "AetheryteShortcut": "Ruby Sea - Tamamizu", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2009085, + "Position": { + "X": 367.18176, + "Y": -119.93892, + "Z": -291.77762 + }, + "TerritoryId": 613, + "InteractionType": "Emote", + "Emote": "pray" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} From 087a6068d095691b3a33f593f90b35d4497104ff Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sat, 28 Sep 2024 16:16:14 +0800 Subject: [PATCH 26/51] Added new daily quest: - Pickles of Partnership --- .../Dailies/2984_Pickles of Partnership.json | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json new file mode 100644 index 00000000..dcf8bcfe --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json @@ -0,0 +1,75 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1019249, + "Position": { + "X": 537.1328, + "Y": 33.655228, + "Z": -811.1849 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Onokoro" + }, + { + "DataId": 1024420, + "Position": { + "X": 577.3556, + "Y": 9.866471, + "Z": -733.79114 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 391.50903, + "Y": -119.58932, + "Z": -236.18898 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + }, + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} From e0056147d29af6f55f735c9d2dc6d0f27e67e4f2 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 29 Sep 2024 01:02:40 +0800 Subject: [PATCH 27/51] Updated "Pickles of Partnership". Added another possible NPC to interact. Added conditional quest variables. --- .../Dailies/2984_Pickles of Partnership.json | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json index dcf8bcfe..41b1d804 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json @@ -30,7 +30,20 @@ "TerritoryId": 613, "InteractionType": "Interact", "Fly": true, - "AetheryteShortcut": "Ruby Sea - Onokoro" + "AetheryteShortcut": "Ruby Sea - Onokoro", + "RequiredQuestVariables": [null, null, [16, 32], null, null, null] + }, + { + "DataId": 1024348, + "Position": { + "X": 724.8187, + "Y": 1.3691645, + "Z": -814.4198 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, null, [32], null, null, null] }, { "DataId": 1024420, @@ -41,7 +54,8 @@ }, "TerritoryId": 613, "InteractionType": "Interact", - "Fly": true + "Fly": true, + "RequiredQuestVariables": [null, null, [16], null, null, null] } ] }, From eae070d6fb2d792d51bea625e57cbe8e22bdc185 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 29 Sep 2024 01:06:22 +0800 Subject: [PATCH 28/51] Updated step 255 of some of the daily quests. --- .../Kojin/Dailies/2979_Best Served Foul.json | 15 ++++++++++++--- .../Kojin/Dailies/2980_A Real Pearler.json | 15 ++++++++++++--- .../Kojin/Dailies/2981_You Have the Rite.json | 13 +++++++++++-- .../Dailies/2984_Pickles of Partnership.json | 6 +++--- 4 files changed, 38 insertions(+), 11 deletions(-) diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json index 2a43a868..9da9135a 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json @@ -119,6 +119,17 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 392.59683, + "Y": -119.589325, + "Z": -234.30063 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + }, { "DataId": 1024217, "Position": { @@ -127,9 +138,7 @@ "Z": -232.28815 }, "TerritoryId": 613, - "InteractionType": "CompleteQuest", - "Fly": true, - "AetheryteShortcut": "Ruby Sea - Tamamizu" + "InteractionType": "CompleteQuest" } ] } diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json index f3ee8c5a..bc0fa0f7 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json @@ -178,6 +178,17 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 392.59683, + "Y": -119.589325, + "Z": -234.30063 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + }, { "DataId": 1024217, "Position": { @@ -186,9 +197,7 @@ "Z": -232.28815 }, "TerritoryId": 613, - "InteractionType": "CompleteQuest", - "Fly": true, - "AetheryteShortcut": "Ruby Sea - Tamamizu" + "InteractionType": "CompleteQuest" } ] } diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json index f20f18c5..8cafa32b 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2981_You Have the Rite.json @@ -89,6 +89,16 @@ { "Sequence": 255, "Steps": [ + { + "Position": { + "X": 392.59683, + "Y": -119.589325, + "Z": -234.30063 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true + }, { "DataId": 1024217, "Position": { @@ -97,8 +107,7 @@ "Z": -232.28815 }, "TerritoryId": 613, - "InteractionType": "CompleteQuest", - "Fly": true + "InteractionType": "CompleteQuest" } ] } diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json index 41b1d804..75895739 100644 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2984_Pickles of Partnership.json @@ -64,9 +64,9 @@ "Steps": [ { "Position": { - "X": 391.50903, - "Y": -119.58932, - "Z": -236.18898 + "X": 392.59683, + "Y": -119.589325, + "Z": -234.30063 }, "TerritoryId": 613, "InteractionType": "WalkTo", From 95dd132dcbc9274069558931c318b0e47690a495 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 29 Sep 2024 01:19:04 +0800 Subject: [PATCH 29/51] Added new story quest: - Under Wraps --- .../Kojin/Story/2974_Under Wraps.json | 133 ++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Story/2974_Under Wraps.json diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Story/2974_Under Wraps.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Story/2974_Under Wraps.json new file mode 100644 index 00000000..9da1c6c8 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Story/2974_Under Wraps.json @@ -0,0 +1,133 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024215, + "Position": { + "X": 400.07617, + "Y": -119.589325, + "Z": -247.54712 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024231, + "Position": { + "X": 463.40125, + "Y": 56.86197, + "Z": -157.94617 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true, + "AetheryteShortcut": "Yanxia - Namai", + "DialogueChoices": [ + { + "Prompt": "TEXT_BANKJN002_02974_Q1_000_000", + "Type": "List", + "Answer": "TEXT_BANKJN002_02974_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2009169, + "Position": { + "X": 145.922, + "Y": 26.352295, + "Z": 456.9314 + }, + "TerritoryId": 614, + "InteractionType": "Snipe", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2009170, + "Position": { + "X": 205.31006, + "Y": 14.297607, + "Z": 712.76404 + }, + "TerritoryId": 614, + "InteractionType": "Snipe", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024238, + "Position": { + "X": 302.72363, + "Y": 2.8619597, + "Z": 731.44116 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024244, + "Position": { + "X": 181.10925, + "Y": 6.1105657, + "Z": 553.2462 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024215, + "Position": { + "X": 400.07617, + "Y": -119.589325, + "Z": -247.54712 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu", + "DialogueChoices": [ + { + "Prompt": "TEXT_BANKJN002_02974_Q3_000_000", + "Type": "List", + "Answer": "TEXT_BANKJN002_02974_A3_000_001" + } + ] + } + ] + } + ] +} From d3389baa4585f39dd01c0a5f8e73a97c304d0d70 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 29 Sep 2024 01:53:40 +0800 Subject: [PATCH 30/51] Added new action "Inhale" --- QuestPaths/quest-v1.json | 1 + Questionable.Model/Questing/Converter/ActionConverter.cs | 1 + Questionable.Model/Questing/EAction.cs | 2 ++ 3 files changed, 4 insertions(+) diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index 0c0661f7..b0fd35d2 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -912,6 +912,7 @@ "Buffet (Griffin)", "Trample", "Fumigate", + "Inhale", "Siphon Snout", "Peculiar Light", "Cannonfire", diff --git a/Questionable.Model/Questing/Converter/ActionConverter.cs b/Questionable.Model/Questing/Converter/ActionConverter.cs index 32a6654f..6f0be40e 100644 --- a/Questionable.Model/Questing/Converter/ActionConverter.cs +++ b/Questionable.Model/Questing/Converter/ActionConverter.cs @@ -26,6 +26,7 @@ public sealed class ActionConverter() : EnumConverter(Values) { EAction.BuffetGriffin, "Buffet (Griffin)" }, { EAction.Trample, "Trample" }, { EAction.Fumigate, "Fumigate" }, + { EAction.Inhale, "Inhale" }, { EAction.SiphonSnout, "Siphon Snout" }, { EAction.PeculiarLight, "Peculiar Light" }, { EAction.Cannonfire, "Cannonfire" }, diff --git a/Questionable.Model/Questing/EAction.cs b/Questionable.Model/Questing/EAction.cs index bcc676e4..27bcca1f 100644 --- a/Questionable.Model/Questing/EAction.cs +++ b/Questionable.Model/Questing/EAction.cs @@ -27,6 +27,7 @@ public enum EAction Fumigate = 5872, MagitekPulse = 8624, MagitekThunder = 8625, + Inhale = 10013, SiphonSnout = 18187, PeculiarLight = 20030, Cannonfire = 20121, @@ -63,6 +64,7 @@ public static class EActionExtensions or EAction.BuffetGriffin or EAction.Trample or EAction.Fumigate + or EAction.Inhale or EAction.SiphonSnout or EAction.PeculiarLight or EAction.Cannonfire From f7ba64d34bad007567447162dbd5060c8bc492eb Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Sun, 29 Sep 2024 02:25:59 +0800 Subject: [PATCH 31/51] Added new daily quests: - Little Kojin Lost - Much at Steak - Sand-sifting Specialist --- .../Kojin/Dailies/2985_Little Kojin Lost.json | 118 ++++++++++++ .../Kojin/Dailies/2986_Much at Steak.json | 97 ++++++++++ .../Dailies/2990_Sand-sifting Specialist.json | 179 ++++++++++++++++++ 3 files changed, 394 insertions(+) create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2985_Little Kojin Lost.json create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2986_Much at Steak.json create mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2990_Sand-sifting Specialist.json diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2985_Little Kojin Lost.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2985_Little Kojin Lost.json new file mode 100644 index 00000000..658f8fdb --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2985_Little Kojin Lost.json @@ -0,0 +1,118 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 324.734, + "Y": -118.16611, + "Z": -310.65613 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "RestartNavigationIfCancelled": false + }, + { + "DataId": 2009099, + "Position": { + "X": 829.0073, + "Y": -122.179016, + "Z": -768.91736 + }, + "TerritoryId": 613, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_BANKJN401_02985_SAYTODO_000_015" + }, + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024295, + "Position": { + "X": 861.6616, + "Y": -108.659546, + "Z": -546.4103 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [16], null, null, null, null] + }, + { + "DataId": 1024345, + "Position": { + "X": 891.78296, + "Y": -140.61188, + "Z": -794.36945 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [32], null, null, null, null] + }, + { + "DataId": 1024344, + "Position": { + "X": 836.14856, + "Y": -127.85541, + "Z": -910.7042 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true, + "RequiredQuestVariables": [null, [48], null, null, null, null] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 392.59683, + "Y": -119.589325, + "Z": -234.30063 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + }, + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2986_Much at Steak.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2986_Much at Steak.json new file mode 100644 index 00000000..ba5a8f43 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2986_Much at Steak.json @@ -0,0 +1,97 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -305.79498, + "Y": -0.5, + "Z": -517.7326 + }, + "TerritoryId": 613, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [8237], + "Fly": true, + "Land": true, + "AetheryteShortcut": "Ruby Sea - Onokoro", + "RequiredQuestVariables": [null, null, [1], null, null, null] + }, + { + "Position": { + "X": 166.64561, + "Y": -0.4983238, + "Z": -751.1739 + }, + "TerritoryId": 613, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [8237], + "Fly": true, + "Land": true, + "AetheryteShortcut": "Ruby Sea - Onokoro", + "RequiredQuestVariables": [null, null, [2], null, null, null] + }, + { + "Position": { + "X": -135.29268, + "Y": -0.06343824, + "Z": -805.9451 + }, + "TerritoryId": 613, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [8237], + "Fly": true, + "Land": true, + "AetheryteShortcut": "Ruby Sea - Onokoro", + "RequiredQuestVariables": [null, null, [3], null, null, null] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 392.59683, + "Y": -119.589325, + "Z": -234.30063 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + }, + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2990_Sand-sifting Specialist.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2990_Sand-sifting Specialist.json new file mode 100644 index 00000000..f08218d8 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2990_Sand-sifting Specialist.json @@ -0,0 +1,179 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024218, + "Position": { + "X": 387.56384, + "Y": -119.795334, + "Z": -257.64862 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 322.45865, + "Y": -121.24298, + "Z": -314.65158 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "RestartNavigationIfCancelled": false + }, + { + "DataId": 2009109, + "Position": { + "X": 239.18518, + "Y": -74.99817, + "Z": -464.95764 + }, + "TerritoryId": 613, + "InteractionType": "Action", + "Action": "Inhale", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [16, 48, 128, 144], + null, + null + ] + }, + { + "DataId": 2009108, + "Position": { + "X": 286.33557, + "Y": -74.60144, + "Z": -499.01584 + }, + "TerritoryId": 613, + "InteractionType": "Action", + "Action": "Inhale", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [16, 48, 128, 160], + null, + null + ] + }, + { + "DataId": 2009106, + "Position": { + "X": 539.2385, + "Y": -56.26001, + "Z": -364.88904 + }, + "TerritoryId": 613, + "InteractionType": "Action", + "Action": "Inhale", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [16, 64, 160], + null, + null + ] + }, + { + "DataId": 2009107, + "Position": { + "X": 560.14343, + "Y": -75.547424, + "Z": -410.81866 + }, + "TerritoryId": 613, + "InteractionType": "Action", + "Action": "Inhale", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [48, 64, 144, 160], + null, + null + ] + }, + { + "DataId": 2009105, + "Position": { + "X": 613.94666, + "Y": -74.57086, + "Z": -400.04578 + }, + "TerritoryId": 613, + "InteractionType": "Action", + "Action": "Inhale", + "Fly": true, + "RequiredQuestVariables": [ + null, + null, + null, + [64, 128, 144], + null, + null + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 392.59683, + "Y": -119.589325, + "Z": -234.30063 + }, + "TerritoryId": 613, + "InteractionType": "WalkTo", + "Fly": true, + "AetheryteShortcut": "Ruby Sea - Tamamizu" + }, + { + "DataId": 1024217, + "Position": { + "X": 394.39978, + "Y": -119.58932, + "Z": -232.28815 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} From b5ba224f108d941f2772df8d4e98521d561ae60c Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Wed, 25 Sep 2024 00:38:31 +0800 Subject: [PATCH 32/51] Added new daily quest - Fifty Shades of Yellow --- .../Dailies/2277_Fifty Shades of Yellow.json | 118 ++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2277_Fifty Shades of Yellow.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2277_Fifty Shades of Yellow.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2277_Fifty Shades of Yellow.json new file mode 100644 index 00000000..1f83afd0 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2277_Fifty Shades of Yellow.json @@ -0,0 +1,118 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016803, + "Position": { + "X": 57.297607, + "Y": -47.842846, + "Z": -174.63953 + }, + "TerritoryId": 398, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016872, + "Position": { + "X": -42.954163, + "Y": -33.573986, + "Z": -24.490784 + }, + "TerritoryId": 398, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_BANGNA602_02277_SYSTEM_000_012" + }, + "Fly": true + }, + { + "DataId": 1016871, + "Position": { + "X": -113.38989, + "Y": -34.45324, + "Z": -206.65302 + }, + "TerritoryId": 398, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_BANGNA602_02277_SYSTEM_000_012" + }, + "Fly": true + }, + { + "DataId": 1016873, + "Position": { + "X": -178.17963, + "Y": -35.40849, + "Z": -80.094604 + }, + "TerritoryId": 398, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_BANGNA602_02277_SYSTEM_000_012" + }, + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016874, + "Position": { + "X": -399.25232, + "Y": 96.070595, + "Z": -43.01526 + }, + "TerritoryId": 398, + "InteractionType": "Say", + "ChatMessage": { + "Key": "TEXT_BANGNA602_02277_SYSTEM_000_012" + }, + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1016874, + "Position": { + "X": -399.25232, + "Y": 96.070595, + "Z": -43.01526 + }, + "TerritoryId": 398, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016803, + "Position": { + "X": 57.297607, + "Y": -47.842846, + "Z": -174.63953 + }, + "TerritoryId": 398, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} From 46d54f4d7928b3310ef1fe94ef0472678b1fc1c3 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Thu, 26 Sep 2024 21:51:42 +0800 Subject: [PATCH 33/51] Added new daily quest: - Bugging the Bugs --- .../Vath/Dailies/2263_Bugging the Bugs.json | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2263_Bugging the Bugs.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2263_Bugging the Bugs.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2263_Bugging the Bugs.json new file mode 100644 index 00000000..933aa250 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vath/Dailies/2263_Bugging the Bugs.json @@ -0,0 +1,116 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016803, + "Position": { + "X": 57.297607, + "Y": -47.842846, + "Z": -174.63953 + }, + "TerritoryId": 398, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1017031, + "Position": { + "X": 74.20459, + "Y": -48.533592, + "Z": -171.12994 + }, + "TerritoryId": 398, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2006887, + "Position": { + "X": 523.4302, + "Y": -50.370117, + "Z": 90.86743 + }, + "TerritoryId": 398, + "InteractionType": "Action", + "Action": "Fumigate", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2006970, + "Position": { + "X": 517.4791, + "Y": -50.644714, + "Z": 89.00586 + }, + "TerritoryId": 398, + "InteractionType": "Action", + "Action": "Fumigate", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2006889, + "Position": { + "X": 689.7229, + "Y": -52.262207, + "Z": 62.088867 + }, + "TerritoryId": 398, + "InteractionType": "Action", + "Action": "Fumigate", + "Fly": true + }, + { + "DataId": 2006888, + "Position": { + "X": 586.1753, + "Y": -37.979797, + "Z": 257.3739 + }, + "TerritoryId": 398, + "InteractionType": "Action", + "Action": "Fumigate", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016803, + "Position": { + "X": 57.297607, + "Y": -47.842846, + "Z": -174.63953 + }, + "TerritoryId": 398, + "InteractionType": "CompleteQuest", + "Fly": true, + "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine" + } + ] + } + ] +} From 7436f03199ca0242d8eb8b6e272a976d5e03dab9 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Mon, 30 Sep 2024 00:24:13 +0800 Subject: [PATCH 34/51] Removed the following daily quests: - Best Served Foul - A Real Pearler --- .../Kojin/Dailies/2979_Best Served Foul.json | 146 ------------- .../Kojin/Dailies/2980_A Real Pearler.json | 205 ------------------ 2 files changed, 351 deletions(-) delete mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json delete mode 100644 QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json deleted file mode 100644 index 9da9135a..00000000 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2979_Best Served Foul.json +++ /dev/null @@ -1,146 +0,0 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "plogon_enjoyer", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1024217, - "Position": { - "X": 394.39978, - "Y": -119.58932, - "Z": -232.28815 - }, - "TerritoryId": 613, - "InteractionType": "AcceptQuest" - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "DataId": 1024538, - "Position": { - "X": 703.7003, - "Y": 0.73878324, - "Z": -26.077698 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "DataId": 2009241, - "Position": { - "X": 532.6465, - "Y": 0.99176025, - "Z": -201.2818 - }, - "TerritoryId": 613, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [8234], - "Fly": true, - "RequiredQuestVariables": [null, null, [34], null, null, null] - }, - { - "DataId": 8234, - "Position": { - "X": 534.78296, - "Y": 1, - "Z": -193.164 - }, - "TerritoryId": 613, - "InteractionType": "UseItem", - "ItemId": 2002398, - "RequiredQuestVariables": [null, null, [34], null, null, null] - }, - { - "DataId": 2009240, - "Position": { - "X": 620.2334, - "Y": 0.10675049, - "Z": -315.9076 - }, - "TerritoryId": 613, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [8233], - "Fly": true, - "RequiredQuestVariables": [null, null, [18, 35], null, null, null] - }, - { - "DataId": 8233, - "Position": { - "X": 616.9984, - "Y": 0.04129504, - "Z": -318.1964 - }, - "TerritoryId": 613, - "InteractionType": "UseItem", - "ItemId": 2002398, - "RequiredQuestVariables": [null, null, [18, 35], null, null, null] - }, - { - "DataId": 2009239, - "Position": { - "X": 762.9358, - "Y": 0.44250488, - "Z": -286.7323 - }, - "TerritoryId": 613, - "InteractionType": "Combat", - "EnemySpawnType": "AfterInteraction", - "KillEnemyDataIds": [8232], - "Fly": true, - "RequiredQuestVariables": [null, null, [19], null, null, null] - }, - { - "DataId": 8232, - "Position": { - "X": 760.98267, - "Y": 0.36481446, - "Z": -290.0893 - }, - "TerritoryId": 613, - "InteractionType": "UseItem", - "ItemId": 2002398, - "RequiredQuestVariables": [null, null, [19], null, null, null] - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": 392.59683, - "Y": -119.589325, - "Z": -234.30063 - }, - "TerritoryId": 613, - "InteractionType": "WalkTo", - "Fly": true, - "AetheryteShortcut": "Ruby Sea - Tamamizu" - }, - { - "DataId": 1024217, - "Position": { - "X": 394.39978, - "Y": -119.58932, - "Z": -232.28815 - }, - "TerritoryId": 613, - "InteractionType": "CompleteQuest" - } - ] - } - ] -} diff --git a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json b/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json deleted file mode 100644 index bc0fa0f7..00000000 --- a/QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Dailies/2980_A Real Pearler.json +++ /dev/null @@ -1,205 +0,0 @@ -{ - "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", - "Author": "plogon_enjoyer", - "QuestSequence": [ - { - "Sequence": 0, - "Steps": [ - { - "DataId": 1024217, - "Position": { - "X": 394.39978, - "Y": -119.58932, - "Z": -232.28815 - }, - "TerritoryId": 613, - "InteractionType": "AcceptQuest" - } - ] - }, - { - "Sequence": 1, - "Steps": [ - { - "Position": { - "X": 317.60394, - "Y": -83.29468, - "Z": -227.42934 - }, - "TerritoryId": 613, - "InteractionType": "WalkTo", - "Fly": true - }, - { - "DataId": 2009094, - "Position": { - "X": 211.078, - "Y": -135.14917, - "Z": 56.168457 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [ - null, - [1, 3, 5, 6, 7, 8], - null, - null, - null, - null - ] - }, - { - "DataId": 2009095, - "Position": { - "X": 163.0426, - "Y": -148.05829, - "Z": 72.28198 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [null, [2, 9, 21], null, null, null, null] - }, - { - "DataId": 2009096, - "Position": { - "X": 134.23352, - "Y": -161.21161, - "Z": 70.450806 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [null, [24, 37], null, null, null, null] - }, - { - "DataId": 2009080, - "Position": { - "X": 196.27673, - "Y": -146.685, - "Z": 40.45166 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [null, [4, 19], null, null, null, null] - }, - { - "DataId": 2009081, - "Position": { - "X": 151.56775, - "Y": -168.1087, - "Z": 49.454468 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [null, [22, 23, 40], null, null, null, null] - }, - { - "DataId": 2009082, - "Position": { - "X": 141.86316, - "Y": -170.30597, - "Z": 96.75745 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [ - null, - [18, 17, 20, 35, 38], - null, - null, - null, - null - ] - }, - { - "DataId": 2009083, - "Position": { - "X": 165.08728, - "Y": -143.54169, - "Z": 116.227905 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [ - null, - [25, 33, 36, 39], - null, - null, - null, - null - ] - }, - { - "DataId": 2009084, - "Position": { - "X": 173.81543, - "Y": -167.3457, - "Z": 114.61047 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true, - "RequiredQuestVariables": [null, [34, 41], null, null, null, null] - } - ] - }, - { - "Sequence": 2, - "Steps": [ - { - "Position": { - "X": 804.21405, - "Y": 1.4000988, - "Z": 720.92487 - }, - "TerritoryId": 613, - "InteractionType": "WalkTo", - "Fly": true - }, - { - "DataId": 1024460, - "Position": { - "X": 873.9298, - "Y": 1.1792068, - "Z": 851.9568 - }, - "TerritoryId": 613, - "InteractionType": "Interact", - "Fly": true - } - ] - }, - { - "Sequence": 255, - "Steps": [ - { - "Position": { - "X": 392.59683, - "Y": -119.589325, - "Z": -234.30063 - }, - "TerritoryId": 613, - "InteractionType": "WalkTo", - "Fly": true, - "AetheryteShortcut": "Ruby Sea - Tamamizu" - }, - { - "DataId": 1024217, - "Position": { - "X": 394.39978, - "Y": -119.58932, - "Z": -232.28815 - }, - "TerritoryId": 613, - "InteractionType": "CompleteQuest" - } - ] - } - ] -} From 46e4ab609e7194010fb227e69f56488509de0d6a Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Thu, 26 Sep 2024 23:51:21 +0800 Subject: [PATCH 35/51] Added the following story quest: - A Symbiotic Friendship (cherry picked from commit 65e3417d1ceef875690ea1f99b36387c02c4f03f) --- .../Story/2260_A Symbiotic Friendship.json | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json new file mode 100644 index 00000000..bc9a3ec9 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json @@ -0,0 +1,37 @@ +{ + "$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json", + "Author": "plogon_enjoyer", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016802, + "Position": { + "X": 53.360718, + "Y": -48.000004, + "Z": -169.97028 + }, + "TerritoryId": 398, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1011928, + "Position": { + "X": 73.19751, + "Y": -49.19563, + "Z": -139.05548 + }, + "TerritoryId": 398, + "InteractionType": "CompleteQuest", + "Fly": true + } + ] + } + ] +} From 9611e79cf2239865b2028941eb5f3c7f629be811 Mon Sep 17 00:00:00 2001 From: Plogon Enjoyer Date: Mon, 30 Sep 2024 00:31:43 +0800 Subject: [PATCH 36/51] Fixed InteractionType. Changed from "Interact" to "AcceptQuest". (cherry picked from commit 83c48a8454ea11616e4e72976138616dc33b1f23) --- .../Vanu Vanu/Story/2260_A Symbiotic Friendship.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json index bc9a3ec9..f061ed47 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json @@ -13,7 +13,7 @@ "Z": -169.97028 }, "TerritoryId": 398, - "InteractionType": "Interact" + "InteractionType": "AcceptQuest" } ] }, From 01e657dbdd2229638c56df7c19c87b105148d970 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 29 Sep 2024 20:22:28 +0200 Subject: [PATCH 37/51] Add support for Crystarium leves --- .../Kholusia/576__MIN.json | 120 ++++++++++++++++++ .../6.x - Endwalker/Labyrinthos/886__MIN.json | 3 +- .../Leves/MIN/L1540_Barmy for Ballistas.json | 38 ++++++ .../MSQ/I-5.3/3774_Food for the Soul.json | 1 - .../Misc/3605_The Aspiring Skywatcher.json | 21 +++ Questionable/Data/LeveData.cs | 5 + 6 files changed, 186 insertions(+), 2 deletions(-) create mode 100644 GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json create mode 100644 QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json create mode 100644 QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json diff --git a/GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json b/GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json new file mode 100644 index 00000000..6be75bd0 --- /dev/null +++ b/GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", + "Author": "liza", + "Steps": [ + { + "TerritoryId": 814, + "InteractionType": "None" + } + ], + "Groups": [ + { + "Nodes": [ + { + "DataId": 32512, + "Locations": [ + { + "Position": { + "X": -221.5365, + "Y": 88.75751, + "Z": 36.51096 + }, + "MinimumAngle": -100, + "MaximumAngle": 25 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32513, + "Locations": [ + { + "Position": { + "X": -227.0897, + "Y": 89.90434, + "Z": 37.42806 + }, + "MinimumAngle": -20, + "MaximumAngle": 60 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32514, + "Locations": [ + { + "Position": { + "X": -233.9371, + "Y": 89.18435, + "Z": 42.91663 + }, + "MinimumAngle": -110, + "MaximumAngle": -25 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32515, + "Locations": [ + { + "Position": { + "X": -243.0384, + "Y": 88.70179, + "Z": 48.95438 + }, + "MinimumAngle": -70, + "MaximumAngle": 45 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32516, + "Locations": [ + { + "Position": { + "X": -256.5147, + "Y": 90.32328, + "Z": 51.07351 + }, + "MinimumAngle": -75, + "MaximumAngle": 90 + } + ] + } + ] + }, + { + "Nodes": [ + { + "DataId": 32517, + "Locations": [ + { + "Position": { + "X": -265.2769, + "Y": 90.43383, + "Z": 45.49376 + }, + "MinimumAngle": -40, + "MaximumAngle": 40 + } + ] + } + ] + } + ] +} diff --git a/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json index 8bb59514..0657a96f 100644 --- a/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json +++ b/GatheringPaths/6.x - Endwalker/Labyrinthos/886__MIN.json @@ -1,6 +1,7 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json", "Author": "liza", + "FlyBetweenNodes": false, "Steps": [ { "TerritoryId": 956, @@ -157,4 +158,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json b/QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json new file mode 100644 index 00000000..48631931 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Leves/MIN/L1540_Barmy for Ballistas.json @@ -0,0 +1,38 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -213.94563, + "Y": 84.02199, + "Z": 43.544315 + }, + "TerritoryId": 814, + "InteractionType": "InitiateLeve", + "AetheryteShortcut": "Kholusia - Wright", + "Fly": true, + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + }, + { + "TerritoryId": 814, + "InteractionType": "Gather", + "ItemsToGather": [ + { + "ItemId": 2002785, + "AlternativeItemId": 2002786, + "ItemCount": 999 + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json index aaf60578..3408d12f 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3774_Food for the Soul.json @@ -52,7 +52,6 @@ "Fly": true }, { - "Comment": "TODO Verify", "DataId": 1033818, "Position": { "X": 24.551636, diff --git a/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json b/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json new file mode 100644 index 00000000..b0905c11 --- /dev/null +++ b/QuestPaths/5.x - Shadowbringers/Unlocks/Misc/3605_The Aspiring Skywatcher.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1031106, + "Position": { + "X": -8.255188, + "Y": -3.1851232E-07, + "Z": 10.543945 + }, + "TerritoryId": 819, + "InteractionType": "AcceptQuest" + } + ] + } + ] +} diff --git a/Questionable/Data/LeveData.cs b/Questionable/Data/LeveData.cs index a8084200..fcabe5d8 100644 --- a/Questionable/Data/LeveData.cs +++ b/Questionable/Data/LeveData.cs @@ -13,6 +13,11 @@ internal sealed class LeveData { private static readonly List Leves = [ + new( + aetheryteLocation: EAetheryteLocation.Crystarium, + aethernetShortcut: new AethernetShortcut{From = EAetheryteLocation.Crystarium, To = EAetheryteLocation.CrystariumCrystallineMean}, + issuerDataId: 1027847, + issuerPosition: new(-73.94349f, 19.999794f, -110.86395f)), new( aetheryteLocation: EAetheryteLocation.OldSharlayan, aethernetShortcut: new AethernetShortcut From 7397ca547a7ee58022af72b1385db8030ffa06be Mon Sep 17 00:00:00 2001 From: Limiana <5073202+Limiana@users.noreply.github.com> Date: Mon, 30 Sep 2024 23:14:56 +0300 Subject: [PATCH 38/51] Add TextAdvance ipc --- Questionable/External/TextAdvanceIpc.cs | 79 +++++++++++++++++++++++++ Questionable/QuestionablePlugin.cs | 2 + 2 files changed, 81 insertions(+) create mode 100644 Questionable/External/TextAdvanceIpc.cs diff --git a/Questionable/External/TextAdvanceIpc.cs b/Questionable/External/TextAdvanceIpc.cs new file mode 100644 index 00000000..bb771b02 --- /dev/null +++ b/Questionable/External/TextAdvanceIpc.cs @@ -0,0 +1,79 @@ +using Dalamud.Plugin; +using Dalamud.Plugin.Ipc; +using Dalamud.Plugin.Services; +using FFXIVClientStructs.FFXIV.Client.Game; +using Questionable.Controller; +using Questionable.Data; +using Questionable.Model.Common; +using System; + +namespace Questionable.External; + +internal sealed class TextAdvanceIpc : IDisposable +{ + private bool _isExternalControlActivated; + private readonly QuestController _questController; + private readonly IFramework _framework; + private readonly ICallGateSubscriber _isInExternalControl; + private readonly ICallGateSubscriber _enableExternalControl; + private readonly ICallGateSubscriber _disableExternalControl; + private readonly string _pluginName; + private readonly ExternalTerritoryConfig _externalTerritoryConfig = new(); + + public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework, QuestController questController) + { + _framework = framework; + _questController = questController; + _isInExternalControl = pluginInterface.GetIpcSubscriber("TextAdvance.IsInExternalControl"); + _enableExternalControl = pluginInterface.GetIpcSubscriber("TextAdvance.EnableExternalControl"); + _disableExternalControl = pluginInterface.GetIpcSubscriber("TextAdvance.DisableExternalControl"); + _pluginName = pluginInterface.InternalName; + _framework.Update += OnUpdate; + } + + public void Dispose() + { + _framework.Update -= OnUpdate; + if(_isExternalControlActivated) + { + _disableExternalControl.InvokeFunc(_pluginName); + } + } + + public void OnUpdate(IFramework framework) + { + if(_questController.IsRunning) + { + if(!_isInExternalControl.InvokeFunc()) + { + if(_enableExternalControl.InvokeFunc(_pluginName, _externalTerritoryConfig)) + { + _isExternalControlActivated = true; + } + } + } + else + { + if(_isExternalControlActivated) + { + if(_disableExternalControl.InvokeFunc(_pluginName) || !_isInExternalControl.InvokeFunc()) + { + _isExternalControlActivated = false; + } + } + } + } + + public class ExternalTerritoryConfig + { + public bool? EnableQuestAccept = true; + public bool? EnableQuestComplete = true; + public bool? EnableRewardPick = true; + public bool? EnableRequestHandin = true; + public bool? EnableCutsceneEsc = true; + public bool? EnableCutsceneSkipConfirm = true; + public bool? EnableTalkSkip = true; + public bool? EnableRequestFill = true; + public bool? EnableAutoInteract = false; + } +} diff --git a/Questionable/QuestionablePlugin.cs b/Questionable/QuestionablePlugin.cs index a3731ed4..b9a1c54e 100644 --- a/Questionable/QuestionablePlugin.cs +++ b/Questionable/QuestionablePlugin.cs @@ -124,6 +124,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); serviceCollection.AddSingleton(); + serviceCollection.AddSingleton(); } private static void AddTaskFactories(ServiceCollection serviceCollection) @@ -289,6 +290,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin serviceProvider.GetRequiredService(); serviceProvider.GetRequiredService(); serviceProvider.GetRequiredService().Enable(); + serviceProvider.GetRequiredService(); } public void Dispose() From 4c63c2b88ff345358552298375e3ebfa7de86414 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 1 Oct 2024 20:53:21 +0200 Subject: [PATCH 39/51] Minor EW path adjustments --- .../Thavnair/4203_Alchemist or Dancer.json | 10 ++++++++++ .../4369_On Low Tide.json | 9 +++++++++ .../4370_A Fishermans Friend.json | 18 ++++++++++++++++++ .../B-Garlemald/4389_Personae non Gratae.json | 6 ++++-- 4 files changed, 41 insertions(+), 2 deletions(-) diff --git a/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4203_Alchemist or Dancer.json b/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4203_Alchemist or Dancer.json index 3b15ae0b..85aec37d 100644 --- a/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4203_Alchemist or Dancer.json +++ b/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4203_Alchemist or Dancer.json @@ -20,6 +20,15 @@ { "Sequence": 1, "Steps": [ + { + "Position": { + "X": 19.631685, + "Y": 90.24879, + "Z": -136.69801 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, { "DataId": 1039382, "Position": { @@ -27,6 +36,7 @@ "Y": 90.248795, "Z": -133.34863 }, + "StopDistance": 7, "TerritoryId": 957, "InteractionType": "Interact" } diff --git a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json index 86c7a33f..7023f142 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json +++ b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json @@ -36,6 +36,15 @@ "TerritoryId": 957, "InteractionType": "Interact" }, + { + "Position": { + "X": 193.6185, + "Y": 1.9123514, + "Z": 713.436 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, { "DataId": 1037622, "Position": { diff --git a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json index d3ac2166..ab24c9ce 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json +++ b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json @@ -67,6 +67,24 @@ { "Sequence": 3, "Steps": [ + { + "Position": { + "X": 198.9156, + "Y": 4.763735, + "Z": 657.83264 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 177.03275, + "Y": 4.763736, + "Z": 658.2807 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo" + }, { "DataId": 1037626, "Position": { diff --git a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4389_Personae non Gratae.json b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4389_Personae non Gratae.json index 9bee400f..47b951a3 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4389_Personae non Gratae.json +++ b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4389_Personae non Gratae.json @@ -163,7 +163,8 @@ "Z": -237.499 }, "TerritoryId": 958, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Mount": true }, { "Position": { @@ -197,7 +198,8 @@ "Z": -244.6051 }, "TerritoryId": 958, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "Mount": true }, { "Position": { From fad4f0e72072b93323f8332f40cab6efb866719d Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 1 Oct 2024 21:28:19 +0200 Subject: [PATCH 40/51] Minor path adjustments --- .../1425_Saw That One Coming.json | 36 +++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json index 076643a9..101c13a3 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Emotes/Harvest Dance/1425_Saw That One Coming.json @@ -19,7 +19,7 @@ "InSameTerritory": true } }, - "Comment": "We have get here first just to make sure we don't run into walls." + "$": "We have get here first just to make sure we don't run into walls." }, { "Position": { @@ -101,7 +101,7 @@ "InSameTerritory": true } }, - "Comment": "Interact with the gal now!" + "$": "Interact with the gal now!" } ] }, @@ -124,7 +124,7 @@ "InSameTerritory": true } }, - "Comment": "Speak with the man now!" + "$": "Speak with the man now!" } ] }, @@ -151,7 +151,15 @@ "InSameTerritory": true } }, - "Comment": "Give the First kid his present" + "$": "Give the First kid his present", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] }, { "DataId": 1007794, @@ -167,7 +175,15 @@ "[Gridania] Leatherworkers' Guild & Shaded Bower", "[Gridania] Mih Khetto's Amphitheatre" ], - "Comment": "Give the second kid his present." + "$": "Give the second kid his present.", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] }, { "DataId": 1007793, @@ -183,7 +199,15 @@ "[Gridania] Mih Khetto's Amphitheatre", "[Gridania] Conjurers' Guild" ], - "Comment": "Give the third kid his present." + "$": "Give the third kid his present.", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] } ] }, From 35eeb83b49b4546f48a36cf4f235bced8bb7938d Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 1 Oct 2024 21:47:30 +0200 Subject: [PATCH 41/51] Consider quest step complete if QuestWork matches + maybe fix some interact interruptions --- .../Controller/Steps/Interactions/Interact.cs | 38 ++++++++++++++----- 1 file changed, 29 insertions(+), 9 deletions(-) diff --git a/Questionable/Controller/Steps/Interactions/Interact.cs b/Questionable/Controller/Steps/Interactions/Interact.cs index 3cb137c4..ac8f5109 100644 --- a/Questionable/Controller/Steps/Interactions/Interact.cs +++ b/Questionable/Controller/Steps/Interactions/Interact.cs @@ -7,6 +7,7 @@ using Dalamud.Plugin.Services; using FFXIVClientStructs.FFXIV.Client.Game; using Microsoft.Extensions.Logging; using Questionable.Controller.Steps.Shared; +using Questionable.Controller.Utils; using Questionable.Functions; using Questionable.Model; using Questionable.Model.Questing; @@ -57,7 +58,7 @@ internal static class Interact yield return new Task(step.DataId.Value, quest, step.InteractionType, step.TargetTerritoryId != null || quest.Id is SatisfactionSupplyNpcId || step.SkipConditions is { StepIf.Never: true } || step.InteractionType == EInteractionType.PurchaseItem, - step.PickUpItemId, step.SkipConditions?.StepIf); + step.PickUpItemId, step.SkipConditions?.StepIf, step.CompletionQuestVariablesFlags); } } @@ -67,15 +68,25 @@ internal static class Interact EInteractionType InteractionType, bool SkipMarkerCheck = false, uint? PickUpItemId = null, - SkipStepConditions? SkipConditions = null) : ITask + SkipStepConditions? SkipConditions = null, + List? CompletionQuestVariablesFlags = null) : ITask { + public List CompletionQuestVariablesFlags { get; } = CompletionQuestVariablesFlags ?? []; + + public bool HasCompletionQuestVariablesFlags { get; } = + Quest != null && + CompletionQuestVariablesFlags != null && + QuestWorkUtils.HasCompletionFlags(CompletionQuestVariablesFlags); + public bool ShouldRedoOnInterrupt() => true; - public override string ToString() => $"Interact({DataId})"; + public override string ToString() => + $"Interact{(HasCompletionQuestVariablesFlags ? "*" : "")}({DataId})"; } internal sealed class DoInteract( GameFunctions gameFunctions, + QuestFunctions questFunctions, ICondition condition, ILogger logger) : TaskExecutor, IConditionChangeAware @@ -151,13 +162,22 @@ internal static class Interact return ETaskResult.TaskComplete; } } - else + else if (InteractionType == EInteractionType.Gather && condition[ConditionFlag.Gathering]) + return ETaskResult.TaskComplete; + else if (Quest != null && Task.HasCompletionQuestVariablesFlags) { - if (ProgressContext != null && (ProgressContext.WasSuccessful() || - _interactionState == EInteractionState.InteractionConfirmed)) - return ETaskResult.TaskComplete; - - if (InteractionType == EInteractionType.Gather && condition[ConditionFlag.Gathering]) + var questWork = questFunctions.GetQuestProgressInfo(Quest.Id); + return questWork != null && + QuestWorkUtils.MatchesQuestWork(Task.CompletionQuestVariablesFlags, questWork) + ? ETaskResult.TaskComplete + : ETaskResult.StillRunning; + } + else if (ProgressContext != null) + { + if (ProgressContext.WasInterrupted()) + return ETaskResult.StillRunning; + else if (ProgressContext.WasSuccessful() || + _interactionState == EInteractionState.InteractionConfirmed) return ETaskResult.TaskComplete; } From 4ccd615832b6a6c195fb6a62317f2ae1e3ed9efc Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 1 Oct 2024 22:05:21 +0200 Subject: [PATCH 42/51] Fix 'NotInInventory' ignoring HQ items --- .../Class Quests/SGE/4068_Sage's Focus.json | 14 +------------- .../Controller/Steps/Interactions/EquipItem.cs | 2 ++ .../Controller/Steps/Shared/SkipCondition.cs | 3 ++- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json b/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json index 5c731ab8..18fbc7da 100644 --- a/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json +++ b/QuestPaths/6.x - Endwalker/Class Quests/SGE/4068_Sage's Focus.json @@ -33,13 +33,8 @@ "TerritoryId": 134, "InteractionType": "EquipItem", "ItemId": 35778, - "AetheryteShortcut": "Middle La Noscea - Summerford Farms", - "Fly": true, "Comment": "Try to Equip Stonegold Milpreves", "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true - }, "StepIf": { "Item": { "NotInInventory": true @@ -60,14 +55,7 @@ }, "StopDistance": 5, "TerritoryId": 134, - "InteractionType": "AcceptQuest", - "AetheryteShortcut": "Middle La Noscea - Summerford Farms", - "Fly": true, - "SkipConditions": { - "AetheryteShortcutIf": { - "InSameTerritory": true - } - } + "InteractionType": "AcceptQuest" } ] }, diff --git a/Questionable/Controller/Steps/Interactions/EquipItem.cs b/Questionable/Controller/Steps/Interactions/EquipItem.cs index 9e424f65..c8159247 100644 --- a/Questionable/Controller/Steps/Interactions/EquipItem.cs +++ b/Questionable/Controller/Steps/Interactions/EquipItem.cs @@ -158,6 +158,8 @@ internal static class EquipItem return; } } + + throw new TaskException($"Could not equip item {Task.ItemId}."); } private static List? GetEquipSlot(Item item) diff --git a/Questionable/Controller/Steps/Shared/SkipCondition.cs b/Questionable/Controller/Steps/Shared/SkipCondition.cs index 9690d474..c95ee8ea 100644 --- a/Questionable/Controller/Steps/Shared/SkipCondition.cs +++ b/Questionable/Controller/Steps/Shared/SkipCondition.cs @@ -144,7 +144,8 @@ internal static class SkipCondition if (skipConditions.Item is { NotInInventory: true } && step is { ItemId: not null }) { InventoryManager* inventoryManager = InventoryManager.Instance(); - if (inventoryManager->GetInventoryItemCount(step.ItemId.Value) == 0) + if (inventoryManager->GetInventoryItemCount(step.ItemId.Value) == 0 && + inventoryManager->GetInventoryItemCount(step.ItemId.Value, true) == 0) { logger.LogInformation("Skipping step, no item with itemId {ItemId} in inventory", step.ItemId.Value); From e9b6b27ce2fb0a5565fa540c74a7b11021070ca0 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 1 Oct 2024 22:25:25 +0200 Subject: [PATCH 43/51] Remove 'TerritoryBlacklist' from quests --- QuestPathGenerator/QuestSourceGenerator.cs | 3 --- .../Alliance Raid Quests/494_The World of Darkness.json | 3 --- .../MSQ-1/Gridania/129_Spirithold Broken.json | 3 --- .../MSQ-1/Gridania/445_Chasing Shadows.json | 3 --- .../MSQ-1/Limsa/414_Victory in Peril.json | 3 --- .../2.x - A Realm Reborn/MSQ-1/Limsa/469_Just Deserts.json | 3 --- .../MSQ-1/Limsa/543_Lurkers in the Grotto.json | 3 --- .../MSQ-1/Limsa/544_Feint and Strike.json | 3 --- .../MSQ-1/Shared/245_It's Probably Pirates.json | 3 --- .../MSQ-1/Shared/343_Lord of the Inferno.json | 4 ---- .../MSQ-1/Shared/660_Into a Copper Hell.json | 4 ---- .../MSQ-1/Shared/677_Fire in the Gloom.json | 3 --- .../MSQ-1/Ul'dah/550_Underneath the Sultantree.json | 3 --- .../MSQ-1/Ul'dah/551_Duty, Honor, Country.json | 3 --- .../514_Into the Beast's Maw.json | 3 --- .../832_The Things We Do for Cheese.json | 3 --- .../MSQ-2/B4-Titan/857_Lord of Crags.json | 3 --- .../952_In Pursuit of the Past.json | 3 --- .../967_History Repeating.json | 3 --- .../1005_Every Little Thing She Does Is Magitek.json | 3 --- .../MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json | 3 --- .../MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json | 3 --- .../MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json | 4 ---- .../MSQ-2/E2-2.2/1361_Lord of the Whorl.json | 3 --- .../MSQ-2/E3-2.3/3885_Levin an Impression.json | 3 --- .../Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json | 3 --- .../Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json | 3 --- .../Dungeons/1130_Shadows Uncast (Immortal Flames).json | 3 --- .../A7-Azys Lla/1667_Close Encounters of the VIth Kind.json | 3 --- .../MSQ/H-4.55/3185_A Requiem for Heroes.json | 3 --- .../MSQ/A4-Crystarium 2/3300_The Lightwardens.json | 3 --- .../MSQ/B-Il Mheg/3305_The Oracle of Light.json | 3 --- .../MSQ/B-Il Mheg/3312_The Key to the Castle.json | 3 --- .../MSQ/B-Il Mheg/3320_Acht-la Ormh Inn.json | 3 --- .../MSQ/C-Rak'tika/3340_The Burden of Knowledge.json | 3 --- .../MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json | 3 --- .../MSQ/D-Amh Araeng 2/3621_A Fresh Start.json | 3 --- .../MSQ/E-Kholusia 2/3631_A Feast of Lies.json | 3 --- .../MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json | 4 ---- .../MSQ/F-Tempest/3654_Shadowbringers.json | 4 ---- .../MSQ/G-5.1/3674_A Grand Adventure.json | 3 --- .../MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json | 3 --- .../MSQ/H-5.2/3769_Beneath the Surface.json | 3 --- .../5.x - Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json | 3 --- .../MSQ/I-5.3/3777_The Converging Light.json | 3 --- .../MSQ/I-5.3/3778_Hope's Confluence.json | 3 --- .../MSQ/J-5.4/4011_Like Master, Like Pupil.json | 3 --- .../MSQ/J-5.4/4015_The Great Ship Vylbrand.json | 3 --- .../MSQ/K-5.5/4062_The Flames of War.json | 3 --- .../MSQ/L-5.55/4066_Death Unto Dawn.json | 3 --- .../4377_In the Dark of the Tower.json | 3 --- .../MSQ/B-Garlemald/4383_A Frosty Reception.json | 3 --- .../MSQ/B-Garlemald/4394_In from the Cold.json | 3 --- .../MSQ/B-Garlemald/4395_Gateway of the Gods.json | 3 --- .../6.x - Endwalker/MSQ/B-Garlemald/4398_The Martyr.json | 3 --- .../6.x - Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json | 3 --- .../MSQ/E-Elpis/4432_Worthy of His Back.json | 3 --- .../MSQ/E-Elpis/4437_Caging the Messenger.json | 3 --- .../MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json | 3 --- .../MSQ/F-Labyrinthos2/4449_Her Children One and All.json | 4 ---- .../6.x - Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json | 5 ----- .../6.x - Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json | 3 --- .../6.x - Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json | 3 --- .../MSQ/I-6.2/4594_Where Everything Begins.json | 3 --- .../6.x - Endwalker/MSQ/I-6.2/4597_The Wind Rises.json | 3 --- .../MSQ/J-6.3/4673_An Unforeseen Bargain.json | 3 --- .../MSQ/J-6.3/4674_King of the Mountain.json | 3 --- .../6.x - Endwalker/MSQ/J-6.3/4677_Desires Untold.json | 3 --- QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json | 3 --- QuestPaths/6.x - Endwalker/MSQ/K-6.4/4742_Abyssal Dark.json | 3 --- .../6.x - Endwalker/MSQ/L-6.5/4748_Down in the Dark.json | 4 ---- .../6.x - Endwalker/MSQ/M-6.55/4752_The Game Is Afoot.json | 3 --- .../Class Quests/VPR/4849_Fangs of the Viper.json | 3 --- .../MSQ/A-Kozama'uka1-Urqopacha1/4879_For All Turali.json | 3 --- .../B-Kozama'uka2-Urqopacha2/4891_The High Luminary.json | 3 --- .../MSQ/B-Kozama'uka2-Urqopacha2/4894_The Skyruin.json | 3 --- .../7.x - Dawntrail/MSQ/C-Yak T'el/4902_Taking a Stand.json | 3 --- .../MSQ/C-Yak T'el/4908_The Feat of Brotherhood.json | 3 --- .../MSQ/C-Yak T'el/4909_Road to the Golden City.json | 3 --- .../MSQ/D-Shaaloani-HeritageFound1/4926_All Aboard.json | 3 --- .../4942_The Protector and the Destroyer.json | 3 --- .../4945_The Resilient Son.json | 4 ---- .../7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json | 4 ---- .../Raid Quests/4961_The Claw in the Dark.json | 3 --- .../7.x - Dawntrail/Raid Quests/4962_Sweet Poison.json | 3 --- QuestPaths/7.x - Dawntrail/Raid Quests/4964_Vile Heat.json | 3 --- .../Raid Quests/4965_The Neoteric Witch.json | 3 --- .../Magical Ranged/4847_Heroes and Pretenders.json | 3 --- .../Physical Ranged/4841_The Mightiest Shield.json | 3 --- .../Role Quests/Tank/4823_Dreams of a New Day.json | 3 --- .../Dungeons/5014_Something Stray in the Neighborhood.json | 3 --- QuestPaths/quest-v1.json | 6 ------ Questionable.Model/Questing/QuestRoot.cs | 1 - Questionable/Controller/QuestController.cs | 3 --- Questionable/Windows/QuestWindow.cs | 3 +-- 95 files changed, 1 insertion(+), 296 deletions(-) diff --git a/QuestPathGenerator/QuestSourceGenerator.cs b/QuestPathGenerator/QuestSourceGenerator.cs index bcf960f3..b23bb9da 100644 --- a/QuestPathGenerator/QuestSourceGenerator.cs +++ b/QuestPathGenerator/QuestSourceGenerator.cs @@ -57,7 +57,6 @@ public class QuestSourceGenerator : ISourceGenerator { quest.Author = []; quest.QuestSequence = []; - quest.TerritoryBlacklist = []; } quests.Add((id, quest)); @@ -165,8 +164,6 @@ public class QuestSourceGenerator : ISourceGenerator Assignment(nameof(QuestRoot.Disabled), quest.Disabled, false).AsSyntaxNodeOrToken(), Assignment(nameof(QuestRoot.Comment), quest.Comment, null) .AsSyntaxNodeOrToken(), - AssignmentList(nameof(QuestRoot.TerritoryBlacklist), - quest.TerritoryBlacklist).AsSyntaxNodeOrToken(), AssignmentExpression( SyntaxKind.SimpleAssignmentExpression, IdentifierName(nameof(QuestRoot.QuestSequence)), diff --git a/QuestPaths/2.x - A Realm Reborn/Alliance Raid Quests/494_The World of Darkness.json b/QuestPaths/2.x - A Realm Reborn/Alliance Raid Quests/494_The World of Darkness.json index 82facbb5..9fec034e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Alliance Raid Quests/494_The World of Darkness.json +++ b/QuestPaths/2.x - A Realm Reborn/Alliance Raid Quests/494_The World of Darkness.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 151 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/129_Spirithold Broken.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/129_Spirithold Broken.json index e687b40c..8c7b51e1 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/129_Spirithold Broken.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/129_Spirithold Broken.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 225 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/445_Chasing Shadows.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/445_Chasing Shadows.json index 5eebced7..d59a446c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/445_Chasing Shadows.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/445_Chasing Shadows.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 233 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/414_Victory in Peril.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/414_Victory in Peril.json index b4a19a72..05886053 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/414_Victory in Peril.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/414_Victory in Peril.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 249 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/469_Just Deserts.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/469_Just Deserts.json index 83d0dd96..62476d4e 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/469_Just Deserts.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/469_Just Deserts.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 272 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/543_Lurkers in the Grotto.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/543_Lurkers in the Grotto.json index 6c4e8377..8e6aad40 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/543_Lurkers in the Grotto.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/543_Lurkers in the Grotto.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 252 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/544_Feint and Strike.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/544_Feint and Strike.json index b12023a3..e812ae0f 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/544_Feint and Strike.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/544_Feint and Strike.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 280 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/245_It's Probably Pirates.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/245_It's Probably Pirates.json index 2abe3f67..8a352254 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/245_It's Probably Pirates.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/245_It's Probably Pirates.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1036 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/343_Lord of the Inferno.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/343_Lord of the Inferno.json index 0b6de9a4..ff980ffa 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/343_Lord of the Inferno.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/343_Lord of the Inferno.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 275, - 1045 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/660_Into a Copper Hell.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/660_Into a Copper Hell.json index 83960d58..b6f45f31 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/660_Into a Copper Hell.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/660_Into a Copper Hell.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1038, - 274 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/677_Fire in the Gloom.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/677_Fire in the Gloom.json index f62baef3..7340e66a 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/677_Fire in the Gloom.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/677_Fire in the Gloom.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1037 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/550_Underneath the Sultantree.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/550_Underneath the Sultantree.json index 5446546e..c12bda58 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/550_Underneath the Sultantree.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/550_Underneath the Sultantree.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 270 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/551_Duty, Honor, Country.json b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/551_Duty, Honor, Country.json index 016fb60c..c16c22b9 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/551_Duty, Honor, Country.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/551_Duty, Honor, Country.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 271 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json index 12924d71..cf0acff2 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 1039 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json index 61cf091c..bcb40f05 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 1041 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json index 28997d99..e0898189 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 1046 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json index ce945842..ad446eeb 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 1042 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/967_History Repeating.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/967_History Repeating.json index 087bbfca..931e753c 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/967_History Repeating.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C2-Western La Noscea, Isles of Umbra/967_History Repeating.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 330 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1005_Every Little Thing She Does Is Magitek.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1005_Every Little Thing She Does Is Magitek.json index 762c7e02..07af74fb 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1005_Every Little Thing She Does Is Magitek.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C6-Mor Dhona/1005_Every Little Thing She Does Is Magitek.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 309 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json index b45a155b..f7d746fe 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 1043 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json index f56eca2f..81c32c86 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4521_Operation Archon.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 1049 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json index d2255ab9..c878f58b 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 1044, - 1048 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json index 1dfcc672..c030ff43 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E2-2.2/1361_Lord of the Whorl.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 281 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json index 488ad1ea..fcafa039 100644 --- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json +++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/3885_Levin an Impression.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 374 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json index 19a06dad..69dff9a1 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1128_Shadows Uncast (Maelstrom).json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 171 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json index b1b7beb3..bb2006b8 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1129_Shadows Uncast (Twin Adder).json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 171 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json index 90c6b7d5..76187f73 100644 --- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json +++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1130_Shadows Uncast (Immortal Flames).json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 171 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/3.x - Heavensward/MSQ/A7-Azys Lla/1667_Close Encounters of the VIth Kind.json b/QuestPaths/3.x - Heavensward/MSQ/A7-Azys Lla/1667_Close Encounters of the VIth Kind.json index 79d9235b..907bdd45 100644 --- a/QuestPaths/3.x - Heavensward/MSQ/A7-Azys Lla/1667_Close Encounters of the VIth Kind.json +++ b/QuestPaths/3.x - Heavensward/MSQ/A7-Azys Lla/1667_Close Encounters of the VIth Kind.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "JerryWester", - "TerritoryBlacklist": [ - 459 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json b/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json index fdb4747b..57a652e9 100644 --- a/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json +++ b/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 830 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json b/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json index e889192d..d4eef79d 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 837 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json index 92bd076b..695679a7 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3305_The Oracle of Light.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 861 - ], "QuestSequence": [ { "Sequence": 0, 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 226f762c..8f5193b0 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 @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 821 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3320_Acht-la Ormh Inn.json b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3320_Acht-la Ormh Inn.json index 9343449a..28fb3a34 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3320_Acht-la Ormh Inn.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3320_Acht-la Ormh Inn.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 845 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json index 63ebecdc..075dff0c 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 823 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json index 4a39fbd5..425b0c74 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3619_Full Steam Ahead.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 860 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3621_A Fresh Start.json b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3621_A Fresh Start.json index f33c24e0..6018d53d 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3621_A Fresh Start.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/D-Amh Araeng 2/3621_A Fresh Start.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 836 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3631_A Feast of Lies.json b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3631_A Feast of Lies.json index 0060a088..7eee6e71 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3631_A Feast of Lies.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3631_A Feast of Lies.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 863 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json index 67b106f2..9ee12fd7 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 822, - 846 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3654_Shadowbringers.json b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3654_Shadowbringers.json index 40480ce7..eb439d5f 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3654_Shadowbringers.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/F-Tempest/3654_Shadowbringers.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 838, - 847 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json index bee1224a..bb316275 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 884 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json index b9298647..c8a671c3 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 893 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json index 5c1fed1b..c947dc96 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 898 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json index ed00c176..9bd05223 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 932 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json index e6b53036..70ed3448 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 916 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json index 553634bd..a0daf444 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 922 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json b/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json index 6eb1a7cc..959276cc 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 933 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json b/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json index c3f2fc98..a906fe10 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 954 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json index bf610ba5..c74e6ed8 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 938 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json b/QuestPaths/5.x - Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json index 12faa18d..dee4eaec 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 977 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json index 024cb04a..22f2d97a 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json +++ b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 952 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4383_A Frosty Reception.json b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4383_A Frosty Reception.json index c79e9a2c..5169a8f4 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4383_A Frosty Reception.json +++ b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4383_A Frosty Reception.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1010 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4394_In from the Cold.json b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4394_In from the Cold.json index df2c8baa..20e3b2b8 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4394_In from the Cold.json +++ b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4394_In from the Cold.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1011 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4395_Gateway of the Gods.json b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4395_Gateway of the Gods.json index 62032af3..485746d3 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4395_Gateway of the Gods.json +++ b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4395_Gateway of the Gods.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 969 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4398_The Martyr.json b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4398_The Martyr.json index e590093e..0f24a82d 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4398_The Martyr.json +++ b/QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4398_The Martyr.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 992 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json b/QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json index 432f8f8d..37285324 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json +++ b/QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 970 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json b/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json index b315afad..c9b3c8c2 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json +++ b/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1014 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json b/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json index f46eacb3..0a7e8e55 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json +++ b/QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 974 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json b/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json index 8b05a9d8..182ffffa 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json +++ b/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1012 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json b/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json index fd828e38..5294bab4 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json +++ b/QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 978, - 995 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json b/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json index af09a13a..9a1abef6 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json +++ b/QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json @@ -1,11 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 973, - 997, - 1013 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json b/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json index d05a5978..c79468bb 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json +++ b/QuestPaths/6.x - Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1050 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json b/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json index 007d0a43..cc6ea1fa 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json +++ b/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1070 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json b/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json index ee0a66cc..98b7ea55 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json +++ b/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1091 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4597_The Wind Rises.json b/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4597_The Wind Rises.json index 4e75ca6d..926a40f1 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4597_The Wind Rises.json +++ b/QuestPaths/6.x - Endwalker/MSQ/I-6.2/4597_The Wind Rises.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1071 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json b/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json index 66b764ab..e19e8950 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json +++ b/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1120 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4674_King of the Mountain.json b/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4674_King of the Mountain.json index 9d9c0f9e..130cb389 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4674_King of the Mountain.json +++ b/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4674_King of the Mountain.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1097 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4677_Desires Untold.json b/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4677_Desires Untold.json index 78cfbbc7..3a42aaaa 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4677_Desires Untold.json +++ b/QuestPaths/6.x - Endwalker/MSQ/J-6.3/4677_Desires Untold.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1095 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json index 7a4cf1d4..9f738bc8 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json +++ b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1126 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4742_Abyssal Dark.json b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4742_Abyssal Dark.json index 925170a0..8faf117c 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4742_Abyssal Dark.json +++ b/QuestPaths/6.x - Endwalker/MSQ/K-6.4/4742_Abyssal Dark.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1140 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/L-6.5/4748_Down in the Dark.json b/QuestPaths/6.x - Endwalker/MSQ/L-6.5/4748_Down in the Dark.json index 766724f9..3930a8dd 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/L-6.5/4748_Down in the Dark.json +++ b/QuestPaths/6.x - Endwalker/MSQ/L-6.5/4748_Down in the Dark.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1164, - 1168 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/6.x - Endwalker/MSQ/M-6.55/4752_The Game Is Afoot.json b/QuestPaths/6.x - Endwalker/MSQ/M-6.55/4752_The Game Is Afoot.json index 5525ce22..24e33e79 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/M-6.55/4752_The Game Is Afoot.json +++ b/QuestPaths/6.x - Endwalker/MSQ/M-6.55/4752_The Game Is Afoot.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1177 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json b/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json index dec630ec..7ab43797 100644 --- a/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json +++ b/QuestPaths/7.x - Dawntrail/Class Quests/VPR/4849_Fangs of the Viper.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1235 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For All Turali.json b/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For All Turali.json index 9a983943..28e35590 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For All Turali.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For All Turali.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1167 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4891_The High Luminary.json b/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4891_The High Luminary.json index fd17edfa..8b1a2021 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4891_The High Luminary.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4891_The High Luminary.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1193 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4894_The Skyruin.json b/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4894_The Skyruin.json index 170b1a17..3b8ee005 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4894_The Skyruin.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4894_The Skyruin.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1195 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4902_Taking a Stand.json b/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4902_Taking a Stand.json index 0c7f0af7..4a4940cc 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4902_Taking a Stand.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4902_Taking a Stand.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1211 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4908_The Feat of Brotherhood.json b/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4908_The Feat of Brotherhood.json index abb2d9bf..0b7c8b47 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4908_The Feat of Brotherhood.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4908_The Feat of Brotherhood.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1212 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4909_Road to the Golden City.json b/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4909_Road to the Golden City.json index efabe8be..384623ce 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4909_Road to the Golden City.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4909_Road to the Golden City.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1194 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4926_All Aboard.json b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4926_All Aboard.json index ec258cb1..51a11987 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4926_All Aboard.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4926_All Aboard.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1198 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json index cb0a79af..b3c05e7d 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4942_The Protector and the Destroyer.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1213 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json index bb4681d7..8e967708 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1200, - 1208 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json index f5798feb..778f11db 100644 --- a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json +++ b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json @@ -1,10 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1199, - 1202 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Raid Quests/4961_The Claw in the Dark.json b/QuestPaths/7.x - Dawntrail/Raid Quests/4961_The Claw in the Dark.json index cb804c97..d4ec0c27 100644 --- a/QuestPaths/7.x - Dawntrail/Raid Quests/4961_The Claw in the Dark.json +++ b/QuestPaths/7.x - Dawntrail/Raid Quests/4961_The Claw in the Dark.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1225 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Raid Quests/4962_Sweet Poison.json b/QuestPaths/7.x - Dawntrail/Raid Quests/4962_Sweet Poison.json index 0073030d..408d87c9 100644 --- a/QuestPaths/7.x - Dawntrail/Raid Quests/4962_Sweet Poison.json +++ b/QuestPaths/7.x - Dawntrail/Raid Quests/4962_Sweet Poison.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1227 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Raid Quests/4964_Vile Heat.json b/QuestPaths/7.x - Dawntrail/Raid Quests/4964_Vile Heat.json index ade86865..d593ae59 100644 --- a/QuestPaths/7.x - Dawntrail/Raid Quests/4964_Vile Heat.json +++ b/QuestPaths/7.x - Dawntrail/Raid Quests/4964_Vile Heat.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1229 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Raid Quests/4965_The Neoteric Witch.json b/QuestPaths/7.x - Dawntrail/Raid Quests/4965_The Neoteric Witch.json index a4fef371..b764b27c 100644 --- a/QuestPaths/7.x - Dawntrail/Raid Quests/4965_The Neoteric Witch.json +++ b/QuestPaths/7.x - Dawntrail/Raid Quests/4965_The Neoteric Witch.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1231 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4847_Heroes and Pretenders.json b/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4847_Heroes and Pretenders.json index 73a1350d..765794c0 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4847_Heroes and Pretenders.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Magical Ranged/4847_Heroes and Pretenders.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1218 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4841_The Mightiest Shield.json b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4841_The Mightiest Shield.json index 599b3b17..20380ed1 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4841_The Mightiest Shield.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Physical Ranged/4841_The Mightiest Shield.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1217 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Role Quests/Tank/4823_Dreams of a New Day.json b/QuestPaths/7.x - Dawntrail/Role Quests/Tank/4823_Dreams of a New Day.json index db15f8e2..4f05b345 100644 --- a/QuestPaths/7.x - Dawntrail/Role Quests/Tank/4823_Dreams of a New Day.json +++ b/QuestPaths/7.x - Dawntrail/Role Quests/Tank/4823_Dreams of a New Day.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1214 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json index 235b4349..0e421d58 100644 --- a/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json +++ b/QuestPaths/7.x - Dawntrail/Unlocks/Dungeons/5014_Something Stray in the Neighborhood.json @@ -1,9 +1,6 @@ { "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "liza", - "TerritoryBlacklist": [ - 1204 - ], "QuestSequence": [ { "Sequence": 0, diff --git a/QuestPaths/quest-v1.json b/QuestPaths/quest-v1.json index b0fd35d2..3fe60751 100644 --- a/QuestPaths/quest-v1.json +++ b/QuestPaths/quest-v1.json @@ -29,12 +29,6 @@ "type": "string", "description": "Dev Comment (not visible in-game)" }, - "TerritoryBlacklist": { - "type": "array", - "items": { - "type": "integer" - } - }, "QuestSequence": { "type": "array", "items": { diff --git a/Questionable.Model/Questing/QuestRoot.cs b/Questionable.Model/Questing/QuestRoot.cs index e1158fc8..99899412 100644 --- a/Questionable.Model/Questing/QuestRoot.cs +++ b/Questionable.Model/Questing/QuestRoot.cs @@ -16,6 +16,5 @@ public sealed class QuestRoot public bool Disabled { get; set; } public string? Comment { get; set; } - public List TerritoryBlacklist { get; set; } = new(); public List QuestSequence { get; set; } = new(); } diff --git a/Questionable/Controller/QuestController.cs b/Questionable/Controller/QuestController.cs index fc1734d3..594cac80 100644 --- a/Questionable/Controller/QuestController.cs +++ b/Questionable/Controller/QuestController.cs @@ -210,9 +210,6 @@ internal sealed class QuestController : MiniTaskController, IDi } } - if (CurrentQuest != null && CurrentQuest.Quest.Root.TerritoryBlacklist.Contains(_clientState.TerritoryType)) - return; - if (AutomationType == EAutomationType.Automatic && (_taskQueue.AllTasksComplete || _taskQueue.CurrentTaskExecutor?.CurrentTask is WaitAtEnd.WaitQuestAccepted) && CurrentQuest is { Sequence: 0, Step: 0 } or { Sequence: 0, Step: 255 } diff --git a/Questionable/Windows/QuestWindow.cs b/Questionable/Windows/QuestWindow.cs index fa880ec4..37724c8c 100644 --- a/Questionable/Windows/QuestWindow.cs +++ b/Questionable/Windows/QuestWindow.cs @@ -119,8 +119,7 @@ internal sealed class QuestWindow : LWindow, IPersistableWindowConfig if (_configuration.General.HideInAllInstances && _territoryData.IsDutyInstance(_clientState.TerritoryType)) return false; - var currentQuest = _questController.CurrentQuest; - return currentQuest == null || !currentQuest.Quest.Root.TerritoryBlacklist.Contains(_clientState.TerritoryType); + return true; } public override void Draw() From 3fdf86f240e78246c5c6bd80d559749ff12c6659 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 1 Oct 2024 23:25:10 +0200 Subject: [PATCH 44/51] Version bump --- Directory.Build.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 6aced3c9..939fb575 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 3.7 + 3.8 From 7e0bfaf706de8571a4d425cf0e4923541e556292 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Tue, 1 Oct 2024 23:45:36 +0200 Subject: [PATCH 45/51] Update ECommons --- vendor/ECommons | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/ECommons b/vendor/ECommons index 1038f5ae..147e12e9 160000 --- a/vendor/ECommons +++ b/vendor/ECommons @@ -1 +1 @@ -Subproject commit 1038f5ae8964c7ea57aea6f0fe2aef7c9be50848 +Subproject commit 147e12e95f2fb781f2c8ddac31d948700ed9051c From f85b858fc3fac1ee325d0707bb2fcb3ae7b4198f Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 3 Oct 2024 18:30:59 +0200 Subject: [PATCH 46/51] Fix schema URL --- .../Vanu Vanu/Story/2260_A Symbiotic Friendship.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json index f061ed47..a2400d21 100644 --- a/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json +++ b/QuestPaths/3.x - Heavensward/Allied Societies/Vanu Vanu/Story/2260_A Symbiotic Friendship.json @@ -1,5 +1,5 @@ { - "$schema": "https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json", + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "Author": "plogon_enjoyer", "QuestSequence": [ { From 005574a77456e4fe4924e7722848a06d0e0cb7b2 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 3 Oct 2024 18:31:32 +0200 Subject: [PATCH 47/51] Minor quest additions --- .../Kugane/2669_Zero Tolerance Teahouse.json | 67 +++++++ .../Side Quests/Kugane/2813_Child Labor.json | 176 ++++++++++++++++++ .../4369_On Low Tide.json | 19 +- .../4812_Treasured Bonds.json | 114 ++++++++++++ .../4813_More Precious than Gil.json | 167 +++++++++++++++++ 5 files changed, 535 insertions(+), 8 deletions(-) create mode 100644 QuestPaths/4.x - Stormblood/Side Quests/Kugane/2669_Zero Tolerance Teahouse.json create mode 100644 QuestPaths/4.x - Stormblood/Side Quests/Kugane/2813_Child Labor.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4813_More Precious than Gil.json diff --git a/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2669_Zero Tolerance Teahouse.json b/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2669_Zero Tolerance Teahouse.json new file mode 100644 index 00000000..1d54419a --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2669_Zero Tolerance Teahouse.json @@ -0,0 +1,67 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1023304, + "Position": { + "X": 2.7008667, + "Y": 2.0507723E-06, + "Z": -52.84204 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1023306, + "Position": { + "X": -80.338745, + "Y": -6.9700804, + "Z": -49.118835 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1023305, + "Position": { + "X": 4.409851, + "Y": 2.100081E-06, + "Z": -52.903076 + }, + "TerritoryId": 628, + "InteractionType": "UseItem", + "ItemId": 2002339 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1023304, + "Position": { + "X": 2.7008667, + "Y": 2.0507723E-06, + "Z": -52.84204 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2813_Child Labor.json b/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2813_Child Labor.json new file mode 100644 index 00000000..112b2757 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2813_Child Labor.json @@ -0,0 +1,176 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1022620, + "Position": { + "X": -4.7455444, + "Y": 0.022830343, + "Z": -113.96973 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1023127, + "Position": { + "X": -102.9527, + "Y": 11.80004, + "Z": -114.76312 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1023131, + "Position": { + "X": -88.304016, + "Y": -6.9999995, + "Z": -63.09613 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Bokairo Inn", + "[Kugane] Shiokaze Hostelry" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 4 + ] + }, + { + "DataId": 1023126, + "Position": { + "X": 32.60852, + "Y": 2.9999993, + "Z": -49.881836 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Shiokaze Hostelry", + "[Kugane] Aetheryte Plaza" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1023130, + "Position": { + "X": 80.460815, + "Y": 4.000001, + "Z": 71.488525 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] Kogane Dori Markets" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 8 + ] + }, + { + "DataId": 1023128, + "Position": { + "X": -34.103943, + "Y": 15.000004, + "Z": 68.86389 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1023129, + "Position": { + "X": 17.593567, + "Y": 11.44387, + "Z": 174.45642 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Kogane Dori Markets", + "[Kugane] Thavnairian Consulate" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 16 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1022620, + "Position": { + "X": -4.7455444, + "Y": 0.022830343, + "Z": -113.96973 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "AethernetShortcut": [ + "[Kugane] Thavnairian Consulate", + "[Kugane] Rakuza District" + ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_STMBDZ710_02813_Q1_000_031", + "Answer": "TEXT_STMBDZ710_02813_A1_000_032" + } + ] + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json index 7023f142..cb13b753 100644 --- a/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json +++ b/QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4369_On Low Tide.json @@ -83,21 +83,24 @@ "Steps": [ { "Position": { - "X": 200.24112, - "Y": 1.7700036, - "Z": 712.99384 + "X": 223.328, + "Y": -0.6, + "Z": 752.7248 }, "TerritoryId": 957, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "Sprint": true }, { "Position": { - "X": 240.97523, - "Y": 0.8542664, - "Z": 712.4415 + "X": 253.03053, + "Y": 0.7659681, + "Z": 732.0563 }, "TerritoryId": 957, - "InteractionType": "WalkTo" + "InteractionType": "WalkTo", + "DisableNavmesh": true }, { "DataId": 1038606, diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json b/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json new file mode 100644 index 00000000..ae400744 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json @@ -0,0 +1,114 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1042599, + "Position": { + "X": 31.998047, + "Y": 5.1499996, + "Z": -67.73486 + }, + "TerritoryId": 962, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Old Sharlayan", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1046136, + "Position": { + "X": -341.39008, + "Y": 22.3, + "Z": -103.74609 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Studium" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1046138, + "Position": { + "X": 30.960571, + "Y": 5.1499996, + "Z": -66.88031 + }, + "StopDistance": 7, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1046139, + "Position": { + "X": 87.63245, + "Y": -16.247002, + "Z": 123.76587 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] Scholar's Harbor" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1046141, + "Position": { + "X": -133.4707, + "Y": 28.049995, + "Z": 219.65356 + }, + "StopDistance": 5, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2013721, + "Position": { + "X": 406.30188, + "Y": 13.01593, + "Z": -299.8551 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "AetheryteShortcut": "Thavnair - Palaka's Stand", + "Fly": true + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4813_More Precious than Gil.json b/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4813_More Precious than Gil.json new file mode 100644 index 00000000..39c2cefa --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4813_More Precious than Gil.json @@ -0,0 +1,167 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1046203, + "Position": { + "X": 406.42407, + "Y": 3.1168795, + "Z": -272.26672 + }, + "StopDistance": 5, + "TerritoryId": 957, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Thavnair - Palaka's Stand", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1046203, + "Position": { + "X": 406.42407, + "Y": 3.1168795, + "Z": -272.26672 + }, + "StopDistance": 5, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1037703, + "Position": { + "X": 423.7887, + "Y": 3.1168795, + "Z": -269.73376 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1037707, + "Position": { + "X": 432.02856, + "Y": 5.912681, + "Z": -225.20789 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1039517, + "Position": { + "X": 376.6078, + "Y": 5.709401, + "Z": -220.50812 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1046203, + "Position": { + "X": 545.292, + "Y": 10.612534, + "Z": 232.90868 + }, + "StopDistance": 0.5, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1037630, + "Position": { + "X": 401.8158, + "Y": 3.1168792, + "Z": -273.76215 + }, + "StopDistance": 7, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1042599, + "Position": { + "X": 31.998047, + "Y": 5.1499996, + "Z": -67.73486 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AetheryteShortcut": "Old Sharlayan" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1042599, + "Position": { + "X": 31.998047, + "Y": 5.1499996, + "Z": -67.73486 + }, + "TerritoryId": 962, + "InteractionType": "CompleteQuest" + } + ] + } + ] +} From a8e3eb95c9ba8b22101c674ad7dfec0d16d315d1 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Thu, 3 Oct 2024 18:31:44 +0200 Subject: [PATCH 48/51] Show validation info in journal window --- .../4812_Treasured Bonds.json | 2 +- Questionable/Validation/QuestValidator.cs | 4 ++ .../QuestJournalComponent.cs | 49 ++++++++++++------- .../QuickAccessButtonsComponent.cs | 2 +- Questionable/Windows/QuestValidationWindow.cs | 2 +- 5 files changed, 38 insertions(+), 21 deletions(-) diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json b/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json index ae400744..ec71ebfb 100644 --- a/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json +++ b/QuestPaths/6.x - Endwalker/Side Stories/Tataru's Grand Endeavor/4812_Treasured Bonds.json @@ -104,7 +104,7 @@ "Z": -299.8551 }, "TerritoryId": 957, - "InteractionType": "Interact", + "InteractionType": "CompleteQuest", "AetheryteShortcut": "Thavnair - Palaka's Stand", "Fly": true } diff --git a/Questionable/Validation/QuestValidator.cs b/Questionable/Validation/QuestValidator.cs index 80050d40..847c705b 100644 --- a/Questionable/Validation/QuestValidator.cs +++ b/Questionable/Validation/QuestValidator.cs @@ -5,6 +5,7 @@ using System.Threading; using System.Threading.Tasks; using Microsoft.Extensions.Logging; using Questionable.Model; +using Questionable.Model.Questing; namespace Questionable.Validation; @@ -91,6 +92,9 @@ internal sealed class QuestValidator }, CancellationToken.None, TaskCreationOptions.LongRunning, TaskScheduler.Default); } + public List GetIssues(ElementId elementId) => + _validationIssues.Where(x => x.ElementId == elementId).ToList(); + private static IEnumerable DisabledTribesAsIssues(Dictionary disabledTribeQuests) { return disabledTribeQuests diff --git a/Questionable/Windows/JournalComponents/QuestJournalComponent.cs b/Questionable/Windows/JournalComponents/QuestJournalComponent.cs index e1d2b6c5..f273b00d 100644 --- a/Questionable/Windows/JournalComponents/QuestJournalComponent.cs +++ b/Questionable/Windows/JournalComponents/QuestJournalComponent.cs @@ -13,19 +13,16 @@ using Questionable.Data; using Questionable.Functions; using Questionable.Model; using Questionable.Model.Questing; +using Questionable.Validation; using Questionable.Windows.QuestComponents; namespace Questionable.Windows.JournalComponents; internal sealed class QuestJournalComponent { - private readonly Dictionary _genreCounts = []; - - private readonly Dictionary _categoryCounts = - []; - - private readonly Dictionary _sectionCounts = - []; + private readonly Dictionary _genreCounts = []; + private readonly Dictionary _categoryCounts = []; + private readonly Dictionary _sectionCounts = []; private readonly JournalData _journalData; private readonly QuestRegistry _questRegistry; @@ -35,13 +32,14 @@ internal sealed class QuestJournalComponent private readonly IDalamudPluginInterface _pluginInterface; private readonly QuestController _questController; private readonly ICommandManager _commandManager; + private readonly QuestValidator _questValidator; private List _filteredSections = []; private string _searchText = string.Empty; public QuestJournalComponent(JournalData journalData, QuestRegistry questRegistry, QuestFunctions questFunctions, UiUtils uiUtils, QuestTooltipComponent questTooltipComponent, IDalamudPluginInterface pluginInterface, - QuestController questController, ICommandManager commandManager) + QuestController questController, ICommandManager commandManager, QuestValidator questValidator) { _journalData = journalData; _questRegistry = questRegistry; @@ -51,6 +49,7 @@ internal sealed class QuestJournalComponent _pluginInterface = pluginInterface; _questController = questController; _commandManager = commandManager; + _questValidator = questValidator; } public void DrawQuests() @@ -99,7 +98,7 @@ internal sealed class QuestJournalComponent if (filter.Section.QuestCount == 0) return; - (int available, int obtainable, int completed) = _sectionCounts.GetValueOrDefault(filter.Section); + (int available, int obtainable, int completed) = _sectionCounts.GetValueOrDefault(filter.Section, new()); ImGui.TableNextRow(); ImGui.TableNextColumn(); @@ -125,7 +124,7 @@ internal sealed class QuestJournalComponent if (filter.Category.QuestCount == 0) return; - (int available, int obtainable, int completed) = _categoryCounts.GetValueOrDefault(filter.Category); + (int available, int obtainable, int completed) = _categoryCounts.GetValueOrDefault(filter.Category, new()); ImGui.TableNextRow(); ImGui.TableNextColumn(); @@ -151,7 +150,7 @@ internal sealed class QuestJournalComponent if (filter.Genre.QuestCount == 0) return; - (int supported, int obtainable, int completed) = _genreCounts.GetValueOrDefault(filter.Genre); + (int supported, int obtainable, int completed) = _genreCounts.GetValueOrDefault(filter.Genre, new()); ImGui.TableNextRow(); ImGui.TableNextColumn(); @@ -212,7 +211,19 @@ internal sealed class QuestJournalComponent } ImGui.SetCursorPosX(ImGui.GetCursorPosX() + spacing); - _uiUtils.ChecklistItem(string.Empty, quest is { Root.Disabled: false }); + + if (quest is { Root.Disabled: false }) + { + List issues = _questValidator.GetIssues(quest.Id); + if (issues.Any(x => x.Severity == EIssueSeverity.Error)) + _uiUtils.ChecklistItem(string.Empty, ImGuiColors.DalamudRed, FontAwesomeIcon.ExclamationTriangle); + else if (issues.Count > 0) + _uiUtils.ChecklistItem(string.Empty, ImGuiColors.ParsedBlue, FontAwesomeIcon.InfoCircle); + else + _uiUtils.ChecklistItem(string.Empty, true); + } + else + _uiUtils.ChecklistItem(string.Empty, false); ImGui.TableNextColumn(); var (color, icon, text) = _uiUtils.GetQuestStyle(questInfo.QuestId); @@ -329,7 +340,7 @@ internal sealed class QuestJournalComponent _questRegistry.TryGetQuest(x.QuestId, out var quest) && !quest.Root.Disabled); int obtainable = genre.Quests.Count(x => !_questFunctions.IsQuestUnobtainable(x.QuestId)); int completed = genre.Quests.Count(x => _questFunctions.IsQuestComplete(x.QuestId)); - _genreCounts[genre] = (available, obtainable, completed); + _genreCounts[genre] = new(available, obtainable, completed); } foreach (var category in _journalData.Categories) @@ -341,7 +352,7 @@ internal sealed class QuestJournalComponent int available = counts.Sum(x => x.Available); int obtainable = counts.Sum(x => x.Obtainable); int completed = counts.Sum(x => x.Completed); - _categoryCounts[category] = (available, obtainable, completed); + _categoryCounts[category] = new(available, obtainable, completed); } foreach (var section in _journalData.Sections) @@ -353,20 +364,20 @@ internal sealed class QuestJournalComponent int available = counts.Sum(x => x.Available); int obtainable = counts.Sum(x => x.Obtainable); int completed = counts.Sum(x => x.Completed); - _sectionCounts[section] = (available, obtainable, completed); + _sectionCounts[section] = new(available, obtainable, completed); } } internal void ClearCounts() { foreach (var genreCount in _genreCounts.ToList()) - _genreCounts[genreCount.Key] = (genreCount.Value.Available, genreCount.Value.Available, 0); + _genreCounts[genreCount.Key] = genreCount.Value with { Completed = 0 }; foreach (var categoryCount in _categoryCounts.ToList()) - _categoryCounts[categoryCount.Key] = (categoryCount.Value.Available, categoryCount.Value.Available, 0); + _categoryCounts[categoryCount.Key] = categoryCount.Value with { Completed = 0 }; foreach (var sectionCount in _sectionCounts.ToList()) - _sectionCounts[sectionCount.Key] = (sectionCount.Value.Available, sectionCount.Value.Available, 0); + _sectionCounts[sectionCount.Key] = sectionCount.Value with { Completed = 0 }; } private sealed record FilteredSection(JournalData.Section Section, List Categories); @@ -374,4 +385,6 @@ internal sealed class QuestJournalComponent private sealed record FilteredCategory(JournalData.Category Category, List Genres); private sealed record FilteredGenre(JournalData.Genre Genre, List Quests); + + private sealed record JournalCounts(int Available = 0, int Obtainable = 0, int Completed = 0); } diff --git a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs index 4860f687..6093686a 100644 --- a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs +++ b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs @@ -113,7 +113,7 @@ internal sealed class QuickAccessButtonsComponent int partsToRender = errorCount == 0 || infoCount == 0 ? 1 : 2; using var id = ImRaii.PushId("validationissues"); - var icon1 = FontAwesomeIcon.TimesCircle; + var icon1 = FontAwesomeIcon.ExclamationTriangle; var icon2 = FontAwesomeIcon.InfoCircle; Vector2 iconSize1, iconSize2; using (var _ = _pluginInterface.UiBuilder.IconFontFixedWidthHandle.Push()) diff --git a/Questionable/Windows/QuestValidationWindow.cs b/Questionable/Windows/QuestValidationWindow.cs index 173c82f3..7532ac5e 100644 --- a/Questionable/Windows/QuestValidationWindow.cs +++ b/Questionable/Windows/QuestValidationWindow.cs @@ -77,7 +77,7 @@ internal sealed class QuestValidationWindow : LWindow if (validationIssue.Severity == EIssueSeverity.Error) { using var color = ImRaii.PushColor(ImGuiCol.Text, ImGuiColors.DalamudRed); - ImGui.TextUnformatted(FontAwesomeIcon.TimesCircle.ToIconString()); + ImGui.TextUnformatted(FontAwesomeIcon.ExclamationTriangle.ToIconString()); } else { From 4d0161b42704b71fbfc83924bcb7982a2ef58439 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Fri, 4 Oct 2024 00:44:40 +0200 Subject: [PATCH 49/51] Add Heavensward/Stormblood Hildibrand quests --- .../Hildibrand/502_Her Last Vow.json | 3 +- ..._A Gentleman Falls, Rather than Flies.json | 238 +++++++++++++++ .../2227_Don't Call It a Comeback.json | 119 ++++++++ .../Hildibrand/2228_The Gigi Situation.json | 114 +++++++ .../2229_The Measure of a Mammet.json | 138 +++++++++ .../2369_A Gazebo to Call Our Own.json | 228 ++++++++++++++ .../2370_Don't Trust Anyone over Sixty.json | 213 +++++++++++++ .../2371_The Proud and the Pointy-eyed.json | 187 ++++++++++++ .../2372_If I Could Turn Back Time.json | 162 ++++++++++ ...68_A Picture Is Worth a Thousand Moms.json | 160 ++++++++++ .../3008_A Hingan Tale - Nashu Goes East.json | 197 ++++++++++++ .../3020_Life Imitates Art Imitates Life.json | 167 ++++++++++ .../3021_Of Wolves and Gentlemen.json | 136 +++++++++ .../3094_In the Eye of the Hingan.json | 101 ++++++ .../Side Stories/3095_The Blade Mislaid.json | 151 +++++++++ .../3150_The Black Heart Beneath.json | 162 ++++++++++ .../3151_Good Swords, Good Dogs.json | 111 +++++++ .../3167_The Past Is Never Past.json | 179 +++++++++++ .../3168_Don't Do the Dewprism.json | 164 ++++++++++ .../4542_The Sleeping Gentleman.json | 289 ++++++++++++++++++ .../Hildibrand/4543_A Soulful Reunion.json | 236 ++++++++++++++ 21 files changed, 3454 insertions(+), 1 deletion(-) create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2226_A Gentleman Falls, Rather than Flies.json create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2227_Don't Call It a Comeback.json create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2228_The Gigi Situation.json create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2229_The Measure of a Mammet.json create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2369_A Gazebo to Call Our Own.json create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2370_Don't Trust Anyone over Sixty.json create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2371_The Proud and the Pointy-eyed.json create mode 100644 QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2372_If I Could Turn Back Time.json create mode 100644 QuestPaths/4.x - Stormblood/Side Quests/Kugane/2668_A Picture Is Worth a Thousand Moms.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3008_A Hingan Tale - Nashu Goes East.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3020_Life Imitates Art Imitates Life.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3021_Of Wolves and Gentlemen.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3094_In the Eye of the Hingan.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3095_The Blade Mislaid.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3150_The Black Heart Beneath.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3151_Good Swords, Good Dogs.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3167_The Past Is Never Past.json create mode 100644 QuestPaths/4.x - Stormblood/Side Stories/3168_Don't Do the Dewprism.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4542_The Sleeping Gentleman.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json diff --git a/QuestPaths/2.x - A Realm Reborn/Side Stories/Hildibrand/502_Her Last Vow.json b/QuestPaths/2.x - A Realm Reborn/Side Stories/Hildibrand/502_Her Last Vow.json index 4fb68ddd..7f34150e 100644 --- a/QuestPaths/2.x - A Realm Reborn/Side Stories/Hildibrand/502_Her Last Vow.json +++ b/QuestPaths/2.x - A Realm Reborn/Side Stories/Hildibrand/502_Her Last Vow.json @@ -99,7 +99,8 @@ "Z": 173.72388 }, "TerritoryId": 153, - "InteractionType": "CompleteQuest" + "InteractionType": "CompleteQuest", + "NextQuestId": 2226 } ] } diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2226_A Gentleman Falls, Rather than Flies.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2226_A Gentleman Falls, Rather than Flies.json new file mode 100644 index 00000000..e0b00111 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2226_A Gentleman Falls, Rather than Flies.json @@ -0,0 +1,238 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016597, + "Position": { + "X": -266.71252, + "Y": -20.034918, + "Z": -66.42261 + }, + "TerritoryId": 419, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Ishgard", + "AethernetShortcut": [ + "[Ishgard] Aetheryte Plaza", + "[Ishgard] The Jeweled Crozier" + ], + "SkipConditions": { + "AetheryteShortcutIf": { + "InTerritory": [ + 419 + ], + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -258.68442, + "Y": -20.03493, + "Z": -66.1965 + }, + "TerritoryId": 419, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, + { + "DataId": 1011207, + "Position": { + "X": -258.8083, + "Y": -20.03509, + "Z": -63.553833 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "Position": { + "X": -226.53459, + "Y": -16.134916, + "Z": -51.93084 + }, + "TerritoryId": 419, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + } + }, + { + "DataId": 1011202, + "Position": { + "X": -228.10712, + "Y": -16.034918, + "Z": -49.912292 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "Position": { + "X": -205.36649, + "Y": -16.134916, + "Z": -51.418564 + }, + "TerritoryId": 419, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } + }, + { + "DataId": 1011204, + "Position": { + "X": -203.6012, + "Y": -16.034918, + "Z": -53.23877 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1012180, + "Position": { + "X": -174.18176, + "Y": -12.555469, + "Z": -21.561035 + }, + "TerritoryId": 419, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1015596, + "Position": { + "X": 15.915161, + "Y": 15.96505, + "Z": -0.22894287 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ishgard] The Jeweled Crozier", + "[Ishgard] The Last Vigil" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2006709, + "Position": { + "X": 38.80359, + "Y": 16.494995, + "Z": -31.204712 + }, + "TerritoryId": 419, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1011231, + "Position": { + "X": 503.1051, + "Y": 217.95148, + "Z": 790.2189 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 2006753, + "Position": { + "X": -217.05963, + "Y": 88.09033, + "Z": -585.2598 + }, + "TerritoryId": 397, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 2227 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2227_Don't Call It a Comeback.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2227_Don't Call It a Comeback.json new file mode 100644 index 00000000..416cbf97 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2227_Don't Call It a Comeback.json @@ -0,0 +1,119 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016604, + "Position": { + "X": -222.24768, + "Y": 88.525505, + "Z": -582.8794 + }, + "StopDistance": 7, + "TerritoryId": 397, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016629, + "Position": { + "X": 409.9336, + "Y": 166.24477, + "Z": -448.661 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1016612, + "Position": { + "X": 757.83923, + "Y": 186.03809, + "Z": -538.26196 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": 789.0687, + "Y": 186.03352, + "Z": -529.4571 + }, + "TerritoryId": 397, + "InteractionType": "Combat", + "EnemySpawnType": "AutoOnEnterArea", + "KillEnemyDataIds": [ + 5536 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2006763, + "Position": { + "X": 789.2728, + "Y": 186.44995, + "Z": -529.3507 + }, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1016617, + "Position": { + "X": 790.3716, + "Y": 186.03076, + "Z": -527.0314 + }, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016619, + "Position": { + "X": -66.84979, + "Y": 8.05915, + "Z": 9.506287 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ishgard", + "NextQuestId": 2228 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2228_The Gigi Situation.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2228_The Gigi Situation.json new file mode 100644 index 00000000..35bdbb10 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2228_The Gigi Situation.json @@ -0,0 +1,114 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016619, + "Position": { + "X": -66.84979, + "Y": 8.05915, + "Z": 9.506287 + }, + "TerritoryId": 418, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1016600, + "Position": { + "X": 46.097534, + "Y": 15.8650675, + "Z": -27.298462 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ishgard] Aetheryte Plaza", + "[Ishgard] The Last Vigil" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1017131, + "Position": { + "X": 35.446655, + "Y": 15.965061, + "Z": -96.75751 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ishgard] The Last Vigil", + "[Ishgard] The Tribunal" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1017278, + "Position": { + "X": -158.31238, + "Y": 2.0333426, + "Z": -10.635559 + }, + "TerritoryId": 418, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ishgard] The Tribunal", + "[Ishgard] Skysteel Manufactory" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1016607, + "Position": { + "X": -260.12054, + "Y": -20.035, + "Z": -66.14789 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ishgard] Skysteel Manufactory", + "[Ishgard] The Jeweled Crozier" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016608, + "Position": { + "X": -261.0971, + "Y": -20.03499, + "Z": -66.11737 + }, + "StopDistance": 5, + "TerritoryId": 419, + "InteractionType": "CompleteQuest", + "NextQuestId": 2229 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2229_The Measure of a Mammet.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2229_The Measure of a Mammet.json new file mode 100644 index 00000000..88ac8dfb --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2229_The Measure of a Mammet.json @@ -0,0 +1,138 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016608, + "Position": { + "X": -261.0971, + "Y": -20.03499, + "Z": -66.11737 + }, + "StopDistance": 5, + "TerritoryId": 419, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1011225, + "Position": { + "X": -170.6112, + "Y": 16.979578, + "Z": -37.125244 + }, + "TerritoryId": 418, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ishgard] The Jeweled Crozier", + "[Ishgard] Skysteel Manufactory" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1017133, + "Position": { + "X": 408.07202, + "Y": 195.66847, + "Z": 585.3512 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2007180, + "Position": { + "X": 262.10425, + "Y": 163.31726, + "Z": 295.67407 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1017274, + "Position": { + "X": 164.53796, + "Y": 166.2741, + "Z": 181.32288 + }, + "TerritoryId": 397, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1017274, + "Position": { + "X": 164.53796, + "Y": 166.2741, + "Z": 181.32288 + }, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1017277, + "Position": { + "X": 163.13416, + "Y": 166.2741, + "Z": 179.4613 + }, + "StopDistance": 5, + "TerritoryId": 397, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016619, + "Position": { + "X": -66.84979, + "Y": 8.05915, + "Z": 9.506287 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ishgard", + "NextQuestId": 2369 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2369_A Gazebo to Call Our Own.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2369_A Gazebo to Call Our Own.json new file mode 100644 index 00000000..fc1d57ed --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2369_A Gazebo to Call Our Own.json @@ -0,0 +1,228 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016619, + "Position": { + "X": -66.84979, + "Y": 8.05915, + "Z": 9.506287 + }, + "TerritoryId": 418, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1017959, + "Position": { + "X": 39.505493, + "Y": 16.49931, + "Z": -29.922974 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Ishgard] Aetheryte Plaza", + "[Ishgard] The Last Vigil" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1017962, + "Position": { + "X": 4.837097, + "Y": 11.964993, + "Z": 31.296265 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1017963, + "Position": { + "X": 21.683044, + "Y": 11.965154, + "Z": 47.68445 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1017964, + "Position": { + "X": -40.634766, + "Y": 11.965008, + "Z": 32.028687 + }, + "TerritoryId": 419, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1017968, + "Position": { + "X": -43.778137, + "Y": 11.965093, + "Z": 47.348755 + }, + "TerritoryId": 419, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1017970, + "Position": { + "X": 132.43298, + "Y": 205.99544, + "Z": 80.9491 + }, + "TerritoryId": 478, + "InteractionType": "Interact", + "AetheryteShortcut": "Idyllshire" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1012099, + "Position": { + "X": 50.278442, + "Y": 206.04715, + "Z": 57.75537 + }, + "TerritoryId": 478, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1012299, + "Position": { + "X": -16.586609, + "Y": 206.49942, + "Z": 42.98462 + }, + "StopDistance": 5, + "TerritoryId": 478, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "Position": { + "X": -2.76668, + "Y": 205.81511, + "Z": 24.614613 + }, + "TerritoryId": 478, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } + }, + { + "DataId": 1017977, + "Position": { + "X": -0.7172241, + "Y": 206.49947, + "Z": 20.09607 + }, + "StopDistance": 7, + "TerritoryId": 478, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1017981, + "Position": { + "X": 10.208252, + "Y": 206.77286, + "Z": 62.394165 + }, + "TerritoryId": 478, + "InteractionType": "CompleteQuest", + "NextQuestId": 2370 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2370_Don't Trust Anyone over Sixty.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2370_Don't Trust Anyone over Sixty.json new file mode 100644 index 00000000..f5a29229 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2370_Don't Trust Anyone over Sixty.json @@ -0,0 +1,213 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1017983, + "Position": { + "X": 11.520508, + "Y": 207.49994, + "Z": 85.34363 + }, + "StopDistance": 7, + "TerritoryId": 478, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1017988, + "Position": { + "X": -544.1825, + "Y": 144.84157, + "Z": -346.7918 + }, + "TerritoryId": 399, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Idyllshire] Aetheryte Plaza", + "[Idyllshire] Prologue Gate (Western Hinterlands)" + ], + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1017993, + "Position": { + "X": -544.1825, + "Y": 144.84157, + "Z": -346.7918 + }, + "TerritoryId": 399, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1017997, + "Position": { + "X": -595.48334, + "Y": 147.9601, + "Z": -37.43042 + }, + "TerritoryId": 399, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1018005, + "Position": { + "X": -761.31836, + "Y": 149.64381, + "Z": 16.739136 + }, + "TerritoryId": 399, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1018005, + "Position": { + "X": -761.31836, + "Y": 149.64381, + "Z": 16.739136 + }, + "TerritoryId": 399, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1018122, + "Position": { + "X": -761.2573, + "Y": 149.64243, + "Z": 16.80011 + }, + "TerritoryId": 399, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1018122, + "Position": { + "X": -761.2573, + "Y": 149.64243, + "Z": 16.80011 + }, + "TerritoryId": 399, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1018122, + "Position": { + "X": -761.2573, + "Y": 149.64243, + "Z": 16.80011 + }, + "TerritoryId": 399, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 9, + "Steps": [ + { + "DataId": 1018122, + "Position": { + "X": -761.2573, + "Y": 149.64243, + "Z": 16.80011 + }, + "TerritoryId": 399, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 10, + "Steps": [ + { + "DataId": 1017997, + "Position": { + "X": -595.48334, + "Y": 147.9601, + "Z": -37.43042 + }, + "TerritoryId": 399, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 11, + "Steps": [ + { + "DataId": 1018007, + "Position": { + "X": -602.5941, + "Y": 147.58852, + "Z": -39.230957 + }, + "StopDistance": 7, + "TerritoryId": 399, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1016619, + "Position": { + "X": -66.84979, + "Y": 8.05915, + "Z": 9.506287 + }, + "TerritoryId": 418, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Ishgard", + "NextQuestId": 2371 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2371_The Proud and the Pointy-eyed.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2371_The Proud and the Pointy-eyed.json new file mode 100644 index 00000000..75850c08 --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2371_The Proud and the Pointy-eyed.json @@ -0,0 +1,187 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1016619, + "Position": { + "X": -66.84979, + "Y": 8.05915, + "Z": 9.506287 + }, + "TerritoryId": 418, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1018448, + "Position": { + "X": 11.48999, + "Y": 206.58485, + "Z": 76.157715 + }, + "TerritoryId": 478, + "InteractionType": "Interact", + "AetheryteShortcut": "Idyllshire" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1018451, + "Position": { + "X": 606.775, + "Y": -49.501324, + "Z": 40.482178 + }, + "TerritoryId": 398, + "InteractionType": "Interact", + "AetheryteShortcut": "The Dravanian Forelands - Tailfeather", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1011920, + "Position": { + "X": 519.8595, + "Y": -51.071976, + "Z": 88.24292 + }, + "TerritoryId": 398, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1011921, + "Position": { + "X": 453.36072, + "Y": -51.141403, + "Z": 58.579346 + }, + "TerritoryId": 398, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": 493.00256, + "Y": -51.02798, + "Z": 16.711847 + }, + "TerritoryId": 398, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, + { + "DataId": 1011919, + "Position": { + "X": 497.82556, + "Y": -49.790283, + "Z": 11.825684 + }, + "StopDistance": 7, + "TerritoryId": 398, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1018454, + "Position": { + "X": 549.18726, + "Y": -51.275715, + "Z": 6.1798096 + }, + "TerritoryId": 398, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1018460, + "Position": { + "X": -108.659546, + "Y": -35.633152, + "Z": -19.485779 + }, + "TerritoryId": 398, + "InteractionType": "Interact", + "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1018460, + "Position": { + "X": -108.659546, + "Y": -35.633152, + "Z": -19.485779 + }, + "TerritoryId": 398, + "InteractionType": "CompleteQuest", + "NextQuestId": 2372 + } + ] + } + ] +} diff --git a/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2372_If I Could Turn Back Time.json b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2372_If I Could Turn Back Time.json new file mode 100644 index 00000000..2fa5e8ed --- /dev/null +++ b/QuestPaths/3.x - Heavensward/Side Stories/Hildibrand/2372_If I Could Turn Back Time.json @@ -0,0 +1,162 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1018463, + "Position": { + "X": -108.62903, + "Y": -35.63229, + "Z": -19.455322 + }, + "TerritoryId": 398, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1018468, + "Position": { + "X": -559.7162, + "Y": 48, + "Z": 304.5243 + }, + "TerritoryId": 400, + "InteractionType": "Interact", + "AetheryteShortcut": "The Churning Mists - Zenith" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1018468, + "Position": { + "X": -559.7162, + "Y": 48, + "Z": 304.5243 + }, + "TerritoryId": 400, + "InteractionType": "UseItem", + "ItemId": 2002034 + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1018468, + "Position": { + "X": -559.7162, + "Y": 48, + "Z": 304.5243 + }, + "TerritoryId": 400, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1018468, + "Position": { + "X": -559.7162, + "Y": 48, + "Z": 304.5243 + }, + "TerritoryId": 400, + "InteractionType": "UseItem", + "ItemId": 2002047 + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1018468, + "Position": { + "X": -559.7162, + "Y": 48, + "Z": 304.5243 + }, + "TerritoryId": 400, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1018468, + "Position": { + "X": -559.7162, + "Y": 48, + "Z": 304.5243 + }, + "TerritoryId": 400, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1018468, + "Position": { + "X": -559.7162, + "Y": 48, + "Z": 304.5243 + }, + "TerritoryId": 400, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1018459, + "Position": { + "X": -673.8232, + "Y": 73, + "Z": 288.4718 + }, + "StopDistance": 5, + "TerritoryId": 400, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1018456, + "Position": { + "X": 13.595764, + "Y": 206.59943, + "Z": 77.28699 + }, + "TerritoryId": 478, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Idyllshire", + "NextQuestId": 3008 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2668_A Picture Is Worth a Thousand Moms.json b/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2668_A Picture Is Worth a Thousand Moms.json new file mode 100644 index 00000000..e6debd99 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Quests/Kugane/2668_A Picture Is Worth a Thousand Moms.json @@ -0,0 +1,160 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1022958, + "Position": { + "X": 25.253662, + "Y": 7.9999995, + "Z": 159.47205 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -59.62348, + "Y": 7.999999, + "Z": -59.427254 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ], + "AethernetShortcut": [ + "[Kugane] Thavnairian Consulate", + "[Kugane] Shiokaze Hostelry" + ], + "RestartNavigationIfCancelled": false + }, + { + "Position": { + "X": -74.28216, + "Y": 18, + "Z": -164.39622 + }, + "TerritoryId": 628, + "InteractionType": "Jump", + "AethernetShortcut": [ + "[Kugane] Shiokaze Hostelry", + "[Kugane] Bokairo Inn" + ], + "JumpDestination": { + "Position": { + "X": -67.259315, + "Y": 20.530502, + "Z": -163.86617 + }, + "StopDistance": 0.5, + "Type": "RepeatedJumps" + } + }, + { + "Position": { + "X": -37.85175, + "Y": 20.196363, + "Z": -163.43034 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": -37.806847, + "Y": 21.332985, + "Z": -161.45049 + }, + "StopDistance": 1, + "TerritoryId": 628, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -31.778416, + "Y": 23.141376, + "Z": -159.92921 + } + } + }, + { + "Position": { + "X": -32.529102, + "Y": 23.164635, + "Z": -159.86409 + }, + "StopDistance": 0.5, + "TerritoryId": 628, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -28.255697, + "Y": 24.146992, + "Z": -159.81477 + } + } + }, + { + "Position": { + "X": -28.255697, + "Y": 24.146992, + "Z": -159.81477 + }, + "StopDistance": 0.5, + "TerritoryId": 628, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -24.809277, + "Y": 24.899979, + "Z": -159.88982 + }, + "StopDistance": 0.5 + }, + "RestartNavigationIfCancelled": false, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1022958, + "Position": { + "X": 25.253662, + "Y": 7.9999995, + "Z": 159.47205 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] Thavnairian Consulate" + ] + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3008_A Hingan Tale - Nashu Goes East.json b/QuestPaths/4.x - Stormblood/Side Stories/3008_A Hingan Tale - Nashu Goes East.json new file mode 100644 index 00000000..8715a007 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3008_A Hingan Tale - Nashu Goes East.json @@ -0,0 +1,197 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024349, + "Position": { + "X": -27.054321, + "Y": -1.3048761E-05, + "Z": -69.596436 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024350, + "Position": { + "X": -36.02661, + "Y": 14.001708, + "Z": -45.39563 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024350, + "Position": { + "X": -36.02661, + "Y": 14.001708, + "Z": -45.39563 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB711_03008_Q1_000_000", + "Answer": "TEXT_CHRHDB711_03008_A1_000_002" + } + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1019000, + "Position": { + "X": 39.414062, + "Y": 4.49998, + "Z": -43.47296 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "Position": { + "X": -93.72425, + "Y": 11.799999, + "Z": -147.28041 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + } + }, + { + "DataId": 1019034, + "Position": { + "X": -95.84198, + "Y": 11.8, + "Z": -147.29541 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1024409, + "Position": { + "X": -20.920166, + "Y": 6.019962, + "Z": -133.31812 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024351, + "Position": { + "X": -36.270752, + "Y": 5.9819617, + "Z": -152.36133 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB711_03008_Q2_000_000", + "Answer": "TEXT_CHRHDB711_03008_A2_000_001" + } + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024352, + "Position": { + "X": 24.093994, + "Y": 6.025086, + "Z": -134.02002 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024355, + "Position": { + "X": 25.375732, + "Y": 6.0313134, + "Z": -119.432434 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 3020 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3020_Life Imitates Art Imitates Life.json b/QuestPaths/4.x - Stormblood/Side Stories/3020_Life Imitates Art Imitates Life.json new file mode 100644 index 00000000..15ab40c0 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3020_Life Imitates Art Imitates Life.json @@ -0,0 +1,167 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024355, + "Position": { + "X": 25.375732, + "Y": 6.0313134, + "Z": -119.432434 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Kugane", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + }, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB721_03020_Q1_000_004", + "Answer": "TEXT_CHRHDB721_03020_A1_000_005" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1024711, + "Position": { + "X": 136.21729, + "Y": 12.000006, + "Z": -69.87109 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Rakuza District", + "[Kugane] Sekiseigumi Barracks" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1019063, + "Position": { + "X": 3.3416748, + "Y": -6.6541724E-11, + "Z": -67.73486 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Sekiseigumi Barracks", + "[Kugane] Aetheryte Plaza" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1019039, + "Position": { + "X": -35.111023, + "Y": 13.999897, + "Z": -64.042114 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024705, + "Position": { + "X": 8.590759, + "Y": 4, + "Z": 35.171997 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1024708, + "Position": { + "X": 98.83264, + "Y": 4.0000014, + "Z": 103.471436 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024709, + "Position": { + "X": -108.01868, + "Y": -5.999997, + "Z": 70.23718 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024710, + "Position": { + "X": 835.5382, + "Y": 5.9230075, + "Z": 834.6837 + }, + "TerritoryId": 613, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] The Ruby Price" + ], + "NextQuestId": 3021 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3021_Of Wolves and Gentlemen.json b/QuestPaths/4.x - Stormblood/Side Stories/3021_Of Wolves and Gentlemen.json new file mode 100644 index 00000000..1f90ec68 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3021_Of Wolves and Gentlemen.json @@ -0,0 +1,136 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024710, + "Position": { + "X": 835.5382, + "Y": 5.9230075, + "Z": 834.6837 + }, + "TerritoryId": 613, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1019166, + "Position": { + "X": 495.6587, + "Y": 29.394592, + "Z": 722.0111 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1024717, + "Position": { + "X": 503.44092, + "Y": 28.738373, + "Z": 737.4226 + }, + "TerritoryId": 613, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2008628, + "Position": { + "X": 633.81384, + "Y": 1.4800415, + "Z": 216.26611 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024722, + "Position": { + "X": 615.4115, + "Y": 69.10424, + "Z": -79.88104 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1024723, + "Position": { + "X": 534.2031, + "Y": 0.004061999, + "Z": -252.58258 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1024725, + "Position": { + "X": 100.02283, + "Y": 4.0000014, + "Z": 99.25989 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] Kogane Dori Markets" + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1024708, + "Position": { + "X": 98.83264, + "Y": 4.0000014, + "Z": 103.471436 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 3094 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3094_In the Eye of the Hingan.json b/QuestPaths/4.x - Stormblood/Side Stories/3094_In the Eye of the Hingan.json new file mode 100644 index 00000000..cbbdeeeb --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3094_In the Eye of the Hingan.json @@ -0,0 +1,101 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024708, + "Position": { + "X": 98.83264, + "Y": 4.0000014, + "Z": 103.471436 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1025885, + "Position": { + "X": 26.443848, + "Y": 6.024561, + "Z": -118.57788 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Kogane Dori Markets", + "[Kugane] Rakuza District" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1025887, + "Position": { + "X": -62.790894, + "Y": 6.0295854, + "Z": -171.19104 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1025891, + "Position": { + "X": -45.059937, + "Y": 10.503964, + "Z": -191.79071 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1025887, + "Position": { + "X": -62.790894, + "Y": 6.0295854, + "Z": -171.19104 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1025893, + "Position": { + "X": -60.41046, + "Y": 6.0110765, + "Z": -168.41382 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 3095 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3095_The Blade Mislaid.json b/QuestPaths/4.x - Stormblood/Side Stories/3095_The Blade Mislaid.json new file mode 100644 index 00000000..c493b8f0 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3095_The Blade Mislaid.json @@ -0,0 +1,151 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025893, + "Position": { + "X": -60.41046, + "Y": 6.0110765, + "Z": -168.41382 + }, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1025896, + "Position": { + "X": 248.09644, + "Y": 17.471375, + "Z": -664.9729 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "AetheryteShortcut": "Yanxia - House of the Fierce", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1025901, + "Position": { + "X": -93.70575, + "Y": 53.144028, + "Z": -530.2663 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1025906, + "Position": { + "X": -208.8808, + "Y": 53.217514, + "Z": -581.3535 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2009533, + "Position": { + "X": -220.11145, + "Y": 53.20813, + "Z": -597.80273 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1025910, + "Position": { + "X": -125.41394, + "Y": 53.217514, + "Z": -648.4321 + }, + "TerritoryId": 614, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1025911, + "Position": { + "X": -126.237915, + "Y": 53.217514, + "Z": -650.6905 + }, + "StopDistance": 5, + "TerritoryId": 614, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1019030, + "Position": { + "X": 65.72058, + "Y": 10.503965, + "Z": -167.1626 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AetheryteShortcut": "Kugane" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1025912, + "Position": { + "X": 66.57507, + "Y": 10.503965, + "Z": -155.59625 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 3150 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3150_The Black Heart Beneath.json b/QuestPaths/4.x - Stormblood/Side Stories/3150_The Black Heart Beneath.json new file mode 100644 index 00000000..70c91fb6 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3150_The Black Heart Beneath.json @@ -0,0 +1,162 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025912, + "Position": { + "X": 66.57507, + "Y": 10.503965, + "Z": -155.59625 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1022620, + "Position": { + "X": -4.7455444, + "Y": 0.022830343, + "Z": -113.96973 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1019063, + "Position": { + "X": 3.3416748, + "Y": -6.6541724E-11, + "Z": -67.73486 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1022628, + "Position": { + "X": 38.651123, + "Y": 2.99999, + "Z": -66.7583 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1025912, + "Position": { + "X": 66.57507, + "Y": 10.503965, + "Z": -155.59625 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026349, + "Position": { + "X": 62.18042, + "Y": 5.991543, + "Z": -106.126526 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "Position": { + "X": 65.39469, + "Y": 5.8110533, + "Z": -121.784775 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 72.780495, + "Y": -8.000002, + "Z": -127.28816 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "DataId": 1026457, + "Position": { + "X": 62.271973, + "Y": -8.0999975, + "Z": -225.2995 + }, + "TerritoryId": 628, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026353, + "Position": { + "X": 45.456543, + "Y": -7.470526, + "Z": -261.34125 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 3151 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3151_Good Swords, Good Dogs.json b/QuestPaths/4.x - Stormblood/Side Stories/3151_Good Swords, Good Dogs.json new file mode 100644 index 00000000..50a08d2b --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3151_Good Swords, Good Dogs.json @@ -0,0 +1,111 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1026351, + "Position": { + "X": 45.090332, + "Y": -7.469796, + "Z": -262.7146 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026355, + "Position": { + "X": 841.27563, + "Y": 1.1792023, + "Z": 861.90576 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] The Ruby Price" + ], + "Mount": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1019166, + "Position": { + "X": 495.6587, + "Y": 29.394592, + "Z": 722.0111 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026366, + "Position": { + "X": 433.73767, + "Y": 30.29471, + "Z": 780.69727 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1026367, + "Position": { + "X": 297.32202, + "Y": 0.35283074, + "Z": 470.51184 + }, + "TerritoryId": 613, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026369, + "Position": { + "X": -35.080566, + "Y": 5.983372, + "Z": -152.23932 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] Rakuza District" + ], + "NextQuestId": 3167 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3167_The Past Is Never Past.json b/QuestPaths/4.x - Stormblood/Side Stories/3167_The Past Is Never Past.json new file mode 100644 index 00000000..a2a606f8 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3167_The Past Is Never Past.json @@ -0,0 +1,179 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1024351, + "Position": { + "X": -36.270752, + "Y": 5.9819617, + "Z": -152.36133 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1026363, + "Position": { + "X": 54.61206, + "Y": 7.999999, + "Z": 192.401 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Rakuza District", + "[Kugane] Thavnairian Consulate" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 628, + "InteractionType": "Duty", + "ContentFinderConditionId": 595 + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1026364, + "Position": { + "X": 52.536743, + "Y": 8.02, + "Z": 192.49243 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AetheryteShortcut": "Kugane", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1024351, + "Position": { + "X": -36.270752, + "Y": 5.9819617, + "Z": -152.36133 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Thavnairian Consulate", + "[Kugane] Rakuza District" + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1019063, + "Position": { + "X": 3.3416748, + "Y": -6.6541724E-11, + "Z": -67.73486 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1018994, + "Position": { + "X": 49.240845, + "Y": 4.0000005, + "Z": 55.77173 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] Kogane Dori Markets" + ], + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1026369, + "Position": { + "X": -35.080566, + "Y": 5.983372, + "Z": -152.23932 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Kogane Dori Markets", + "[Kugane] Rakuza District" + ], + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB751_03167_Q1_000_000", + "Answer": "TEXT_CHRHDB751_03167_A1_000_002" + } + ] + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1025885, + "Position": { + "X": 26.443848, + "Y": 6.024561, + "Z": -118.57788 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "NextQuestId": 3168 + } + ] + } + ] +} diff --git a/QuestPaths/4.x - Stormblood/Side Stories/3168_Don't Do the Dewprism.json b/QuestPaths/4.x - Stormblood/Side Stories/3168_Don't Do the Dewprism.json new file mode 100644 index 00000000..fdb72ac4 --- /dev/null +++ b/QuestPaths/4.x - Stormblood/Side Stories/3168_Don't Do the Dewprism.json @@ -0,0 +1,164 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1025885, + "Position": { + "X": 26.443848, + "Y": 6.024561, + "Z": -118.57788 + }, + "StopDistance": 5, + "TerritoryId": 628, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": 65.39469, + "Y": 5.8110533, + "Z": -121.784775 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo" + }, + { + "Position": { + "X": 72.780495, + "Y": -8.000002, + "Z": -127.28816 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo", + "DisableNavmesh": true + }, + { + "DataId": 1019068, + "Position": { + "X": 42.191162, + "Y": -7.463482, + "Z": -264.75934 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB752_03168_Q1_000_000", + "Answer": "TEXT_CHRHDB752_03168_A1_000_001" + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1019033, + "Position": { + "X": 52.048462, + "Y": 8.02, + "Z": 140.55078 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AetheryteShortcut": "Kugane", + "AethernetShortcut": [ + "[Kugane] Aetheryte Plaza", + "[Kugane] Thavnairian Consulate" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "Position": { + "X": 16.635633, + "Y": 11.441568, + "Z": 174.71848 + }, + "TerritoryId": 628, + "InteractionType": "WalkTo" + }, + { + "DataId": 1026764, + "Position": { + "X": 24.917969, + "Y": 6.0124164, + "Z": -123.979614 + }, + "TerritoryId": 628, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Thavnairian Consulate", + "[Kugane] Rakuza District" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1026350, + "Position": { + "X": 512.90137, + "Y": 0.8484344, + "Z": 148.91272 + }, + "TerritoryId": 613, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Kugane] Rakuza District", + "[Kugane] The Ruby Price" + ], + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1026765, + "Position": { + "X": 495.10938, + "Y": 1.611506, + "Z": 149.49255 + }, + "StopDistance": 5, + "TerritoryId": 613, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1026766, + "Position": { + "X": 52.384155, + "Y": 10.503965, + "Z": -154.03986 + }, + "TerritoryId": 628, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Kugane", + "NextQuestId": 4542 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4542_The Sleeping Gentleman.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4542_The Sleeping Gentleman.json new file mode 100644 index 00000000..2116b0b5 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4542_The Sleeping Gentleman.json @@ -0,0 +1,289 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1042487, + "Position": { + "X": 32.272827, + "Y": -4.4237822E-07, + "Z": -0.7477417 + }, + "TerritoryId": 963, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Radz-at-Han", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB811_04542_Q4_000_000", + "Answer": "TEXT_CHRHDB811_04542_A4_000_001" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1042488, + "Position": { + "X": 150.68274, + "Y": 4.783756, + "Z": -145.00653 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1042489, + "Position": { + "X": 147.75305, + "Y": 27.06, + "Z": 36.057007 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Radz-at-Han] Aetheryte Plaza", + "[Radz-at-Han] Kama" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1027322, + "Position": { + "X": -20.126648, + "Y": 3.9998171, + "Z": 204.24194 + }, + "StopDistance": 5, + "TerritoryId": 819, + "InteractionType": "Interact", + "AetheryteShortcut": "Crystarium", + "AethernetShortcut": [ + "[Crystarium] Aetheryte Plaza", + "[Crystarium] The Pendants" + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "TerritoryId": 819, + "AethernetShortcut": [ + "[Crystarium] The Pendants", + "[Crystarium] Tessellation (Lakeland)" + ], + "InteractionType": "None" + }, + { + "Position": { + "X": 55.589294, + "Y": 2.0276523, + "Z": 669.1557 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, + "Comment": "these bridges have navmesh problems" + }, + { + "Position": { + "X": 15.410904, + "Y": 2.2598603, + "Z": 677.3755 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "Position": { + "X": -82.79376, + "Y": 11.970126, + "Z": 765.8721 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "DataId": 1042493, + "Position": { + "X": -106.73688, + "Y": 14.173656, + "Z": 756.4354 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "DataId": 1042491, + "Position": { + "X": -137.22437, + "Y": 9.572956, + "Z": 708.3999 + }, + "StopDistance": 1, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1042492, + "Position": { + "X": -218.76862, + "Y": 1.9084097, + "Z": 756.16077 + }, + "TerritoryId": 813, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "Position": { + "X": -82.79376, + "Y": 11.970126, + "Z": 765.8721 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "DataId": 1042494, + "Position": { + "X": -54.032227, + "Y": 2.015483, + "Z": 677.9125 + }, + "TerritoryId": 813, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "Position": { + "X": 15.410904, + "Y": 2.2598603, + "Z": 677.3755 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "Position": { + "X": 55.589294, + "Y": 2.0276523, + "Z": 669.1557 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "DisableNavmesh": true, + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + }, + "Comment": "these bridges have navmesh problems" + }, + { + "Position": { + "X": 105.453514, + "Y": -1.5952542, + "Z": 604.3535 + }, + "TerritoryId": 813, + "InteractionType": "WalkTo", + "SkipConditions": { + "StepIf": { + "Flying": "Unlocked" + } + } + }, + { + "DataId": 1042497, + "Position": { + "X": 220.7522, + "Y": 12.699311, + "Z": 229.84656 + }, + "TerritoryId": 813, + "InteractionType": "CompleteQuest", + "Fly": true, + "NextQuestId": 4543 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json new file mode 100644 index 00000000..08b0bfae --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json @@ -0,0 +1,236 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1042499, + "Position": { + "X": 217.51733, + "Y": 12.445339, + "Z": 228.44275 + }, + "StopDistance": 5, + "TerritoryId": 813, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB812_04543_Q1_000_000", + "Answer": "TEXT_CHRHDB812_04543_A1_000_002" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1042502, + "Position": { + "X": -57.38922, + "Y": -36.72638, + "Z": -254.53583 + }, + "TerritoryId": 819, + "InteractionType": "Interact", + "AetheryteShortcut": "Crystarium", + "AethernetShortcut": [ + "[Crystarium] Aetheryte Plaza", + "[Crystarium] The Cabinet of Curiosity" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1042505, + "Position": { + "X": 148.11926, + "Y": 27.06, + "Z": 36.240112 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AetheryteShortcut": "Radz-at-Han", + "AethernetShortcut": [ + "[Radz-at-Han] Aetheryte Plaza", + "[Radz-at-Han] Kama" + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1037341, + "Position": { + "X": 133.77576, + "Y": 26.99999, + "Z": 12.405518 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1037352, + "Position": { + "X": 112.10791, + "Y": 26.99999, + "Z": 25.253662 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1042506, + "Position": { + "X": 126.11572, + "Y": 26.999989, + "Z": 32.76111 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1042508, + "Position": { + "X": 126.11572, + "Y": 26.999989, + "Z": 32.76111 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1037324, + "Position": { + "X": -4.257263, + "Y": 27, + "Z": 36.362183 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "Position": { + "X": -3.0175605, + "Y": 27, + "Z": 36.584843 + }, + "StopDistance": 0.5, + "TerritoryId": 963, + "InteractionType": "Jump", + "JumpDestination": { + "Position": { + "X": -3.6922705, + "Y": -1.9999962, + "Z": 52.106045 + } + } + }, + { + "DataId": 1042509, + "Position": { + "X": -29.373718, + "Y": -1.9999962, + "Z": 130.93762 + }, + "TerritoryId": 963, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 1042510, + "Position": { + "X": -337.57538, + "Y": 3.2215352, + "Z": 365.7129 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "AetheryteShortcut": "Thavnair - Great Work", + "Fly": true + } + ] + }, + { + "Sequence": 9, + "Steps": [ + { + "DataId": 1042511, + "Position": { + "X": -376.669, + "Y": 1.1651754, + "Z": 379.23242 + }, + "StopDistance": 5, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1042512, + "Position": { + "X": 31.387817, + "Y": -5.021957E-07, + "Z": -0.65618896 + }, + "TerritoryId": 963, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Radz-at-Han" + } + ] + } + ] +} From 708e260eee95a508758e00b24758d08ac79eb84e Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 5 Oct 2024 14:32:29 +0200 Subject: [PATCH 50/51] Add config option for TA settings --- Directory.Build.targets | 2 +- Questionable/Configuration.cs | 1 + Questionable/External/TextAdvanceIpc.cs | 14 ++++++++++---- Questionable/Windows/ConfigWindow.cs | 7 +++++++ 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 939fb575..590411dd 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,5 +1,5 @@ - 3.8 + 3.9 diff --git a/Questionable/Configuration.cs b/Questionable/Configuration.cs index 3ea014cb..f2a25164 100644 --- a/Questionable/Configuration.cs +++ b/Questionable/Configuration.cs @@ -20,6 +20,7 @@ internal sealed class Configuration : IPluginConfiguration public bool UseEscToCancelQuesting { get; set; } = true; public bool ShowIncompleteSeasonalEvents { get; set; } = true; public bool AutomaticallyCompleteSnipeTasks { get; set; } + public bool ConfigureTextAdvance { get; set; } = true; } internal sealed class AdvancedConfiguration diff --git a/Questionable/External/TextAdvanceIpc.cs b/Questionable/External/TextAdvanceIpc.cs index bb771b02..dd4fa395 100644 --- a/Questionable/External/TextAdvanceIpc.cs +++ b/Questionable/External/TextAdvanceIpc.cs @@ -6,6 +6,7 @@ using Questionable.Controller; using Questionable.Data; using Questionable.Model.Common; using System; +using System.Diagnostics.CodeAnalysis; namespace Questionable.External; @@ -13,6 +14,7 @@ internal sealed class TextAdvanceIpc : IDisposable { private bool _isExternalControlActivated; private readonly QuestController _questController; + private readonly Configuration _configuration; private readonly IFramework _framework; private readonly ICallGateSubscriber _isInExternalControl; private readonly ICallGateSubscriber _enableExternalControl; @@ -20,10 +22,11 @@ internal sealed class TextAdvanceIpc : IDisposable private readonly string _pluginName; private readonly ExternalTerritoryConfig _externalTerritoryConfig = new(); - public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework, QuestController questController) + public TextAdvanceIpc(IDalamudPluginInterface pluginInterface, IFramework framework, QuestController questController, Configuration configuration) { _framework = framework; _questController = questController; + _configuration = configuration; _isInExternalControl = pluginInterface.GetIpcSubscriber("TextAdvance.IsInExternalControl"); _enableExternalControl = pluginInterface.GetIpcSubscriber("TextAdvance.EnableExternalControl"); _disableExternalControl = pluginInterface.GetIpcSubscriber("TextAdvance.DisableExternalControl"); @@ -40,9 +43,9 @@ internal sealed class TextAdvanceIpc : IDisposable } } - public void OnUpdate(IFramework framework) + private void OnUpdate(IFramework framework) { - if(_questController.IsRunning) + if(_configuration.General.ConfigureTextAdvance && _questController.IsRunning) { if(!_isInExternalControl.InvokeFunc()) { @@ -64,8 +67,10 @@ internal sealed class TextAdvanceIpc : IDisposable } } - public class ExternalTerritoryConfig + [SuppressMessage("ReSharper", "MemberCanBePrivate.Global")] + public sealed class ExternalTerritoryConfig { +#pragma warning disable CS0414 // Field is assigned but its value is never used public bool? EnableQuestAccept = true; public bool? EnableQuestComplete = true; public bool? EnableRewardPick = true; @@ -75,5 +80,6 @@ internal sealed class TextAdvanceIpc : IDisposable public bool? EnableTalkSkip = true; public bool? EnableRequestFill = true; public bool? EnableAutoInteract = false; +#pragma warning restore CS0414 // Field is assigned but its value is never used } } diff --git a/Questionable/Windows/ConfigWindow.cs b/Questionable/Windows/ConfigWindow.cs index 0b278c04..0416943f 100644 --- a/Questionable/Windows/ConfigWindow.cs +++ b/Questionable/Windows/ConfigWindow.cs @@ -90,6 +90,13 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig Save(); } + bool configureTextAdvance = _configuration.General.ConfigureTextAdvance; + if (ImGui.Checkbox("Automatically configure TextAdvance with the recommended settings", ref configureTextAdvance)) + { + _configuration.General.ConfigureTextAdvance = configureTextAdvance; + Save(); + } + if (ImGui.CollapsingHeader("Cheats")) { ImGui.TextColored(ImGuiColors.DalamudRed, "This setting will be removed in a future version, and will be\navailable through TextAdvance instead."); From a9216f246407700046e1ae2ad80b7be24e603743 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sun, 6 Oct 2024 17:58:59 +0200 Subject: [PATCH 51/51] Add Endwalker Hildibrand quests --- .../MSQ/K-5.5/4062_The Flames of War.json | 2 +- .../MSQ/K-5.5/4063_When the Dust Settles.json | 2 +- .../Hildibrand/4543_A Soulful Reunion.json | 3 +- .../Hildibrand/4641_Lunar Conspiracy.json | 211 ++++++++++++++++++ .../4642_The Imperfect Gentleman.json | 104 +++++++++ .../4718_The Spectacle of Inspection.json | 197 ++++++++++++++++ .../Hildibrand/4719_Generational Bonding.json | 120 ++++++++++ .../Hildibrand/4754_By Agents Unknown.json | 120 ++++++++++ .../Hildibrand/4755_Not from Around Here.json | 205 +++++++++++++++++ .../4799_Of Duplicity and Duplication.json | 152 +++++++++++++ .../Hildibrand/4800_Gentlemen at Heart.json | 73 ++++++ 11 files changed, 1186 insertions(+), 3 deletions(-) create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4641_Lunar Conspiracy.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4642_The Imperfect Gentleman.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4718_The Spectacle of Inspection.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4719_Generational Bonding.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4754_By Agents Unknown.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4755_Not from Around Here.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4799_Of Duplicity and Duplication.json create mode 100644 QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4800_Gentlemen at Heart.json diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json index c74e6ed8..d4f27497 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json @@ -88,7 +88,7 @@ "Y": 83.2, "Z": 15.121643 }, - "StopDistance": 5, + "StopDistance": 7, "TerritoryId": 130, "InteractionType": "CompleteQuest" } diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json index 607c69f2..cc73070e 100644 --- a/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json +++ b/QuestPaths/5.x - Shadowbringers/MSQ/K-5.5/4063_When the Dust Settles.json @@ -12,7 +12,7 @@ "Y": 83.2, "Z": 15.121643 }, - "StopDistance": 5, + "StopDistance": 7, "TerritoryId": 130, "InteractionType": "AcceptQuest" } diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json index 08b0bfae..c950da6e 100644 --- a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4543_A Soulful Reunion.json @@ -228,7 +228,8 @@ }, "TerritoryId": 963, "InteractionType": "CompleteQuest", - "AetheryteShortcut": "Radz-at-Han" + "AetheryteShortcut": "Radz-at-Han", + "NextQuestId": 4641 } ] } diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4641_Lunar Conspiracy.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4641_Lunar Conspiracy.json new file mode 100644 index 00000000..deeaa99a --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4641_Lunar Conspiracy.json @@ -0,0 +1,211 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1042512, + "Position": { + "X": 31.387817, + "Y": -5.021957E-07, + "Z": -0.65618896 + }, + "TerritoryId": 963, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB821_04641_Q2_000_000", + "Answer": "TEXT_CHRHDB821_04641_A2_000_002" + }, + { + "Type": "List", + "Prompt": "TEXT_CHRHDB821_04641_Q3_000_000", + "Answer": "TEXT_CHRHDB821_04641_A3_000_001" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1042524, + "Position": { + "X": -432.70013, + "Y": 22.328213, + "Z": 508.75085 + }, + "TerritoryId": 958, + "InteractionType": "Interact", + "AetheryteShortcut": "Garlemald - Camp Broken Glass" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2012531, + "Position": { + "X": -663.29443, + "Y": 132.6466, + "Z": 728.96924 + }, + "StopDistance": 0.5, + "TerritoryId": 959, + "InteractionType": "Interact", + "TargetTerritoryId": 1024, + "AetheryteShortcut": "Mare Lamentorum - Sinus Lacrimarum", + "Fly": true + }, + { + "DataId": 2012529, + "Position": { + "X": 0.07623291, + "Y": 0.83917236, + "Z": 52.506226 + }, + "TerritoryId": 1024, + "InteractionType": "Interact", + "TargetTerritoryId": 958 + }, + { + "DataId": 1042525, + "Position": { + "X": -446.0365, + "Y": 10.5, + "Z": -616.14404 + }, + "TerritoryId": 958, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1042526, + "Position": { + "X": -657.9232, + "Y": 130.61172, + "Z": 722.62134 + }, + "StopDistance": 7, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1042528, + "Position": { + "X": -15.213318, + "Y": -129.20917, + "Z": -475.6695 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1042531, + "Position": { + "X": -103.07471, + "Y": -137.41672, + "Z": -444.66315 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "Position": { + "X": -59.250706, + "Y": -133.00002, + "Z": -587.20355 + }, + "TerritoryId": 959, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1042532, + "Position": { + "X": -60.624146, + "Y": -132.80109, + "Z": -587.4266 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 1037816, + "Position": { + "X": 114.3053, + "Y": -132.87448, + "Z": -559.35 + }, + "TerritoryId": 959, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 8, + "Steps": [ + { + "DataId": 2013061, + "Position": { + "X": 249.19507, + "Y": 66.544556, + "Z": 367.2693 + }, + "StopDistance": 0.5, + "TerritoryId": 959, + "InteractionType": "Interact", + "AetheryteShortcut": "Mare Lamentorum - Sinus Lacrimarum", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1042544, + "Position": { + "X": 324.422, + "Y": 130.1783, + "Z": 711.94006 + }, + "StopDistance": 7, + "TerritoryId": 959, + "InteractionType": "CompleteQuest", + "NextQuestId": 4642 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4642_The Imperfect Gentleman.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4642_The Imperfect Gentleman.json new file mode 100644 index 00000000..39e83634 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4642_The Imperfect Gentleman.json @@ -0,0 +1,104 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1042544, + "Position": { + "X": 324.422, + "Y": 130.1783, + "Z": 711.94006 + }, + "StopDistance": 6, + "TerritoryId": 959, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1042548, + "Position": { + "X": 1.5106201, + "Y": 70.01534, + "Z": -1.083435 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 2013062, + "Position": { + "X": -129.83911, + "Y": 61.661743, + "Z": 120.80554 + }, + "StopDistance": 0.5, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 2013063, + "Position": { + "X": -249.22565, + "Y": 81.712036, + "Z": 134.1726 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2013064, + "Position": { + "X": -358.23608, + "Y": 104.53955, + "Z": 117.234985 + }, + "TerritoryId": 959, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1042555, + "Position": { + "X": 31.204712, + "Y": -5.351952E-07, + "Z": -0.77819824 + }, + "StopDistance": 5, + "TerritoryId": 963, + "InteractionType": "CompleteQuest", + "NextQuestId": 4718 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4718_The Spectacle of Inspection.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4718_The Spectacle of Inspection.json new file mode 100644 index 00000000..a99ea5c0 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4718_The Spectacle of Inspection.json @@ -0,0 +1,197 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1042558, + "Position": { + "X": 33.066284, + "Y": -5.8859587E-07, + "Z": -2.2125854 + }, + "StopDistance": 5, + "TerritoryId": 963, + "InteractionType": "AcceptQuest", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB831_04718_Q6_000_000", + "Answer": "TEXT_CHRHDB831_04718_A6_000_001" + } + ] + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1042560, + "Position": { + "X": 431.96765, + "Y": 3.1168795, + "Z": -250.5379 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "AetheryteShortcut": "Thavnair - Palaka's Stand" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1042564, + "Position": { + "X": 423.63623, + "Y": 3.1168795, + "Z": -273.8537 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1042565, + "Position": { + "X": 393.14856, + "Y": 3.1164212, + "Z": -212.9397 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1042567, + "Position": { + "X": 374.80737, + "Y": 3.1168795, + "Z": -256.45844 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1042572, + "Position": { + "X": 374.44104, + "Y": 3.1168795, + "Z": -257.64862 + }, + "StopDistance": 5, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 2013267, + "Position": { + "X": 205.70679, + "Y": 7.9193726, + "Z": -180.34644 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB831_04718_Q4_000_000", + "Answer": "TEXT_CHRHDB831_04718_A4_000_001" + } + ] + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 2013268, + "Position": { + "X": 36.209595, + "Y": 17.196838, + "Z": -232.68488 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true, + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB831_04718_Q5_000_000", + "Answer": "TEXT_CHRHDB831_04718_A5_000_001" + } + ] + } + ] + }, + { + "Sequence": 7, + "Steps": [ + { + "DataId": 2013269, + "Position": { + "X": -13.565308, + "Y": 22.964722, + "Z": -346.7613 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1042573, + "Position": { + "X": 565.91125, + "Y": 13.300535, + "Z": 242.48108 + }, + "StopDistance": 7, + "TerritoryId": 957, + "InteractionType": "CompleteQuest", + "NextQuestId": 4719 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4719_Generational Bonding.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4719_Generational Bonding.json new file mode 100644 index 00000000..19d9c1bf --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4719_Generational Bonding.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1042573, + "Position": { + "X": 565.91125, + "Y": 13.300535, + "Z": 242.48108 + }, + "StopDistance": 7, + "TerritoryId": 957, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044765, + "Position": { + "X": 9.567322, + "Y": -6.762952E-05, + "Z": 17.715698 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AetheryteShortcut": "Radz-at-Han" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044752, + "Position": { + "X": -432.02875, + "Y": 22.24389, + "Z": 507.53027 + }, + "TerritoryId": 958, + "InteractionType": "Interact", + "AetheryteShortcut": "Garlemald - Camp Broken Glass" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1044754, + "Position": { + "X": -458.3963, + "Y": 20.805109, + "Z": -333.69952 + }, + "TerritoryId": 958, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2013272, + "Position": { + "X": 697.8712, + "Y": 30.105957, + "Z": -789.7612 + }, + "TerritoryId": 958, + "InteractionType": "Interact", + "AetheryteShortcut": "Garlemald - Tertium", + "Fly": true + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1044762, + "Position": { + "X": 694.97217, + "Y": 30.104027, + "Z": -785.8244 + }, + "StopDistance": 5, + "TerritoryId": 958, + "InteractionType": "SinglePlayerDuty" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1044765, + "Position": { + "X": 9.567322, + "Y": -6.762952E-05, + "Z": 17.715698 + }, + "StopDistance": 5, + "TerritoryId": 963, + "InteractionType": "CompleteQuest", + "NextQuestId": 4754 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4754_By Agents Unknown.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4754_By Agents Unknown.json new file mode 100644 index 00000000..d2d7b9cc --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4754_By Agents Unknown.json @@ -0,0 +1,120 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1044768, + "Position": { + "X": 11.154297, + "Y": -0.00010118321, + "Z": 14.816467 + }, + "StopDistance": 5, + "TerritoryId": 963, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044769, + "Position": { + "X": 145.73889, + "Y": 27.059998, + "Z": 36.819946 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Radz-at-Han] Aetheryte Plaza", + "[Radz-at-Han] Kama" + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "Position": { + "X": 31.966597, + "Y": 5.8818626, + "Z": 580.4358 + }, + "TerritoryId": 957, + "InteractionType": "Combat", + "EnemySpawnType": "OverworldEnemies", + "ComplexCombatData": [ + { + "DataId": 13527, + "MinimumKillCount": 1, + "RewardItemId": 2003459, + "RewardItemCount": 1 + } + ], + "AetheryteShortcut": "Thavnair - Yedlihmad", + "Fly": true + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1044774, + "Position": { + "X": -483.57367, + "Y": 1.580146, + "Z": -24.551819 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "AetheryteShortcut": "Thavnair - Great Work", + "Fly": true + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 2013336, + "Position": { + "X": -589.50183, + "Y": 2.2735596, + "Z": -285.42004 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1044772, + "Position": { + "X": 147.35632, + "Y": 27.059998, + "Z": 32.700073 + }, + "TerritoryId": 963, + "InteractionType": "CompleteQuest", + "AetheryteShortcut": "Radz-at-Han", + "AethernetShortcut": [ + "[Radz-at-Han] Aetheryte Plaza", + "[Radz-at-Han] Kama" + ], + "NextQuestId": 4755 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4755_Not from Around Here.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4755_Not from Around Here.json new file mode 100644 index 00000000..1dfcd8e6 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4755_Not from Around Here.json @@ -0,0 +1,205 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1044783, + "Position": { + "X": -313.4051, + "Y": 93.68002, + "Z": -316.7926 + }, + "StopDistance": 5, + "TerritoryId": 957, + "InteractionType": "AcceptQuest", + "AetheryteShortcut": "Thavnair - Great Work", + "SkipConditions": { + "AetheryteShortcutIf": { + "InSameTerritory": true + } + } + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044788, + "Position": { + "X": -42.191284, + "Y": 2.4950514, + "Z": -36.14868 + }, + "TerritoryId": 962, + "InteractionType": "Interact", + "AetheryteShortcut": "Old Sharlayan", + "DialogueChoices": [ + { + "Type": "List", + "Prompt": "TEXT_CHRHDB842_04755_Q2_000_000", + "Answer": "TEXT_CHRHDB842_04755_A2_000_001" + } + ] + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1039544, + "Position": { + "X": -29.617859, + "Y": 179.71387, + "Z": -826.2302 + }, + "TerritoryId": 956, + "InteractionType": "Interact", + "AethernetShortcut": [ + "[Old Sharlayan] Aetheryte Plaza", + "[Old Sharlayan] The Hall of Artifice (Labyrinthos)" + ], + "TargetTerritoryId": 962 + }, + { + "DataId": 1044794, + "Position": { + "X": -63.09613, + "Y": 18, + "Z": -297.59674 + }, + "TerritoryId": 962, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1044799, + "Position": { + "X": 408.49915, + "Y": 170.17088, + "Z": -431.7235 + }, + "TerritoryId": 956, + "InteractionType": "Interact", + "AetheryteShortcut": "Labyrinthos - Archeion" + } + ] + }, + { + "Sequence": 4, + "Steps": [ + { + "DataId": 1044805, + "Position": { + "X": 435.26355, + "Y": 65.16199, + "Z": -134.20312 + }, + "TerritoryId": 956, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + }, + { + "DataId": 1044806, + "Position": { + "X": 414.87744, + "Y": 65.16199, + "Z": -117.784424 + }, + "TerritoryId": 956, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1044807, + "Position": { + "X": 494.40747, + "Y": 65.16199, + "Z": -82.993835 + }, + "TerritoryId": 956, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + } + ] + }, + { + "Sequence": 5, + "Steps": [ + { + "DataId": 1044809, + "Position": { + "X": 470.90857, + "Y": 65.16199, + "Z": -85.61841 + }, + "TerritoryId": 956, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 6, + "Steps": [ + { + "DataId": 1044765, + "Position": { + "X": 9.567322, + "Y": -6.762952E-05, + "Z": 17.715698 + }, + "TerritoryId": 963, + "InteractionType": "Interact", + "AetheryteShortcut": "Radz-at-Han" + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1044768, + "Position": { + "X": 11.154297, + "Y": -0.00010118321, + "Z": 14.816467 + }, + "TerritoryId": 963, + "InteractionType": "CompleteQuest", + "NextQuestId": 4799 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4799_Of Duplicity and Duplication.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4799_Of Duplicity and Duplication.json new file mode 100644 index 00000000..3c4d70a2 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4799_Of Duplicity and Duplication.json @@ -0,0 +1,152 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1044768, + "Position": { + "X": 11.154297, + "Y": -0.00010118321, + "Z": 14.816467 + }, + "TerritoryId": 963, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "DataId": 1044815, + "Position": { + "X": 182.17737, + "Y": 5.3180933, + "Z": 646.3873 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "AetheryteShortcut": "Thavnair - Yedlihmad" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "DataId": 1044821, + "Position": { + "X": 216.38806, + "Y": 10.035135, + "Z": 613.79407 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 64 + ] + }, + { + "DataId": 1044822, + "Position": { + "X": 244.09851, + "Y": 9.916463, + "Z": 575.8601 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true, + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 32 + ] + }, + { + "Position": { + "X": 203.62158, + "Y": 1.7700036, + "Z": 711.6622 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo", + "Fly": true, + "SkipConditions": { + "StepIf": { + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + } + }, + { + "DataId": 1044820, + "Position": { + "X": 205.09644, + "Y": 1.7700036, + "Z": 710.84155 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "CompletionQuestVariablesFlags": [ + null, + null, + null, + null, + null, + 128 + ] + } + ] + }, + { + "Sequence": 3, + "Steps": [ + { + "DataId": 1044824, + "Position": { + "X": 212.4513, + "Y": 4.763736, + "Z": 653.65063 + }, + "TerritoryId": 957, + "InteractionType": "Interact", + "Fly": true + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1044830, + "Position": { + "X": 25.680908, + "Y": 1.5596709, + "Z": 634.5464 + }, + "StopDistance": 5, + "TerritoryId": 957, + "InteractionType": "CompleteQuest", + "NextQuestId": 4800 + } + ] + } + ] +} diff --git a/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4800_Gentlemen at Heart.json b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4800_Gentlemen at Heart.json new file mode 100644 index 00000000..1c46edd9 --- /dev/null +++ b/QuestPaths/6.x - Endwalker/Side Stories/Hildibrand/4800_Gentlemen at Heart.json @@ -0,0 +1,73 @@ +{ + "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", + "Author": "liza", + "QuestSequence": [ + { + "Sequence": 0, + "Steps": [ + { + "DataId": 1044835, + "Position": { + "X": 24.338135, + "Y": 1.6764785, + "Z": 631.1284 + }, + "StopDistance": 5, + "TerritoryId": 957, + "InteractionType": "AcceptQuest" + } + ] + }, + { + "Sequence": 1, + "Steps": [ + { + "Position": { + "X": -18.503275, + "Y": 56.94149, + "Z": 74.85906 + }, + "TerritoryId": 957, + "InteractionType": "WalkTo", + "Fly": true + }, + { + "DataId": 1044751, + "Position": { + "X": -16.617126, + "Y": 56.856533, + "Z": 74.052 + }, + "TerritoryId": 957, + "InteractionType": "Interact" + } + ] + }, + { + "Sequence": 2, + "Steps": [ + { + "TerritoryId": 1183, + "InteractionType": "Duty", + "ContentFinderConditionId": 944 + } + ] + }, + { + "Sequence": 255, + "Steps": [ + { + "DataId": 1044768, + "Position": { + "X": 11.154297, + "Y": -0.00010118321, + "Z": 14.816467 + }, + "StopDistance": 5, + "TerritoryId": 963, + "InteractionType": "CompleteQuest" + } + ] + } + ] +}