Add Respected Pelupelu quests

Add 'Sanuwa Samba' Vanu Vanu quest
Add 'When Hunting Goes Wrong' Vath quest
2024-11-20 18:39:30 +01:00 · 2024-11-20 16:29:57 +01:00 · 2024-11-20 03:28:35 +01:00 · 2024-11-20 03:28:13 +01:00 · 2024-11-19 19:01:53 +01:00 · 2024-11-19 17:15:11 +01:00
64 changed files with 1821 additions and 504 deletions
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,5 +1,5 @@
 <Project>
    <PropertyGroup>
-        <Version>4.0</Version>
+        <Version>4.3</Version>
    </PropertyGroup>
 </Project>
--- a/GatheringPathRenderer/EditorCommands.cs
+++ b/GatheringPathRenderer/EditorCommands.cs
@ -3,16 +3,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Numerics;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Game.Command;
 using Dalamud.Plugin.Services;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using Questionable.Model;
 using Questionable.Model.Gathering;
 using Questionable.Model.Questing;
@ -70,14 +66,14 @@ internal sealed class EditorCommands : IDisposable
        if (target == null || target.ObjectKind != ObjectKind.GatheringPoint)
            throw new Exception("No valid target");

-        var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>()!.GetRow(target.DataId);
+        var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>().GetRowOrDefault(target.DataId);
        if (gatheringPoint == null)
            throw new Exception("Invalid gathering point");

        FileInfo targetFile;
        GatheringRoot root;
        var locationsInTerritory = _plugin.GetLocationsInTerritory(_clientState.TerritoryType).ToList();
-        var location = locationsInTerritory.SingleOrDefault(x => x.Id == gatheringPoint.GatheringPointBase.Row);
+        var location = locationsInTerritory.SingleOrDefault(x => x.Id == gatheringPoint.Value.GatheringPointBase.RowId);
        if (location != null)
        {
            targetFile = location.File;
@ -96,7 +92,7 @@ internal sealed class EditorCommands : IDisposable
        }
        else
        {
-            (targetFile, root) = CreateNewFile(gatheringPoint, target);
+            (targetFile, root) = CreateNewFile(gatheringPoint.Value, target);
            _chatGui.Print($"Creating new file under {targetFile.FullName}", "qG");
        }

@ -174,16 +170,16 @@ internal sealed class EditorCommands : IDisposable
            ?.File.Directory;
        if (targetFolder == null)
        {
-            var territoryInfo = _dataManager.GetExcelSheet<TerritoryType>()!.GetRow(_clientState.TerritoryType)!;
+            var territoryInfo = _dataManager.GetExcelSheet<TerritoryType>().GetRow(_clientState.TerritoryType);
            targetFolder = _plugin.PathsDirectory
-                .CreateSubdirectory(ExpansionData.ExpansionFolders[(EExpansionVersion)territoryInfo.ExVersion.Row])
-                .CreateSubdirectory(territoryInfo.PlaceName.Value!.Name.ToString());
+                .CreateSubdirectory(ExpansionData.ExpansionFolders[(EExpansionVersion)territoryInfo.ExVersion.RowId])
+                .CreateSubdirectory(territoryInfo.PlaceName.Value.Name.ToString());
        }

        FileInfo targetFile =
            new FileInfo(
                Path.Combine(targetFolder.FullName,
-                    $"{gatheringPoint.GatheringPointBase.Row}_{gatheringPoint.PlaceName.Value!.Name}_{(_clientState.LocalPlayer!.ClassJob.Id == 16 ? "MIN" : "BTN")}.json"));
+                    $"{gatheringPoint.GatheringPointBase.RowId}_{gatheringPoint.PlaceName.Value.Name}_{(_clientState.LocalPlayer!.ClassJob.RowId == 16 ? "MIN" : "BTN")}.json"));
        var root = new GatheringRoot
        {
            Author = [_configuration.AuthorName],
--- a/GatheringPathRenderer/RendererPlugin.cs
+++ b/GatheringPathRenderer/RendererPlugin.cs
@ -59,7 +59,7 @@ public sealed class RendererPlugin : IDalamudPlugin
        _editorWindow = new EditorWindow(this, _editorCommands, dataManager, targetManager, clientState, objectTable)
            { IsOpen = true };
        _windowSystem.AddWindow(_editorWindow);
-        _currentClassJob = (EClassJob?)_clientState.LocalPlayer?.ClassJob.Id ?? EClassJob.Adventurer;
+        _currentClassJob = (EClassJob?)_clientState.LocalPlayer?.ClassJob.RowId ?? EClassJob.Adventurer;

        _pluginInterface.GetIpcSubscriber<object>("Questionable.ReloadData")
            .Subscribe(Reload);
--- a/GatheringPathRenderer/Windows/EditorWindow.cs
+++ b/GatheringPathRenderer/Windows/EditorWindow.cs
@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Numerics;
 using Dalamud.Game.ClientState.Objects;
@ -11,7 +10,7 @@ using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin.Services;
 using ImGuiNET;
-using Lumina.Excel.GeneratedSheets;
+using Lumina.Excel.Sheets;
 using Questionable.Model.Gathering;

 namespace GatheringPathRenderer.Windows;
@ -205,12 +204,12 @@ internal sealed class EditorWindow : Window
        }
        else if (_target != null)
        {
-            var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>()!.GetRow(_target.DataId);
+            var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>().GetRowOrDefault(_target.DataId);
            if (gatheringPoint == null)
                return;

            var locationsInTerritory = _plugin.GetLocationsInTerritory(_clientState.TerritoryType).ToList();
-            var location = locationsInTerritory.SingleOrDefault(x => x.Id == gatheringPoint.GatheringPointBase.Row);
+            var location = locationsInTerritory.SingleOrDefault(x => x.Id == gatheringPoint.Value.GatheringPointBase.RowId);
            if (location != null)
            {
                var targetFile = location.File;
@ -234,9 +233,9 @@ internal sealed class EditorWindow : Window
            }
            else
            {
-                if (ImGui.Button($"Create location ({gatheringPoint.GatheringPointBase.Row})"))
+                if (ImGui.Button($"Create location ({gatheringPoint.Value.GatheringPointBase.RowId})"))
                {
-                    var (targetFile, root) = _editorCommands.CreateNewFile(gatheringPoint, _target);
+                    var (targetFile, root) = _editorCommands.CreateNewFile(gatheringPoint.Value, _target);
                    _plugin.Save(targetFile, root);
                }
            }
--- a/GatheringPathRenderer/packages.lock.json
+++ b/GatheringPathRenderer/packages.lock.json
@ -4,9 +4,9 @@
    "net8.0-windows7.0": {
      "DalamudPackager": {
        "type": "Direct",
-        "requested": "[2.1.13, )",
-        "resolved": "2.1.13",
-        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
      },
      "DotNet.ReproducibleBuilds": {
        "type": "Direct",
@ -87,7 +87,7 @@
      "llib": {
        "type": "Project",
        "dependencies": {
-          "DalamudPackager": "[2.1.13, )"
+          "DalamudPackager": "[11.0.0, )"
        }
      },
      "questionable.model": {
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 70b0bef2459898a70f7b34b4d196bbaeb72397b1
+Subproject commit e4bbc05ede6f6f01e7028b24614ed8cb333e909c
--- a/Vanu/Dailies/2178_Sanuwa
+++ b/Vanu/Dailies/2178_Sanuwa
@ -0,0 +1,118 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1016089,
+          "Position": {
+            "X": -799.46594,
+            "Y": -133.2695,
+            "Z": -404.1352
+          },
+          "TerritoryId": 401,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1016093,
+          "Position": {
+            "X": -776.0281,
+            "Y": -133.35559,
+            "Z": -414.32825
+          },
+          "TerritoryId": 401,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1016219,
+          "Position": {
+            "X": 14.389221,
+            "Y": -111.05486,
+            "Z": 413.71777
+          },
+          "TerritoryId": 401,
+          "InteractionType": "Action",
+          "Action": "Buffet (Sanuwa)",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "DataId": 1016217,
+          "Position": {
+            "X": 97.48987,
+            "Y": -86.45681,
+            "Z": 466.57495
+          },
+          "TerritoryId": 401,
+          "InteractionType": "Action",
+          "Action": "Buffet (Sanuwa)",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 1016218,
+          "Position": {
+            "X": 137.95679,
+            "Y": -87.380325,
+            "Z": 434.62268
+          },
+          "TerritoryId": 401,
+          "InteractionType": "Action",
+          "Action": "Buffet (Sanuwa)",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1016089,
+          "Position": {
+            "X": -799.46594,
+            "Y": -133.2695,
+            "Z": -404.1352
+          },
+          "TerritoryId": 401,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu"
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Vath/Dailies/2261_Getting
+++ b/Societies/Vath/Dailies/2261_Getting
@ -62,6 +62,16 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -70,8 +80,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2262_Breath
+++ b/Societies/Vath/Dailies/2262_Breath
@ -58,6 +58,16 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -66,8 +76,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "Interact",
-          "Fly": true
+          "InteractionType": "Interact"
        }
      ]
    },
@ -102,6 +111,16 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -110,8 +129,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2263_Bugging
+++ b/Societies/Vath/Dailies/2263_Bugging
@ -98,6 +98,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -106,9 +117,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2264_Too
+++ b/Societies/Vath/Dailies/2264_Too
@ -62,6 +62,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -70,9 +81,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2265_The
+++ b/Societies/Vath/Dailies/2265_The
@ -91,6 +91,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -99,9 +110,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2266_A
+++ b/Societies/Vath/Dailies/2266_A
@ -91,6 +91,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -99,9 +110,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2267_Where
+++ b/Societies/Vath/Dailies/2267_Where
@ -73,6 +73,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -81,9 +92,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2268_The
+++ b/Societies/Vath/Dailies/2268_The
@ -58,6 +58,17 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -66,9 +77,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "Interact",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "Interact"
        }
      ]
    },
