test new quest schema

(cherry picked from commit 1bd92659c3) (cherry picked from commit a5c51b73dc) (cherry picked from commit f7e77dd9a9) (cherry picked from commit e025abb06c)
Merge branch 'ananta'
2024-09-08 01:31:17 +08:00 · 2024-09-08 01:30:59 +08:00 · 2024-09-08 01:30:51 +08:00 · 2024-09-08 01:30:42 +08:00 · 2024-09-06 23:09:42 +02:00 · 2024-09-06 21:24:38 +02:00
358 changed files with 14164 additions and 656 deletions
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@ -1,5 +1,5 @@
 <Project>
    <PropertyGroup>
-        <Version>2.19</Version>
+        <Version>2.20</Version>
    </PropertyGroup>
 </Project>
--- a/Forelands/911_Avalonia
+++ b/Forelands/911_Avalonia
@ -0,0 +1,53 @@
+{
+  "$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
+              }
+            }
+          ]
+        },
+        {
+          "DataId": 34383,
+          "Locations": [
+            {
+              "Position": {
+                "X": -636.4533,
+                "Y": -100.1258,
+                "Z": 484.7436
+              }
+            }
+          ]
+        },
+        {
+          "DataId": 34384,
+          "Locations": [
+            {
+              "Position": {
+                "X": -589.4542,
+                "Y": -100.4852,
+                "Z": 528.1926
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/Forelands/914_Avalonia
+++ b/Forelands/914_Avalonia
@ -0,0 +1,53 @@
+{
+  "$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
+              }
+            }
+          ]
+        },
+        {
+          "DataId": 34392,
+          "Locations": [
+            {
+              "Position": {
+                "X": -44.89702,
+                "Y": -32.39204,
+                "Z": -153.4274
+              }
+            }
+          ]
+        },
+        {
+          "DataId": 34393,
+          "Locations": [
+            {
+              "Position": {
+                "X": -36.6049,
+                "Y": -31.32222,
+                "Z": -134.1001
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/Shadowbringers/The
+++ b/Shadowbringers/The
@ -4,7 +4,8 @@
  "Steps": [
    {
      "TerritoryId": 818,
-      "InteractionType": "None"
+      "InteractionType": "None",
+      "AetheryteShortcut": "Tempest - Ondo Cups"
    }
  ],
  "Groups": [
--- a/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
+++ b/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
@ -109,6 +109,9 @@ internal static class SkipConditionsExtensions
                                .AsSyntaxNodeOrToken(),
                            Assignment(nameof(NearPositionCondition.MaximumDistance),
                                    nearPositionCondition.MaximumDistance, emptyCondition.MaximumDistance)
+                                .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(NearPositionCondition.TerritoryId),
+                                    nearPositionCondition.TerritoryId, emptyCondition.TerritoryId)
                                .AsSyntaxNodeOrToken()))));
    }

--- a/QuestPathGenerator/Utils.cs
+++ b/QuestPathGenerator/Utils.cs
@ -36,7 +36,7 @@ public static class Utils
        if (questSchemaFile != null)
        {
            SchemaRegistry.Global.Register(
-                new Uri("https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json"),
+                new Uri("https://git.carvel.li/plogon_enjoyer/Questionable/raw/branch/temp/QuestPaths/quest-v1.json"),
                JsonSchema.FromText(questSchemaFile.GetText()!.ToString()));
        }

--- a/Quests/1200_Sanding
+++ b/Quests/1200_Sanding
--- a/Reborn/Alliance
+++ b/Reborn/Alliance
--- a/Quests/1202_Labyrinth
+++ b/Quests/1202_Labyrinth
--- a/Prosperity.json
+++ b/Prosperity.json
--- a/Quests/1474_Syrcus
+++ b/Quests/1474_Syrcus
--- a/Quests/1709_Legacy
+++ b/Quests/1709_Legacy
--- a/Reborn/Alliance
+++ b/Reborn/Alliance
--- a/Reborn/Alliance
+++ b/Reborn/Alliance
--- a/Quests/BRD/1086_The
+++ b/Quests/BRD/1086_The
@ -8,7 +8,14 @@
        {
          "TerritoryId": 153,
          "InteractionType": "EquipItem",
-          "ItemId": 4546
+          "ItemId": 4546,
+          "AetheryteShortcut": "South Shroud - Quarrymill",
+          "Fly": true,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        },
        {
          "TerritoryId": 153,
@ -22,14 +29,7 @@
            "Z": -7.3396606
          },
          "TerritoryId": 153,
-          "InteractionType": "AcceptQuest",
-          "AetheryteShortcut": "South Shroud - Quarrymill",
-          "Fly": true,
-          "SkipConditions": {
-            "AetheryteShortcutIf": {
-              "InSameTerritory": true
-            }
-          }
+          "InteractionType": "AcceptQuest"
        }
      ]
    },
--- a/Quests/BTN/3_Way
+++ b/Quests/BTN/3_Way
@ -13,7 +13,20 @@
            "Z": -142.93127
          },
          "TerritoryId": 133,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Gridania",
+          "AethernetShortcut": [
+            "[Gridania] Aetheryte Plaza",
+            "[Gridania] Botanists' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                133
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MIN/192_So
+++ b/Quests/MIN/192_So
@ -14,6 +14,19 @@
          },
          "TerritoryId": 131,
          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          },
          "DialogueChoices": [
            {
              "Type": "YesNo",
--- a/Quests/MIN/597_Way
+++ b/Quests/MIN/597_Way
@ -13,7 +13,20 @@
            "Z": 153.2157
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MIN/599_My
+++ b/Quests/MIN/599_My
@ -13,7 +13,20 @@
            "Z": 157.42725
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MIN/600_Know
+++ b/Quests/MIN/600_Know
@ -13,7 +13,20 @@
            "Z": 157.42725
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MNK/532_Way
+++ b/Quests/MNK/532_Way
@ -13,7 +13,13 @@
            "Z": -51.163513
          },
          "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        }
      ]
    },
