.gitignore

@@ -2,5 +2,4 @@
 bin/
 /.idea
 /.vs
-/.vscode
 *.user

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "LLib"]
 	path = LLib
 	url = https://git.carvel.li/liza/LLib.git
-[submodule "vendor/NotificationMasterAPI"]
-	path = vendor/NotificationMasterAPI
-	url = https://github.com/NightmareXIV/NotificationMasterAPI.git
-[submodule "vendor/pictomancy"]
-	path = vendor/pictomancy
-	url = https://github.com/sourpuh/ffxiv_pictomancy
+[submodule "vendor/ECommons"]
+	path = vendor/ECommons
+	url = https://github.com/NightmareXIV/ECommons.git

Directory.Build.targets

@@ -1,5 +1,5 @@
 <Project>
-    <PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
-        <Version>4.20</Version>
+    <PropertyGroup>
+        <Version>2.6</Version>
     </PropertyGroup>
 </Project>

GatheringPathRenderer/.gitignore

@@ -1 +0,0 @@
-/dist

GatheringPathRenderer/DalamudPackager.targets

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project>
-    <Target Name="PackagePluginDebug" AfterTargets="Build" Condition="'$(Configuration)' == 'Debug'">
-        <DalamudPackager
-                ProjectDir="$(ProjectDir)"
-                OutputPath="$(OutputPath)"
-                AssemblyName="$(AssemblyName)"
-                MakeZip="false"
-                VersionComponents="2"/>
-    </Target>
-
-    <Target Name="PackagePlugin" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
-        <DalamudPackager
-                ProjectDir="$(ProjectDir)"
-                OutputPath="$(OutputPath)"
-                AssemblyName="$(AssemblyName)"
-                MakeZip="true"
-                VersionComponents="2"
-                Exclude="GatheringPathRenderer.deps.json;ECommons.xml;ECommons.pdb;LLib.pdb"/>
-    </Target>
-</Project>

GatheringPathRenderer/EditorCommands.cs

@@ -3,15 +3,18 @@ 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.Sheets;
+using Lumina.Excel.GeneratedSheets;
 using Questionable.Model;
 using Questionable.Model.Gathering;
-using Questionable.Model.Questing;
 
 namespace GatheringPathRenderer;
 
@@ -66,14 +69,14 @@ internal sealed class EditorCommands : IDisposable
         if (target == null || target.ObjectKind != ObjectKind.GatheringPoint)
             throw new Exception("No valid target");
 
-        var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>().GetRowOrDefault(target.DataId);
+        var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>()!.GetRow(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.Value.GatheringPointBase.RowId);
+        var location = locationsInTerritory.SingleOrDefault(x => x.Id == gatheringPoint.GatheringPointBase.Row);
         if (location != null)
         {
             targetFile = location.File;
@@ -92,7 +95,7 @@ internal sealed class EditorCommands : IDisposable
         }
         else
         {
-            (targetFile, root) = CreateNewFile(gatheringPoint.Value, target);
+            (targetFile, root) = CreateNewFile(gatheringPoint, target);
             _chatGui.Print($"Creating new file under {targetFile.FullName}", "qG");
         }
 