--- a/Societies/Vath/Dailies/2269_Ploughing
+++ b/Societies/Vath/Dailies/2269_Ploughing
@ -88,14 +88,13 @@
      "Steps": [
        {
          "Position": {
-                        "X": 59.511234,
-                        "Y": -48,
-                        "Z": -171.35385
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
          },
          "TerritoryId": 398,
          "InteractionType": "WalkTo",
          "Fly": true,
-                    "Land": true,
          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
        },
        {
--- a/Societies/Vath/Dailies/2270_At
+++ b/Societies/Vath/Dailies/2270_At
@ -148,14 +148,14 @@
      "Steps": [
        {
          "Position": {
-                        "X": 59.511234,
-                        "Y": -48,
-                        "Z": -171.35385
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
          },
          "TerritoryId": 398,
          "InteractionType": "WalkTo",
          "Fly": true,
-                    "Land": true
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
        },
        {
          "DataId": 1016803,
--- a/Societies/Vath/Dailies/2272_Shoo
+++ b/Societies/Vath/Dailies/2272_Shoo
@ -78,6 +78,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -86,9 +97,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2273_All
+++ b/Societies/Vath/Dailies/2273_All
@ -55,6 +55,16 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -63,8 +73,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2274_Smells
+++ b/Societies/Vath/Dailies/2274_Smells
@ -91,6 +91,17 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -99,9 +110,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "Interact",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "Interact"
        }
      ]
    },
--- a/Societies/Vath/Dailies/2275_When
+++ b/Societies/Vath/Dailies/2275_When
@ -0,0 +1,125 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1016803,
+          "Position": {
+            "X": 57.297607,
+            "Y": -47.842846,
+            "Z": -174.63953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1016865,
+          "Position": {
+            "X": -272.23627,
+            "Y": -35.408485,
+            "Z": 219.07373
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "DataId": 1016864,
+          "Position": {
+            "X": -452.32324,
+            "Y": -35.352047,
+            "Z": 174.30371
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1016866,
+          "Position": {
+            "X": -397.05505,
+            "Y": -34.192406,
+            "Z": 243.12195
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            5551
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1016866,
+          "Position": {
+            "X": -397.05505,
+            "Y": -34.192406,
+            "Z": 243.12195
+          },
+          "TerritoryId": 398,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 1016803,
+          "Position": {
+            "X": 57.297607,
+            "Y": -47.842846,
+            "Z": -174.63953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Vath/Dailies/2277_Fifty
+++ b/Societies/Vath/Dailies/2277_Fifty
@ -101,6 +101,16 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -109,8 +119,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2278_A
+++ b/Societies/Vath/Dailies/2278_A
@ -100,6 +100,16 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -108,8 +118,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2279_Neighborhood
+++ b/Societies/Vath/Dailies/2279_Neighborhood
@ -73,6 +73,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -81,9 +92,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Societies/Vath/Dailies/2280_Not
+++ b/Societies/Vath/Dailies/2280_Not
@ -101,6 +101,16 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 58.39701,
+            "Y": -48.000008,
+            "Z": -172.36507
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "DataId": 1016803,
          "Position": {
@ -109,8 +119,7 @@
            "Z": -174.63953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest",
-          "Fly": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Endwalker/Alliance
+++ b/Endwalker/Alliance
@ -0,0 +1,70 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1036044,
+          "Position": {
+            "X": 652.7046,
+            "Y": 297.47797,
+            "Z": -171.03839
+          },
+          "TerritoryId": 814,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Kholusia - Tomra",
+          "Fly": true,
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_LUCKTA523_04052_Q1_000_000",
+              "Answer": "TEXT_LUCKTA523_04052_A1_000_001"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 552.4747,
+            "Y": 294.7846,
+            "Z": -137.54712
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [
+            10391
+          ],
+          "CombatItemUse": {
+            "ItemId": 2003071,
+            "Condition": "Health%",
+            "Value": 30
+          },
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1036044,
+          "Position": {
+            "X": 652.7046,
+            "Y": 297.47797,
+            "Z": -171.03839
+          },
+          "TerritoryId": 814,
+          "InteractionType": "CompleteQuest",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
--- a/Deliveries/Anden/4716_Every
+++ b/Deliveries/Anden/4716_Every
@ -0,0 +1,84 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1044547,
+          "Position": {
+            "X": -241.68768,
+            "Y": 51.058994,
+            "Z": 620.8744
+          },
+          "TerritoryId": 816,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Il Mheg - Lydha Lran",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          },
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_SUBCTS681_04716_Q1_000_003",
+              "Answer": "TEXT_SUBCTS681_04716_A1_000_001"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1044560,
+          "Position": {
+            "X": -241.68768,
+            "Y": 51.058994,
+            "Z": 620.8744
+          },
+          "TerritoryId": 816,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2013247,
+          "Position": {
+            "X": 428.15283,
+            "Y": 3.2196045,
+            "Z": 23.483582
+          },
+          "TerritoryId": 817,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Rak'tika - Fanow",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1044560,
+          "Position": {
+            "X": -241.68768,
+            "Y": 51.058994,
+            "Z": 620.8744
+          },
+          "TerritoryId": 816,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Il Mheg - Lydha Lran",
+          "Fly": true,
+          "NextQuestId": 4717
+        }
+      ]
+    }
+  ]
+}
--- a/Deliveries/Anden/4717_A
+++ b/Deliveries/Anden/4717_A
@ -0,0 +1,44 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1044550,
+          "Position": {
+            "X": -239.70398,
+            "Y": 51.05899,
+            "Z": 622.2477
+          },
+          "StopDistance": 5,
+          "TerritoryId": 816,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Il Mheg - Lydha Lran",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1044562,
+          "Position": {
+            "X": -294.97223,
+            "Y": 67.46317,
+            "Z": 603.6621
+          },
+          "TerritoryId": 816,
+          "InteractionType": "CompleteQuest",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/4760_Guided
+++ b/Quests/4760_Guided
@ -21,6 +21,17 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": 807.9048,
+            "Y": 152.2857,
+            "Z": -243.60707
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Elpis - Anagnorisis",
+          "Fly": true
+        },
        {
          "DataId": 2012293,
          "Position": {
@ -30,8 +41,6 @@
          },
          "TerritoryId": 961,
          "InteractionType": "Interact",
-          "AetheryteShortcut": "Elpis - Anagnorisis",
-          "Fly": true,
          "TargetTerritoryId": 1025
        },
        {
@ -120,7 +129,8 @@
            "Z": 301.9912
          },
          "TerritoryId": 956,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 5252
        }
      ]
    }