--- a/Quests/MNK/533_Way
+++ b/Quests/MNK/533_Way
@ -14,7 +14,13 @@
            "Z": -51.163513
          },
          "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        }
      ]
    }
--- a/Quests/PLD/1055_Paladin's
+++ b/Quests/PLD/1055_Paladin's
@ -14,6 +14,7 @@
          },
          "TerritoryId": 131,
          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
          "AethernetShortcut": [
            "[Ul'dah] Aetheryte Plaza",
            "[Ul'dah] Gladiators' Guild"
--- a/Quests/PLD/256_Kicking
+++ b/Quests/PLD/256_Kicking
@ -13,7 +13,20 @@
            "Z": 39.81079
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Gladiators' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1097_Forgotten
+++ b/Quests/SCH/1097_Forgotten
@ -12,7 +12,13 @@
            "Z": 4.017052
          },
          "TerritoryId": 129,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        },
        {
          "DataId": 1000895,
--- a/Quests/SCH/1098_The
+++ b/Quests/SCH/1098_The
@ -8,7 +8,20 @@
        {
          "TerritoryId": 128,
          "InteractionType": "EquipItem",
-          "ItemId": 4550
+          "ItemId": 4550,
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        },
        {
          "DataId": 1006757,
--- a/Quests/SCH/1099_The
+++ b/Quests/SCH/1099_The
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1100_In
+++ b/Quests/SCH/1100_In
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1101_For
+++ b/Quests/SCH/1101_For
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1102_The
+++ b/Quests/SCH/1102_The
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/WHM/1080_Only
+++ b/Quests/WHM/1080_Only
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -150,7 +151,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1081_O
+++ b/Quests/WHM/1081_O
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -157,7 +158,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1082_Following
+++ b/Quests/WHM/1082_Following
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -202,7 +203,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -293,7 +295,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -409,7 +412,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1083_Yearn
+++ b/Quests/WHM/1083_Yearn
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -194,7 +195,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1084_Heart
+++ b/Quests/WHM/1084_Heart
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -117,7 +118,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/1007_Primal
+++ b/Quests/1007_Primal
@ -0,0 +1,49 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000423,
+          "Position": {
+            "X": 232.04382,
+            "Y": 1.999974,
+            "Z": 45.578613
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 204
+        },
+        {
+          "DataId": 1003061,
+          "Position": {
+            "X": -0.015319824,
+            "Y": 0.500025,
+            "Z": -4.3793945
+          },
+          "TerritoryId": 204,
+          "InteractionType": "CompleteQuest",
+          "DisableNavmesh": true,
+          "NextQuestId": 1008
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1008_Who
+++ b/Quests/1008_Who
@ -0,0 +1,152 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003061,
+          "Position": {
+            "X": -0.015319824,
+            "Y": 0.500025,
+            "Z": -4.3793945
+          },
+          "TerritoryId": 204,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2001215,
+          "Position": {
+            "X": 0.002457563,
+            "Y": 1.052062,
+            "Z": 9.820032
+          },
+          "TerritoryId": 204,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 132,
+          "SkipConditions": {
+            "StepIf": {
+              "NotInTerritory": [
+                204
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1000195,
+          "Position": {
+            "X": 197.4364,
+            "Y": 0.0026046988,
+            "Z": 57.114502
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 1000156,
+          "Position": {
+            "X": 6.6376343,
+            "Y": 1.1442462,
+            "Z": -11.795227
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Gridania] Archers' Guild",
+            "[Gridania] Aetheryte Plaza"
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            16
+          ]
+        },
+        {
+          "DataId": 1000122,
+          "Position": {
+            "X": 88.60913,
+            "Y": -8.685379,
+            "Z": 128.64868
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "DataId": 1000372,
+          "Position": {
+            "X": 39.53601,
+            "Y": -8.041565,
+            "Z": 112.13855
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000423,
+          "Position": {
+            "X": 232.04382,
+            "Y": 1.999974,
+            "Z": 45.578613
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 204,
+          "AethernetShortcut": [
+            "[Gridania] Aetheryte Plaza",
+            "[Gridania] Archers' Guild"
+          ]
+        },
+        {
+          "DataId": 1003061,
+          "Position": {
+            "X": -0.015319824,
+            "Y": 0.500025,
+            "Z": -4.3793945
+          },
+          "TerritoryId": 204,
+          "InteractionType": "CompleteQuest",
+          "DisableNavmesh": true,
+          "NextQuestId": 1009
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1009_The
+++ b/Quests/1009_The
@ -0,0 +1,123 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003061,
+          "Position": {
+            "X": -0.015319824,
+            "Y": 0.500025,
+            "Z": -4.3793945
+          },
+          "TerritoryId": 204,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1006584,
+          "Position": {
+            "X": 193.83533,
+            "Y": 7.8634253,
+            "Z": -57.724915
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "South Shroud - Quarrymill"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 616.5126,
+            "Y": 22.329094,
+            "Z": 84.68576
+          },
+          "TerritoryId": 153,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 2002241,
+          "Position": {
+            "X": 617.21216,
+            "Y": 23.605652,
+            "Z": 83.26843
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            2198
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2002614,
+          "Position": {
+            "X": 617.21216,
+            "Y": 23.605652,
+            "Z": 83.26843
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1006584,
+          "Position": {
+            "X": 193.83533,
+            "Y": 7.8634253,
+            "Z": -57.724915
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "South Shroud - Quarrymill"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 210.56421,
+            "Y": 18.119999,
+            "Z": -21.370262
+          },
+          "TerritoryId": 153,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 1006585,
+          "Position": {
+            "X": 209.3385,
+            "Y": 18.119999,
+            "Z": -21.957764
+          },
+          "TerritoryId": 153,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 1012
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1012_All
+++ b/Quests/1012_All
@ -0,0 +1,64 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006585,
+          "Position": {
+            "X": 209.3385,
+            "Y": 18.119999,
+            "Z": -21.957764
+          },
+          "TerritoryId": 153,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "TerritoryId": 132,
+          "InteractionType": "UseItem",
+          "ItemId": 30362,
+          "TargetTerritoryId": 140
+        },
+        {
+          "Position": {
+            "X": -492.96475,
+            "Y": 20.999884,
+            "Z": -380.82272
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Avoid walking around Waking Sands table"
+        },
+        {
+          "DataId": 2001711,
+          "Position": {
+            "X": -480.9181,
+            "Y": 18.00103,
+            "Z": -386.862
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212
+        },
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 433
+        }
+      ]
+    }
+  ]
+}
--- a/Reborn/Unlocks/Trials/1047_A
+++ b/Reborn/Unlocks/Trials/1047_A
--- a/Reborn/Unlocks/Trials/1048_Ifrit
+++ b/Reborn/Unlocks/Trials/1048_Ifrit
@ -87,7 +87,8 @@
          "TerritoryId": 146,
          "Mount": false,
          "InteractionType": "CompleteQuest",
-          "StopDistance": 5
+          "StopDistance": 5,
+          "IgnoreDistanceToObject": true
        }
      ]
    }
--- a/Reborn/Unlocks/Trials/1157_In
+++ b/Reborn/Unlocks/Trials/1157_In
--- a/Reborn/Unlocks/Trials/1158_In
+++ b/Reborn/Unlocks/Trials/1158_In
--- a/Quests/1194_Primal
+++ b/Quests/1194_Primal
@ -0,0 +1,38 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1000168,
+          "Position": {
+            "X": -75.48645,
+            "Y": -0.5013741,
+            "Z": -5.081299
+          },
+          "TerritoryId": 132,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Gridania",
+          "NextQuestId": 1195
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1195_Gale-force
+++ b/Quests/1195_Gale-force
@ -0,0 +1,119 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1000168,
+          "Position": {
+            "X": -75.48645,
+            "Y": -0.5013741,
+            "Z": -5.081299
+          },
+          "TerritoryId": 132,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 643.84,
+            "Y": 287.48834,
+            "Z": 175.5028
+          },
+          "TerritoryId": 155,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
+          "Fly": true
+        },
+        {
+          "DataId": 2003456,
+          "Position": {
+            "X": 649.7748,
+            "Y": 292.4391,
+            "Z": 175.34143
+          },
+          "TerritoryId": 155,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "TerritoryId": 155,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 65
+        }
+      ]
+    },
+    {
+      "Sequence": 3
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1000168,
+          "Position": {
+            "X": -75.48645,
+            "Y": -0.5013741,
+            "Z": -5.081299
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Gridania"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "TerritoryId": 132,
+          "InteractionType": "UseItem",
+          "ItemId": 30362,
+          "TargetTerritoryId": 140
+        },
+        {
+          "Position": {
+            "X": -492.96475,
+            "Y": 20.999884,
+            "Z": -380.82272
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Avoid walking around Waking Sands table"
+        },
+        {
+          "DataId": 2001711,
+          "Position": {
+            "X": -480.9181,
+            "Y": 18.00103,
+            "Z": -386.862
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212
+        },
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 1196
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1196_Quake
+++ b/Quests/1196_Quake
@ -0,0 +1,193 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1003281,
+          "Position": {
+            "X": 97.520386,
+            "Y": 40.248554,
+            "Z": 81.1322
+          },
+          "TerritoryId": 128,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] The Aftcastle"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 71.55255,
+            "Y": 59.83099,
+            "Z": -516.4647
+          },
+          "TerritoryId": 180,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "Outer La Noscea - Camp Overlook"
+        },
+        {
+          "Position": {
+            "X": 111.7023,
+            "Y": 28.568699,
+            "Z": -611.7063
+          },
+          "TerritoryId": 180,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 84.102905,
+            "Y": 28.170393,
+            "Z": -716.35504
+          },
+          "TerritoryId": 180,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 161.06644,
+            "Y": 26.61216,
+            "Z": -712.6371
+          },
+          "TerritoryId": 180,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 176.3917,
+            "Y": 29.076319,
+            "Z": -652.8805
+          },
+          "TerritoryId": 180,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 143.06934,
+            "Y": 23.642702,
+            "Z": -656.43506
+          },
+          "TerritoryId": 180,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 2003457,
+          "Position": {
+            "X": 144.39612,
+            "Y": 29.037842,
+            "Z": -622.4918
+          },
+          "TerritoryId": 180,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "TerritoryId": 180,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 64
+        }
+      ]
+    },
+    {
+      "Sequence": 4
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1003281,
+          "Position": {
+            "X": 97.520386,
+            "Y": 40.248554,
+            "Z": 81.1322
+          },
+          "TerritoryId": 128,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] The Aftcastle"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "TerritoryId": 132,
+          "InteractionType": "UseItem",
+          "ItemId": 30362,
+          "TargetTerritoryId": 140
+        },
+        {
+          "Position": {
+            "X": -492.96475,
+            "Y": 20.999884,
+            "Z": -380.82272
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Avoid walking around Waking Sands table"
+        },
+        {
+          "DataId": 2001711,
+          "Position": {
+            "X": -480.9181,
+            "Y": 18.00103,
+            "Z": -386.862
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212
+        },
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 1197
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1197_Ifrit
+++ b/Quests/1197_Ifrit
@ -0,0 +1,188 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": -119.1183,
+            "Y": 3.7999938,
+            "Z": -104.33473
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Ul'dah",
+          "$": "Ul'dah Aetheryte to Immortal Flames"
+        },
+        {
+          "DataId": 1004576,
+          "Position": {
+            "X": -141.64954,
+            "Y": 4.1,
+            "Z": -114.67157
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": -22.992174,
+            "Y": 31.881628,
+            "Z": -3.1655574
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo"
+        },
+        {
+          "Position": {
+            "X": 373.0123,
+            "Y": 46.21888,
+            "Z": -47.523537
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 500.2741,
+            "Y": 36.9815,
+            "Z": -153.72185
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 694.0748,
+            "Y": 4.267518,
+            "Z": -84.443855
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 2003458,
+          "Position": {
+            "X": 694.3617,
+            "Y": 7.9193726,
+            "Z": -80.1557
+          },
+          "TerritoryId": 146,
+          "Mount": false,
+          "InteractionType": "Interact",
+          "StopDistance": 5,
+          "IgnoreDistanceToObject": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "TerritoryId": 146,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 63
+        }
+      ]
+    },
+    {
+      "Sequence": 4
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "Position": {
+            "X": -119.1183,
+            "Y": 3.7999938,
+            "Z": -104.33473
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Ul'dah",
+          "$": "Ul'dah Aetheryte to Immortal Flames"
+        },
+        {
+          "DataId": 1004576,
+          "Position": {
+            "X": -141.64954,
+            "Y": 4.1,
+            "Z": -114.67157
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "TerritoryId": 132,
+          "InteractionType": "UseItem",
+          "ItemId": 30362,
+          "TargetTerritoryId": 140
+        },
+        {
+          "Position": {
+            "X": -492.96475,
+            "Y": 20.999884,
+            "Z": -380.82272
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Avoid walking around Waking Sands table"
+        },
+        {
+          "DataId": 2001711,
+          "Position": {
+            "X": -480.9181,
+            "Y": 18.00103,
+            "Z": -386.862
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212
+        },
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 1198
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1198_To
+++ b/Quests/1198_To
@ -0,0 +1,82 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 26.405773,
+            "Y": 29.49983,
+            "Z": -767.3998
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona"
+        },
+        {
+          "Position": {
+            "X": 25.629164,
+            "Y": 28.999998,
+            "Z": -823.2204
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 1001304,
+          "Position": {
+            "X": 25.589355,
+            "Y": 29,
+            "Z": -825.37573
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 26.405773,
+            "Y": 29.49983,
+            "Z": -767.3998
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 1006951,
+          "Position": {
+            "X": 73.77734,
+            "Y": 33.066578,
+            "Z": -709.77344
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1309_Primal
+++ b/Quests/1309_Primal
@ -0,0 +1,80 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006951,
+          "Position": {
+            "X": 73.77734,
+            "Y": 33.066578,
+            "Z": -709.77344
+          },
+          "TerritoryId": 156,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "TerritoryId": 155,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 65,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "TerritoryId": 180,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 64,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "TerritoryId": 146,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 63,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006951,
+          "Position": {
+            "X": 73.77734,
+            "Y": 33.066578,
+            "Z": -709.77344
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1412_The
+++ b/Quests/1412_The
@ -0,0 +1,54 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1000168,
+          "Position": {
+            "X": -75.48645,
+            "Y": -0.5013741,
+            "Z": -5.081299
+          },
+          "TerritoryId": 132,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Gridania"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1008544,
+          "Position": {
+            "X": -316.42633,
+            "Y": 12.050298,
+            "Z": -35.385742
+          },
+          "TerritoryId": 152,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "East Shroud - Hawthorne Hut",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1413_Whorl
+++ b/Quests/1413_Whorl
@ -0,0 +1,58 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1003281,
+          "Position": {
+            "X": 97.520386,
+            "Y": 40.248554,
+            "Z": 81.1322
+          },
+          "TerritoryId": 128,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] The Aftcastle"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1005409,
+          "Position": {
+            "X": 159.62463,
+            "Y": 8.974117,
+            "Z": 582.7573
+          },
+          "TerritoryId": 135,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks",
+          "Fly": true
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/1530_Judgment
+++ b/Quests/1530_Judgment
@ -0,0 +1,115 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1009294,
+          "Position": {
+            "X": -63.767517,
+            "Y": -1.7171676,
+            "Z": 11.673096
+          },
+          "TerritoryId": 132,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1000587,
+          "Position": {
+            "X": -7.248047,
+            "Y": -8.407776,
+            "Z": 268.23828
+          },
+          "TerritoryId": 152,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "East Shroud - Hawthorne Hut",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 198.12068,
+            "Y": -31.484615,
+            "Z": -218.4991
+          },
+          "TerritoryId": 152,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 2004430,
+          "Position": {
+            "X": 198.2909,
+            "Y": -29.83142,
+            "Z": -220.44714
+          },
+          "TerritoryId": 152,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "TerritoryId": 152,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 78
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "TerritoryId": 132,
+          "InteractionType": "UseItem",
+          "ItemId": 30362,
+          "TargetTerritoryId": 140
+        },
+        {
+          "Position": {
+            "X": -492.96475,
+            "Y": 20.999884,
+            "Z": -380.82272
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Avoid walking around Waking Sands table"
+        },
+        {
+          "DataId": 2001711,
+          "Position": {
+            "X": -480.9181,
+            "Y": 18.00103,
+            "Z": -386.862
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212
+        },
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/433_Fear
+++ b/Quests/433_Fear
@ -0,0 +1,64 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1009294,
+          "Position": {
+            "X": -63.767517,
+            "Y": -1.7171676,
+            "Z": 11.673096
+          },
+          "TerritoryId": 132,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Gridania"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1011250,
+          "Position": {
+            "X": 616.51013,
+            "Y": 22.291952,
+            "Z": 85.22156
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "South Shroud - Quarrymill",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "TerritoryId": 153,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 82
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1011250,
+          "Position": {
+            "X": 616.51013,
+            "Y": 22.291952,
+            "Z": 85.22156
+          },
+          "TerritoryId": 153,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Quests/90_Drop
+++ b/Quests/90_Drop
@ -0,0 +1,166 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": -424.22275,
+            "Y": 265.1,
+            "Z": -206.5006
+          },
+          "TerritoryId": 155,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead"
+        },
+        {
+          "DataId": 1006444,
+          "Position": {
+            "X": -432.9748,
+            "Y": 233.47266,
+            "Z": -199.6643
+          },
+          "TerritoryId": 155,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": -431.37878,
+            "Y": 259.79306,
+            "Z": -194.97882
+          },
+          "TerritoryId": 155,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": -423.87833,
+            "Y": 266.9849,
+            "Z": -205.68484
+          },
+          "TerritoryId": 155,
+          "InteractionType": "WalkTo",
+          "Fly": false
+        },
+        {
+          "DataId": 1010054,
+          "Position": {
+            "X": -916.6552,
+            "Y": 229.3692,
+            "Z": -6.4240723
+          },
+          "TerritoryId": 155,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "TerritoryId": 155,
+          "InteractionType": "Duty",
+          "ContentFinderConditionId": 80
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": -424.22275,
+            "Y": 265.1,
+            "Z": -206.5006
+          },
+          "TerritoryId": 155,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "AetheryteShortcut": "Coerthas Central Highlands - Camp Dragonhead",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        },
+        {
+          "DataId": 1006444,
+          "Position": {
+            "X": -432.9748,
+            "Y": 233.47266,
+            "Z": -199.6643
+          },
+          "TerritoryId": 155,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "TerritoryId": 132,
+          "InteractionType": "UseItem",
+          "ItemId": 30362,
+          "TargetTerritoryId": 140
+        },
+        {
+          "Position": {
+            "X": -492.96475,
+            "Y": 20.999884,
+            "Z": -380.82272
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Avoid walking around Waking Sands table"
+        },
+        {
+          "DataId": 2001711,
+          "Position": {
+            "X": -480.9181,
+            "Y": 18.00103,
+            "Z": -386.862
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 212
+        },
+        {
+          "DataId": 1007478,
+          "Position": {
+            "X": -2.822998,
+            "Y": -3.0000014,
+            "Z": -56.229553
+          },
+          "TerritoryId": 212,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}
--- a/Heavensward/Aether
+++ b/Heavensward/Aether
@ -196,6 +196,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": -465.66104,
+            "Y": 43.041187,
+            "Z": 380.90747
+          },
+          "TerritoryId": 400,
+          "InteractionType": "WalkTo",
+          "Mount": true,
+          "DisableNavmesh": true
+        },
        {
          "DataId": 1013420,
          "Position": {
@ -204,8 +215,7 @@
            "Z": 347.0968
          },
          "TerritoryId": 400,
-          "InteractionType": "CompleteQuest",
-          "DisableNavmesh": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Forelands/1771_Some
+++ b/Forelands/1771_Some
@ -111,6 +111,7 @@
          },
          "TerritoryId": 398,
          "InteractionType": "WalkTo",
+          "Mount": true,
          "SkipConditions": {
            "StepIf": {
              "CompletionQuestVariablesFlags": [
--- a/Forelands/1790_Stolen
+++ b/Forelands/1790_Stolen
@ -20,6 +20,15 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": 67.682434,
+            "Y": -49.685223,
+            "Z": -148.21802
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 4001,
          "Position": {
--- a/Forelands/1797_The
+++ b/Forelands/1797_The
@ -118,6 +118,7 @@
          },
          "TerritoryId": 398,
          "InteractionType": "WalkTo",
+          "Mount": true,
          "SkipConditions": {
            "StepIf": {
              "CompletionQuestVariablesFlags": [
--- a/Heavensward/Aether
+++ b/Heavensward/Aether
@ -152,7 +152,8 @@
            "Z": 22.9953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
        }
      ]
    }
--- a/Hinterlands/1945_Ebb
+++ b/Hinterlands/1945_Ebb
@ -98,6 +98,7 @@
            "Y": 205.6815,
            "Z": 31.631958
          },
+          "StopDistance": 5,
          "TerritoryId": 478,
          "InteractionType": "CompleteQuest",
          "AetheryteShortcut": "Idyllshire"
--- a/Hinterlands/1963_Taking
+++ b/Hinterlands/1963_Taking
@ -30,6 +30,17 @@
          "InteractionType": "WalkTo",
          "TargetTerritoryId": 399
        },
+        {
+          "DataId": 2006210,
+          "Position": {
+            "X": -487.48004,
+            "Y": 144.64026,
+            "Z": -285.359
+          },
+          "TerritoryId": 399,
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818088
+        },
        {
          "DataId": 1013651,
          "Position": {
--- a/Clouds/1909_Sleepless
+++ b/Clouds/1909_Sleepless
@ -20,6 +20,15 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": -44.83911,
+            "Y": -1.6023016,
+            "Z": -655.73804
+          },
+          "TerritoryId": 401,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 2005824,
          "Position": {
--- a/Quests/WAR/588_The
+++ b/Quests/WAR/588_The
@ -135,6 +135,20 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "Position": {
+            "X": 423.53406,
+            "Y": -26.253891,
+            "Z": -550.60297
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
        {
          "DataId": 2005573,
          "Position": {
@ -177,7 +191,8 @@
            "StepIf": {
              "Flying": "Unlocked"
            }
-          }
+          },
+          "DisableNavmesh": true
        }
      ]
    },
--- a/Quests/WHM/1719_Taint
+++ b/Quests/WHM/1719_Taint
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1724_Trials
+++ b/Quests/WHM/1724_Trials
@ -56,7 +56,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1725_Hands
+++ b/Quests/WHM/1725_Hands
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -116,7 +117,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -244,7 +246,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Heavensward/MSQ/A1-Coerthas
+++ b/Heavensward/MSQ/A1-Coerthas
@ -12,6 +12,7 @@
            "Y": 0.014982708,
            "Z": -0.07635498
          },
+          "StopDistance": 7,
          "TerritoryId": 395,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A1-Coerthas
+++ b/Heavensward/MSQ/A1-Coerthas
@ -114,8 +114,7 @@
            "Z": 761.01306
          },
          "TerritoryId": 401,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Heavensward/MSQ/A1-Coerthas
+++ b/Heavensward/MSQ/A1-Coerthas
@ -83,6 +83,15 @@
            128
          ]
        },
+        {
+          "Position": {
+            "X": -368.08698,
+            "Y": -185.05266,
+            "Z": 792.836
+          },
+          "TerritoryId": 401,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 1012360,
          "Position": {
--- a/Heavensward/MSQ/A2-Raubahn/1599_Flame
+++ b/Heavensward/MSQ/A2-Raubahn/1599_Flame
@ -20,6 +20,23 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1011952,
+          "Position": {
+            "X": -277.63788,
+            "Y": -184.59735,
+            "Z": 741.60376
+          },
+          "TerritoryId": 401,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop",
+          "PickUpQuestId": 1748,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        },
        {
          "DataId": 1001029,
          "Position": {
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -47,6 +47,7 @@
            "Y": 16.009666,
            "Z": -9.567444
          },
+          "StopDistance": 7,
          "TerritoryId": 419,
          "InteractionType": "Interact",
          "TargetTerritoryId": 433
@ -63,6 +64,7 @@
            "Y": 0.022254243,
            "Z": -4.409851
          },
+          "StopDistance": 5,
          "TerritoryId": 433,
          "InteractionType": "CompleteQuest",
          "DialogueChoices": [
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -12,6 +12,7 @@
            "Y": 0.022254243,
            "Z": -4.409851
          },
+          "StopDistance": 5,
          "TerritoryId": 433,
          "InteractionType": "AcceptQuest"
        }
@ -27,7 +28,6 @@
            "Y": 1.1443481,
            "Z": 13.199036
          },
