Directory.Build.targets

@@ -1,5 +0,0 @@
-<Project>
-    <PropertyGroup>
-        <Version>3.4</Version>
-    </PropertyGroup>
-</Project>

GatheringPathRenderer/EditorCommands.cs

@@ -15,7 +15,6 @@ using Dalamud.Plugin.Services;
 using Lumina.Excel.GeneratedSheets;
 using Questionable.Model;
 using Questionable.Model.Gathering;
-using Questionable.Model.Questing;
 
 namespace GatheringPathRenderer;
 
@@ -176,7 +175,7 @@ internal sealed class EditorCommands : IDisposable
         {
             var territoryInfo = _dataManager.GetExcelSheet<TerritoryType>()!.GetRow(_clientState.TerritoryType)!;
             targetFolder = _plugin.PathsDirectory
-                .CreateSubdirectory(ExpansionData.ExpansionFolders[(EExpansionVersion)territoryInfo.ExVersion.Row])
+                .CreateSubdirectory(ExpansionData.ExpansionFolders[(byte)territoryInfo.ExVersion.Row])
                 .CreateSubdirectory(territoryInfo.PlaceName.Value!.Name.ToString());
         }
 
@@ -187,14 +186,7 @@ internal sealed class EditorCommands : IDisposable
         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,6 +1,5 @@
 <Project Sdk="Dalamud.NET.Sdk/10.0.0">
     <ItemGroup>
-      <ProjectReference Include="..\LLib\LLib.csproj" />
       <ProjectReference Include="..\Questionable.Model\Questionable.Model.csproj" />
       <ProjectReference Include="..\vendor\ECommons\ECommons\ECommons.csproj" />
     </ItemGroup>

GatheringPathRenderer/RendererPlugin.cs

@@ -1,13 +1,10 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-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;
@@ -16,7 +13,6 @@ using ECommons;
 using ECommons.Schedulers;
 using ECommons.SplatoonAPI;
 using GatheringPathRenderer.Windows;
-using LLib.GameData;
 using Questionable.Model;
 using Questionable.Model.Gathering;
 
@@ -37,7 +33,6 @@ public sealed class RendererPlugin : IDalamudPlugin
     private readonly EditorWindow _editorWindow;
 
     private readonly List<GatheringLocationContext> _gatheringLocations = [];
-    private EClassJob _currentClassJob;
 
     public RendererPlugin(IDalamudPluginInterface pluginInterface, IClientState clientState,
         ICommandManager commandManager, IDataManager dataManager, ITargetManager targetManager, IChatGui chatGui,
@@ -59,7 +54,6 @@ public sealed class RendererPlugin : IDalamudPlugin
         _editorWindow = new EditorWindow(this, _editorCommands, dataManager, targetManager, clientState, objectTable)
             { IsOpen = true };
         _windowSystem.AddWindow(_editorWindow);
-        _currentClassJob = (EClassJob?)_clientState.LocalPlayer?.ClassJob.Id ?? EClassJob.Adventurer;
 
         _pluginInterface.GetIpcSubscriber<object>("Questionable.ReloadData")
             .Subscribe(Reload);
@@ -69,7 +63,6 @@ public sealed class RendererPlugin : IDalamudPlugin
 
         _pluginInterface.UiBuilder.Draw += _windowSystem.Draw;
         _clientState.TerritoryChanged += TerritoryChanged;
-        _clientState.ClassJobChanged += ClassJobChanged;
         if (_clientState.IsLoggedIn)
             TerritoryChanged(_clientState.TerritoryType);
     }