--- a/Endwalker/Raid
+++ b/Endwalker/Raid
@ -0,0 +1,126 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1048609,
+          "Position": {
+            "X": -10.696594,
+            "Y": 2.4000525,
+            "Z": -31.174255
+          },
+          "TerritoryId": 962,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Old Sharlayan",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1045332,
+          "Position": {
+            "X": -639.704,
+            "Y": -27.177149,
+            "Z": 301.9912
+          },
+          "TerritoryId": 956,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Labyrinthos - Aporia"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 807.9048,
+            "Y": 152.2857,
+            "Z": -243.60707
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Elpis - Anagnorisis",
+          "Fly": true
+        },
+        {
+          "DataId": 2012293,
+          "Position": {
+            "X": 809.9336,
+            "Y": 151.81189,
+            "Z": -243.42719
+          },
+          "TerritoryId": 961,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 1025
+        },
+        {
+          "DataId": 1048610,
+          "Position": {
+            "X": 93.94971,
+            "Y": -1E-11,
+            "Z": 61.020752
+          },
+          "TerritoryId": 1025,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2014542,
+          "Position": {
+            "X": 104.57007,
+            "Y": -0.015319824,
+            "Z": 46.25
+          },
+          "TerritoryId": 1025,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1048610,
+          "Position": {
+            "X": 93.94971,
+            "Y": -1E-11,
+            "Z": 61.020752
+          },
+          "TerritoryId": 1025,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1045332,
+          "Position": {
+            "X": -639.704,
+            "Y": -27.177149,
+            "Z": 301.9912
+          },
+          "TerritoryId": 956,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Labyrinthos - Aporia"
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/Labyrinthos/4326_Seeing
+++ b/Quests/Labyrinthos/4326_Seeing
@ -0,0 +1,62 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1037575,
+          "Position": {
+            "X": 6.454529,
+            "Y": -31.530432,
+            "Z": -78.14148
+          },
+          "TerritoryId": 956,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 379.89767,
+            "Y": 68.15723,
+            "Z": -169.26231
+          },
+          "TerritoryId": 956,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [
+            13415
+          ],
+          "CombatItemUse": {
+            "ItemId": 2003316,
+            "Condition": "Health%",
+            "Value": 50
+          },
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1037575,
+          "Position": {
+            "X": 6.454529,
+            "Y": -31.530432,
+            "Z": -78.14148
+          },
+          "TerritoryId": 956,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Labyrinthos - Sharlayan Hamlet",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
--- a/Societies/Pelupelu/Dailies/5201_Ferocious
+++ b/Societies/Pelupelu/Dailies/5201_Ferocious
@ -53,7 +53,21 @@
            null,
            null,
            null
-          ]
+          ],
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        },
        {
          "DataId": 2014481,
--- a/Societies/Pelupelu/Dailies/5202_Community
+++ b/Societies/Pelupelu/Dailies/5202_Community
@ -39,7 +39,21 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        }
      ]
    },
--- a/Societies/Pelupelu/Dailies/5203_Preventative
+++ b/Societies/Pelupelu/Dailies/5203_Preventative
@ -48,7 +48,21 @@
            null,
            null,
            64
-          ]
+          ],
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        },
        {
          "DataId": 2014485,
@ -101,7 +115,21 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        },
        {
          "DataId": 1051711,
--- a/Societies/Pelupelu/Dailies/5204_Burden
+++ b/Societies/Pelupelu/Dailies/5204_Burden
@ -39,7 +39,21 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        }
      ]
    },
@ -85,7 +99,21 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        },
        {
          "DataId": 1051711,
--- a/Societies/Pelupelu/Dailies/5205_Growing
+++ b/Societies/Pelupelu/Dailies/5205_Growing
@ -31,9 +31,20 @@
      "Sequence": 1,
      "Steps": [
        {
+          "Position": {
+            "X": -165.49648,
+            "Y": 8.736965,
+            "Z": -401.72836
+          },
          "TerritoryId": 1188,
-          "InteractionType": "None",
-          "AetheryteShortcut": "Kozama'uka - Ok'hanu"
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Kozama'uka - Ok'hanu",
+          "Fly": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Locked"
+            }
+          }
        },
        {
          "DataId": 1052307,
--- a/Societies/Pelupelu/Dailies/5210_The
+++ b/Societies/Pelupelu/Dailies/5210_The
@ -1,7 +1,6 @@
 {
  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
  "Author": "liza",
-  "Comment": "TODO untested how many RNG states this has",
  "QuestSequence": [
    {
      "Sequence": 0,
@ -40,7 +39,21 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        }
      ]
    },
@ -98,6 +111,32 @@
            null,
            null
          ]
+        },
+        {
+          "DataId": 2014490,
+          "Position": {
+            "X": 485.6183,
+            "Y": 10.8185425,
+            "Z": -281.7884
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            18173
+          ],
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [
+              {
+                "High": 3
+              }
+            ],
+            null,
+            null,
+            null
+          ]
        }
      ]
    },
--- a/Societies/Pelupelu/Dailies/5212_Starting
+++ b/Societies/Pelupelu/Dailies/5212_Starting
@ -47,7 +47,21 @@
            null,
            null,
            128