-          "StopDistance": 7,
          "TerritoryId": 433,
          "InteractionType": "Interact",
          "TargetTerritoryId": 419
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -87,6 +87,17 @@
    {
      "Sequence": 4,
      "Steps": [
+        {
+          "DataId": 1011240,
+          "Position": {
+            "X": 493.15625,
+            "Y": 200.2377,
+            "Z": 663.01965
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1744
+        },
        {
          "DataId": 2005536,
          "Position": {
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -20,6 +20,39 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1011910,
+          "Position": {
+            "X": -298.26813,
+            "Y": 126.67049,
+            "Z": -1.4191895
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1759
+        },
+        {
+          "DataId": 1011907,
+          "Position": {
+            "X": -288.8686,
+            "Y": 127.06639,
+            "Z": 13.199036
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1760
+        },
+        {
+          "DataId": 1011911,
+          "Position": {
+            "X": -279.56055,
+            "Y": 127.08131,
+            "Z": 13.595764
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2111
+        },
        {
          "Position": {
            "X": -365.48965,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -20,6 +20,16 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": -826.9342,
+            "Y": 117.95439,
+            "Z": -642.92413
+          },
+          "TerritoryId": 397,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "Position": {
            "X": -850.3646,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -35,6 +35,17 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "DataId": 1011916,
+          "Position": {
+            "X": 470.02356,
+            "Y": -49.89133,
+            "Z": 20.370789
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1771
+        },
        {
          "Position": {
            "X": 634.0371,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -105,6 +105,17 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "DataId": 1011929,
+          "Position": {
+            "X": 70.81714,
+            "Y": -49.2083,
+            "Z": -141.55798
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1790
+        },
        {
          "Position": {
            "X": 70.535545,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -90,13 +90,52 @@
      "Sequence": 255,
      "Steps": [
        {
+          "DataId": 1011916,
          "Position": {
-            "X": 123.44939,
-            "Y": -60.88712,
-            "Z": -118.79085
+            "X": 470.02356,
+            "Y": -49.89133,
+            "Z": 20.370789
          },
          "TerritoryId": 398,
-          "InteractionType": "WalkTo"
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1797,
+          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1797
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1011937,
+          "Position": {
+            "X": -305.56195,
+            "Y": 39.04307,
+            "Z": 22.9953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1802,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1802
+              ]
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": 22.235865,
+            "Y": -24.754946,
+            "Z": -119.65716
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
        },
        {
          "DataId": 1014544,
@ -106,7 +145,8 @@
            "Z": -142.50409
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "DisableNavmesh": true
        }
      ]
    }
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -12,7 +12,7 @@
            "Y": -50.325172,
            "Z": -146.95972
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 398,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,7 +12,7 @@
            "Y": -69.42934,
            "Z": 693.5072
          },
-          "StopDistance": 5,
+          "StopDistance": 6.5,
          "TerritoryId": 400,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -31,6 +31,17 @@
          "DisableNavmesh": true,
          "Mount": true
        },
+        {
+          "DataId": 1012284,
+          "Position": {
+            "X": 363.24097,
+            "Y": -73.25598,
+            "Z": 678.4314
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1819
+        },
        {
          "Position": {
            "X": 286.46622,
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -155,7 +155,7 @@
            "Y": -69.42934,
            "Z": 693.5072
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "CompleteQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,7 +12,7 @@
            "Y": -69.42934,
            "Z": 693.5072
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -58,6 +58,25 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1012285,
+          "Position": {
+            "X": 247.11987,
+            "Y": -42.33362,
+            "Z": 565.3314
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1823,
+          "AetheryteShortcut": "The Churning Mists - Moghome",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1823
+              ]
+            }
+          }
+        },
        {
          "DataId": 1013202,
          "Position": {
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -85,6 +85,7 @@
            "Y": 123.72873,
            "Z": 210.74231
          },
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "CompleteQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,6 +12,7 @@
            "Y": 123.72873,
            "Z": 210.74231
          },
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -20,6 +20,17 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1013434,
+          "Position": {
+            "X": 517.9064,
+            "Y": -1.1917055,
+            "Z": -354.63495
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1835
+        },
        {
          "DataId": 1012720,
          "Position": {
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,6 +12,7 @@
            "Y": 16.979584,
            "Z": -37.521973
          },
+          "StopDistance": 7,
          "TerritoryId": 418,
          "InteractionType": "AcceptQuest"
        }
@ -58,6 +59,7 @@
            "Y": 0,
            "Z": -3.1281738
          },
+          "StopDistance": 7,
          "TerritoryId": 212,
          "InteractionType": "Interact"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -21,6 +21,25 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1013420,
+          "Position": {
+            "X": -511.46716,
+            "Y": 50,
+            "Z": 347.0968
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "The Churning Mists - Zenith",
+          "PickUpQuestId": 1828,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1828
+              ]
+            }
+          }
+        },
        {
          "DataId": 1013172,
          "Position": {
@ -30,7 +49,6 @@
          },
          "TerritoryId": 400,
          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "The Churning Mists - Zenith",
          "Fly": true
        }
      ]
--- a/Heavensward/MSQ/A4-Ishgard/1641_The
+++ b/Heavensward/MSQ/A4-Ishgard/1641_The
@ -21,6 +21,18 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1014720,
+          "Position": {
+            "X": 13.809326,
+            "Y": 15.96505,
+            "Z": -13.870483
+          },
+          "StopDistance": 7,
+          "TerritoryId": 419,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1874
+        },
        {
          "DataId": 1011223,
          "Position": {
@ -37,8 +49,9 @@
              "Yes": true
            }
          ],
+          "AetheryteShortcut": "Ishgard",
          "AethernetShortcut": [
-            "[Ishgard] The Last Vigil",
+            "[Ishgard] Aetheryte Plaza",
            "[Ishgard] The Forgotten Knight"
          ]
        },
--- a/Heavensward/MSQ/A5-Sea
+++ b/Heavensward/MSQ/A5-Sea
@ -38,7 +38,7 @@
            "Z": 113.54166
          },
          "TerritoryId": 401,
-          "InteractionType": "SinglePlayerDuty",
+          "InteractionType": "Emote",
          "Emote": "lookout",
          "StopDistance": 0.25
        }
@ -54,10 +54,9 @@
            "Z": 77.39858
          },
          "TerritoryId": 401,