@@ -170,27 +173,20 @@ 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.RowId])
-                .CreateSubdirectory(territoryInfo.PlaceName.Value.Name.ToString());
+                .CreateSubdirectory(ExpansionData.ExpansionFolders[(EExpansionVersion)territoryInfo.ExVersion.Row])
+                .CreateSubdirectory(territoryInfo.PlaceName.Value!.Name.ToString());
         }
 
         FileInfo targetFile =
             new FileInfo(
                 Path.Combine(targetFolder.FullName,
-                    $"{gatheringPoint.GatheringPointBase.RowId}_{gatheringPoint.PlaceName.Value.Name}_{(_clientState.LocalPlayer!.ClassJob.RowId == 16 ? "MIN" : "BTN")}.json"));
+                    $"{gatheringPoint.GatheringPointBase.Row}_{gatheringPoint.PlaceName.Value!.Name}_{(_clientState.LocalPlayer!.ClassJob.Id == 16 ? "MIN" : "BTN")}.json"));
         var root = new GatheringRoot
         {
             Author = [_configuration.AuthorName],
-            Steps =
-            [
-                new QuestStep
-                {
-                    TerritoryId = _clientState.TerritoryType,
-                    InteractionType = EInteractionType.None,
-                }
-            ],
+            TerritoryId = _clientState.TerritoryType,
             Groups =
             [
                 new GatheringNodeGroup

GatheringPathRenderer/GatheringPathRenderer.csproj

@@ -1,17 +1,9 @@
-<Project Sdk="Dalamud.NET.Sdk/11.0.0">
-    <PropertyGroup>
-        <Version>0.1</Version>
-        <OutputPath>dist</OutputPath>
-        <PathMap Condition="$(SolutionDir) != ''">$(SolutionDir)=X:\</PathMap>
-        <Platforms>x64</Platforms>
-    </PropertyGroup>
-
+<Project Sdk="Dalamud.NET.Sdk/10.0.0">
     <ItemGroup>
       <ProjectReference Include="..\LLib\LLib.csproj" />
       <ProjectReference Include="..\Questionable.Model\Questionable.Model.csproj" />
-      <ProjectReference Include="..\vendor\pictomancy\Pictomancy\Pictomancy.csproj" />
+      <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj" />
     </ItemGroup>
 
     <Import Project="..\LLib\LLib.targets"/>
-    <Import Project="..\LLib\RenameZip.targets"/>
 </Project>

GatheringPathRenderer/GatheringPathRenderer.json

@@ -1,7 +1,6 @@
 {
   "Name": "GatheringPathRenderer",
   "Author": "Liza Carvelli",
-  "Punchline": "[Questionable dev plugin]: Renders gathering location.",
-  "Description": "[Questionable dev plugin]: Renders gathering location using Pictomancy.",
-  "RepoUrl": "https://git.carvel.li/liza/Questionable/src/branch/master/GatheringPathRenderer"
+  "Punchline": "dev only plugin: Renders gathering location.",
+  "Description": "dev only plugin: Renders gathering location (without ECommons polluting the entire normal project)."
 }

GatheringPathRenderer/RendererPlugin.cs

@@ -1,31 +1,31 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using System.Numerics;
 using System.Text.Encodings.Web;
 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.Interface.Windowing;
 using Dalamud.Plugin;
 using Dalamud.Plugin.Services;
+using ECommons;
+using ECommons.Schedulers;
+using ECommons.SplatoonAPI;
 using GatheringPathRenderer.Windows;
 using LLib.GameData;
-using Pictomancy;
+using Questionable.Model;
 using Questionable.Model.Gathering;
 
 namespace GatheringPathRenderer;
 
-[SuppressMessage("ReSharper", "ClassNeverInstantiated.Global")]
 public sealed class RendererPlugin : IDalamudPlugin
 {
+    private const long OnTerritoryChange = -2;
+
     private readonly WindowSystem _windowSystem = new(nameof(RendererPlugin));
-    private readonly List<uint> _colors = [0x40FF2020, 0x4020FF20, 0x402020FF, 0x40FFFF20, 0x40FF20FF, 0x4020FFFF];
+    private readonly List<uint> _colors = [0xFFFF2020, 0xFF20FF20, 0xFF2020FF, 0xFFFFFF20, 0xFFFF20FF, 0xFF20FFFF];
 
     private readonly IDalamudPluginInterface _pluginInterface;
     private readonly IClientState _clientState;
@@ -54,31 +54,29 @@ public sealed class RendererPlugin : IDalamudPlugin
 
         _editorCommands = new EditorCommands(this, dataManager, commandManager, targetManager, clientState, chatGui,
             configuration);
-        var configWindow = new ConfigWindow(pluginInterface, configuration);
-        _editorWindow = new EditorWindow(this, _editorCommands, dataManager, targetManager, clientState, objectTable,
-                configWindow)
+        _editorWindow = new EditorWindow(this, _editorCommands, dataManager, targetManager, clientState, objectTable)
             { IsOpen = true };
-        _windowSystem.AddWindow(configWindow);
         _windowSystem.AddWindow(_editorWindow);
-        _currentClassJob = (EClassJob?)_clientState.LocalPlayer?.ClassJob.RowId ?? EClassJob.Adventurer;
+        _currentClassJob = (EClassJob?)_clientState.LocalPlayer?.ClassJob.Id ?? EClassJob.Adventurer;
 
         _pluginInterface.GetIpcSubscriber<object>("Questionable.ReloadData")
             .Subscribe(Reload);
 
-        PictoService.Initialize(pluginInterface);
+        ECommonsMain.Init(pluginInterface, this, Module.SplatoonAPI);
         LoadGatheringLocationsFromDirectory();
 
         _pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
-        _pluginInterface.UiBuilder.Draw += Draw;
+        _clientState.TerritoryChanged += TerritoryChanged;
         _clientState.ClassJobChanged += ClassJobChanged;
+        if (_clientState.IsLoggedIn)
+            TerritoryChanged(_clientState.TerritoryType);
     }
 
     internal DirectoryInfo PathsDirectory
     {
         get
         {
-#if DEBUG
-            DirectoryInfo? solutionDirectory = _pluginInterface.AssemblyLocation.Directory?.Parent?.Parent;
+            DirectoryInfo? solutionDirectory = _pluginInterface.AssemblyLocation.Directory?.Parent?.Parent?.Parent;
             if (solutionDirectory != null)
             {
                 DirectoryInfo pathProjectDirectory =
@@ -87,20 +85,14 @@ public sealed class RendererPlugin : IDalamudPlugin
                     return pathProjectDirectory;
             }
 
-            throw new Exception($"Unable to resolve project path ({_pluginInterface.AssemblyLocation.Directory})");
-#else
-            var allPluginsDirectory =
- _pluginInterface.ConfigFile.Directory ?? throw new Exception("Unknown directory for plugin configs");
-            return allPluginsDirectory
-                .CreateSubdirectory("Questionable")
-                .CreateSubdirectory("GatheringPaths");
-#endif
+            throw new Exception("Unable to resolve project path");
         }
     }
 
     internal void Reload()
     {
         LoadGatheringLocationsFromDirectory();
+        Redraw();
     }
 
     private void LoadGatheringLocationsFromDirectory()
@@ -109,17 +101,12 @@ public sealed class RendererPlugin : IDalamudPlugin
 
         try
         {
-#if DEBUG
-            foreach (var expansionFolder in Questionable.Model.ExpansionData.ExpansionFolders.Values)
+            foreach (var expansionFolder in ExpansionData.ExpansionFolders.Values)
                 LoadFromDirectory(
                     new DirectoryInfo(Path.Combine(PathsDirectory.FullName, expansionFolder)));
+
             _pluginLog.Information(
                 $"Loaded {_gatheringLocations.Count} gathering root locations from project directory");
-#else
-            LoadFromDirectory(PathsDirectory);
-            _pluginLog.Information(
-                $"Loaded {_gatheringLocations.Count} gathering root locations from {PathsDirectory.FullName} directory");
-#endif
         }
         catch (Exception e)
         {
@@ -132,7 +119,7 @@ public sealed class RendererPlugin : IDalamudPlugin
         if (!directory.Exists)
             return;
 
-        //_pluginLog.Information($"Loading locations from {directory}");
+        _pluginLog.Information($"Loading locations from {directory}");
         foreach (FileInfo fileInfo in directory.GetFiles("*.json"))
         {
             try
@@ -159,7 +146,7 @@ public sealed class RendererPlugin : IDalamudPlugin
     }
 
     internal IEnumerable<GatheringLocationContext> GetLocationsInTerritory(ushort territoryId)
-        => _gatheringLocations.Where(x => x.Root.Steps.LastOrDefault()?.TerritoryId == territoryId);
+        => _gatheringLocations.Where(x => x.Root.TerritoryId == territoryId);
 
     internal void Save(FileInfo targetFile, GatheringRoot root)
     {
@@ -168,10 +155,6 @@ public sealed class RendererPlugin : IDalamudPlugin
             Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
             WriteIndented = true,
-            TypeInfoResolver = new DefaultJsonTypeInfoResolver
-            {
-                Modifiers = { NoEmptyCollectionModifier }
-            },
         };
         using (var stream = File.Create(targetFile.FullName))
         {
@@ -193,125 +176,139 @@ public sealed class RendererPlugin : IDalamudPlugin
         Reload();
     }
 
-    private static void NoEmptyCollectionModifier(JsonTypeInfo typeInfo)
-    {
-        foreach (var property in typeInfo.Properties)
-        {
-            if (typeof(ICollection).IsAssignableFrom(property.PropertyType))
-            {
-                property.ShouldSerialize = (_, val) => val is ICollection { Count: > 0 };
-            }
-        }
-    }
+    private void TerritoryChanged(ushort territoryId) => Redraw();
 
     private void ClassJobChanged(uint classJobId)
     {
         _currentClassJob = (EClassJob)classJobId;
+        Redraw(_currentClassJob);
     }
 
-    private void Draw()
+    internal void Redraw() => Redraw(_currentClassJob);
+
+    private void Redraw(EClassJob classJob)
     {
-        if (!_currentClassJob.IsGatherer())
+        Splatoon.RemoveDynamicElements("GatheringPathRenderer");
+        if (!classJob.IsGatherer())
             return;
 
-        using var drawList = PictoService.Draw();
-        if (drawList == null)
-            return;
-
-        Vector3 position = _clientState.LocalPlayer?.Position ?? Vector3.Zero;
-        foreach (var location in GetLocationsInTerritory(_clientState.TerritoryType))
-        {
-            if (!location.Root.Groups.Any(gr =>
-                    gr.Nodes.Any(
-                        no => no.Locations.Any(
-                            loc => Vector3.Distance(loc.Position, position) < 200f))))
-                continue;
-
-            foreach (var group in location.Root.Groups)
-            {
-                foreach (GatheringNode node in group.Nodes)
-                {
-                    foreach (var x in node.Locations)
-                    {
-                        bool isUnsaved = false;
-                        bool isCone = false;
-                        float minimumAngle = 0;
-                        float maximumAngle = 0;
-                        if (_editorWindow.TryGetOverride(x.InternalId, out LocationOverride? locationOverride) &&
-                            locationOverride != null)
+        var elements = GetLocationsInTerritory(_clientState.TerritoryType)
+            .SelectMany(location =>
+                location.Root.Groups.SelectMany(group =>
+                    group.Nodes.SelectMany(node => node.Locations
+                        .SelectMany(x =>
                         {
-                            isUnsaved = locationOverride.NeedsSave();
-                            if (locationOverride.IsCone())
+                            bool isUnsaved = false;
+                            bool isCone = false;
+                            int minimumAngle = 0;
+                            int maximumAngle = 0;
+                            if (_editorWindow.TryGetOverride(x.InternalId, out LocationOverride? locationOverride) &&
+                                locationOverride != null)
+                            {
+                                isUnsaved = locationOverride.NeedsSave();
+                                if (locationOverride.IsCone())
+                                {
+                                    isCone = true;
+                                    minimumAngle = locationOverride.MinimumAngle.GetValueOrDefault();
+                                    maximumAngle = locationOverride.MaximumAngle.GetValueOrDefault();
+                                }
+                            }
+
+                            if (!isCone && x.IsCone())
                             {
                                 isCone = true;
-                                minimumAngle = locationOverride.MinimumAngle.GetValueOrDefault();
-                                maximumAngle = locationOverride.MaximumAngle.GetValueOrDefault();
+                                minimumAngle = x.MinimumAngle.GetValueOrDefault();
+                                maximumAngle = x.MaximumAngle.GetValueOrDefault();
                             }
-                        }
 
-                        if (!isCone && x.IsCone())
-                        {
-                            isCone = true;
-                            minimumAngle = x.MinimumAngle.GetValueOrDefault();
-                            maximumAngle = x.MaximumAngle.GetValueOrDefault();
-                        }
-
-                        minimumAngle *= (float)Math.PI / 180;
-                        maximumAngle *= (float)Math.PI / 180;
-                        if (!isCone || maximumAngle - minimumAngle >= 2 * Math.PI)
-                        {
-                            minimumAngle = 0;
-                            maximumAngle = (float)Math.PI * 2;
-                        }
-
-                        uint color = _colors[location.Root.Groups.IndexOf(group) % _colors.Count];
-                        drawList.AddFanFilled(x.Position,
-                            locationOverride?.MinimumDistance ?? x.CalculateMinimumDistance(),
-                            locationOverride?.MaximumDistance ?? x.CalculateMaximumDistance(),
-                            minimumAngle, maximumAngle, color);
-                        drawList.AddFan(x.Position,
-                            locationOverride?.MinimumDistance ?? x.CalculateMinimumDistance(),
-                            locationOverride?.MaximumDistance ?? x.CalculateMaximumDistance(),
-                            minimumAngle, maximumAngle, color | 0xFF000000);
-
-                        drawList.AddText(x.Position, isUnsaved ? 0xFFFF0000 : 0xFFFFFFFF, $"{location.Root.Groups.IndexOf(group)} // {node.DataId} / {node.Locations.IndexOf(x)} || {minimumAngle}, {maximumAngle}", 1f);
+                            var a = GatheringMath.CalculateLandingLocation(x, 0, 0);
+                            var b = GatheringMath.CalculateLandingLocation(x, 1, 1);
+                            return new List<Element>
+                            {
+                                new Element(isCone
+                                    ? ElementType.ConeAtFixedCoordinates
+                                    : ElementType.CircleAtFixedCoordinates)
+                                {
+                                    refX = x.Position.X,
+                                    refY = x.Position.Z,
+                                    refZ = x.Position.Y,
+                                    Filled = true,
+                                    radius = locationOverride?.MinimumDistance ?? x.CalculateMinimumDistance(),
+                                    Donut = (locationOverride?.MaximumDistance ?? x.CalculateMaximumDistance()) - (locationOverride?.MinimumDistance ?? x.CalculateMinimumDistance()),
+                                    color = _colors[location.Root.Groups.IndexOf(group) % _colors.Count],
+                                    Enabled = true,
+                                    coneAngleMin = minimumAngle,
+                                    coneAngleMax = maximumAngle,
+                                    tether = false,
+                                },
+                                new Element(ElementType.CircleAtFixedCoordinates)
+                                {
+                                    refX = x.Position.X,
+                                    refY = x.Position.Z,
+                                    refZ = x.Position.Y,
+                                    color = 0xFFFFFFFF,
+                                    radius = 0.1f,
+                                    Enabled = true,
+                                    overlayText =
+                                        $"{location.Root.Groups.IndexOf(group)} // {node.DataId} / {node.Locations.IndexOf(x)}",
+                                    overlayBGColor = isUnsaved ? 0xFF2020FF : 0xFF000000,
+                                },
 #if false
-                        var a = GatheringMath.CalculateLandingLocation(x, 0, 0);
-                        var b = GatheringMath.CalculateLandingLocation(x, 1, 1);
-                        new Element(ElementType.CircleAtFixedCoordinates)
-                        {
-                            refX = a.X,
-                            refY = a.Z,
-                            refZ = a.Y,
-                            color = _colors[0],
-                            radius = 0.1f,
-                            Enabled = true,
-                            overlayText = "Min Angle"
-                        },
-                        new Element(ElementType.CircleAtFixedCoordinates)
-                        {
-                            refX = b.X,
-                            refY = b.Z,
-                            refZ = b.Y,
-                            color = _colors[1],
-                            radius = 0.1f,
-                            Enabled = true,
-                            overlayText = "Max Angle"
-                        }
+                                new Element(ElementType.CircleAtFixedCoordinates)
+                                {
+                                    refX = a.X,
+                                    refY = a.Z,
+                                    refZ = a.Y,
+                                    color = _colors[0],
+                                    radius = 0.1f,
+                                    Enabled = true,
+                                    overlayText = "Min Angle"
+                                },
+                                new Element(ElementType.CircleAtFixedCoordinates)
+                                {
+                                    refX = b.X,
+                                    refY = b.Z,
+                                    refZ = b.Y,
+                                    color = _colors[1],
+                                    radius = 0.1f,
+                                    Enabled = true,
+                                    overlayText = "Max Angle"
+                                }
 #endif
-                    }
-                }
-            }
+                            };
+                        }))))
+            .ToList();
+
+        if (elements.Count == 0)
+        {
+            _pluginLog.Information("No new elements to render.");
+            return;
         }
+
+        _ = new TickScheduler(delegate
+        {
+            try
+            {
+                Splatoon.AddDynamicElements("GatheringPathRenderer",
+                    elements.ToArray(),
+                    new[] { OnTerritoryChange });
+                _pluginLog.Information($"Created {elements.Count} splatoon elements.");
+            }
+            catch (Exception e)
+            {
+                _pluginLog.Error(e, "Unable to create splatoon layer");
+            }
+        });
     }
 
     public void Dispose()
     {
         _clientState.ClassJobChanged -= ClassJobChanged;
-        _pluginInterface.UiBuilder.Draw -= Draw;
+        _clientState.TerritoryChanged -= TerritoryChanged;
         _pluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
 
-        PictoService.Dispose();
+        Splatoon.RemoveDynamicElements("GatheringPathRenderer");
+        ECommonsMain.Dispose();
 
         _pluginInterface.GetIpcSubscriber<object>("Questionable.ReloadData")
             .Unsubscribe(Reload);

GatheringPathRenderer/Windows/ConfigWindow.cs

@@ -1,33 +0,0 @@
-using Dalamud.Interface.Windowing;
-using Dalamud.Plugin;
-using ImGuiNET;
-
-namespace GatheringPathRenderer.Windows;
-
-internal sealed class ConfigWindow : Window
-{
-    private readonly IDalamudPluginInterface _pluginInterface;
-    private readonly Configuration _configuration;
-
-    public ConfigWindow(IDalamudPluginInterface pluginInterface, Configuration configuration)
-        : base("Gathering Path Config", ImGuiWindowFlags.AlwaysAutoResize)
-    {
-        _pluginInterface = pluginInterface;
-        _configuration = configuration;
-
-        AllowPinning = false;
-        AllowClickthrough = false;
-    }
-
-    public override void Draw()
-    {
-        string authorName = _configuration.AuthorName;
-        if (ImGui.InputText("Author name for new files", ref authorName, 256))
-        {
-            _configuration.AuthorName = authorName;
-            Save();
-        }
-    }
-
-    private void Save() => _pluginInterface.SavePluginConfig(_configuration);
-}

GatheringPathRenderer/Windows/EditorWindow.cs

@@ -1,17 +1,17 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.IO;
 using System.Linq;
 using System.Numerics;
 using Dalamud.Game.ClientState.Objects;
 using Dalamud.Game.ClientState.Objects.Enums;
 using Dalamud.Game.ClientState.Objects.Types;
-using Dalamud.Interface;
 using Dalamud.Interface.Colors;
 using Dalamud.Interface.Windowing;
 using Dalamud.Plugin.Services;
 using ImGuiNET;
-using Lumina.Excel.Sheets;
+using Lumina.Excel.GeneratedSheets;
 using Questionable.Model.Gathering;
 
 namespace GatheringPathRenderer.Windows;
@@ -33,9 +33,9 @@ internal sealed class EditorWindow : Window
         _targetLocation;
 
     public EditorWindow(RendererPlugin plugin, EditorCommands editorCommands, IDataManager dataManager,
-        ITargetManager targetManager, IClientState clientState, IObjectTable objectTable, ConfigWindow configWindow)
-        : base($"Gathering Path Editor {typeof(EditorWindow).Assembly.GetName().Version!.ToString(2)}###QuestionableGatheringPathEditor",
-            ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoNavFocus | ImGuiWindowFlags.AlwaysAutoResize)
+        ITargetManager targetManager, IClientState clientState, IObjectTable objectTable)
+        : base("Gathering Path Editor###QuestionableGatheringPathEditor",
+            ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoNavFocus)
     {
         _plugin = plugin;
         _editorCommands = editorCommands;
@@ -46,23 +46,9 @@ internal sealed class EditorWindow : Window
 
         SizeConstraints = new WindowSizeConstraints
         {
-            MinimumSize = new Vector2(300, 100),
+            MinimumSize = new Vector2(300, 300),
         };
 
-        TitleBarButtons.Add(new TitleBarButton
-        {
-            Icon = FontAwesomeIcon.Cog,
-            IconOffset = new Vector2(1.5f, 1),
-            Click = _ => configWindow.IsOpen = true,
-            Priority = int.MinValue,
-            ShowTooltip = () =>
-            {
-                ImGui.BeginTooltip();
-                ImGui.Text("Open Configuration");
-                ImGui.EndTooltip();
-            }
-        });
-
         RespectCloseHotkey = false;
         ShowCloseButton = false;
         AllowPinning = false;
@@ -80,7 +66,7 @@ internal sealed class EditorWindow : Window
 
         _target = _targetManager.Target;
         var gatheringLocations = _plugin.GetLocationsInTerritory(_clientState.TerritoryType);
-        var location = gatheringLocations.ToList().SelectMany(context =>
+        var location = gatheringLocations.SelectMany(context =>
                 context.Root.Groups.SelectMany(group =>
                     group.Nodes.SelectMany(node => node.Locations
                         .Select(location =>
@@ -154,6 +140,7 @@ internal sealed class EditorWindow : Window
             {
                 locationOverride.MinimumAngle = minAngle;
                 locationOverride.MaximumAngle = maxAngle;
+                _plugin.Redraw();
             }
 
             float minDistance = locationOverride.MinimumDistance ?? location.CalculateMinimumDistance();
@@ -162,6 +149,7 @@ internal sealed class EditorWindow : Window
             {
                 locationOverride.MinimumDistance = minDistance;
                 locationOverride.MaximumDistance = maxDistance;
+                _plugin.Redraw();
             }
 
             bool unsaved = locationOverride.NeedsSave();
@@ -192,6 +180,7 @@ internal sealed class EditorWindow : Window
             if (ImGui.Button("Reset"))
             {
                 _changes[location.InternalId] = new LocationOverride();
+                _plugin.Redraw();
             }
 
             ImGui.EndDisabled();
@@ -216,12 +205,12 @@ internal sealed class EditorWindow : Window
         }
         else if (_target != null)
         {
-            var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>().GetRowOrDefault(_target.DataId);
+            var gatheringPoint = _dataManager.GetExcelSheet<GatheringPoint>()!.GetRow(_target.DataId);
             if (gatheringPoint == null)
                 return;
 
             var locationsInTerritory = _plugin.GetLocationsInTerritory(_clientState.TerritoryType).ToList();
-            var location = locationsInTerritory.SingleOrDefault(x => x.Id == gatheringPoint.Value.GatheringPointBase.RowId);
+            var location = locationsInTerritory.SingleOrDefault(x => x.Id == gatheringPoint.GatheringPointBase.Row);
             if (location != null)
             {
                 var targetFile = location.File;
@@ -245,9 +234,9 @@ internal sealed class EditorWindow : Window
             }
             else
             {
-                if (ImGui.Button($"Create location ({gatheringPoint.Value.GatheringPointBase.RowId})"))
+                if (ImGui.Button($"Create location ({gatheringPoint.GatheringPointBase.Row})"))
                 {
-                    var (targetFile, root) = _editorCommands.CreateNewFile(gatheringPoint.Value, _target);
+                    var (targetFile, root) = _editorCommands.CreateNewFile(gatheringPoint, _target);
                     _plugin.Save(targetFile, root);
                 }
             }

GatheringPaths/.editorconfig

@@ -1,8 +0,0 @@
-root = true
-
-[*.json]
-indent_size = 2
-indent_style = space
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8

GatheringPaths/2.x - A Realm Reborn/Central Thanalan/157_Spineless Basin_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 141,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Central Thanalan - Black Brush Station"
-    }
-  ],
+  "TerritoryId": 141,
+  "AetheryteShortcut": "Central Thanalan - Black Brush Station",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/2.x - A Realm Reborn/Western Thanalan/154_Hammerlea_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 140,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Western Thanalan - Horizon"
-    }
-  ],
+  "TerritoryId": 140,
+  "AetheryteShortcut": "Western Thanalan - Horizon",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/300_Twinpools_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 397,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
-    }
-  ],
+  "TerritoryId": 397,
+  "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/351_Red Rim_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 397,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
-    }
-  ],
+  "TerritoryId": 397,
+  "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
   "Groups": [
     {
       "Nodes": [
@@ -169,4 +164,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/551_The Bed of Bones_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 397,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
-    }
-  ],
+  "TerritoryId": 397,
+  "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/552_Gorgagne Holding_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 397,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
-    }
-  ],
+  "TerritoryId": 397,
+  "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/Coerthas Western Highlands/724_The Convictory_MIN.json