@@ -121,7 +114,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
@@ -148,19 +141,14 @@ 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)
     {
         JsonSerializerOptions options = new()
         {
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingDefault,
             WriteIndented = true,
-            TypeInfoResolver = new DefaultJsonTypeInfoResolver
-            {
-                Modifiers = { NoEmptyCollectionModifier }
-            },
         };
         using (var stream = File.Create(targetFile.FullName))
         {
@@ -173,7 +161,6 @@ public sealed class RendererPlugin : IDalamudPlugin
 
             using var writer = new Utf8JsonWriter(stream, new JsonWriterOptions
             {
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
                 Indented = true
             });
             newNode.WriteTo(writer, options);
@@ -182,32 +169,11 @@ 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);
-    }
-
-    internal void Redraw() => Redraw(_currentClassJob);
-
-    private void Redraw(EClassJob classJob)
+    internal void Redraw()
     {
         Splatoon.RemoveDynamicElements("GatheringPathRenderer");
-        if (!classJob.IsGatherer())
-            return;
 
         var elements = GetLocationsInTerritory(_clientState.TerritoryType)
             .SelectMany(location =>
@@ -238,10 +204,8 @@ public sealed class RendererPlugin : IDalamudPlugin
                                 maximumAngle = x.MaximumAngle.GetValueOrDefault();
                             }
 
-#if false
                             var a = GatheringMath.CalculateLandingLocation(x, 0, 0);
                             var b = GatheringMath.CalculateLandingLocation(x, 1, 1);
-#endif
                             return new List<Element>
                             {
                                 new Element(isCone
@@ -252,9 +216,8 @@ public sealed class RendererPlugin : IDalamudPlugin
                                     refY = x.Position.Z,
                                     refZ = x.Position.Y,
                                     Filled = true,
-                                    radius = locationOverride?.MinimumDistance ?? x.CalculateMinimumDistance(),
-                                    Donut = (locationOverride?.MaximumDistance ?? x.CalculateMaximumDistance()) -
-                                            (locationOverride?.MinimumDistance ?? x.CalculateMinimumDistance()),
+                                    radius = x.CalculateMinimumDistance(),
+                                    Donut = x.CalculateMaximumDistance() - x.CalculateMinimumDistance(),
                                     color = _colors[location.Root.Groups.IndexOf(group) % _colors.Count],
                                     Enabled = true,
                                     coneAngleMin = minimumAngle,
@@ -271,9 +234,8 @@ public sealed class RendererPlugin : IDalamudPlugin
                                     Enabled = true,
                                     overlayText =
                                         $"{location.Root.Groups.IndexOf(group)} // {node.DataId} / {node.Locations.IndexOf(x)}",
-                                    overlayBGColor = isUnsaved ? 0xFF2020FF : 0xFF000000,
+                                    overlayBGColor = isUnsaved ? 0xFF2020FF : 0,
                                 },
-#if false
                                 new Element(ElementType.CircleAtFixedCoordinates)
                                 {
                                     refX = a.X,
@@ -294,7 +256,6 @@ public sealed class RendererPlugin : IDalamudPlugin
                                     Enabled = true,
                                     overlayText = "Max Angle"
                                 }
-#endif
                             };
                         }))))
             .ToList();
@@ -323,7 +284,6 @@ public sealed class RendererPlugin : IDalamudPlugin
 
     public void Dispose()
     {
-        _clientState.ClassJobChanged -= ClassJobChanged;
         _clientState.TerritoryChanged -= TerritoryChanged;
         _pluginInterface.UiBuilder.Draw -= _windowSystem.Draw;
 

GatheringPathRenderer/Windows/EditorWindow.cs

@@ -34,8 +34,7 @@ internal sealed class EditorWindow : Window
 
     public EditorWindow(RendererPlugin plugin, EditorCommands editorCommands, IDataManager dataManager,
         ITargetManager targetManager, IClientState clientState, IObjectTable objectTable)
-        : base("Gathering Path Editor###QuestionableGatheringPathEditor",
-            ImGuiWindowFlags.NoFocusOnAppearing | ImGuiWindowFlags.NoNavFocus)
+        : base("Gathering Path Editor###QuestionableGatheringPathEditor")
     {
         _plugin = plugin;
         _editorCommands = editorCommands;
@@ -48,22 +47,11 @@ internal sealed class EditorWindow : Window
         {
             MinimumSize = new Vector2(300, 300),
         };
-
-        RespectCloseHotkey = false;
         ShowCloseButton = false;
-        AllowPinning = false;
-        AllowClickthrough = false;
     }
 
     public override void Update()
     {
-        if (!_clientState.IsLoggedIn || _clientState.LocalPlayer == null)
-        {
-            _target = null;
-            _targetLocation = null;
-            return;
-        }
-
         _target = _targetManager.Target;
         var gatheringLocations = _plugin.GetLocationsInTerritory(_clientState.TerritoryType);
         var location = gatheringLocations.SelectMany(context =>
@@ -75,7 +63,7 @@ internal sealed class EditorWindow : Window
                             if (_target != null)
                                 distance = Vector3.Distance(location.Position, _target.Position);
                             else
-                                distance = Vector3.Distance(location.Position, _clientState.LocalPlayer.Position);
+                                distance = Vector3.Distance(location.Position, _clientState.LocalPlayer!.Position);
 
                             return new { Context = context, Node = node, Location = location, Distance = distance };
                         })
@@ -94,12 +82,11 @@ internal sealed class EditorWindow : Window
             return;
         }
 
-        _target ??= _objectTable
-            .Where(x => x.ObjectKind == ObjectKind.GatheringPoint && x.DataId == location.Node.DataId)
+        _target ??= _objectTable.Where(x => x.ObjectKind == ObjectKind.GatheringPoint && x.DataId == location.Node.DataId)
             .Select(x => new
             {
                 Object = x,
-                Distance = Vector3.Distance(location.Location.Position, _clientState.LocalPlayer.Position)
+                Distance = Vector3.Distance(location.Location.Position, _clientState.LocalPlayer!.Position)
             })
             .Where(x => x.Distance < 3f)
             .OrderBy(x => x.Distance)