-          "InteractionType": "Emote",
+          "InteractionType": "SinglePlayerDuty",
          "Emote": "lookout",
-          "StopDistance": 0.25,
-          "Comment": "Solo Duty triggered by emoting?"
+          "StopDistance": 0.25
        }
      ]
    },
--- a/Heavensward/MSQ/A5-Sea
+++ b/Heavensward/MSQ/A5-Sea
@ -20,6 +20,17 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1012069,
+          "Position": {
+            "X": -647.0283,
+            "Y": -51.05719,
+            "Z": -417.74628
+          },
+          "TerritoryId": 401,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1909
+        },
        {
          "DataId": 1012064,
          "Position": {
@ -35,6 +46,17 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "DataId": 1012068,
+          "Position": {
+            "X": -597.0398,
+            "Y": -51.05185,
+            "Z": -387.0451
+          },
+          "TerritoryId": 401,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1910
+        },
        {
          "DataId": 2006231,
          "Position": {
@ -68,6 +90,7 @@
            "Y": -14.730623,
            "Z": -537.56006
          },
+          "StopDistance": 7,
          "TerritoryId": 401,
          "InteractionType": "Interact",
          "DialogueChoices": [
@ -100,7 +123,7 @@
            "Y": -14.153766,
            "Z": -543.0228
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 401,
          "InteractionType": "CompleteQuest"
        }
--- a/Heavensward/MSQ/A5-Sea
+++ b/Heavensward/MSQ/A5-Sea
@ -12,7 +12,7 @@
            "Y": -14.153766,
            "Z": -543.0228
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 401,
          "InteractionType": "AcceptQuest"
        }
--- a/Hinterlands/1653_Tataru's
+++ b/Hinterlands/1653_Tataru's
@ -21,6 +21,15 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": 43.620056,
+            "Y": -7.9655867,
+            "Z": 103.63884
+          },
+          "TerritoryId": 132,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 1000691,
          "Position": {
--- a/Hinterlands/1654_Onward
+++ b/Hinterlands/1654_Onward
@ -45,7 +45,8 @@
          },
          "TerritoryId": 398,
          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather"