@@ -1,118 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 397,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33290,
-          "Locations": [
-            {
-              "Position": {
-                "X": -409.5019,
-                "Y": 171.5775,
-                "Z": 49.79576
-              },
-              "MinimumAngle": -40,
-              "MaximumAngle": 115
-            },
-            {
-              "Position": {
-                "X": -418.5088,
-                "Y": 168.7132,
-                "Z": 33.29783
-              },
-              "MinimumAngle": 10,
-              "MaximumAngle": 110
-            }
-          ]
-        },
-        {
-          "DataId": 33289,
-          "Locations": [
-            {
-              "Position": {
-                "X": -413.911,
-                "Y": 170.7656,
-                "Z": 43.01591
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 130
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33292,
-          "Locations": [
-            {
-              "Position": {
-                "X": -510.636,
-                "Y": 169.9518,
-                "Z": 119.9934
-              },
-              "MinimumAngle": 150,
-              "MaximumAngle": 310
-            }
-          ]
-        },
-        {
-          "DataId": 33291,
-          "Locations": [
-            {
-              "Position": {
-                "X": -519.3103,
-                "Y": 169.0242,
-                "Z": 111.3145
-              },
-              "MinimumAngle": 125,
-              "MaximumAngle": 300
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33293,
-          "Locations": [
-            {
-              "Position": {
-                "X": -563.8201,
-                "Y": 159.5121,
-                "Z": -11.58269
-              },
-              "MinimumAngle": -100,
-              "MaximumAngle": 50
-            }
-          ]
-        },
-        {
-          "DataId": 33294,
-          "Locations": [
-            {
-              "Position": {
-                "X": -555.6268,
-                "Y": 159.594,
-                "Z": -17.77679
-              },
-              "MinimumAngle": -145,
-              "MaximumAngle": 25
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Churning Mists/355_Landlord Colony_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 400,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Churning Mists - Moghome"
-    }
-  ],
+  "TerritoryId": 400,
+  "AetheryteShortcut": "The Churning Mists - Moghome",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Churning Mists/359_Four Arms_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 400,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Churning Mists - Zenith"
-    }
-  ],
+  "TerritoryId": 400,
+  "AetheryteShortcut": "The Churning Mists - Zenith",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Churning Mists/553_Landlord Colony_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 400,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Churning Mists - Moghome"
-    }
-  ],
+  "TerritoryId": 400,
+  "AetheryteShortcut": "The Churning Mists - Moghome",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Churning Mists/554_Ohl Tahn_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 400,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Churning Mists - Zenith"
-    }
-  ],
+  "TerritoryId": 400,
+  "AetheryteShortcut": "The Churning Mists - Zenith",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Churning Mists/726_Weston Waters_MIN.json