@@ -135,20 +122,18 @@ internal sealed class EditorWindow : Window
             }
 
             int minAngle = locationOverride.MinimumAngle ?? location.MinimumAngle.GetValueOrDefault();
-            int maxAngle = locationOverride.MaximumAngle ?? location.MaximumAngle.GetValueOrDefault();
-            if (ImGui.DragIntRange2("Angle", ref minAngle, ref maxAngle, 5, -360, 360))
+            if (ImGui.DragInt("Min Angle", ref minAngle, 5, -360, 360))
             {
                 locationOverride.MinimumAngle = minAngle;
-                locationOverride.MaximumAngle = maxAngle;
+                locationOverride.MaximumAngle ??= location.MaximumAngle.GetValueOrDefault();
                 _plugin.Redraw();
             }
 
-            float minDistance = locationOverride.MinimumDistance ?? location.CalculateMinimumDistance();
-            float maxDistance = locationOverride.MaximumDistance ?? location.CalculateMaximumDistance();
-            if (ImGui.DragFloatRange2("Distance", ref minDistance, ref maxDistance, 0.1f, 1f, 3f))
+            int maxAngle = locationOverride.MaximumAngle ?? location.MaximumAngle.GetValueOrDefault();
+            if (ImGui.DragInt("Max Angle", ref maxAngle, 5, -360, 360))
             {
-                locationOverride.MinimumDistance = minDistance;
-                locationOverride.MaximumDistance = maxDistance;
+                locationOverride.MinimumAngle ??= location.MinimumAngle.GetValueOrDefault();
+                locationOverride.MaximumAngle = maxAngle;
                 _plugin.Redraw();
             }
 
@@ -158,18 +143,8 @@ internal sealed class EditorWindow : Window
                 ImGui.PushStyleColor(ImGuiCol.Button, ImGuiColors.DalamudRed);
             if (ImGui.Button("Save"))
             {
-                if (locationOverride is { MinimumAngle: not null, MaximumAngle: not null })
-                {
-                    location.MinimumAngle = locationOverride.MinimumAngle ?? location.MinimumAngle;
-                    location.MaximumAngle = locationOverride.MaximumAngle ?? location.MaximumAngle;
-                }
-
-                if (locationOverride is { MinimumDistance: not null, MaximumDistance: not null })
-                {
-                    location.MinimumDistance = locationOverride.MinimumDistance;
-                    location.MaximumDistance = locationOverride.MaximumDistance;
-                }
-
+                location.MinimumAngle = locationOverride.MinimumAngle;
+                location.MaximumAngle = locationOverride.MaximumAngle;
                 _plugin.Save(context.File, context.Root);
             }
 