-          ]
+          ],
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        },
        {
          "DataId": 2014495,
--- a/Societies/Pelupelu/Dailies/5213_Advisor
+++ b/Societies/Pelupelu/Dailies/5213_Advisor
@ -1,7 +1,6 @@
 {
  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
  "Author": "liza",
-  "Disabled": true,
  "QuestSequence": [
    {
      "Sequence": 0,
@ -28,6 +27,93 @@
        }
      ]
    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2014497,
+          "Position": {
+            "X": -130.7851,
+            "Y": 114.39685,
+            "Z": 240.31421
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            18174
+          ],
+          "AetheryteShortcut": "Kozama'uka - Earthenshire",
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [
+              {
+                "High": 1
+              }
+            ],
+            null,
+            null,
+            null
+          ]
+        },
+        {
+          "DataId": 2014498,
+          "Position": {
+            "X": -56.565247,
+            "Y": 111.77234,
+            "Z": 172.62524
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            18174
+          ],
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [
+              {
+                "High": 2
+              }
+            ],
+            null,
+            null,
+            null
+          ]
+        },
+        {
+          "DataId": 2014499,
+          "Position": {
+            "X": -84.18408,
+            "Y": 111.436646,
+            "Z": 268.05518
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            18174
+          ],
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [
+              {
+                "High": 3
+              }
+            ],
+            null,
+            null,
+            null
+          ]
+        }
+      ]
+    },
    {
      "Sequence": 255,
      "Steps": [
--- a/Societies/Pelupelu/Dailies/5214_Let
+++ b/Societies/Pelupelu/Dailies/5214_Let
@ -1,7 +1,6 @@
 {
  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
  "Author": "liza",
-  "Disabled": true,
  "QuestSequence": [
    {
      "Sequence": 0,
@ -28,6 +27,74 @@
        }
      ]
    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1052324,
+          "Position": {
+            "X": -248.18805,
+            "Y": 110.17465,
+            "Z": 189.01343
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Kozama'uka - Earthenshire",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1052326,
+          "Position": {
+            "X": -304.61584,
+            "Y": 110.20639,
+            "Z": 725.39856
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            [
+              {
+                "High": 2
+              }
+            ],
+            null,
+            null,
+            null,
+            null
+          ]
+        },
+        {
+          "DataId": 1052435,
+          "Position": {
+            "X": 505.76025,
+            "Y": 115.10293,
+            "Z": 205.7373
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Kozama'uka - Many Fires",
+          "RequiredQuestVariables": [
+            null,
+            [
+              {
+                "High": 1
+              }
+            ],
+            null,
+            null,
+            null,
+            null
+          ]
+        }
+      ]
+    },
    {
      "Sequence": 255,
      "Steps": [
--- a/Societies/Pelupelu/Dailies/5215_The
+++ b/Societies/Pelupelu/Dailies/5215_The
@ -1,7 +1,6 @@
 {
  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
  "Author": "liza",
-  "Disabled": true,
  "QuestSequence": [
    {
      "Sequence": 0,
@ -28,6 +27,99 @@
        }
      ]
    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1051798,
+          "Position": {
+            "X": 897.734,
+            "Y": 6.8223433,
+            "Z": -285.1759
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1052328,
+          "Position": {
+            "X": 171.6792,
+            "Y": 16.762953,
+            "Z": -112.44379
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Action",
+          "Action": "Bosom Brook",
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [
+              {
+                "High": 1
+              }
+            ],
+            null,
+            null,
+            null
+          ]
+        },
+        {
+          "DataId": 1052329,
+          "Position": {
+            "X": 216.7544,
+            "Y": 16.31888,
+            "Z": -99.687195
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Action",
+          "Action": "Bosom Brook",
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [
+              {
+                "High": 2
+              }
+            ],
+            null,
+            null,
+            null
+          ]
+        },
+        {
+          "DataId": 1052327,
+          "Position": {
+            "X": 186.38892,
+            "Y": 21.742897,
+            "Z": -74.47931
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Action",
+          "Action": "Bosom Brook",
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [
+              {
+                "High": 3
+              }
+            ],
+            null,
+            null,
+            null
+          ]
+        }
+      ]
+    },
    {
      "Sequence": 255,
      "Steps": [
--- a/Societies/Pelupelu/Dailies/5218_The
+++ b/Societies/Pelupelu/Dailies/5218_The
@ -38,7 +38,21 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "WalkTo",
-          "Fly": true
+          "Fly": true,
+          "AetheryteShortcut": "Kozama'uka - Dock Poga",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 770.7179,
+                  "Y": 12.84657,
+                  "Z": -263.99634
+                },
+                "TerritoryId": 1188,
+                "MaximumDistance": 300
+              }
+            }
+          }
        },
        {
          "DataId": 1052331,
--- a/Societies/Pelupelu/Dailies/5219_Born
+++ b/Societies/Pelupelu/Dailies/5219_Born
@ -1,7 +1,6 @@
 {
  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
  "Author": "liza",
-  "Disabled": true,
  "QuestSequence": [
    {
      "Sequence": 0,
@ -28,6 +27,84 @@
        }
      ]
    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1052333,
+          "Position": {
+            "X": 775.1736,
+            "Y": 12.871736,
+            "Z": -196.0022
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 1052335,
+          "Position": {
+            "X": 867.76526,
+            "Y": 14.402381,
+            "Z": -171.31305
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "DataId": 1052334,
+          "Position": {
+            "X": 864.5609,
+            "Y": 15.056413,
+            "Z": -256.27533
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1052336,
+          "Position": {
+            "X": 838.4375,
+            "Y": 14.301746,
+            "Z": -222.06458
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
    {
      "Sequence": 255,
      "Steps": [
@ -39,7 +116,7 @@
          },
          "TerritoryId": 1188,
          "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Kozama'uka - Dock Poga"
+          "Fly": true
        },
        {
          "DataId": 1051711,
--- a/Societies/Pelupelu/Story/5193_An
+++ b/Societies/Pelupelu/Story/5193_An
@ -163,6 +163,21 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": 780.3438,
+            "Y": 13.823656,
+            "Z": -238.32625
+          },
+          "TerritoryId": 1188,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "SkipConditions": {
+            "StepIf": {
+              "AetheryteUnlocked": "Kozama'uka - Dock Poga"
+            }
+          }
+        },
        {
          "TerritoryId": 1188,
          "InteractionType": "AttuneAetheryte",
--- a/QuestPaths/quest-v1.json
+++ b/QuestPaths/quest-v1.json
@ -965,7 +965,8 @@
                  "Katon",
                  "Raiton",
                  "Hide",
-                  "Slug Shot"
+                  "Slug Shot",
+                  "Bosom Brook"
                ]
              }
            },
--- a/Questionable.Model/Questing/Converter/ActionConverter.cs
+++ b/Questionable.Model/Questing/Converter/ActionConverter.cs
@ -41,5 +41,6 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
        { EAction.Katon, "Katon" },
        { EAction.Raiton, "Raiton" },
        { EAction.SlugShot, "Slug Shot" },
+        { EAction.BosomBrook, "Bosom Brook" },
    };
 }
--- a/Questionable.Model/Questing/EAction.cs
+++ b/Questionable.Model/Questing/EAction.cs
@ -47,6 +47,7 @@ public enum EAction
    Raiton = 2267,
    RabbitMedium = 2272,
    SlugShot = 7412,
+    BosomBrook = 37173,

    CollectMiner = 240,
    ScourMiner = 22182,
@ -84,6 +85,7 @@ public static class EActionExtensions
            or EAction.YellowGulal
            or EAction.BlueGulal
            or EAction.ElectrixFlux
-            or EAction.HopStep;
+            or EAction.HopStep
+            or EAction.BosomBrook;
    }
 }