@@ -1,113 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 400,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Churning Mists - Zenith"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33305,
-          "Locations": [
-            {
-              "Position": {
-                "X": -560.7639,
-                "Y": 266.9573,
-                "Z": -744.8922
-              },
-              "MinimumAngle": -45,
-              "MaximumAngle": 80
-            }
-          ]
-        },
-        {
-          "DataId": 33306,
-          "Locations": [
-            {
-              "Position": {
-                "X": -547.9997,
-                "Y": 268.3711,
-                "Z": -737.2209
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 95
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33304,
-          "Locations": [
-            {
-              "Position": {
-                "X": -682.6185,
-                "Y": 261.1417,
-                "Z": -778.2869
-              },
-              "MinimumAngle": -50,
-              "MaximumAngle": 20,
-              "MinimumDistance": 1.5,
-              "MaximumDistance": 3
-            }
-          ]
-        },
-        {
-          "DataId": 33303,
-          "Locations": [
-            {
-              "Position": {
-                "X": -696.5138,
-                "Y": 261.6092,
-                "Z": -759.7711
-              },
-              "MinimumAngle": 215,
-              "MaximumAngle": 310
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33301,
-          "Locations": [
-            {
-              "Position": {
-                "X": -792.3468,
-                "Y": 271.3054,
-                "Z": -737.431
-              },
-              "MinimumAngle": 280,
-              "MaximumAngle": 360,
-              "MinimumDistance": 2,
-              "MaximumDistance": 3
-            }
-          ]
-        },
-        {
-          "DataId": 33302,
-          "Locations": [
-            {
-              "Position": {
-                "X": -800.0043,
-                "Y": 269.2748,
-                "Z": -729.5305
-              },
-              "MinimumAngle": 230,
-              "MaximumAngle": 340
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Dravanian Forelands/352_Avalonia Fallen_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 398,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
-    }
-  ],
+  "TerritoryId": 398,
+  "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Dravanian Forelands/358_Avalonia Fallen_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 398,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
-    }
-  ],
+  "TerritoryId": 398,
+  "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Dravanian Forelands/725_The Hundred Throes_BTN.json

@@ -1,136 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 398,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Dravanian Forelands - Tailfeather"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33300,
-          "Locations": [
-            {
-              "Position": {
-                "X": 560.8948,
-                "Y": -19.68621,
-                "Z": -534.3345
-              },
-              "MinimumAngle": -75,
-              "MaximumAngle": 30
-            },
-            {
-              "Position": {
-                "X": 557.1625,
-                "Y": -19.65358,
-                "Z": -547.1852
-              },
-              "MinimumAngle": 60,
-              "MaximumAngle": 200
-            }
-          ]
-        },
-        {
-          "DataId": 33299,
-          "Locations": [
-            {
-              "Position": {
-                "X": 571.0399,
-                "Y": -19.2677,
-                "Z": -544.8133
-              },
-              "MinimumAngle": 200,
-              "MaximumAngle": 320
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33297,
-          "Locations": [
-            {
-              "Position": {
-                "X": 630.7735,
-                "Y": -18.70739,
-                "Z": -566.2144
-              },
-              "MinimumAngle": 85,
-              "MaximumAngle": 240
-            }
-          ]
-        },
-        {
-          "DataId": 33298,
-          "Locations": [
-            {
-              "Position": {
-                "X": 639.3101,
-                "Y": -18.78794,
-                "Z": -559.5169
-              },
-              "MinimumAngle": -175,
-              "MaximumAngle": 0
-            },
-            {
-              "Position": {
-                "X": 618.4453,
-                "Y": -18.9477,
-                "Z": -559.1786
-              },
-              "MinimumAngle": 60,
-              "MaximumAngle": 150
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33295,
-          "Locations": [
-            {
-              "Position": {
-                "X": 731.6483,
-                "Y": -20.17027,
-                "Z": -614.199
-              },
-              "MinimumAngle": -35,
-              "MaximumAngle": 125
-            }
-          ]
-        },
-        {
-          "DataId": 33296,
-          "Locations": [
-            {
-              "Position": {
-                "X": 743.4034,
-                "Y": -19.02,
-                "Z": -621.8422
-              },
-              "MinimumAngle": 195,
-              "MaximumAngle": 325
-            },
-            {
-              "Position": {
-                "X": 727.6966,
-                "Y": -20.47985,
-                "Z": -627.8105
-              },
-              "MinimumAngle": 60,
-              "MaximumAngle": 210
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Dravanian Forelands/911_Avalonia Fallen_MIN.json

@@ -1,69 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 398,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34382,
-          "Locations": [
-            {
-              "Position": {
-                "X": -528.8412,
-                "Y": -89.70924,
-                "Z": 458.582
-              },
-              "MinimumAngle": -10,
-              "MaximumAngle": 80,
-              "MinimumDistance": 2.1,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34383,
-          "Locations": [
-            {
-              "Position": {
-                "X": -636.4533,
-                "Y": -100.1258,
-                "Z": 484.7436
-              },
-              "MinimumAngle": -75,
-              "MaximumAngle": 35
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34384,
-          "Locations": [
-            {
-              "Position": {
-                "X": -589.4542,
-                "Y": -100.4852,
-                "Z": 528.1926
-              },
-              "MinimumAngle": -25,
-              "MaximumAngle": 120
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Dravanian Forelands/914_Avalonia Fallen_BTN.json

@@ -1,61 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 398,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34391,
-          "Locations": [
-            {
-              "Position": {
-                "X": -49.75243,
-                "Y": -31.70323,
-                "Z": -171.6977
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34392,
-          "Locations": [
-            {
-              "Position": {
-                "X": -44.89702,
-                "Y": -32.39204,
-                "Z": -153.4274
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34393,
-          "Locations": [
-            {
-              "Position": {
-                "X": -36.6049,
-                "Y": -31.32222,
-                "Z": -134.1001
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Dravanian Hinterlands/353_The Makers' Quarter_MIN.json

@@ -1,23 +1,11 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 399,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Idyllshire",
-      "AethernetShortcut": [
-        "[Idyllshire] Aetheryte Plaza",
-        "[Idyllshire] Epilogue Gate (Eastern Hinterlands)"
-      ],
-      "SkipConditions": {
-        "AetheryteShortcutIf": {
-          "InTerritory": [
-            399
-          ]
-        }
-      }
-    }
+  "TerritoryId": 399,
+  "AetheryteShortcut": "Idyllshire",
+  "AethernetShortcut": [
+    "[Idyllshire] Aetheryte Plaza",
+    "[Idyllshire] Epilogue Gate (Eastern Hinterlands)"
   ],
   "Groups": [
     {

GatheringPaths/3.x - Heavensward/The Dravanian Hinterlands/361_The Answering Quarter_BTN.json

@@ -1,23 +1,11 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 399,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Idyllshire",
-      "AethernetShortcut": [
-        "[Idyllshire] Aetheryte Plaza",
-        "[Idyllshire] Prologue Gate (Western Hinterlands)"
-      ],
-      "SkipConditions": {
-        "AetheryteShortcutIf": {
-          "InTerritory": [
-            399
-          ]
-        }
-      }
-    }
+  "TerritoryId": 399,
+  "AetheryteShortcut": "Idyllshire",
+  "AethernetShortcut": [
+    "[Idyllshire] Aetheryte Plaza",
+    "[Idyllshire] Prologue Gate (Western Hinterlands)"
   ],
   "Groups": [
     {

GatheringPaths/3.x - Heavensward/The Dravanian Hinterlands/723_Quickspill Delta_BTN.json

@@ -1,119 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 399,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Idyllshire",
-      "AethernetShortcut": [
-        "[Idyllshire] Aetheryte Plaza",
-        "[Idyllshire] Prologue Gate (Western Hinterlands)"
-      ],
-      "SkipConditions": {
-        "AetheryteShortcutIf": {
-          "InTerritory": [
-            399
-          ]
-        }
-      }
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33285,
-          "Locations": [
-            {
-              "Position": {
-                "X": -426.4134,
-                "Y": 137.5601,
-                "Z": 514.3357
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 33286,
-          "Locations": [
-            {
-              "Position": {
-                "X": -448.7838,
-                "Y": 137.5986,
-                "Z": 514.3243
-              }
-            },
-            {
-              "Position": {
-                "X": -433.5015,
-                "Y": 137.6451,
-                "Z": 487.8173
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33288,
-          "Locations": [
-            {
-              "Position": {
-                "X": -354.5423,
-                "Y": 137.5715,
-                "Z": 638.9959
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 33287,
-          "Locations": [
-            {
-              "Position": {
-                "X": -352.4377,
-                "Y": 137.5906,
-                "Z": 604.364
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33284,
-          "Locations": [
-            {
-              "Position": {
-                "X": -254.4776,
-                "Y": 137.97,
-                "Z": 591.0092
-              },
-              "MinimumAngle": -20,
-              "MaximumAngle": 85
-            }
-          ]
-        },
-        {
-          "DataId": 33283,
-          "Locations": [
-            {
-              "Position": {
-                "X": -263.1079,
-                "Y": 137.4419,
-                "Z": 569.8724
-              },
-              "MinimumAngle": -10,
-              "MaximumAngle": 190
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Dravanian Hinterlands/808_The Answering Quarter_MIN.json

@@ -1,115 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 399,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Idyllshire",
-      "AethernetShortcut": [
-        "[Idyllshire] Aetheryte Plaza",
-        "[Idyllshire] Prologue Gate (Western Hinterlands)"
-      ]
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33856,
-          "Locations": [
-            {
-              "Position": {
-                "X": -395.4635,
-                "Y": 144.1793,
-                "Z": -249.5864
-              },
-              "MinimumAngle": -190,
-              "MaximumAngle": 0
-            }
-          ]
-        },
-        {
-          "DataId": 33855,
-          "Locations": [
-            {
-              "Position": {
-                "X": -398.5591,
-                "Y": 144.6183,
-                "Z": -241.8769
-              },
-              "MinimumAngle": -140,
-              "MaximumAngle": -20
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33857,
-          "Locations": [
-            {
-              "Position": {
-                "X": -407.5786,
-                "Y": 149.6453,
-                "Z": -93.85593
-              },
-              "MinimumAngle": 185,
-              "MaximumAngle": 280,
-              "MinimumDistance": 2,
-              "MaximumDistance": 3
-            }
-          ]
-        },
-        {
-          "DataId": 33858,
-          "Locations": [
-            {
-              "Position": {
-                "X": -413.9488,
-                "Y": 148.9834,
-                "Z": -71.42188
-              },
-              "MinimumAngle": 165,
-              "MaximumAngle": 285
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33860,
-          "Locations": [
-            {
-              "Position": {
-                "X": -254.579,
-                "Y": 147.4603,
-                "Z": -91.96173
-              },
-              "MinimumAngle": 30,
-              "MaximumAngle": 130
-            }
-          ]
-        },
-        {
-          "DataId": 33859,
-          "Locations": [
-            {
-              "Position": {
-                "X": -254.9425,
-                "Y": 146.4598,
-                "Z": -105.2472
-              },
-              "MinimumAngle": 35,
-              "MaximumAngle": 155
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Dravanian Hinterlands/809_The Makers' Quarter_BTN.json

@@ -1,113 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 399,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Idyllshire",
-      "AethernetShortcut": [
-        "[Idyllshire] Aetheryte Plaza",
-        "[Idyllshire] Epilogue Gate (Eastern Hinterlands)"
-      ]
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33866,
-          "Locations": [
-            {
-              "Position": {
-                "X": 679.6339,
-                "Y": 116.0614,
-                "Z": 134.6795
-              },
-              "MinimumAngle": 200,
-              "MaximumAngle": 320
-            }
-          ]
-        },
-        {
-          "DataId": 33865,
-          "Locations": [
-            {
-              "Position": {
-                "X": 697.5129,
-                "Y": 122.1484,
-                "Z": 146.8725
-              },
-              "MinimumAngle": -205,
-              "MaximumAngle": -10
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33862,
-          "Locations": [
-            {
-              "Position": {
-                "X": 809.8756,
-                "Y": 152.7643,
-                "Z": 205.2242
-              },
-              "MinimumAngle": -95,
-              "MaximumAngle": 90
-            }
-          ]
-        },
-        {
-          "DataId": 33861,
-          "Locations": [
-            {
-              "Position": {
-                "X": 834.4771,
-                "Y": 154.8756,
-                "Z": 206.0541
-              },
-              "MinimumAngle": 35,
-              "MaximumAngle": 185
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33863,
-          "Locations": [
-            {
-              "Position": {
-                "X": 781.7728,
-                "Y": 134.6856,
-                "Z": -22.00103
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 135
-            }
-          ]
-        },
-        {
-          "DataId": 33864,
-          "Locations": [
-            {
-              "Position": {
-                "X": 774.9854,
-                "Y": 134.3857,
-                "Z": -27.45042
-              },
-              "MinimumAngle": -25,
-              "MaximumAngle": 120
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Sea of Clouds/354_Voor Sian Siran_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 401,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop"
-    }
-  ],
+  "TerritoryId": 401,
+  "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Sea of Clouds/360_The Blue Window_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 401,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu"
-    }
-  ],
+  "TerritoryId": 401,
+  "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/3.x - Heavensward/The Sea of Clouds/727_The Nidifice_BTN.json

@@ -1,109 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 401,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33308,
-          "Locations": [
-            {
-              "Position": {
-                "X": 612.0084,
-                "Y": -154.126,
-                "Z": 721.6054
-              },
-              "MinimumAngle": -220,
-              "MaximumAngle": 25
-            }
-          ]
-        },
-        {
-          "DataId": 33307,
-          "Locations": [
-            {
-              "Position": {
-                "X": 601.7455,
-                "Y": -154.7067,
-                "Z": 734.4706
-              },
-              "MinimumAngle": -120,
-              "MaximumAngle": 75
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33311,
-          "Locations": [
-            {
-              "Position": {
-                "X": 654.2362,
-                "Y": -159.8305,
-                "Z": 820.9418
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 33312,
-          "Locations": [
-            {
-              "Position": {
-                "X": 656.2291,
-                "Y": -160.4766,
-                "Z": 826.9885
-              },
-              "MinimumAngle": 100,
-              "MaximumAngle": 270
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33309,
-          "Locations": [
-            {
-              "Position": {
-                "X": 739.0756,
-                "Y": -158.0396,
-                "Z": 642.5712
-              },
-              "MinimumAngle": 110,
-              "MaximumAngle": 210,
-              "MinimumDistance": 1,
-              "MaximumDistance": 3
-            }
-          ]
-        },
-        {
-          "DataId": 33310,
-          "Locations": [
-            {
-              "Position": {
-                "X": 723.027,
-                "Y": -157.7834,
-                "Z": 626.666
-              },
-              "MinimumAngle": -170,
-              "MaximumAngle": 35
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/3.x - Heavensward/The Sea of Clouds/728_The Shattered Back_MIN.json

@@ -1,113 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 401,
-      "InteractionType": "None",
-      "AetheryteShortcut": "The Sea of Clouds - Ok' Zundu"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33313,
-          "Locations": [
-            {
-              "Position": {
-                "X": 284.0225,
-                "Y": -40.41348,
-                "Z": -766.5984
-              },
-              "MinimumAngle": 160,
-              "MaximumAngle": 245,
-              "MinimumDistance": 1.6,
-              "MaximumDistance": 3
-            }
-          ]
-        },
-        {
-          "DataId": 33314,
-          "Locations": [
-            {
-              "Position": {
-                "X": 291.4046,
-                "Y": -40.37925,
-                "Z": -758.5402
-              },
-              "MinimumAngle": 210,
-              "MaximumAngle": 345
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33315,
-          "Locations": [
-            {
-              "Position": {
-                "X": 358.8156,
-                "Y": -41.42974,
-                "Z": -734.5118
-              },
-              "MinimumAngle": 115,
-              "MaximumAngle": 250
-            }
-          ]
-        },
-        {
-          "DataId": 33316,
-          "Locations": [
-            {
-              "Position": {
-                "X": 367.6869,
-                "Y": -41.54303,
-                "Z": -735.3597
-              },
-              "MinimumAngle": 70,
-              "MaximumAngle": 220
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33317,
-          "Locations": [
-            {
-              "Position": {
-                "X": 452.3558,
-                "Y": -47.13874,
-                "Z": -752.6805
-              },
-              "MinimumAngle": 150,
-              "MaximumAngle": 275
-            }
-          ]
-        },
-        {
-          "DataId": 33318,
-          "Locations": [
-            {
-              "Position": {
-                "X": 465.9165,
-                "Y": -47.82627,
-                "Z": -756.4039
-              },
-              "MinimumAngle": 35,
-              "MaximumAngle": 160,
-              "MinimumDistance": 1.2,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/495_Onsal Hakair_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Azim Steppe - Dawn Throne"
-    }
-  ],
+  "TerritoryId": 622,
+  "AetheryteShortcut": "Azim Steppe - Dawn Throne",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Azim Steppe/519_Nhaama's Retreat_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Azim Steppe - Dawn Throne"
-    }
-  ],
+  "TerritoryId": 622,
+  "AetheryteShortcut": "Azim Steppe - Dawn Throne",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Azim Steppe/541_Ceol Aen__MIN.json

@@ -1,64 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32314,
-          "Locations": [
-            {
-              "Position": {
-                "X": -506.7959,
-                "Y": 67.50204,
-                "Z": -406.9001
-              },
-              "MinimumAngle": 5,
-              "MaximumAngle": 170,
-              "MinimumDistance": 1,
-              "MaximumDistance": 2.3
-            }
-          ]
-        },
-        {
-          "DataId": 32315,
-          "Locations": [
-            {
-              "Position": {
-                "X": -505.4885,
-                "Y": 67.502,
-                "Z": -397.644
-              },
-              "MinimumAngle": -20,
-              "MaximumAngle": 105,
-              "MinimumDistance": 1,
-              "MaximumDistance": 2.1
-            }
-          ]
-        },
-        {
-          "DataId": 32316,
-          "Locations": [
-            {
-              "Position": {
-                "X": -501.4457,
-                "Y": 67.48835,
-                "Z": -391.6048
-              },
-              "MinimumAngle": -50,
-              "MaximumAngle": 105,
-              "MinimumDistance": 1,
-              "MaximumDistance": 2.2
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/542_Azim Khaat_MIN.json

@@ -1,64 +0,0 @@
-{
-  "schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32317,
-          "Locations": [
-            {
-              "Position": {
-                "X": 147.9038,
-                "Y": 17.89183,
-                "Z": -63.83757
-              },
-              "MinimumAngle": 20,
-              "MaximumAngle": 340
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32318,
-          "Locations": [
-            {
-              "Position": {
-                "X": 178.1422,
-                "Y": 13.02608,
-                "Z": -45.63166
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32319,
-          "Locations": [
-            {
-              "Position": {
-                "X": 141.474,
-                "Y": 18.02604,
-                "Z": -61.94627
-              },
-              "MinimumAngle": 20,
-              "MaximumAngle": 340
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/543_Sea of Blades_MIN.json

@@ -1,69 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32320,
-          "Locations": [
-            {
-              "Position": {
-                "X": 609.3118,
-                "Y": -21.51083,
-                "Z": 558.524
-              },
-              "MinimumAngle": 90,
-              "MaximumAngle": 270,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32321,
-          "Locations": [
-            {
-              "Position": {
-                "X": 609.9794,
-                "Y": -21.53052,
-                "Z": 579.6443
-              },
-              "MinimumAngle": 90,
-              "MaximumAngle": 135,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32322,
-          "Locations": [
-            {
-              "Position": {
-                "X": 588.3865,
-                "Y": -20.42655,
-                "Z": 561.5663
-              },
-              "MinimumAngle": 45,
-              "MaximumAngle": 315,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/544_Onsal Hakair_MIN.json

@@ -1,61 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "plogon_enjoyer",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Azim Steppe - Dawn Throne"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32323,
-          "Locations": [
-            {
-              "Position": {
-                "X": -54.36381,
-                "Y": 55.83623,
-                "Z": -357.2043
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32325,
-          "Locations": [
-            {
-              "Position": {
-                "X": -56.99122,
-                "Y": 59.4855,
-                "Z": -368.9053
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32324,
-          "Locations": [
-            {
-              "Position": {
-                "X": -83.84797,
-                "Y": 60.70433,
-                "Z": -366.7615
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/545_Onsal Hakair_BTN.json

@@ -1,60 +0,0 @@
-{
-  "schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-        "TerritoryId": 622,
-        "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32326,
-          "Locations": [
-            {
-              "Position": {
-                  "X": -515.5125,
-                  "Y": 65.79073,
-                  "Z": -386.0356
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32327,
-          "Locations": [
-            {
-              "Position": {
-                  "X": -527.5466,
-                  "Y": 64.7018,
-                  "Z": -379.2951
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32328,
-          "Locations": [
-            {
-              "Position": {
-                  "X": -505.5859,
-                  "Y": 64.95732,
-                  "Z": -367.5692
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/546_Azim Khaat_BTN.json

@@ -1,60 +0,0 @@
-{
-  "schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32329,
-          "Locations": [
-            {
-              "Position": {
-                "X": 152.6547,
-                "Y": 18.44606,
-                "Z": -48.11443
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32330,
-          "Locations": [
-            {
-              "Position": {
-                "X": 153.6145,
-                "Y": 17.2952,
-                "Z": -64.51379
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32331,
-          "Locations": [
-            {
-              "Position": {
-                "X": 170.0975,
-                "Y": 14.96311,
-                "Z": -52.22673
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/547_Sea of Blades_BTN.json

@@ -1,60 +0,0 @@
-{
-  "schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32332,
-          "Locations": [
-            {
-              "Position": {
-                "X": 573.6873,
-                "Y": -20.41718,
-                "Z": 582.5559
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32333,
-          "Locations": [
-            {
-              "Position": {
-                "X": 579.1252,
-                "Y": -20.40873,
-                "Z": 565.84
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32334,
-          "Locations": [
-            {
-              "Position": {
-                "X": 608.5944,
-                "Y": -21.23272,
-                "Z": 571.2001
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/548_Onsal Hakair_BTN.json

@@ -1,61 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "plogon_enjoyer",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Azim Steppe - Dawn Throne"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32335,
-          "Locations": [
-            {
-              "Position": {
-                "X": -80.14488,
-                "Y": 58.18221,
-                "Z": -358.3333
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32336,
-          "Locations": [
-            {
-              "Position": {
-                "X": -58.9046,
-                "Y": 52.59887,
-                "Z": -350.7942
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32337,
-          "Locations": [
-            {
-              "Position": {
-                "X": -81.5958,
-                "Y": 51.05495,
-                "Z": -334.9854
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/549_Onsal Hakair_MIN.json

@@ -1,60 +0,0 @@
-{
-  "schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-        "TerritoryId": 622,
-        "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32338,
-          "Locations": [
-            {
-                "Position": {
-                    "X": 727.463,
-                    "Y": 14.92286,
-                    "Z": -477.1528
-                }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32339,
-          "Locations": [
-            {
-                "Position": {
-                    "X": 721.5626,
-                    "Y": 24.81664,
-                    "Z": -499.1444
-                }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32340,
-          "Locations": [
-            {
-                "Position": {
-                    "X": 702.1278,
-                    "Y": 27.92893,
-                    "Z": -505.186
-                }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/550_Onsal Hakair_BTN.json

@@ -1,60 +0,0 @@
-{
-  "schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "Theo",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32341,
-          "Locations": [
-            {
-              "Position": {
-                "X": 615.4055,
-                "Y": 31.42307,
-                "Z": -475.3718
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32342,
-          "Locations": [
-            {
-              "Position": {
-                "X": 612.0082,
-                "Y": 25.45944,
-                "Z": -442.0886
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32343,
-          "Locations": [
-            {
-              "Position": {
-                "X": 634.1258,
-                "Y": 21.76424,
-                "Z": -436.3917
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/812_Kahkol Iloh_MIN.json

@@ -1,111 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Azim Steppe - Reunion"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33883,
-          "Locations": [
-            {
-              "Position": {
-                "X": 128.0255,
-                "Y": -1.00095,
-                "Z": 322.0047
-              },
-              "MinimumAngle": -120,
-              "MaximumAngle": 65
-            }
-          ]
-        },
-        {
-          "DataId": 33884,
-          "Locations": [
-            {
-              "Position": {
-                "X": 116.5815,
-                "Y": -1.584854,
-                "Z": 321.8561
-              },
-              "MinimumAngle": -65,
-              "MaximumAngle": 100
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33882,
-          "Locations": [
-            {
-              "Position": {
-                "X": -31.5303,
-                "Y": -2.218102,
-                "Z": 328.7178
-              },
-              "MinimumAngle": 110,
-              "MaximumAngle": 255
-            }
-          ]
-        },
-        {
-          "DataId": 33881,
-          "Locations": [
-            {
-              "Position": {
-                "X": -44.53269,
-                "Y": -1.966054,
-                "Z": 332.6949
-              },
-              "MinimumAngle": 120,
-              "MaximumAngle": 225
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33880,
-          "Locations": [
-            {
-              "Position": {
-                "X": 37.46276,
-                "Y": -4.431953,
-                "Z": 425.0844
-              },
-              "MinimumAngle": 140,
-              "MaximumAngle": 240
-            }
-          ]
-        },
-        {
-          "DataId": 33879,
-          "Locations": [
-            {
-              "Position": {
-                "X": 46.12198,
-                "Y": -5.283945,
-                "Z": 426.5148
-              },
-              "MinimumAngle": 115,
-              "MaximumAngle": 255,
-              "MinimumDistance": 1.5,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Azim Steppe/813_Onsal Hakair_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 622,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Azim Steppe - Dawn Throne"
-    }
-  ],
+  "TerritoryId": 622,
+  "AetheryteShortcut": "Azim Steppe - Dawn Throne",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Fringes/485_East End_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 612,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Fringes - Castrum Oriens"
-    }
-  ],
+  "TerritoryId": 612,
+  "AetheryteShortcut": "Fringes - Castrum Oriens",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Fringes/486_The Striped Hills_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 612,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Fringes - Castrum Oriens"
-    }
-  ],
+  "TerritoryId": 612,
+  "AetheryteShortcut": "Fringes - Castrum Oriens",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Fringes/505_East End_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 612,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Fringes - Castrum Oriens"
-    }
-  ],
+  "TerritoryId": 612,
+  "AetheryteShortcut": "Fringes - Castrum Oriens",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Fringes/509_Dimwold_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 612,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Fringes - Castrum Oriens"
-    }
-  ],
+  "TerritoryId": 612,
+  "AetheryteShortcut": "Fringes - Castrum Oriens",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Fringes/513_Dimwold_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 612,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Fringes - Castrum Oriens"
-    }
-  ],
+  "TerritoryId": 612,
+  "AetheryteShortcut": "Fringes - Castrum Oriens",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Fringes/810_Vira Nilya_MIN.json

@@ -1,115 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 612,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Fringes - Peering Stones"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33871,
-          "Locations": [
-            {
-              "Position": {
-                "X": 556.8531,
-                "Y": 73.44064,
-                "Z": 99.57761
-              },
-              "MinimumAngle": 35,
-              "MaximumAngle": 160
-            }
-          ]
-        },
-        {
-          "DataId": 33872,
-          "Locations": [
-            {
-              "Position": {
-                "X": 561.7782,
-                "Y": 73.45153,
-                "Z": 72.6368
-              },
-              "MinimumAngle": 15,
-              "MaximumAngle": 165,
-              "MinimumDistance": 1.3,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33867,
-          "Locations": [
-            {
-              "Position": {
-                "X": 498.26,
-                "Y": 76.74628,
-                "Z": -46.34168
-              },
-              "MinimumAngle": -65,
-              "MaximumAngle": 45
-            }
-          ]
-        },
-        {
-          "DataId": 33868,
-          "Locations": [
-            {
-              "Position": {
-                "X": 473.011,
-                "Y": 76.55681,
-                "Z": -47.70556
-              },
-              "MinimumAngle": -45,
-              "MaximumAngle": 60,
-              "MinimumDistance": 1.9,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33870,
-          "Locations": [
-            {
-              "Position": {
-                "X": 361.4784,
-                "Y": 70.79905,
-                "Z": 146.1887
-              },
-              "MinimumAngle": -55,
-              "MaximumAngle": 40,
-              "MinimumDistance": 1.3,
-              "MaximumDistance": 3
-            }
-          ]
-        },
-        {
-          "DataId": 33869,
-          "Locations": [
-            {
-              "Position": {
-                "X": 364.7684,
-                "Y": 70.90228,
-                "Z": 167.3831
-              },
-              "MinimumAngle": 105,
-              "MaximumAngle": 230
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Fringes/811_Virdjala_BTN.json

@@ -1,109 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 612,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Fringes - Peering Stones"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33875,
-          "Locations": [
-            {
-              "Position": {
-                "X": 567.9412,
-                "Y": 50.43103,
-                "Z": 373.1152
-              },
-              "MinimumAngle": 200,
-              "MaximumAngle": 350
-            }
-          ]
-        },
-        {
-          "DataId": 33876,
-          "Locations": [
-            {
-              "Position": {
-                "X": 578.4171,
-                "Y": 48.36443,
-                "Z": 365.4806
-              },
-              "MinimumAngle": -45,
-              "MaximumAngle": 120
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33873,
-          "Locations": [
-            {
-              "Position": {
-                "X": 599.5352,
-                "Y": 75.60928,
-                "Z": 244.3069
-              },
-              "MinimumAngle": -80,
-              "MaximumAngle": 70
-            }
-          ]
-        },
-        {
-          "DataId": 33874,
-          "Locations": [
-            {
-              "Position": {
-                "X": 592.9609,
-                "Y": 75.62624,
-                "Z": 268.9515
-              },
-              "MinimumAngle": 110,
-              "MaximumAngle": 285
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33878,
-          "Locations": [
-            {
-              "Position": {
-                "X": 753.3094,
-                "Y": 72.73058,
-                "Z": 364.073
-              },
-              "MinimumAngle": 95,
-              "MaximumAngle": 240
-            }
-          ]
-        },
-        {
-          "DataId": 33877,
-          "Locations": [
-            {
-              "Position": {
-                "X": 764.3023,
-                "Y": 74.18732,
-                "Z": 337.2563
-              },
-              "MinimumAngle": -70,
-              "MaximumAngle": 105
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Lochs/493_The High Bank_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 621,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Lochs - Porta Praetoria"
-    }
-  ],
+  "TerritoryId": 621,
+  "AetheryteShortcut": "Lochs - Porta Praetoria",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Lochs/514_Abalathia's Skull_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 621,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Lochs - Ala Mhigan Quarter"
-    }
-  ],
+  "TerritoryId": 621,
+  "AetheryteShortcut": "Lochs - Ala Mhigan Quarter",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Lochs/526_Abalathia's Skull_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 621,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Lochs - Porta Praetoria"
-    }
-  ],
+  "TerritoryId": 621,
+  "AetheryteShortcut": "Lochs - Porta Praetoria",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Lochs/732_The Queen's Gardens_MIN.json

@@ -1,120 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 621,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Lochs - Ala Mhigan Quarter"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33339,
-          "Locations": [
-            {
-              "Position": {
-                "X": 440.6299,
-                "Y": 74.86803,
-                "Z": -205.3779
-              },
-              "MinimumAngle": 85,
-              "MaximumAngle": 215
-            }
-          ]
-        },
-        {
-          "DataId": 33340,
-          "Locations": [
-            {
-              "Position": {
-                "X": 426.4497,
-                "Y": 70.57706,
-                "Z": -198.046
-              },
-              "MinimumAngle": 95,
-              "MaximumAngle": 180,
-              "MinimumDistance": 1.3,
-              "MaximumDistance": 3
-            },
-            {
-              "Position": {
-                "X": 453.1248,
-                "Y": 77.29013,
-                "Z": -211.6347
-              },
-              "MinimumAngle": 85,
-              "MaximumAngle": 190
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33337,
-          "Locations": [
-            {
-              "Position": {
-                "X": 561.2196,
-                "Y": 94.65154,
-                "Z": -315.6258
-              },
-              "MinimumAngle": 50,
-              "MaximumAngle": 160
-            }
-          ]
-        },
-        {
-          "DataId": 33338,
-          "Locations": [
-            {
-              "Position": {
-                "X": 563.1749,
-                "Y": 93.41929,
-                "Z": -335.4834
-              },
-              "MinimumAngle": -25,
-              "MaximumAngle": 75
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33341,
-          "Locations": [
-            {
-              "Position": {
-                "X": 388.9345,
-                "Y": 54.85489,
-                "Z": -350.8919
-              },
-              "MinimumAngle": 55,
-              "MaximumAngle": 150
-            }
-          ]
-        },
-        {
-          "DataId": 33342,
-          "Locations": [
-            {
-              "Position": {
-                "X": 394.7824,
-                "Y": 51.66671,
-                "Z": -369.6645
-              },
-              "MinimumAngle": 70,
-              "MaximumAngle": 135
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Peaks/489_Rustrock_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 620,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Peaks - Ala Gannha"
-    }
-  ],
+  "TerritoryId": 620,
+  "AetheryteShortcut": "Peaks - Ala Gannha",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Peaks/512_The Last Forest_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 620,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Peaks - Ala Gannha"
-    }
-  ],
+  "TerritoryId": 620,
+  "AetheryteShortcut": "Peaks - Ala Gannha",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Peaks/531_Sleeping Stones_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 620,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Peaks - Ala Gannha"
-    }
-  ],
+  "TerritoryId": 620,
+  "AetheryteShortcut": "Peaks - Ala Gannha",
   "Groups": [
     {
       "Nodes": [
@@ -84,10 +79,8 @@
                 "Y": 257.4255,
                 "Z": -669.3115
               },
-              "MinimumAngle": -50,
-              "MaximumAngle": -15,
-              "MinimumDistance": 2.1,
-              "MaximumDistance": 3
+              "MinimumAngle": -30,
+              "MaximumAngle": 5
             }
           ]
         }

GatheringPaths/4.x - Stormblood/The Peaks/532_The Last Forest_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 620,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Peaks - Ala Gannha"
-    }
-  ],
+  "TerritoryId": 620,
+  "AetheryteShortcut": "Peaks - Ala Gannha",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Peaks/729_Hidden Tear_BTN.json

@@ -1,118 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 620,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Peaks - Ala Gannha"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33321,
-          "Locations": [
-            {
-              "Position": {
-                "X": 518.1079,
-                "Y": 218.4718,
-                "Z": -593.7597
-              },
-              "MinimumAngle": -140,
-              "MaximumAngle": 70
-            }
-          ]
-        },
-        {
-          "DataId": 33322,
-          "Locations": [
-            {
-              "Position": {
-                "X": 543.8551,
-                "Y": 223.6571,
-                "Z": -583.9418
-              },
-              "MinimumAngle": 175,
-              "MaximumAngle": 290
-            },
-            {
-              "Position": {
-                "X": 513.8116,
-                "Y": 218.4708,
-                "Z": -580.1434
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 145
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33323,
-          "Locations": [
-            {
-              "Position": {
-                "X": 648.0388,
-                "Y": 230.7679,
-                "Z": -678.8027
-              },
-              "MinimumAngle": 225,
-              "MaximumAngle": 345
-            }
-          ]
-        },
-        {
-          "DataId": 33324,
-          "Locations": [
-            {
-              "Position": {
-                "X": 675.1682,
-                "Y": 234.6712,
-                "Z": -675.749
-              },
-              "MinimumAngle": -55,
-              "MaximumAngle": 85
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33320,
-          "Locations": [
-            {
-              "Position": {
-                "X": 722.4699,
-                "Y": 242.8886,
-                "Z": -598.9974
-              },
-              "MinimumAngle": 65,
-              "MaximumAngle": 195
-            }
-          ]
-        },
-        {
-          "DataId": 33319,
-          "Locations": [
-            {
-              "Position": {
-                "X": 718.4479,
-                "Y": 244.6019,
-                "Z": -583.6996
-              },
-              "MinimumAngle": 45,
-              "MaximumAngle": 190
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Peaks/777_Heather Falls_BTN.json

@@ -1,31 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 620,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Peaks - Ala Gannha"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33028,
-          "Locations": [
-            {
-              "Position": {
-                "X": 454.6367,
-                "Y": 227.1414,
-                "Z": -731.7471
-              },
-              "MinimumAngle": -120,
-              "MaximumAngle": 65
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Ruby Sea/487_Hells' Lid_MIN.json

@@ -1,16 +1,11 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Kugane",
-      "AethernetShortcut": [
-        "[Kugane] Aetheryte Plaza",
-        "[Kugane] The Ruby Price"
-      ]
-    }
+  "TerritoryId": 613,
+  "AetheryteShortcut": "Kugane",
+  "AethernetShortcut": [
+    "[Kugane] Aetheryte Plaza",
+    "[Kugane] The Ruby Price"
   ],
   "Groups": [
     {

GatheringPaths/4.x - Stormblood/The Ruby Sea/490_Rasen Kaikyo_MIN.json

@@ -1,149 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "Position": {
-        "X": 322.1539,
-        "Y": -121.22571,
-        "Z": -314.2446
-      },
-      "TerritoryId": 613,
-      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu",
-      "RestartNavigationIfCancelled": false
-    },
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32153,
-          "Locations": [
-            {
-              "Position": {
-                "X": -373.2205,
-                "Y": -136.6522,
-                "Z": -274.8914
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32154,
-          "Locations": [
-            {
-              "Position": {
-                "X": -448.4877,
-                "Y": -116.7225,
-                "Z": -302.5894
-              }
-            },
-            {
-              "Position": {
-                "X": -367.8707,
-                "Y": -141.2844,
-                "Z": -234.9824
-              }
-            },
-            {
-              "Position": {
-                "X": -410.8549,
-                "Y": -118.3526,
-                "Z": -327.6413
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32158,
-          "Locations": [
-            {
-              "Position": {
-                "X": -541.3218,
-                "Y": -110.9725,
-                "Z": -162.0661
-              }
-            },
-            {
-              "Position": {
-                "X": -541.0571,
-                "Y": -101.0088,
-                "Z": -238.4313
-              }
-            },
-            {
-              "Position": {
-                "X": -557.3869,
-                "Y": -91.38704,
-                "Z": -232.6365
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32157,
-          "Locations": [
-            {
-              "Position": {
-                "X": -527.4707,
-                "Y": -125.4386,
-                "Z": -165.366
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32155,
-          "Locations": [
-            {
-              "Position": {
-                "X": -460.3799,
-                "Y": -154.5827,
-                "Z": -110.9484
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32156,
-          "Locations": [
-            {
-              "Position": {
-                "X": -399.089,
-                "Y": -145.1425,
-                "Z": -6.001478
-              }
-            },
-            {
-              "Position": {
-                "X": -474.2804,
-                "Y": -142.6447,
-                "Z": -92.2213
-              }
-            },
-            {
-              "Position": {
-                "X": -474.9154,
-                "Y": -132.8651,
-                "Z": -73.47042
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Ruby Sea/507_Onokoro_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Ruby Sea - Onokoro"
-    }
-  ],
+  "TerritoryId": 613,
+  "AetheryteShortcut": "Ruby Sea - Onokoro",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Ruby Sea/510_East Othard Coastline_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Ruby Sea - Onokoro"
-    }
-  ],
+  "TerritoryId": 613,
+  "AetheryteShortcut": "Ruby Sea - Onokoro",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Ruby Sea/511_Rasen Kaikyo_BTN.json

@@ -1,23 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "Position": {
-        "X": 322.1539,
-        "Y": -121.22571,
-        "Z": -314.2446
-      },
-      "TerritoryId": 613,
-      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu",
-      "RestartNavigationIfCancelled": false
-    },
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 613,
+  "AetheryteShortcut": "Ruby Sea - Tamamizu",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Ruby Sea/529_Rasen Kaikyo_BTN.json

@@ -1,23 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "Position": {
-        "X": 322.1539,
-        "Y": -121.22571,
-        "Z": -314.2446
-      },
-      "TerritoryId": 613,
-      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu",
-      "RestartNavigationIfCancelled": false
-    },
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 613,
+  "AetheryteShortcut": "Ruby Sea - Onokoro",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Ruby Sea/533_The Turquoise Trench_MIN.json

@@ -1,16 +1,11 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Kugane",
-      "AethernetShortcut": [
-        "[Kugane] Aetheryte Plaza",
-        "[Kugane] The Ruby Price"
-      ]
-    }
+  "TerritoryId": 613,
+  "AetheryteShortcut": "Kugane",
+  "AethernetShortcut": [
+    "[Kugane] Aetheryte Plaza",
+    "[Kugane] The Ruby Price"
   ],
   "FlyBetweenNodes": true,
   "Groups": [
@@ -40,7 +35,7 @@
                 "Z": 634.821
               },
               "MinimumAngle": 45,
-              "MaximumAngle": 65,
+              "MaximumAngle": 90,
               "MinimumDistance": 1.6,
               "MaximumDistance": 3
             },

GatheringPaths/4.x - Stormblood/The Ruby Sea/534_The Isle of Bekko_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
-    }
-  ],
+  "TerritoryId": 613,
+  "AetheryteShortcut": "Ruby Sea - Tamamizu",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/The Ruby Sea/535_East Othard Coastline_MIN.json

@@ -1,49 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Ruby Sea - Onokoro"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32308,
-          "Locations": [
-            {
-              "Position": {
-                "X": -531.8166,
-                "Y": 16.39526,
-                "Z": 34.16671
-              },
-              "MinimumAngle": 245,
-              "MaximumAngle": 325
-            },
-            {
-              "Position": {
-                "X": -532.9277,
-                "Y": 15.60621,
-                "Z": 50.29741
-              },
-              "MinimumAngle": 190,
-              "MaximumAngle": 330
-            },
-            {
-              "Position": {
-                "X": -520.6714,
-                "Y": 14.15115,
-                "Z": 73.84262
-              },
-              "MinimumAngle": 105,
-              "MaximumAngle": 230
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Ruby Sea/730_The Kobayashi Maru_MIN.json

@@ -1,150 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "Position": {
-        "X": 322.1539,
-        "Y": -121.22571,
-        "Z": -314.2446
-      },
-      "TerritoryId": 613,
-      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu",
-      "RestartNavigationIfCancelled": false
-    },
-    {
-      "TerritoryId": 613,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33325,
-          "Locations": [
-            {
-              "Position": {
-                "X": 953.1041,
-                "Y": -127.1716,
-                "Z": -816.3145
-              },
-              "MinimumAngle": -25,
-              "MaximumAngle": 100
-            }
-          ]
-        },
-        {
-          "DataId": 33326,
-          "Locations": [
-            {
-              "Position": {
-                "X": 956.8734,
-                "Y": -129.366,
-                "Z": -843.1625
-              },
-              "MinimumAngle": 75,
-              "MaximumAngle": 210
-            },
-            {
-              "Position": {
-                "X": 976.0558,
-                "Y": -131.5356,
-                "Z": -813.2305
-              },
-              "MinimumAngle": -65,
-              "MaximumAngle": 30,
-              "MinimumDistance": 1.4,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33327,
-          "Locations": [
-            {
-              "Position": {
-                "X": 887.1607,
-                "Y": -141.6279,
-                "Z": -863.3355
-              },
-              "MinimumAngle": 185,
-              "MaximumAngle": 340
-            }
-          ]
-        },
-        {
-          "DataId": 33328,
-          "Locations": [
-            {
-              "Position": {
-                "X": 874.0369,
-                "Y": -135.9791,
-                "Z": -848.3512
-              },
-              "MinimumAngle": -80,
-              "MaximumAngle": 60
-            },
-            {
-              "Position": {
-                "X": 895.865,
-                "Y": -144.0468,
-                "Z": -890.5269
-              },
-              "MinimumAngle": 195,
-              "MaximumAngle": 315
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33329,
-          "Locations": [
-            {
-              "Position": {
-                "X": 836.5433,
-                "Y": -140.1729,
-                "Z": -948.7974
-              },
-              "MinimumAngle": 130,
-              "MaximumAngle": 295
-            }
-          ]
-        },
-        {
-          "DataId": 33330,
-          "Locations": [
-            {
-              "Position": {
-                "X": 843.2012,
-                "Y": -139.2853,
-                "Z": -961.9124
-              },
-              "MinimumAngle": -95,
-              "MaximumAngle": 15,
-              "MinimumDistance": 1.3,
-              "MaximumDistance": 3
-            },
-            {
-              "Position": {
-                "X": 856.3994,
-                "Y": -142.4276,
-                "Z": -941.0324
-              },
-              "MinimumAngle": 115,
-              "MaximumAngle": 265
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/Yanxia/488_The Gensui Chain_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 614,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Yanxia - Namai"
-    }
-  ],
+  "TerritoryId": 614,
+  "AetheryteShortcut": "Yanxia - Namai",
   "Groups": [
     {
       "Nodes": [
@@ -52,10 +47,8 @@
                 "Y": 70.24178,
                 "Z": 19.50875
               },
-              "MinimumAngle": 140,
-              "MaximumAngle": 215,
-              "MinimumDistance": 1.8,
-              "MaximumDistance": 3
+              "MinimumAngle": 120,
+              "MaximumAngle": 240
             }
           ]
         }
@@ -160,4 +153,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/4.x - Stormblood/Yanxia/491_Unseen Spirits Laughing_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 614,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Yanxia - Namai"
-    }
-  ],
+  "TerritoryId": 614,
+  "AetheryteShortcut": "Yanxia - Namai",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/Yanxia/508_The Heron's Flight_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 614,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Yanxia - Namai"
-    }
-  ],
+  "TerritoryId": 614,
+  "AetheryteShortcut": "Yanxia - Namai",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/4.x - Stormblood/Yanxia/731_Yuzuka Manor_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 614,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Yanxia - Namai"
-    }
-  ],
+  "TerritoryId": 614,
+  "AetheryteShortcut": "Yanxia - Namai",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/5.x - Shadowbringers/Amh Araeng/591_Twitch_MIN.json

@@ -1,138 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 815,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Amh Araeng - Inn at Journey's Head"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32625,
-          "Locations": [
-            {
-              "Position": {
-                "X": 451.1189,
-                "Y": -40.18039,
-                "Z": 184.7025
-              },
-              "MinimumAngle": 95,
-              "MaximumAngle": 245
-            },
-            {
-              "Position": {
-                "X": 471.4881,
-                "Y": -41.63216,
-                "Z": 185.0577
-              },
-              "MinimumAngle": 160,
-              "MaximumAngle": 285
-            }
-          ]
-        },
-        {
-          "DataId": 32624,
-          "Locations": [
-            {
-              "Position": {
-                "X": 463.4016,
-                "Y": -41.51461,
-                "Z": 181.6076
-              },
-              "MinimumAngle": 90,
-              "MaximumAngle": 250
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32622,
-          "Locations": [
-            {
-              "Position": {
-                "X": 507.8041,
-                "Y": -33.50595,
-                "Z": 26.54234
-              },
-              "MinimumAngle": 60,
-              "MaximumAngle": 180,
-              "MinimumDistance": 1,
-              "MaximumDistance": 3
-            }
-          ]
-        },
-        {
-          "DataId": 32623,
-          "Locations": [
-            {
-              "Position": {
-                "X": 509.3797,
-                "Y": -30.43971,
-                "Z": -2.22134
-              },
-              "MinimumAngle": -55,
-              "MaximumAngle": 30
-            },
-            {
-              "Position": {
-                "X": 490.9295,
-                "Y": -30.41992,
-                "Z": -0.7659363
-              },
-              "MinimumAngle": -70,
-              "MaximumAngle": 25
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32621,
-          "Locations": [
-            {
-              "Position": {
-                "X": 378.5,
-                "Y": -29.83888,
-                "Z": 25.41485
-              },
-              "MinimumAngle": -65,
-              "MaximumAngle": 30
-            },
-            {
-              "Position": {
-                "X": 358.2361,
-                "Y": -30,
-                "Z": 26.45336
-              },
-              "MinimumAngle": -40,
-              "MaximumAngle": 45
-            }
-          ]
-        },
-        {
-          "DataId": 32620,
-          "Locations": [
-            {
-              "Position": {
-                "X": 365.5395,
-                "Y": -34.4827,
-                "Z": 42.98462
-              },
-              "MinimumAngle": 190,
-              "MaximumAngle": 285
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Amh Araeng/611_Snitch_BTN.json

@@ -1,132 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 815,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Amh Araeng - Mord Souq"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32686,
-          "Locations": [
-            {
-              "Position": {
-                "X": 486.6385,
-                "Y": -28.30028,
-                "Z": -161.7677
-              },
-              "MinimumAngle": 155,
-              "MaximumAngle": 335
-            },
-            {
-              "Position": {
-                "X": 494.8945,
-                "Y": -21.52249,
-                "Z": -137.1469
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32685,
-          "Locations": [
-            {
-              "Position": {
-                "X": 503.6436,
-                "Y": -23.70927,
-                "Z": -142.2979
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32689,
-          "Locations": [
-            {
-              "Position": {
-                "X": 657.1875,
-                "Y": -26.81644,
-                "Z": -235.4547
-              },
-              "MinimumAngle": 65,
-              "MaximumAngle": 270
-            }
-          ]
-        },
-        {
-          "DataId": 32690,
-          "Locations": [
-            {
-              "Position": {
-                "X": 655.8629,
-                "Y": -27.85928,
-                "Z": -256.156
-              },
-              "MinimumAngle": 65,
-              "MaximumAngle": 235
-            },
-            {
-              "Position": {
-                "X": 656.6887,
-                "Y": -26.66475,
-                "Z": -230.172
-              },
-              "MinimumAngle": -75,
-              "MaximumAngle": 135
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32688,
-          "Locations": [
-            {
-              "Position": {
-                "X": 487.4965,
-                "Y": -33.01668,
-                "Z": -304.6423
-              },
-              "MinimumAngle": 150,
-              "MaximumAngle": 330
-            },
-            {
-              "Position": {
-                "X": 477.8194,
-                "Y": -31.87613,
-                "Z": -320.6989
-              },
-              "MinimumAngle": 180,
-              "MaximumAngle": 310
-            }
-          ]
-        },
-        {
-          "DataId": 32687,
-          "Locations": [
-            {
-              "Position": {
-                "X": 481.1932,
-                "Y": -32.4591,
-                "Z": -313.7588
-              },
-              "MinimumAngle": 170,
-              "MaximumAngle": 305
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Amh Araeng/919_The Central Hills of Amber_MIN.json

@@ -1,136 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 815,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Amh Araeng - Twine"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34411,
-          "Locations": [
-            {
-              "Position": {
-                "X": -418.0731,
-                "Y": 16.25609,
-                "Z": -127.4739
-              },
-              "MinimumAngle": 240,
-              "MaximumAngle": 360
-            }
-          ]
-        },
-        {
-          "DataId": 34412,
-          "Locations": [
-            {
-              "Position": {
-                "X": -436.8404,
-                "Y": 18.18649,
-                "Z": -121.9686
-              },
-              "MinimumAngle": -80,
-              "MaximumAngle": 75
-            },
-            {
-              "Position": {
-                "X": -412.7203,
-                "Y": 17.72583,
-                "Z": -144.2871
-              },
-              "MinimumAngle": -145,
-              "MaximumAngle": 5
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34409,
-          "Locations": [
-            {
-              "Position": {
-                "X": -309.9351,
-                "Y": 22.43881,
-                "Z": -196.324
-              },
-              "MinimumAngle": -70,
-              "MaximumAngle": 60
-            }
-          ]
-        },
-        {
-          "DataId": 34410,
-          "Locations": [
-            {
-              "Position": {
-                "X": -301.4662,
-                "Y": 22.08392,
-                "Z": -205.1306
-              },
-              "MinimumAngle": -145,
-              "MaximumAngle": -20
-            },
-            {
-              "Position": {
-                "X": -318.3467,
-                "Y": 23.1723,
-                "Z": -198.7676
-              },
-              "MinimumAngle": -45,
-              "MaximumAngle": 85
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34414,
-          "Locations": [
-            {
-              "Position": {
-                "X": -229.6105,
-                "Y": 5.158276,
-                "Z": -103.3359
-              },
-              "MinimumAngle": -40,
-              "MaximumAngle": 170
-            },
-            {
-              "Position": {
-                "X": -247.2413,
-                "Y": 9.6758,
-                "Z": -128.0531
-              },
-              "MinimumAngle": 30,
-              "MaximumAngle": 125
-            }
-          ]
-        },
-        {
-          "DataId": 34413,
-          "Locations": [
-            {
-              "Position": {
-                "X": -248.8988,
-                "Y": 7.998118,
-                "Z": -121.8732
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 160
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Amh Araeng/922_Garik_BTN.json

@@ -1,122 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 815,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Amh Araeng - Twine"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34430,
-          "Locations": [
-            {
-              "Position": {
-                "X": -449.9385,
-                "Y": -1.370689,
-                "Z": -409.258
-              }
-            },
-            {
-              "Position": {
-                "X": -445.7757,
-                "Y": -0.7637522,
-                "Z": -415.8121
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34429,
-          "Locations": [
-            {
-              "Position": {
-                "X": -451.2528,
-                "Y": -1.577711,
-                "Z": -414.294
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34427,
-          "Locations": [
-            {
-              "Position": {
-                "X": -346.0392,
-                "Y": 0.6433533,
-                "Z": -541.9421
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34428,
-          "Locations": [
-            {
-              "Position": {
-                "X": -326.9622,
-                "Y": 1.097262,
-                "Z": -537.5435
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 220
-            },
-            {
-              "Position": {
-                "X": -357.2281,
-                "Y": 0.4458784,
-                "Z": -513.3207
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34431,
-          "Locations": [
-            {
-              "Position": {
-                "X": -441.0019,
-                "Y": -5.337227,
-                "Z": -636.1525
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34432,
-          "Locations": [
-            {
-              "Position": {
-                "X": -464.1121,
-                "Y": -5.420424,
-                "Z": -649.8243
-              }
-            },
-            {
-              "Position": {
-                "X": -436.4872,
-                "Y": -5.205373,
-                "Z": -638.8244
-              },
-              "MinimumAngle": -95,
-              "MaximumAngle": 85
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Il Mheg/651_Thysm Lran_BTN.json

@@ -1,140 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "Position": {
-        "X": 329.38184,
-        "Y": 9.586891,
-        "Z": 749.2314
-      },
-      "TerritoryId": 816,
-      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Il Mheg - Lydha Lran",
-      "Fly": true,
-      "SkipConditions": {
-        "AetheryteShortcutIf": {
-          "InSameTerritory": true
-        }
-      }
-    },
-    {
-      "Position": {
-        "X": 351.29465,
-        "Y": -38.275272,
-        "Z": 763.0457
-      },
-      "TerritoryId": 816,
-      "InteractionType": "WalkTo",
-      "Fly": true,
-      "DisableNavmesh": true
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32832,
-          "Locations": [
-            {
-              "Position": {
-                "X": 382.7488,
-                "Y": -72.47251,
-                "Z": 794.3513
-              }
-            },
-            {
-              "Position": {
-                "X": 388.7861,
-                "Y": -74.19925,
-                "Z": 801.0947
-              }
-            },
-            {
-              "Position": {
-                "X": 386.1797,
-                "Y": -73.5009,
-                "Z": 787.0967
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32831,
-          "Locations": [
-            {
-              "Position": {
-                "X": 396.5799,
-                "Y": -76.29187,
-                "Z": 790.9022
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32830,
-          "Locations": [
-            {
-              "Position": {
-                "X": 492.6384,
-                "Y": -82.73045,
-                "Z": 804.714
-              }
-            },
-            {
-              "Position": {
-                "X": 482.808,
-                "Y": -82.61642,
-                "Z": 802.591
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32829,
-          "Locations": [
-            {
-              "Position": {
-                "X": 493.5814,
-                "Y": -82.43644,
-                "Z": 790.831
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32827,
-          "Locations": [
-            {
-              "Position": {
-                "X": 490.9451,
-                "Y": -97.88062,
-                "Z": 636.6115
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32828,
-          "Locations": [
-            {
-              "Position": {
-                "X": 491.5274,
-                "Y": -100.762,
-                "Z": 626.6958
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Il Mheg/652_Thysm Lran_MIN.json

@@ -1,158 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "Position": {
-        "X": 491.82068,
-        "Y": 3.9304812,
-        "Z": 487.9401
-      },
-      "TerritoryId": 816,
-      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Il Mheg - Lydha Lran",
-      "Fly": true,
-      "SkipConditions": {
-        "AetheryteShortcutIf": {
-          "InSameTerritory": true
-        }
-      }
-    },
-    {
-      "Position": {
-        "X": 506.00256,
-        "Y": -37.76961,
-        "Z": 485.49347
-      },
-      "TerritoryId": 816,
-      "InteractionType": "WalkTo",
-      "Fly": true,
-      "DisableNavmesh": true
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32836,
-          "Locations": [
-            {
-              "Position": {
-                "X": 539.5437,
-                "Y": -81.62054,
-                "Z": 520.1647
-              },
-              "MinimumAngle": -30,
-              "MaximumAngle": 165
-            },
-            {
-              "Position": {
-                "X": 555.8599,
-                "Y": -73.65717,
-                "Z": 494.6164
-              },
-              "MinimumAngle": 35,
-              "MaximumAngle": 240
-            },
-            {
-              "Position": {
-                "X": 576.4164,
-                "Y": -69.75835,
-                "Z": 512.9263
-              },
-              "MinimumAngle": -75,
-              "MaximumAngle": 70
-            }
-          ]
-        },
-        {
-          "DataId": 32835,
-          "Locations": [
-            {
-              "Position": {
-                "X": 552.5504,
-                "Y": -78.23183,
-                "Z": 512.429
-              },
-              "MinimumAngle": -30,
-              "MaximumAngle": 135
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32838,
-          "Locations": [
-            {
-              "Position": {
-                "X": 652.7063,
-                "Y": -46.64378,
-                "Z": 488.4543
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 120
-            },
-            {
-              "Position": {
-                "X": 669.2959,
-                "Y": -47.14824,
-                "Z": 513.9606
-              },
-              "MinimumAngle": -20,
-              "MaximumAngle": 105
-            }
-          ]
-        },
-        {
-          "DataId": 32837,
-          "Locations": [
-            {
-              "Position": {
-                "X": 659.1685,
-                "Y": -46.65159,
-                "Z": 499.8015
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 125
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32834,
-          "Locations": [
-            {
-              "Position": {
-                "X": 576.1583,
-                "Y": -46.68682,
-                "Z": 375.5306
-              },
-              "MinimumAngle": -40,
-              "MaximumAngle": 150
-            }
-          ]
-        },
-        {
-          "DataId": 32833,
-          "Locations": [
-            {
-              "Position": {
-                "X": 571.1834,
-                "Y": -46.41214,
-                "Z": 360.5112
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 115
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Il Mheg/918_Voeburtenburg_MIN.json

@@ -1,136 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 816,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Il Mheg - Wolekdorf"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34407,
-          "Locations": [
-            {
-              "Position": {
-                "X": 398.7715,
-                "Y": 58.00708,
-                "Z": -535.3972
-              },
-              "MinimumAngle": 95,
-              "MaximumAngle": 225
-            }
-          ]
-        },
-        {
-          "DataId": 34408,
-          "Locations": [
-            {
-              "Position": {
-                "X": 395.787,
-                "Y": 57.58823,
-                "Z": -532.1421
-              },
-              "MinimumAngle": 105,
-              "MaximumAngle": 180,
-              "MinimumDistance": 1.5,
-              "MaximumDistance": 3
-            },
-            {
-              "Position": {
-                "X": 403.3334,
-                "Y": 58.56588,
-                "Z": -533.6083
-              },
-              "MinimumAngle": 185,
-              "MaximumAngle": 225,
-              "MinimumDistance": 2,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34405,
-          "Locations": [
-            {
-              "Position": {
-                "X": 563.6605,
-                "Y": 96.62567,
-                "Z": -409.83
-              },
-              "MinimumAngle": 60,
-              "MaximumAngle": 205
-            }
-          ]
-        },
-        {
-          "DataId": 34406,
-          "Locations": [
-            {
-              "Position": {
-                "X": 584.2038,
-                "Y": 97.61217,
-                "Z": -429.3185
-              }
-            },
-            {
-              "Position": {
-                "X": 541.3574,
-                "Y": 95.33327,
-                "Z": -385.5562
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34403,
-          "Locations": [
-            {
-              "Position": {
-                "X": 569.0512,
-                "Y": 96.43839,
-                "Z": -571.2072
-              },
-              "MinimumAngle": 45,
-              "MaximumAngle": 190
-            }
-          ]
-        },
-        {
-          "DataId": 34404,
-          "Locations": [
-            {
-              "Position": {
-                "X": 557.5918,
-                "Y": 92.0403,
-                "Z": -582.1814
-              },
-              "MinimumAngle": 70,
-              "MaximumAngle": 200
-            },
-            {
-              "Position": {
-                "X": 573.9432,
-                "Y": 96.50874,
-                "Z": -575.4167
-              },
-              "MinimumAngle": 85,
-              "MaximumAngle": 220
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Il Mheg/921_Good Jenanna's Grace_BTN.json

@@ -1,120 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 816,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Il Mheg - Wolekdorf"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34422,
-          "Locations": [
-            {
-              "Position": {
-                "X": -161.9915,
-                "Y": 60.04895,
-                "Z": -647.3901
-              }
-            },
-            {
-              "Position": {
-                "X": -179.2945,
-                "Y": 60.84981,
-                "Z": -630.9084
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34421,
-          "Locations": [
-            {
-              "Position": {
-                "X": -182.311,
-                "Y": 60.81965,
-                "Z": -640.2197
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34423,
-          "Locations": [
-            {
-              "Position": {
-                "X": -182.0749,
-                "Y": 60.70063,
-                "Z": -567.6271
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34424,
-          "Locations": [
-            {
-              "Position": {
-                "X": -184.7115,
-                "Y": 59.23207,
-                "Z": -573.9592
-              }
-            },
-            {
-              "Position": {
-                "X": -171.0273,
-                "Y": 62.20385,
-                "Z": -576.3321
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34425,
-          "Locations": [
-            {
-              "Position": {
-                "X": -333.3387,
-                "Y": 82.66466,
-                "Z": -505.7937
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34426,
-          "Locations": [
-            {
-              "Position": {
-                "X": -333.0683,
-                "Y": 82.72758,
-                "Z": -501.5885
-              },
-              "MinimumAngle": 75,
-              "MaximumAngle": 265
-            },
-            {
-              "Position": {
-                "X": -349.0388,
-                "Y": 89.44427,
-                "Z": -512.492
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Kholusia/576__MIN.json

@@ -1,120 +0,0 @@
-{
-  "$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
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/Kholusia/649_Stonegazer_BTN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 814,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Kholusia - Wright"
-    }
-  ],
+  "TerritoryId": 814,
+  "AetheryteShortcut": "Kholusia - Wright",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/5.x - Shadowbringers/Kholusia/650_Shadow Fault_MIN.json

@@ -1,13 +1,8 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 814,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Kholusia - Wright"
-    }
-  ],
+  "TerritoryId": 814,
+  "AetheryteShortcut": "Kholusia - Wright",
   "Groups": [
     {
       "Nodes": [

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/685__MIN.json

@@ -1,69 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 817,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Rak'tika - Slitherbough"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32993,
-          "Locations": [
-            {
-              "Position": {
-                "X": -704.8221,
-                "Y": 2.162976,
-                "Z": 563.2257
-              },
-              "MinimumAngle": 35,
-              "MaximumAngle": 120,
-              "MinimumDistance": 1,
-              "MaximumDistance": 2.4
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32991,
-          "Locations": [
-            {
-              "Position": {
-                "X": -702.9366,
-                "Y": 3.147394,
-                "Z": 580.9824
-              },
-              "MinimumAngle": 20,
-              "MaximumAngle": 120
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32992,
-          "Locations": [
-            {
-              "Position": {
-                "X": -731.9697,
-                "Y": 2.883299,
-                "Z": 562.4577
-              },
-              "MinimumAngle": 100,
-              "MaximumAngle": 245
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/686__MIN.json

@@ -1,90 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "Position": {
-        "X": -790.09827,
-        "Y": 5.6,
-        "Z": 239.26955
-      },
-      "TerritoryId": 817,
-      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Rak'tika - Slitherbough",
-      "Fly": true
-    },
-    {
-      "Position": {
-        "X": -789.0584,
-        "Y": -26.2001,
-        "Z": 239.5829
-      },
-      "TerritoryId": 817,
-      "InteractionType": "WalkTo",
-      "DisableNavmesh": true,
-      "Fly": true
-    },
-    {
-      "TerritoryId": 817,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32996,
-          "Locations": [
-            {
-              "Position": {
-                "X": -831.8083,
-                "Y": -41.57311,
-                "Z": 115.2932
-              },
-              "MinimumAngle": 40,
-              "MaximumAngle": 145,
-              "MinimumDistance": 1.4,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32994,
-          "Locations": [
-            {
-              "Position": {
-                "X": -874.5662,
-                "Y": -38.51086,
-                "Z": 112.2362
-              },
-              "MinimumAngle": -75,
-              "MaximumAngle": 10
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32995,
-          "Locations": [
-            {
-              "Position": {
-                "X": -885.0585,
-                "Y": -37.47266,
-                "Z": 140.9555
-              },
-              "MinimumAngle": 225,
-              "MaximumAngle": 335
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/687__MIN.json

@@ -1,66 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 817,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32997,
-          "Locations": [
-            {
-              "Position": {
-                "X": 476.9907,
-                "Y": -2.17159,
-                "Z": -464.3045
-              },
-              "MinimumAngle": -10,
-              "MaximumAngle": 110
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32999,
-          "Locations": [
-            {
-              "Position": {
-                "X": 447.1716,
-                "Y": -0.6280748,
-                "Z": -467.6738
-              },
-              "MinimumAngle": -120,
-              "MaximumAngle": -5
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32998,
-          "Locations": [
-            {
-              "Position": {
-                "X": 438.931,
-                "Y": -1.880641,
-                "Z": -455.9972
-              },
-              "MinimumAngle": -80,
-              "MaximumAngle": 40
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/688__MIN.json

@@ -1,12 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 817,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 817,
   "Groups": [
     {
       "Nodes": [
@@ -63,4 +58,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/689__MIN.json

@@ -1,13 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 817,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Rak'tika - Slitherbough"
-    }
-  ],
+  "TerritoryId": 817,
   "Groups": [
     {
       "Nodes": [
@@ -64,4 +58,4 @@
       ]
     }
   ]
-}
+}