@@ -234,7 +209,7 @@ internal sealed class EditorWindow : Window
             }
             else
             {
-                if (ImGui.Button($"Create location ({gatheringPoint.GatheringPointBase.Row})"))
+                if (ImGui.Button("Create location"))
                 {
                     var (targetFile, root) = _editorCommands.CreateNewFile(gatheringPoint, _target);
                     _plugin.Save(targetFile, root);
@@ -261,6 +236,6 @@ internal sealed class LocationOverride
 
     public bool NeedsSave()
     {
-        return (MinimumAngle != null && MaximumAngle != null) || (MinimumDistance != null && MaximumDistance != null);
+        return MinimumAngle != null && MaximumAngle != null;
     }
 }

GatheringPathRenderer/packages.lock.json

@@ -92,12 +92,6 @@
       "ecommons": {
         "type": "Project"
       },
-      "llib": {
-        "type": "Project",
-        "dependencies": {
-          "DalamudPackager": "[2.1.13, )"
-        }
-      },
       "questionable.model": {
         "type": "Project",
         "dependencies": {

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": [
@@ -21,15 +16,12 @@
                 "Z": 405.1829
               },
               "MinimumAngle": 100,
-              "MaximumAngle": 250,
-              "MinimumDistance": 1.5,
-              "MaximumDistance": 3
+              "MaximumAngle": 250
             }
           ]
         },
         {
           "DataId": 31345,
-          "Fly": false,
           "Locations": [
             {
               "Position": {
@@ -37,10 +29,8 @@
                 "Y": 216.5585,
                 "Z": 412.4353
               },
-              "MinimumAngle": 75,
-              "MaximumAngle": 145,
-              "MinimumDistance": 1.5,
-              "MaximumDistance": 3
+              "MinimumAngle": 50,
+              "MaximumAngle": 165
             },
             {
               "Position": {
@@ -49,9 +39,7 @@
                 "Z": 421.5481
               },
               "MinimumAngle": 0,
-              "MaximumAngle": 145,
-              "MinimumDistance": 1.5,
-              "MaximumDistance": 3
+              "MaximumAngle": 145
             },
             {
               "Position": {
@@ -60,9 +48,7 @@
                 "Z": 408.2164
               },
               "MinimumAngle": 155,
-              "MaximumAngle": 225,
-              "MinimumDistance": 1.5,
-              "MaximumDistance": 3
+              "MaximumAngle": 225
             }
           ]
         }

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/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,43 +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 - Porta Praetoria"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 32274,
-          "Locations": [
-            {
-              "Position": {
-                "X": -737.3265,
-                "Y": 76.50858,
-                "Z": -591.2296
-              }
-            },
-            {
-              "Position": {
-                "X": -787.0406,
-                "Y": 78.22382,
-                "Z": -640.0532
-              }
-            },
-            {
-              "Position": {
-                "X": -670.0129,
-                "Y": 70.42876,
-                "Z": -645.2087
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

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,7 @@
 {
   "$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,
   "Groups": [
     {
       "Nodes": [

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

@@ -1,138 +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": 32223,
-          "Locations": [
-            {
-              "Position": {
-                "X": -741.6174,
-                "Y": 6.276045,
-                "Z": -639.2435
-              }
-            },
-            {
-              "Position": {
-                "X": -724.2017,
-                "Y": 2.514658,
-                "Z": -647.5651
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32222,
-          "Locations": [
-            {
-              "Position": {
-                "X": -719.345,
-                "Y": 2.520793,
-                "Z": -645.692
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32218,
-          "Locations": [
-            {
-              "Position": {
-                "X": -664.7355,
-                "Y": 15.23751,
-                "Z": -801.2688
-              },
-              "MinimumAngle": -60,
-              "MaximumAngle": 185
-            }
-          ]
-        },
-        {
-          "DataId": 32219,
-          "Locations": [
-            {
-              "Position": {
-                "X": -673.4941,
-                "Y": 16.74037,
-                "Z": -818.1156
-              }
-            },
-            {
-              "Position": {
-                "X": -677.8458,
-                "Y": 15.77772,
-                "Z": -809.6718
-              }
-            },
-            {
-              "Position": {
-                "X": -663.3188,
-                "Y": 14.57053,
-                "Z": -797.132
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32221,
-          "Locations": [
-            {
-              "Position": {
-                "X": -502.177,
-                "Y": 36.7399,
-                "Z": -724.8087
-              }
-            },
-            {
-              "Position": {
-                "X": -508.0492,
-                "Y": 33.89026,
-                "Z": -703.5477
-              }
-            },
-            {
-              "Position": {
-                "X": -490.3923,
-                "Y": 36.73062,
-                "Z": -685.7646
-              },
-              "MinimumAngle": -40,
-              "MaximumAngle": 150
-            }
-          ]
-        },
-        {
-          "DataId": 32220,
-          "Locations": [
-            {
-              "Position": {
-                "X": -493.5531,
-                "Y": 36.08752,
-                "Z": -687.7089
-              },
-              "MinimumAngle": -70,
-              "MaximumAngle": 160
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/4.x - Stormblood/The Ruby Sea/511_Rasen Kaikyo_BTN.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": 32225,
-          "Locations": [
-            {
-              "Position": {
-                "X": 283.2321,
-                "Y": -105.8964,
-                "Z": -89.553
-              }
-            },
-            {
-              "Position": {
-                "X": 251.241,
-                "Y": -112.7794,
-                "Z": -103.9756
-              }
-            },
-            {
-              "Position": {
-                "X": 338.0264,
-                "Y": -86.76475,
-                "Z": -30.31015
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32224,
-          "Locations": [
-            {
-              "Position": {
-                "X": 304.9474,
-                "Y": -98.91968,
-                "Z": -59.39315
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32228,
-          "Locations": [
-            {
-              "Position": {
-                "X": 260.0728,
-                "Y": -124.0964,
-                "Z": 68.48814
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32229,
-          "Locations": [
-            {
-              "Position": {
-                "X": 265.4464,
-                "Y": -128.0422,
-                "Z": 88.30737
-              }
-            },
-            {
-              "Position": {
-                "X": 256.5239,
-                "Y": -113.9164,
-                "Z": -3.19258
-              }
-            },
-            {
-              "Position": {
-                "X": 237.8169,
-                "Y": -122.1193,
-                "Z": -35.11102
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32226,
-          "Locations": [
-            {
-              "Position": {
-                "X": 318.7197,
-                "Y": -88.4566,
-                "Z": 91.66042
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32227,
-          "Locations": [
-            {
-              "Position": {
-                "X": 281.2504,
-                "Y": -113.1205,
-                "Z": 176.6557
-              }
-            },
-            {
-              "Position": {
-                "X": 309.1248,
-                "Y": -88.04077,
-                "Z": 109.5688
-              }
-            },
-            {
-              "Position": {
-                "X": 312.3843,
-                "Y": -95.51873,
-                "Z": 79.94166
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,146 +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": 32282,
-          "Locations": [
-            {
-              "Position": {
-                "X": -332.5556,
-                "Y": -139.5151,
-                "Z": -276.7727
-              }
-            },
-            {
-              "Position": {
-                "X": -398.5437,
-                "Y": -137.4753,
-                "Z": -264.6068
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32281,
-          "Locations": [
-            {
-              "Position": {
-                "X": -377.4165,
-                "Y": -151.0521,
-                "Z": -211.4394
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32277,
-          "Locations": [
-            {
-              "Position": {
-                "X": -509.283,
-                "Y": -107.1854,
-                "Z": -389.3152
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 32278,
-          "Locations": [
-            {
-              "Position": {
-                "X": -470.5726,
-                "Y": -93.28533,
-                "Z": -430.0346
-              }
-            },
-            {
-              "Position": {
-                "X": -549.3453,
-                "Y": -103.2194,
-                "Z": -352.9945
-              }
-            },
-            {
-              "Position": {
-                "X": -548.5269,
-                "Y": -99.45416,
-                "Z": -459.6198
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 32279,
-          "Locations": [
-            {
-              "Position": {
-                "X": -347.0872,
-                "Y": -72.09894,
-                "Z": -420.7435
-              },
-              "MinimumAngle": -80,
-              "MaximumAngle": 100
-            }
-          ]
-        },
-        {
-          "DataId": 32280,
-          "Locations": [
-            {
-              "Position": {
-                "X": -410.6145,
-                "Y": -86.76735,
-                "Z": -432.2196
-              }
-            },
-            {
-              "Position": {
-                "X": -407.9324,
-                "Y": -108.0931,
-                "Z": -384.4449
-              }
-            },
-            {
-              "Position": {
-                "X": -341.0429,
-                "Y": -89.68655,
-                "Z": -396.5815
-              },
-              "MinimumAngle": -45,
-              "MaximumAngle": 110
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,18 +1,12 @@
 {
   "$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": [
     {
       "Nodes": [
@@ -39,10 +33,8 @@
                 "Y": 0.503479,
                 "Z": 634.821
               },
-              "MinimumAngle": 45,
-              "MaximumAngle": 65,
-              "MinimumDistance": 1.6,
-              "MaximumDistance": 3
+              "MinimumAngle": 60,
+              "MaximumAngle": 150
             },
             {
               "Position": {
@@ -140,4 +132,4 @@
       ]
     }
   ]
-}
+}

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,134 +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": 155,
-              "MaximumAngle": 325
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "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/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,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": 33002,
-          "Locations": [
-            {
-              "Position": {
-                "X": 164.1997,
-                "Y": 24.4362,
-                "Z": 58.99305
-              },
-              "MinimumAngle": 85,
-              "MaximumAngle": 225
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33001,
-          "Locations": [
-            {
-              "Position": {
-                "X": 131.2174,
-                "Y": 27.21391,
-                "Z": 45.33313
-              },
-              "MinimumAngle": 160,
-              "MaximumAngle": 275
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33000,
-          "Locations": [
-            {
-              "Position": {
-                "X": 65.9342,
-                "Y": 22.4589,
-                "Z": 45.68196
-              },
-              "MinimumAngle": 180,
-              "MaximumAngle": 265
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

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

@@ -1,67 +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": 33005,
-          "Locations": [
-            {
-              "Position": {
-                "X": 214.7744,
-                "Y": -19.57758,
-                "Z": 623.6767
-              },
-              "MinimumAngle": -15,
-              "MaximumAngle": 55
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33004,
-          "Locations": [
-            {
-              "Position": {
-                "X": 235.4031,
-                "Y": -17.474,
-                "Z": 645.2612
-              },
-              "MinimumAngle": -75,
-              "MaximumAngle": 60
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33003,
-          "Locations": [
-            {
-              "Position": {
-                "X": 263.691,
-                "Y": -15.7453,
-                "Z": 659.6932
-              },
-              "MinimumAngle": 5,
-              "MaximumAngle": 110
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/690__BTN.json

@@ -1,65 +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": 33007,
-          "Locations": [
-            {
-              "Position": {
-                "X": -643.0819,
-                "Y": 1.715566,
-                "Z": 600.3007
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33006,
-          "Locations": [
-            {
-              "Position": {
-                "X": -664.0663,
-                "Y": 4.130917,
-                "Z": 608.2639
-              },
-              "MinimumAngle": 100,
-              "MaximumAngle": 235
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33008,
-          "Locations": [
-            {
-              "Position": {
-                "X": -689.2495,
-                "Y": 4.592032,
-                "Z": 603.05
-              },
-              "MinimumAngle": -95,
-              "MaximumAngle": 85
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/691__BTN.json

@@ -1,82 +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": 33011,
-          "Locations": [
-            {
-              "Position": {
-                "X": -833.2918,
-                "Y": -44.18139,
-                "Z": 229.6708
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33010,
-          "Locations": [
-            {
-              "Position": {
-                "X": -869.9858,
-                "Y": -41.20595,
-                "Z": 221.9869
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33009,
-          "Locations": [
-            {
-              "Position": {
-                "X": -847.5519,
-                "Y": -41.43839,
-                "Z": 195.9766
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/692__BTN.json

@@ -1,64 +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": 33013,
-          "Locations": [
-            {
-              "Position": {
-                "X": 471.6041,
-                "Y": 0.1209641,
-                "Z": -476.659
-              },
-              "MinimumAngle": 0,
-              "MaximumAngle": 125
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33012,
-          "Locations": [
-            {
-              "Position": {
-                "X": 448.4756,
-                "Y": 2.033593,
-                "Z": -482.1674
-              },
-              "MinimumAngle": 155,
-              "MaximumAngle": 345
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33014,
-          "Locations": [
-            {
-              "Position": {
-                "X": 433.1882,
-                "Y": 10.99631,
-                "Z": -517.6039
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/693__BTN.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": 33015,
-          "Locations": [
-            {
-              "Position": {
-                "X": 301.3512,
-                "Y": 8.535884,
-                "Z": 8.796566
-              },
-              "MinimumAngle": 55,
-              "MaximumAngle": 245
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33016,
-          "Locations": [
-            {
-              "Position": {
-                "X": 273.905,
-                "Y": 10.59709,
-                "Z": 19.72124
-              },
-              "MinimumAngle": 135,
-              "MaximumAngle": 340
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33017,
-          "Locations": [
-            {
-              "Position": {
-                "X": 271.7985,
-                "Y": 7.424402,
-                "Z": -29.68495
-              },
-              "MinimumAngle": -165,
-              "MaximumAngle": 15
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Rak'tika Greatwood/694__BTN.json

@@ -1,67 +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": 33020,
-          "Locations": [
-            {
-              "Position": {
-                "X": 226.1767,
-                "Y": -20.10281,
-                "Z": 643.5543
-              },
-              "MinimumAngle": -50,
-              "MaximumAngle": 120
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33018,
-          "Locations": [
-            {
-              "Position": {
-                "X": 248.9525,
-                "Y": -17.98949,
-                "Z": 657.4498
-              },
-              "MinimumAngle": -55,
-              "MaximumAngle": 100,
-              "MinimumDistance": 1,
-              "MaximumDistance": 3
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33019,
-          "Locations": [
-            {
-              "Position": {
-                "X": 209.0277,
-                "Y": -25.56828,
-                "Z": 701.8604
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Tempest/927_The Norvrandt Slope_BTN.json

@@ -1,132 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 818,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Tempest - Ondo Cups"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34458,
-          "Locations": [
-            {
-              "Position": {
-                "X": 44.00173,
-                "Y": 428.2346,
-                "Z": -656.6179
-              },
-              "MinimumAngle": -65,
-              "MaximumAngle": 10
-            },
-            {
-              "Position": {
-                "X": 16.55597,
-                "Y": 426.627,
-                "Z": -670.5577
-              },
-              "MinimumAngle": -25,
-              "MaximumAngle": 110
-            }
-          ]
-        },
-        {
-          "DataId": 34457,
-          "Locations": [
-            {
-              "Position": {
-                "X": 37.23584,
-                "Y": 427.2601,
-                "Z": -653.0619
-              },
-              "MinimumAngle": 245,
-              "MaximumAngle": 335
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34461,
-          "Locations": [
-            {
-              "Position": {
-                "X": -65.51347,
-                "Y": 400.3132,
-                "Z": -539.7745
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34462,
-          "Locations": [
-            {
-              "Position": {
-                "X": -67.70384,
-                "Y": 400.7841,
-                "Z": -542.4638
-              },
-              "MinimumAngle": -85,
-              "MaximumAngle": 55
-            },
-            {
-              "Position": {
-                "X": -55.10947,
-                "Y": 399.0878,
-                "Z": -536.9024
-              },
-              "MinimumDistance": 1,
-              "MaximumDistance": 2.5
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34459,
-          "Locations": [
-            {
-              "Position": {
-                "X": -216.086,
-                "Y": 426.8226,
-                "Z": -649.2361
-              }
-            }
-          ]
-        },
-        {
-          "DataId": 34460,
-          "Locations": [
-            {
-              "Position": {
-                "X": -215.228,
-                "Y": 427.4708,
-                "Z": -653.9598
-              },
-              "MinimumAngle": -55,
-              "MaximumAngle": 135
-            },
-            {
-              "Position": {
-                "X": -201.5463,
-                "Y": 427.882,
-                "Z": -655.0467
-              },
-              "MinimumAngle": -70,
-              "MaximumAngle": 65
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/5.x - Shadowbringers/The Tempest/928_The Norvrandt Slope_MIN.json

@@ -1,136 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 818,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Tempest - Ondo Cups"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34466,
-          "Locations": [
-            {
-              "Position": {
-                "X": 403.2184,
-                "Y": 408.0598,
-                "Z": -755.5223
-              },
-              "MinimumAngle": 80,
-              "MaximumAngle": 190
-            },
-            {
-              "Position": {
-                "X": 438.6136,
-                "Y": 416.6389,
-                "Z": -758.985
-              },
-              "MinimumAngle": 110,
-              "MaximumAngle": 240
-            }
-          ]
-        },
-        {
-          "DataId": 34465,
-          "Locations": [
-            {
-              "Position": {
-                "X": 415.5816,
-                "Y": 412.4482,
-                "Z": -758.7325
-              },
-              "MinimumAngle": 90,
-              "MaximumAngle": 195
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34463,
-          "Locations": [
-            {
-              "Position": {
-                "X": 415.8845,
-                "Y": 431.2351,
-                "Z": -896.2997
-              },
-              "MinimumAngle": -65,
-              "MaximumAngle": 45
-            }
-          ]
-        },
-        {
-          "DataId": 34464,
-          "Locations": [
-            {
-              "Position": {
-                "X": 400.7106,
-                "Y": 428.3826,
-                "Z": -893.9595
-              },
-              "MinimumAngle": -40,
-              "MaximumAngle": 50
-            },
-            {
-              "Position": {
-                "X": 431.8092,
-                "Y": 434.546,
-                "Z": -902.1445
-              },
-              "MinimumAngle": -95,
-              "MaximumAngle": 35
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34467,
-          "Locations": [
-            {
-              "Position": {
-                "X": 284.0778,
-                "Y": 433.4644,
-                "Z": -916.6171
-              },
-              "MinimumAngle": -75,
-              "MaximumAngle": 30
-            }
-          ]
-        },
-        {
-          "DataId": 34468,
-          "Locations": [
-            {
-              "Position": {
-                "X": 278.6176,
-                "Y": 428.9509,
-                "Z": -904.3234
-              },
-              "MinimumAngle": 220,
-              "MaximumAngle": 345
-            },
-            {
-              "Position": {
-                "X": 305.7502,
-                "Y": 432.027,
-                "Z": -912.7272
-              },
-              "MinimumAngle": -80,
-              "MaximumAngle": 40
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/6.x - Endwalker/Elpis/823_The Hungering Gardens_MIN.json

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

GatheringPaths/6.x - Endwalker/Elpis/824_Northerly Zephyrneus_MIN.json

@@ -1,165 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "TerritoryId": 961,
-      "InteractionType": "None",
-      "AetheryteShortcut": "Elpis - Poieten Oikos"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33945,
-          "Locations": [
-            {
-              "Position": {
-                "X": -478.091,
-                "Y": 136.505,
-                "Z": -144.7721
-              },
-              "MinimumAngle": 185,
-              "MaximumAngle": 360
-            },
-            {
-              "Position": {
-                "X": -472.7283,
-                "Y": 136.9691,
-                "Z": -153.0142
-              },
-              "MinimumAngle": -105,
-              "MaximumAngle": 20,
-              "MinimumDistance": 1.6,
-              "MaximumDistance": 3
-            },
-            {
-              "Position": {
-                "X": -457.2324,
-                "Y": 136.2298,
-                "Z": -153.2787
-              },
-              "MinimumAngle": 70,
-              "MaximumAngle": 195
-            }
-          ]
-        },
-        {
-          "DataId": 33944,
-          "Locations": [
-            {
-              "Position": {
-                "X": -477.1867,
-                "Y": 137.1741,
-                "Z": -150.0524
-              },
-              "MinimumAngle": -95,
-              "MaximumAngle": 20
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33946,
-          "Locations": [
-            {
-              "Position": {
-                "X": -335.5337,
-                "Y": 148.5269,
-                "Z": -83.30743
-              },
-              "MinimumAngle": 140,
-              "MaximumAngle": 275
-            }
-          ]
-        },
-        {
-          "DataId": 33947,
-          "Locations": [
-            {
-              "Position": {
-                "X": -333.4615,
-                "Y": 148.59,
-                "Z": -78.42037
-              },
-              "MinimumAngle": -160,
-              "MaximumAngle": -15
-            },
-            {
-              "Position": {
-                "X": -342.3078,
-                "Y": 145.4429,
-                "Z": -109.3348
-              },
-              "MinimumAngle": 210,
-              "MaximumAngle": 355
-            },
-            {
-              "Position": {
-                "X": -327.4102,
-                "Y": 143.6382,
-                "Z": -118.3601
-              },
-              "MinimumAngle": -30,
-              "MaximumAngle": 85
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33942,
-          "Locations": [
-            {
-              "Position": {
-                "X": -291.2093,
-                "Y": 136.4047,
-                "Z": -228.9244
-              },
-              "MinimumAngle": 120,
-              "MaximumAngle": 225
-            }
-          ]
-        },
-        {
-          "DataId": 33943,
-          "Locations": [
-            {
-              "Position": {
-                "X": -343.5337,
-                "Y": 140.0085,
-                "Z": -243.2652
-              },
-              "MinimumAngle": 115,
-              "MaximumAngle": 255
-            },
-            {
-              "Position": {
-                "X": -337.3867,
-                "Y": 136.3985,
-                "Z": -237.7285
-              },
-              "MinimumAngle": -130,
-              "MaximumAngle": 10
-            },
-            {
-              "Position": {
-                "X": -304.9684,
-                "Y": 136.2381,
-                "Z": -229.2424
-              },
-              "MinimumAngle": 115,
-              "MaximumAngle": 240
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/6.x - Endwalker/Elpis/846_Anagnorisis_BTN.json

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

GatheringPaths/6.x - Endwalker/Elysion/316__MIN.json

@@ -1,30 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 1073,
   "Groups": [
     {
       "Nodes": [
@@ -81,4 +58,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/6.x - Endwalker/Elysion/317__MIN.json

@@ -1,30 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 1073,
   "Groups": [
     {
       "Nodes": [
@@ -77,4 +54,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/6.x - Endwalker/Elysion/319__MIN.json

@@ -1,78 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 33840,
-          "Locations": [
-            {
-              "Position": {
-                "X": 10.28351,
-                "Y": 486.144,
-                "Z": -136.9586
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33841,
-          "Locations": [
-            {
-              "Position": {
-                "X": 19.46428,
-                "Y": 485.9226,
-                "Z": -136.738
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 33643,
-          "Locations": [
-            {
-              "Position": {
-                "X": 14.21117,
-                "Y": 486.0551,
-                "Z": -143.435
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

GatheringPaths/6.x - Endwalker/Elysion/322__MIN.json

@@ -1,30 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 1073,
   "Groups": [
     {
       "Nodes": [
@@ -81,4 +58,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/6.x - Endwalker/Elysion/336__MIN.json

@@ -1,30 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 1073,
   "Groups": [
     {
       "Nodes": [
@@ -81,4 +58,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/6.x - Endwalker/Elysion/393__BTN.json

@@ -1,30 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 1073,
   "Groups": [
     {
       "Nodes": [
@@ -77,4 +54,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/6.x - Endwalker/Elysion/394__BTN.json

@@ -1,30 +1,7 @@
 {
   "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
   "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
+  "TerritoryId": 1073,
   "Groups": [
     {
       "Nodes": [
@@ -81,4 +58,4 @@
       ]
     }
   ]
-}
+}

GatheringPaths/6.x - Endwalker/Elysion/396__BTN.json

@@ -1,78 +0,0 @@
-{
-  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/GatheringPaths/gatheringlocation-v1.json",
-  "Author": "liza",
-  "Steps": [
-    {
-      "DataId": 2013074,
-      "Position": {
-        "X": 304.3412,
-        "Y": 483.48206,
-        "Z": 143.11438
-      },
-      "TerritoryId": 960,
-      "InteractionType": "Interact",
-      "TargetTerritoryId": 1073,
-      "SkipConditions": {
-        "StepIf": {
-          "InTerritory": [
-            1073
-          ]
-        }
-      }
-    },
-    {
-      "TerritoryId": 1073,
-      "InteractionType": "None"
-    }
-  ],
-  "Groups": [
-    {
-      "Nodes": [
-        {
-          "DataId": 34350,
-          "Locations": [
-            {
-              "Position": {
-                "X": 18.9518,
-                "Y": 485.9131,
-                "Z": -133.3762
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34351,
-          "Locations": [
-            {
-              "Position": {
-                "X": 15.71416,
-                "Y": 486.0302,
-                "Z": -136.2497
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "Nodes": [
-        {
-          "DataId": 34349,
-          "Locations": [
-            {
-              "Position": {
-                "X": 9.524881,
-                "Y": 486.2234,
-                "Z": -142.2316
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}