--- a/Questionable/Controller/CombatModules/ItemUseModule.cs
+++ b/Questionable/Controller/CombatModules/ItemUseModule.cs
@ -142,8 +142,7 @@ internal sealed class ItemUseModule : ICombatModule
        {
            BattleChara* battleChara = (BattleChara*)gameObject.Address;
            if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.Incapacitated)
-                //return (byte)(((nint)battleChara + 0x1C68) & 0x40) != 0; // FIXME 7.1
-                return false;
+                return (*(byte*)((nint)battleChara + 0x1C68) & 0x40) != 0;

            if (_combatData.CombatItemUse.Condition == ECombatItemUseCondition.HealthPercent)
                return (100f * battleChara->Health / battleChara->MaxHealth) < _combatData.CombatItemUse.Value;
--- a/Questionable/Controller/GameUi/InteractionUiController.cs
+++ b/Questionable/Controller/GameUi/InteractionUiController.cs
@ -98,7 +98,6 @@ internal sealed class InteractionUiController : IDisposable
        _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "SelectYesno", SelectYesnoPostSetup);
        _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "PointMenu", PointMenuPostSetup);
        _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "HousingSelectBlock", HousingSelectBlockPostSetup);
-        _addonLifecycle.RegisterListener(AddonEvent.PostSetup, "TelepotTown", TeleportTownPostSetup);

        unsafe
        {
@ -756,12 +755,12 @@ internal sealed class InteractionUiController : IDisposable
    private bool TryFindWarp(ushort targetTerritoryId, string actualPrompt, [NotNullWhen(true)] out uint? warpId,
        [NotNullWhen(true)] out string? warpText)
    {
-        var warps = _dataManager.GetExcelSheet<Warp>()!
+        var warps = _dataManager.GetExcelSheet<Warp>()
            .Where(x => x.RowId > 0 && x.TerritoryType.RowId == targetTerritoryId);
        foreach (var entry in warps)
        {
-            string? excelName = entry.Name.ToString();
-            string? excelQuestion = entry.Question.ToString();
+            string excelName = entry.Name.ToString();
+            string excelQuestion = entry.Question.ToString();

            if (!string.IsNullOrEmpty(excelQuestion) && GameFunctions.GameStringEquals(excelQuestion, actualPrompt))
            {
@ -848,46 +847,6 @@ internal sealed class InteractionUiController : IDisposable
        addon->FireCallbackInt(0);
    }

-    private void TeleportTownPostSetup(AddonEvent type, AddonArgs args)
-    {
-        if (ShouldHandleUiInteractions &&
-            _questController.HasCurrentTaskMatching(out AethernetShortcut.Task? aethernetShortcut) &&
-            aethernetShortcut.From.IsFirmamentAetheryte())
-        {
-            // this might be better via atkvalues; but this works for now
-            uint toIndex = aethernetShortcut.To switch
-            {
-                EAetheryteLocation.FirmamentMendicantsCourt => 0,
-                EAetheryteLocation.FirmamentMattock => 1,
-                EAetheryteLocation.FirmamentNewNest => 2,
-                EAetheryteLocation.FirmanentSaintRoellesDais => 3,
-                EAetheryteLocation.FirmamentFeatherfall => 4,
-                EAetheryteLocation.FirmamentHoarfrostHall => 5,
-                EAetheryteLocation.FirmamentWesternRisensongQuarter => 6,
-                EAetheryteLocation.FIrmamentEasternRisensongQuarter => 7,
-                _ => uint.MaxValue,
-            };
-
-            if (toIndex == uint.MaxValue)
-                return;
-
-            _logger.LogInformation("Teleporting to {ToName} with menu index {ToIndex}", aethernetShortcut.From,
-                toIndex);
-            unsafe
-            {
-                var teleportToDestination = stackalloc AtkValue[]
-                {
-                    new() { Type = ValueType.Int, Int = 11 },
-                    new() { Type = ValueType.UInt, UInt = toIndex }
-                };
-
-                var addon = (AtkUnitBase*)args.Addon;
-                addon->FireCallback(2, teleportToDestination);
-                addon->FireCallback(2, teleportToDestination, true);
-            }
-        }
-    }
-
    private StringOrRegex? ResolveReference(Quest? quest, string? excelSheet, ExcelRef? excelRef, bool isRegExp)
    {
        if (excelRef == null)
@ -905,7 +864,6 @@ internal sealed class InteractionUiController : IDisposable

    public void Dispose()
    {
-        _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "TelepotTown", TeleportTownPostSetup);
        _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "HousingSelectBlock", HousingSelectBlockPostSetup);
        _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "PointMenu", PointMenuPostSetup);
        _addonLifecycle.UnregisterListener(AddonEvent.PostSetup, "SelectYesno", SelectYesnoPostSetup);
--- a/Questionable/Controller/MiniTaskController.cs
+++ b/Questionable/Controller/MiniTaskController.cs
@ -120,11 +120,15 @@ internal abstract class MiniTaskController<T>
                return;

            case ETaskResult.TaskComplete:
+            case ETaskResult.CreateNewTasks:
                _logger.LogInformation("{Task} → {Result}, remaining tasks: {RemainingTaskCount}",
                    _taskQueue.CurrentTaskExecutor.CurrentTask, result, _taskQueue.RemainingTasks.Count());

                OnTaskComplete(_taskQueue.CurrentTaskExecutor.CurrentTask);

+                if (result == ETaskResult.CreateNewTasks && _taskQueue.CurrentTaskExecutor is IExtraTaskCreator extraTaskCreator)
+                    _taskQueue.EnqueueAll(extraTaskCreator.CreateExtraTasks());
+
                _taskQueue.CurrentTaskExecutor = null;

                // handled in next update
--- a/Questionable/Controller/Steps/ETaskResult.cs
+++ b/Questionable/Controller/Steps/ETaskResult.cs
@ -11,6 +11,11 @@ internal enum ETaskResult
    /// </summary>
    SkipRemainingTasksForStep,

+    /// <summary>
+    /// Assumes the task executor implements <see cref="IExtraTaskCreator"/>.
+    /// </summary>
+    CreateNewTasks,
+
    NextStep,
    End,
 }
--- a/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
+++ b/Questionable/Controller/Steps/Shared/AethernetShortcut.cs
@ -204,19 +204,11 @@ internal static class AethernetShortcut
        }

        private void DoTeleport()