+          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
+          "Fly": true
        }
      ]
    }
--- a/Hinterlands/1656_Golems
+++ b/Hinterlands/1656_Golems
@ -27,6 +27,7 @@
            "Y": 205.62819,
            "Z": 26.901611
          },
+          "StopDistance": 7,
          "TerritoryId": 478,
          "InteractionType": "Interact"
        }
@ -47,7 +48,15 @@
          "$": "0 0 0 0 0 0 -> 1 0 0 0 0 64",
          "ChatMessage": {
            "Key": "TEXT_HEAVNA607_01656_SAYTODO_000"
-          }
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
        },
        {
          "DataId": 1012413,
@ -60,7 +69,15 @@
          "InteractionType": "Say",
          "ChatMessage": {
            "Key": "TEXT_HEAVNA607_01656_SAYTODO_000"
-          }
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
        }
      ]
    },
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Plogon Enjoyer	c0484ee84c	test new quest schema (cherry picked from commit `1bd92659c3`) (cherry picked from commit `a5c51b73dc`) (cherry picked from commit `f7e77dd9a9`) (cherry picked from commit `e025abb06c`)	2024-09-08 01:31:17 +08:00
Plogon Enjoyer	d15ef0b9f4	Merge branch 'ananta'	2024-09-08 01:30:59 +08:00
Plogon Enjoyer	d1fc506f4c	Merge branch 'omicron'	2024-09-08 01:30:51 +08:00
Plogon Enjoyer	cc423c7ac6	Merge branch 'final-class-quests'	2024-09-08 01:30:42 +08:00
Liza Carvelli	baee61ae78	Add YoRHa: Dark Apocalypse quests (excluding locked follow ups)	2024-09-06 23:09:42 +02:00
Liza Carvelli	81d1935187	Don't count unobtainable quests towards completeable quests in journal	2024-09-06 21:24:38 +02:00
Liza Carvelli	0b30189ec2	Move trials from Unlock\Trials to Trial Quests, as expacs tend to have proper questlines	2024-09-06 13:36:47 +02:00
Liza Carvelli	0eef3cd5eb	Add 'comfort' emote	2024-09-06 13:25:10 +02:00
Liza Carvelli	e126031753	Add ARR Odin/Ex unlock quests	2024-09-06 12:36:19 +02:00
Liza Carvelli	c8fed9d278	Code cleanup	2024-09-06 00:08:43 +02:00
Liza Carvelli	60e259442f	Move CT raids to 'Alliance Raid Quests'	2024-09-05 22:51:31 +02:00
Liza Carvelli	5398979c95	Update Shadowbringers paths + include aether current quests in MSQ	2024-09-05 20:49:41 +02:00
Liza Carvelli	af556610d8	Increase default check distance for follow quests	2024-09-05 20:38:55 +02:00
Liza Carvelli	50a2b29fee	Add ShB tank role quests	2024-09-05 15:56:41 +02:00
Liza Carvelli	e1ff326708	Only count successful jumps for for repeatedJumps	2024-09-05 14:46:05 +02:00
Liza Carvelli	b92531f2ec	Restart movement if you're unmounted while moving (Logistics of War)	2024-09-04 23:18:25 +02:00
Liza Carvelli	0e33da7385	Add quest requirements that are only mentioned in quest text	2024-09-04 23:18:06 +02:00
Liza Carvelli	7a9a49acf6	Remove TODO in 'Heroic Dreams'	2024-09-04 20:07:51 +02:00
Liza Carvelli	d59026bf1d	Add moogle unlock quests	2024-09-04 19:53:18 +02:00
Liza Carvelli	7bd3152e00	Update 67 - post-SB paths/include aehter currents	2024-09-04 12:05:17 +02:00
Plogon Enjoyer	d1eee8f977	Added daily quest "Snack between Meals"	2024-09-04 00:13:52 +08:00
Plogon Enjoyer	b6e40bf1a0	Added new daily quest "Sparring Lesson"	2024-09-03 23:53:23 +08:00
Plogon Enjoyer	ec10c6d4c2	Updated "Criminal Crossings"	2024-09-03 23:52:37 +08:00
Plogon Enjoyer	8ef9e70696	Added new Ananta story quest "Chance of Gales"	2024-09-03 23:46:11 +08:00
Liza Carvelli	8baf287604	Add aetheryte shortcuts to sequence 0 of class/job quests that didn't have any (and thus weren't eligible as priority quests)	2024-09-02 22:04:14 +02:00
Liza Carvelli	8638e291b1	Update SB paths + include aether current quests in MSQ (up until Azim Steppe)	2024-09-02 21:54:25 +02:00
Liza Carvelli	617e1d11c3	Explicitly specify territoryId in NearPosition	2024-09-02 21:37:13 +02:00
Liza Carvelli	8848947aca	Update gathering paths	2024-09-01 21:49:33 +02:00
Plogon Enjoyer	b01afa2fa2	Added new Omicron story and daily quests. Also added new gathering points for the story quest.	2024-09-02 02:59:06 +08:00
Plogon Enjoyer	f0f876b810	Fixed RequiredQuestVariables values for the first pair. Added conditional teleports, too.	2024-09-02 02:59:06 +08:00
Plogon Enjoyer	9d41101d26	Updated and enabled Omicron daily quest 'I'll Fish It Myself'	2024-09-02 02:59:06 +08:00
Liza Carvelli	e8b9124119	Code cleanup	2024-09-01 20:36:06 +02:00
Liza Carvelli	272050d11b	Don't allow debug overlay to be closed via ESC	2024-09-01 20:35:50 +02:00
Plogon Enjoyer	1747e96d27	Added the final job quests for the following jobs: - AST - BLM - BRD - DRG - DRK - MCH - MNK - NIN - PLD - RDM - SAM - SCH - SMN - WAR - WHM - DRK - MNK - NIN - SAM - SCH - WHM	2024-09-02 01:06:46 +08:00
Plogon Enjoyer	79375ad2a4	Added "Aspected Benefic" to the list of Actions	2024-09-01 22:15:46 +08:00
Liza Carvelli	7c62a85a8a	Make sequence 0 non-interruptible, as you otherwise get quests with a lower priority than the MSQ	2024-09-01 15:44:59 +02:00
Liza Carvelli	7f348207d3	Add experimental combat module for Magiteknical Failure (aether current quest)	2024-09-01 15:14:37 +02:00
Liza Carvelli	d7aa4243d7	Add EnemySpawnType - AfterAction	2024-09-01 14:21:26 +02:00
Liza Carvelli	86f764aca3	Reduce the max melee distance for RSR	2024-08-31 22:31:06 +02:00
Liza Carvelli	842715337c	Update HW paths + include aether current quests in MSQ	2024-08-31 22:21:36 +02:00
Liza Carvelli	d76242adfe	Fix emote use in 'Familiar Faces' once and for all	2024-08-31 21:50:50 +02:00
Liza Carvelli	c193789d3c	Ignore NextQuestId for job quests	2024-08-31 19:41:59 +02:00