-        {
-            if (Task.From.IsFirmamentAetheryte())
-            {
-                logger.LogInformation("Using manual teleport interaction");
-                _teleported = gameFunctions.InteractWith((uint)Task.From, ObjectKind.EventObj);
-            }
-            else
        {
            logger.LogInformation("Using lifestream to teleport to {Destination}", Task.To);
            lifestreamIpc.Teleport(Task.To);
            _teleported = true;
        }
-        }

        public override ETaskResult Update()
        {
--- a/Questionable/Controller/Steps/Shared/Gather.cs
+++ b/Questionable/Controller/Steps/Shared/Gather.cs
@ -4,7 +4,6 @@ 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;
 using LLib.GameData;
 using Microsoft.Extensions.DependencyInjection;
@ -19,14 +18,7 @@ namespace Questionable.Controller.Steps.Shared;

 internal static class Gather
 {
-    internal sealed class Factory(
-        IServiceProvider serviceProvider,
-        MovementController movementController,
-        GatheringPointRegistry gatheringPointRegistry,
-        IClientState clientState,
-        GatheringData gatheringData,
-        TerritoryData territoryData,
-        ILogger<Factory> logger) : ITaskFactory
+    internal sealed class Factory : ITaskFactory
    {
        public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
        {
@ -34,17 +26,42 @@ internal static class Gather
                yield break;

            foreach (var itemToGather in step.ItemsToGather)
+            {
+                yield return new DelayedGatheringTask(itemToGather, quest);
+            }
+        }
+    }
+
+    internal sealed record DelayedGatheringTask(GatheredItem GatheredItem, Quest Quest) : ITask
+    {
+        public override string ToString() => $"Gathering(pending for {GatheredItem.ItemId})";
+    }
+
+    internal sealed class DelayedGatheringExecutor(
+        MovementController movementController,
+        GatheringData gatheringData,
+        GatheringPointRegistry gatheringPointRegistry,
+        TerritoryData territoryData,
+        IClientState clientState,
+        IServiceProvider serviceProvider,
+        ILogger<DelayedGatheringExecutor> logger) : TaskExecutor<DelayedGatheringTask>, IExtraTaskCreator
+    {
+        protected override bool Start() => true;
+
+        public override ETaskResult Update() => ETaskResult.CreateNewTasks;
+
+        public IEnumerable<ITask> CreateExtraTasks()
        {
            EClassJob currentClassJob = (EClassJob)clientState.LocalPlayer!.ClassJob.RowId;
-                if (!gatheringData.TryGetGatheringPointId(itemToGather.ItemId, currentClassJob,
+            if (!gatheringData.TryGetGatheringPointId(Task.GatheredItem.ItemId, currentClassJob,
                    out GatheringPointId? gatheringPointId))
-                    throw new TaskException($"No gathering point found for item {itemToGather.ItemId}");
+                throw new TaskException($"No gathering point found for item {Task.GatheredItem.ItemId}");

            if (!gatheringPointRegistry.TryGetGatheringPoint(gatheringPointId, out GatheringRoot? gatheringRoot))
                throw new TaskException($"No path found for gathering point {gatheringPointId}");

-                if (HasRequiredItems(itemToGather))
-                    continue;
+            if (HasRequiredItems(Task.GatheredItem))
+                yield break;

            using (var _ = logger.BeginScope("Gathering(inner)"))
            {
@ -56,7 +73,7 @@ internal static class Gather
                foreach (var gatheringStep in gatheringSequence.Steps)
                {
                    foreach (var task in serviceProvider.GetRequiredService<TaskCreator>()
-                                     .CreateTasks(quest, gatheringSequence, gatheringStep))
+                                 .CreateTasks(Task.Quest, gatheringSequence, gatheringStep))
                        if (task is WaitAtEnd.NextStep)
                            yield return new SkipMarker();
                        else
@ -71,10 +88,9 @@ internal static class Gather
            yield return new WaitCondition.Task(() => movementController.IsNavmeshReady,
                "Wait(navmesh ready)");

-                yield return new GatheringTask(gatheringPointId, itemToGather);
+            yield return new GatheringTask(gatheringPointId, Task.GatheredItem);
            yield return new WaitAtEnd.WaitDelay();
        }
-        }

        private unsafe bool HasRequiredItems(GatheredItem itemToGather)
        {
--- a/Questionable/Controller/Steps/TaskExecutor.cs
+++ b/Questionable/Controller/Steps/TaskExecutor.cs
@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using Questionable.Model;

 namespace Questionable.Controller.Steps;

@ -16,6 +18,11 @@ internal interface ITaskExecutor
    ETaskResult Update();
 }

+internal interface IExtraTaskCreator : ITaskExecutor
+{
+    IEnumerable<ITask> CreateExtraTasks();
+}
+
 internal abstract class TaskExecutor<T> : ITaskExecutor
    where T : class, ITask
 {
--- a/Questionable/Controller/Steps/TaskQueue.cs
+++ b/Questionable/Controller/Steps/TaskQueue.cs
@ -18,6 +18,11 @@ internal sealed class TaskQueue
        _tasks.Add(task);
    }

+    public void EnqueueAll(IEnumerable<ITask> tasks)
+    {
+        _tasks.InsertRange(0, tasks);
+    }
+
    public bool TryDequeue([NotNullWhen(true)] out ITask? task)
    {
        task = _tasks.FirstOrDefault();
--- a/Questionable/Data/AetherCurrentData.cs
+++ b/Questionable/Data/AetherCurrentData.cs
@ -11,7 +11,7 @@ internal sealed class AetherCurrentData

    public AetherCurrentData(IDataManager dataManager)
    {
-        _overworldCurrents = dataManager.GetExcelSheet<AetherCurrentCompFlgSet>()!
+        _overworldCurrents = dataManager.GetExcelSheet<AetherCurrentCompFlgSet>()
            .Where(x => x.RowId > 0)
            .Where(x => x.Territory.IsValid)
            .ToImmutableDictionary(
--- a/Questionable/Data/QuestData.cs
+++ b/Questionable/Data/QuestData.cs
@ -40,7 +40,7 @@ internal sealed class QuestData
    public QuestData(IDataManager dataManager)
    {
        Dictionary<uint, uint> questChapters =
-            dataManager.GetExcelSheet<QuestChapter>()!
+            dataManager.GetExcelSheet<QuestChapter>()
                .Where(x => x.RowId > 0 && x.Quest.RowId > 0)
                .ToDictionary(x => x.Quest.RowId, x => x.Redo.RowId);

--- a/Questionable/External/LifestreamIpc.cs
+++ b/Questionable/External/LifestreamIpc.cs
@ -1,5 +1,9 @@
-using Dalamud.Plugin;
+using System.Collections.Generic;
+using Dalamud.Plugin;
 using Dalamud.Plugin.Ipc;
+using Dalamud.Plugin.Services;
+using Lumina.Excel.Sheets;
+using Microsoft.Extensions.Logging;
 using Questionable.Data;
 using Questionable.Model.Common;

@ -8,25 +12,40 @@ namespace Questionable.External;
 internal sealed class LifestreamIpc
 {
    private readonly AetheryteData _aetheryteData;
+    private readonly IDataManager _dataManager;
+    private readonly ILogger<LifestreamIpc> _logger;
    private readonly ICallGateSubscriber<string, bool> _aethernetTeleport;

-    public LifestreamIpc(IDalamudPluginInterface pluginInterface, AetheryteData aetheryteData)
+    public LifestreamIpc(IDalamudPluginInterface pluginInterface, AetheryteData aetheryteData, IDataManager dataManager, ILogger<LifestreamIpc> logger)
    {
        _aetheryteData = aetheryteData;
+        _dataManager = dataManager;
+        _logger = logger;
        _aethernetTeleport = pluginInterface.GetIpcSubscriber<string, bool>("Lifestream.AethernetTeleport");
    }

    public bool Teleport(EAetheryteLocation aetheryteLocation)
    {
-        if (aetheryteLocation == EAetheryteLocation.IshgardFirmament)
+        string? name = aetheryteLocation switch
        {
-            // TODO does this even work on non-EN clients?
-            return _aethernetTeleport.InvokeFunc("Firmament");
-        }
+            EAetheryteLocation.IshgardFirmament => "Firmament",
+            EAetheryteLocation.FirmamentMendicantsCourt => GetPlaceName(3436),
+            EAetheryteLocation.FirmamentMattock => GetPlaceName(3473),
+            EAetheryteLocation.FirmamentNewNest => GetPlaceName(3475),
+            EAetheryteLocation.FirmanentSaintRoellesDais => GetPlaceName(3474),
+            EAetheryteLocation.FirmamentFeatherfall => GetPlaceName(3525),
+            EAetheryteLocation.FirmamentHoarfrostHall => GetPlaceName(3528),
+            EAetheryteLocation.FirmamentWesternRisensongQuarter => GetPlaceName(3646),
+            EAetheryteLocation.FIrmamentEasternRisensongQuarter => GetPlaceName(3645),
+            _ => _aetheryteData.AethernetNames.GetValueOrDefault(aetheryteLocation),
+        };

-        if (!_aetheryteData.AethernetNames.TryGetValue(aetheryteLocation, out string? name))
+        if (name == null)
            return false;

+        _logger.LogInformation("Teleporting to '{Name}'", name);
        return _aethernetTeleport.InvokeFunc(name);
    }
+
+    private string GetPlaceName(uint rowId) => _dataManager.GetExcelSheet<PlaceName>().GetRow(rowId).Name.ToString();
 }
--- a/Questionable/Functions/ChatFunctions.cs
+++ b/Questionable/Functions/ChatFunctions.cs
@ -46,7 +46,7 @@ internal sealed unsafe class ChatFunctions
            .Where(x => x.TextCommand.IsValid)
            .Select(x => (x.RowId, Command: x.TextCommand.Value.Command.ToString()))
            .Where(x => !string.IsNullOrEmpty(x.Command) && x.Command.StartsWith('/'))
-            .ToDictionary(x => (EEmote)x.RowId, x => x.Command!)
+            .ToDictionary(x => (EEmote)x.RowId, x => x.Command)
            .AsReadOnly();
    }

--- a/Questionable/Functions/QuestFunctions.cs
+++ b/Questionable/Functions/QuestFunctions.cs
@ -122,29 +122,45 @@ internal sealed unsafe class QuestFunctions
            // do the MSQ; if a side quest is the first item do that side quest.
            //
            // If no quests are marked as 'priority', accepting a new quest adds it to the top of the list.
+            List<(ElementId Quest, byte Sequence)> trackedQuests = [];
            for (int i = questManager->TrackedQuests.Length - 1; i >= 0; --i)
            {
                ElementId currentQuest;
                var trackedQuest = questManager->TrackedQuests[i];
                switch (trackedQuest.QuestType)
                {
-                    default:
-                        continue;
-
                    case 1: // normal quest
                        currentQuest = new QuestId(questManager->NormalQuests[trackedQuest.Index].QuestId);
                        if (_questRegistry.IsKnownQuest(currentQuest))
-                            return (currentQuest, QuestManager.GetQuestSequence(currentQuest.Value));
-                        continue;
+                            trackedQuests.Add((currentQuest, QuestManager.GetQuestSequence(currentQuest.Value)));
+                        break;

                    case 2: // leve
                        currentQuest = new LeveId(questManager->LeveQuests[trackedQuest.Index].LeveId);
                        if (_questRegistry.IsKnownQuest(currentQuest))
-                            return (currentQuest, questManager->GetLeveQuestById(currentQuest.Value)->Sequence);
-                        continue;
+                            trackedQuests.Add((currentQuest, questManager->GetLeveQuestById(currentQuest.Value)->Sequence));
+                        break;
                }
            }

+            if (trackedQuests.Count > 0)
+            {
+                // if we have multiple quests to turn in for an allied society, try and complete all of them
+                var (firstTrackedQuest, firstTrackedSequence) = trackedQuests.First();
+                EAlliedSociety firstTrackedAlliedSociety = GetCommonAlliedSocietyTurnIn(firstTrackedQuest);
+                if (firstTrackedAlliedSociety != EAlliedSociety.None && firstTrackedSequence == 255)
+                {
+                    foreach (var (quest, sequence) in trackedQuests.Skip(1))
+                    {
+                        // only if the other quest isn't ready to be turned in
+                        if (GetCommonAlliedSocietyTurnIn(quest) == firstTrackedAlliedSociety && sequence != 255)
+                            return (quest, sequence);
+                    }
+                }
+
+                return (firstTrackedQuest, firstTrackedSequence);
+            }
+
            ElementId? priorityQuest = GetNextPriorityQuestThatCanBeAccepted();
            if (priorityQuest != null)
            {
@ -221,6 +237,21 @@ internal sealed unsafe class QuestFunctions
        return (currentQuest, QuestManager.GetQuestSequence(currentQuest.Value));
    }

+    private static EAlliedSociety GetCommonAlliedSocietyTurnIn(ElementId elementId)
+    {
+        if (elementId is QuestId questId)
+        {
+            return questId.Value switch
+            {
+                5215 => EAlliedSociety.None,
+                >= 5199 and <= 5226 => EAlliedSociety.Pelupelu,
+                _ => EAlliedSociety.None,
+            };
+        }
+
+        return EAlliedSociety.None;
+    }
+
    public QuestProgressInfo? GetQuestProgressInfo(ElementId elementId)
    {
        if (elementId is QuestId questId)
@ -596,7 +627,7 @@ internal sealed unsafe class QuestFunctions

    public bool IsClassJobUnlocked(EClassJob classJob)
    {
-        var classJobRow = _dataManager.GetExcelSheet<ClassJob>()!.GetRow((uint)classJob)!;
+        var classJobRow = _dataManager.GetExcelSheet<ClassJob>().GetRow((uint)classJob);
        var questId = (ushort)classJobRow.UnlockQuest.RowId;
        if (questId != 0)
            return IsQuestComplete(new QuestId(questId));
@ -607,7 +638,7 @@ internal sealed unsafe class QuestFunctions

    public bool IsJobUnlocked(EClassJob classJob)
    {
-        var classJobRow = _dataManager.GetExcelSheet<ClassJob>()!.GetRow((uint)classJob)!;
+        var classJobRow = _dataManager.GetExcelSheet<ClassJob>().GetRow((uint)classJob);
        return IsClassJobUnlocked((EClassJob)classJobRow.ClassJobParent.RowId);
    }

--- a/Questionable/Model/SatisfactionSupplyInfo.cs
+++ b/Questionable/Model/SatisfactionSupplyInfo.cs
@ -15,7 +15,7 @@ internal sealed class SatisfactionSupplyInfo : IQuestInfo
        IssuerDataId = npc.Npc.RowId;
        Level = npc.LevelUnlock;
        SortKey = QuestId.Value;
-        Expansion = (EExpansionVersion)npc.QuestRequired.Value!.Expansion.RowId;
+        Expansion = (EExpansionVersion)npc.QuestRequired.Value.Expansion.RowId;
        PreviousQuests = [new PreviousQuestInfo(new QuestId((ushort)(npc.QuestRequired.RowId & 0xFFFF)))];
    }

--- a/Questionable/QuestionablePlugin.cs
+++ b/Questionable/QuestionablePlugin.cs
@ -147,7 +147,6 @@ public sealed class QuestionablePlugin : IDalamudPlugin
            .AddTaskFactoryAndExecutor<StepDisabled.SkipRemainingTasks, StepDisabled.Factory,
                StepDisabled.SkipDisabledStepsExecutor>();
        serviceCollection.AddTaskFactory<EquipRecommended.BeforeDutyOrInstance>();
-        serviceCollection.AddTaskFactoryAndExecutor<Gather.GatheringTask, Gather.Factory, Gather.StartGathering>();
        serviceCollection.AddTaskExecutor<Gather.SkipMarker, Gather.DoSkip>();
        serviceCollection
            .AddTaskFactoryAndExecutor<AetheryteShortcut.Task, AetheryteShortcut.Factory,
@ -156,6 +155,8 @@ public sealed class QuestionablePlugin : IDalamudPlugin
            .AddTaskExecutor<AetheryteShortcut.MoveAwayFromAetheryte, AetheryteShortcut.MoveAwayFromAetheryteExecutor>();
        serviceCollection
            .AddTaskFactoryAndExecutor<SkipCondition.SkipTask, SkipCondition.Factory, SkipCondition.CheckSkip>();
+        serviceCollection.AddTaskFactoryAndExecutor<Gather.GatheringTask, Gather.Factory, Gather.StartGathering>();
+        serviceCollection.AddTaskExecutor<Gather.DelayedGatheringTask, Gather.DelayedGatheringExecutor>();
        serviceCollection
            .AddTaskFactoryAndExecutor<AethernetShortcut.Task, AethernetShortcut.Factory,
                AethernetShortcut.UseAethernetShortcut>();
--- a/Questionable/Windows/JournalComponents/GatheringJournalComponent.cs
+++ b/Questionable/Windows/JournalComponents/GatheringJournalComponent.cs
@ -108,9 +108,9 @@ internal sealed class GatheringJournalComponent
            .GroupBy(x => x.GatheringPointId)
            .ToDictionary(x => x.Key, x => x.First());

-        var itemSheet = dataManager.GetExcelSheet<Item>()!;
+        var itemSheet = dataManager.GetExcelSheet<Item>();

-        _gatheringItems = dataManager.GetExcelSheet<GatheringItem>()!
+        _gatheringItems = dataManager.GetExcelSheet<GatheringItem>()
            .Where(x => x.RowId != 0 && x.GatheringItemLevel.RowId != 0)
            .Select(x => new
            {
@ -120,7 +120,7 @@ internal sealed class GatheringJournalComponent
            .Where(x => !string.IsNullOrEmpty(x.Name))
            .ToDictionary(x => x.GatheringItemId, x => x.Name!);

-        _gatheringPointsByExpansion = dataManager.GetExcelSheet<GatheringPoint>()!
+        _gatheringPointsByExpansion = dataManager.GetExcelSheet<GatheringPoint>()
            .Where(x => x.GatheringPointBase.RowId != 0)
            .Where(x => x.GatheringPointBase.RowId is < 653 or > 680) // exclude ishgard restoration phase 1
            .DistinctBy(x => x.GatheringPointBase.RowId)
@ -128,7 +128,7 @@ internal sealed class GatheringJournalComponent
            {
                GatheringPointId = x.RowId,
                Point = new DefaultGatheringPoint(new GatheringPointId((ushort)x.GatheringPointBase.RowId),
-                    x.GatheringPointBase.Value!.GatheringType.RowId switch
+                    x.GatheringPointBase.Value.GatheringType.RowId switch
                    {
                        0 or 1 => EClassJob.Miner,
                        2 or 3 => EClassJob.Botanist,
@ -159,7 +159,7 @@ internal sealed class GatheringJournalComponent
                         _gatheringPointRegistry.TryGetGatheringPoint(x.Point.Id, out GatheringRoot? gatheringRoot))
                {
                    // for some reason the game doesn't know where this gathering location is
-                    var territoryType = territoryTypeSheet.GetRow(gatheringRoot.Steps.Last().TerritoryId)!;
+                    var territoryType = territoryTypeSheet.GetRow(gatheringRoot.Steps.Last().TerritoryId);
                    return x.Point with
                    {
                        Expansion = (EExpansionVersion)territoryType.ExVersion.RowId,
--- a/Questionable/packages.lock.json
+++ b/Questionable/packages.lock.json
@ -13,9 +13,9 @@
      },
      "DalamudPackager": {
        "type": "Direct",
-        "requested": "[2.1.13, )",
-        "resolved": "2.1.13",
-        "contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
+        "requested": "[11.0.0, )",
+        "resolved": "11.0.0",
+        "contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
      },
      "DotNet.ReproducibleBuilds": {
        "type": "Direct",
@ -174,13 +174,13 @@
      "gatheringpaths": {
        "type": "Project",
        "dependencies": {
-          "Questionable.Model": "[3.12.0, )"
+          "Questionable.Model": "[4.0.0, )"
        }
      },
      "llib": {
        "type": "Project",
        "dependencies": {
-          "DalamudPackager": "[2.1.13, )"
+          "DalamudPackager": "[11.0.0, )"
        }
      },
      "notificationmasterapi": {
@ -195,7 +195,7 @@
      "questpaths": {
        "type": "Project",
        "dependencies": {
-          "Questionable.Model": "[3.12.0, )"
+          "Questionable.Model": "[4.0.0, )"
        }
      }
    }
Author	SHA1	Message	Date
Liza Carvelli	07c5faa781	Add Respected Pelupelu quests	2024-11-20 18:39:30 +01:00
Liza Carvelli	c1aadb8c9c	Add 'Sanuwa Samba' Vanu Vanu quest	2024-11-20 16:29:57 +01:00
Liza Carvelli	6e1ee729da	Add 'When Hunting Goes Wrong' Vath quest	2024-11-20 03:28:35 +01:00
Liza Carvelli	4d397022b9	Add waypoint before Vath turn-in counter to simplify navigation for all daily quests	2024-11-20 03:28:13 +01:00
Liza Carvelli	1d9198eacd	Use Lifestream for firmament teleporting	2024-11-19 19:01:53 +01:00
Liza Carvelli	472aeac04a	Add missing RNG spawn in 'The Rudiments of Fiend Removal'	2024-11-19 17:15:11 +01:00
Liza Carvelli	03f4c39ba8	Update Renderer utility to API 11	2024-11-19 15:57:15 +01:00
Liza Carvelli	28795e68e4	Version bump, remove redundant nullability checks, minor cleanup	2024-11-18 20:56:13 +01:00
Liza Carvelli	3ab1069ab7	Fix item use in 'Strange Bedfellows' and 'Combat Evolved'	2024-11-18 20:51:49 +01:00
Liza Carvelli	f71ddeddfa	Add extra waypoint to attune to Dock Poga aetheryte during first pelupelu quest	2024-11-18 20:00:09 +01:00
Liza Carvelli	c65da42cd1	Add 'A Present from the Present'	2024-11-18 19:35:53 +01:00
Liza Carvelli	ed4d279432	Fix gathering for tribal quests	2024-11-18 19:05:22 +01:00
Liza Carvelli	d4c1b4b3ac	Add 'A Labor of Leaf'	2024-11-18 19:05:12 +01:00
Liza Carvelli	3b1bfcaade	Add 'Every Anden of the Rainbow'	2024-11-18 19:02:01 +01:00
Liza Carvelli	0d7263604b	Updated Pelupelu quests to allow for multiple quests to be turned in at once	2024-11-18 18:21:36 +01:00
Liza Carvelli	a540fd8b86	Add additional waypoint to 'Growing as a Guide'	2024-11-18 17:46:45 +01:00
Liza Carvelli	993d6918ec	Add one of the missing weekly NieR quests	2024-11-18 17:46:31 +01:00
Liza Carvelli	6342da8348	Version bump	2024-11-17 20:39:37 +01:00
Liza Carvelli	af545ea29b	Rebuild in VS	2024-11-17 20:36:32 +01:00