test new quest schema

(cherry picked from commit 1bd92659c3)
(cherry picked from commit a5c51b73dc)
(cherry picked from commit f7e77dd9a9)

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

@@ -10,7 +10,8 @@
       },
       "TerritoryId": 613,
       "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
     },
     {
       "TerritoryId": 613,

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

@@ -10,7 +10,8 @@
       },
       "TerritoryId": 613,
       "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
     },
     {
       "TerritoryId": 613,

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

@@ -10,7 +10,8 @@
       },
       "TerritoryId": 613,
       "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
     },
     {
       "TerritoryId": 613,

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

@@ -10,7 +10,8 @@
       },
       "TerritoryId": 613,
       "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
     },
     {
       "TerritoryId": 613,

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

@@ -4,7 +4,8 @@
   "Steps": [
     {
       "TerritoryId": 818,
-      "InteractionType": "None"
+      "InteractionType": "None",
+      "AetheryteShortcut": "Tempest - Ondo Cups"
     }
   ],
   "Groups": [
@@ -128,4 +129,4 @@
       ]
     }
   ]
-}
+}

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()))));
     }
 

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()));
         }
 

QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/1086_The Archer's Anthem.json

@@ -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"
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/BTN/3_Way of the Botanist.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/MIN/192_So You Want to Be a Miner.json

@@ -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",

QuestPaths/2.x - A Realm Reborn/Class Quests/MIN/597_Way of the Miner.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/MIN/599_My First Pickaxe.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/MIN/600_Know Thy Land.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1061_Brother from Another Mother.json

@@ -0,0 +1,103 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1001286,
+          "Position": {
+            "X": -88.9754,
+            "Y": 2.55,
+            "Z": -51.163513
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2002439,
+          "Position": {
+            "X": -232.80695,
+            "Y": -28.793823,
+            "Z": 125.29175
+          },
+          "TerritoryId": 141,
+          "InteractionType": "UseItem",
+          "ItemId": 2000951,
+          "AethernetShortcut": [
+            "[Ul'dah] Goldsmiths' Guild",
+            "[Ul'dah] Gate of Nald (Central Thanalan)"
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2002440,
+          "Position": {
+            "X": -232.80695,
+            "Y": -28.946411,
+            "Z": 125.29175
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "NextQuestId": 1062
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1062_Insulted Intelligence.json

@@ -0,0 +1,90 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InTerritory": [130, 131]
+            },
+            "AethernetShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2002441,
+          "Position": {
+            "X": 689.5093,
+            "Y": 9.750427,
+            "Z": 483.32947
+          },
+          "TerritoryId": 137,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterItemUse",
+          "ItemId": 2000817,
+          "KillEnemyDataIds": [1925],
+          "AetheryteShortcut": "Eastern La Noscea - Costa Del Sol",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2002442,
+          "Position": {
+            "X": 689.5093,
+            "Y": 9.750427,
+            "Z": 483.32947
+          },
+          "TerritoryId": 137,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "NextQuestId": 1063
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1063_A Slave to the Aether.json

@@ -0,0 +1,117 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InTerritory": [130, 131]
+            },
+            "AethernetShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1007874,
+          "Position": {
+            "X": -221.48468,
+            "Y": 26.16912,
+            "Z": -343.9536
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "Mount": true,
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2002443,
+          "Position": {
+            "X": 24.215942,
+            "Y": 25.65039,
+            "Z": 115.983765
+          },
+          "TerritoryId": 153,
+          "InteractionType": "UseItem",
+          "ItemId": 2000818,
+          "AetheryteShortcut": "South Shroud - Quarrymill",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 24.215942,
+            "Y": 25.65039,
+            "Z": 115.983765
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "DelaySecondsAtStart": 0,
+          "KillEnemyDataIds": [1926]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2002444,
+          "Position": {
+            "X": 24.215942,
+            "Y": 25.65039,
+            "Z": 115.983765
+          },
+          "TerritoryId": 153,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "NextQuestId": 1604
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1064_The Pursuit of Power.json

@@ -0,0 +1,100 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InTerritory": [130, 131]
+            },
+            "AethernetShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2002445,
+          "Position": {
+            "X": 3.1585693,
+            "Y": 20.58435,
+            "Z": -13.16864
+          },
+          "TerritoryId": 152,
+          "InteractionType": "UseItem",
+          "ItemId": 2000820,
+          "AetheryteShortcut": "East Shroud - Hawthorne Hut",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 3.1585693,
+            "Y": 20.58435,
+            "Z": -13.16864
+          },
+          "TerritoryId": 152,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "CombatDelaySecondsAtStart": 0,
+          "KillEnemyDataIds": [1927]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2002446,
+          "Position": {
+            "X": 3.1585693,
+            "Y": 20.58435,
+            "Z": -13.16864
+          },
+          "TerritoryId": 152,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "NextQuestId": 1065
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1065_Good Vibrations.json

@@ -0,0 +1,236 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InTerritory": [130, 131]
+            },
+            "AethernetShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1007875,
+          "Position": {
+            "X": -221.48468,
+            "Y": 26.16912,
+            "Z": -343.9536
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
+          "Mount": true,
+          "DialogueChoices": [
+            {
+              "Type": "YesNo",
+              "Prompt": "TEXT_JOBMNK451_01065_Q1_000_000",
+              "Yes": true
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": -258.66748,
+            "Y": 26.617363,
+            "Z": -320.76898
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Mount": true
+        },
+        {
+          "Position": {
+            "X": 38.911945,
+            "Y": 23.511465,
+            "Z": -142.86761
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "Land": true
+        },
+        {
+          "DataId": 2002447,
+          "Position": {
+            "X": 41.428223,
+            "Y": 25.101074,
+            "Z": -149.64526
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact"
+        },
+        {
+          "Position": {
+            "X": 46.038277,
+            "Y": 50.482662,
+            "Z": -578.6224
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 22.885742,
+            "Y": 17.930914,
+            "Z": -619.7939
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Land": true
+        },
+        {
+          "DataId": 2002548,
+          "Position": {
+            "X": 17.837708,
+            "Y": 20.523315,
+            "Z": -629.1448
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "Mount": true
+        },
+        {
+          "Position": {
+            "X": 214.89189,
+            "Y": 29.38419,
+            "Z": 59.154907
+          },
+          "TerritoryId": 147,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Northern Thanalan - Ceruleum Processing Plant",
+          "Fly": true
+        },
+        {
+          "DataId": 2002448,
+          "Position": {
+            "X": 213.70251,
+            "Y": 30.19751,
+            "Z": 61.020752
+          },
+          "TerritoryId": 147,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1007875,
+          "Position": {
+            "X": -221.48468,
+            "Y": 26.16912,
+            "Z": -343.9536
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "Mount": true,
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1007877,
+          "Position": {
+            "X": -74.08258,
+            "Y": 2.6069984,
+            "Z": 716.39575
+          },
+          "TerritoryId": 135,
+          "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks",
+          "Fly": true,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "CombatDelaySecondsAtStart": 0,
+          "KillEnemyDataIds": [81,345,348]
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1007877,
+          "Position": {
+            "X": -74.08258,
+            "Y": 2.6069984,
+            "Z": 716.39575
+          },
+          "TerritoryId": 135,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "DataId": 1007875,
+          "Position": {
+            "X": -221.48468,
+            "Y": 26.16912,
+            "Z": -343.9536
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "Mount": true,
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "NextQuestId": 1066
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/1066_Five Easy Pieces.json

@@ -0,0 +1,78 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InTerritory": [130, 131]
+            },
+            "AethernetShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 107.50675,
+            "Y": -4.574165,
+            "Z": -543.2282
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Mor Dhona",
+          "Fly": true,
+          "Land": true
+        },
+        {
+          "Position": {
+            "X": 104.612144,
+            "Y": -4.931232,
+            "Z": -533.5191
+          },
+          "TerritoryId": 156,
+          "InteractionType": "SinglePlayerDuty",
+          "Mount": false
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1007899,
+          "Position": {
+            "X": 104.72266,
+            "Y": -4.9380107,
+            "Z": -533.53174
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "NextQuestId": 2026
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/532_Way of the Pugilist.json

@@ -13,7 +13,13 @@
             "Z": -51.163513
           },
           "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/533_Way of the Pugilist.json

@@ -14,7 +14,13 @@
             "Z": -51.163513
           },
           "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     }

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/553_My First Hora.json

@@ -0,0 +1,157 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": -126.59337,
+            "Y": 11.159969,
+            "Z": 276.25775
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "ComplexCombatData": [
+            {
+              "DataId": 351,
+              "CompletionQuestVariablesFlags": [
+                {
+                  "Low": 3
+                },
+                null,
+                null,
+                null,
+                null,
+                null
+              ],
+              "MinimumKillCount": 3
+            }
+          ],
+          "CompletionQuestVariablesFlags": [
+            {
+              "Low": 3
+            },
+            null,
+            null,
+            null,
+            null,
+            null
+          ],
+          "$": "0 0  0 0  0 0 -> 19 0  0 0  0 0",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Gate of Nald (Central Thanalan)"
+          ]
+        },
+        {
+          "Position": {
+            "X": -126.59337,
+            "Y": 11.159969,
+            "Z": 276.25775
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "ComplexCombatData": [
+            {
+              "DataId": 385,
+              "CompletionQuestVariablesFlags": [
+                null,
+                {
+                  "High": 3
+                },
+                null,
+                null,
+                null,
+                null
+              ],
+              "MinimumKillCount": 3
+            }
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            {
+              "High": 3
+            },
+            null,
+            null,
+            null,
+            null
+          ],
+          "$": "19 0  0 0  0 0 -> 35 48  0 0  0 0"
+        },
+        {
+          "Position": {
+            "X": 32.007893,
+            "Y": 5.8527403,
+            "Z": 299.76016
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "ComplexCombatData": [
+            {
+              "DataId": 205,
+              "CompletionQuestVariablesFlags": [
+                null,
+                {
+                  "Low": 3
+                },
+                null,
+                null,
+                null,
+                null
+              ],
+              "MinimumKillCount": 3
+            }
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            {
+              "Low": 3
+            },
+            null,
+            null,
+            null,
+            null
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "AetheryteShortcut": "Ul'dah",
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 554
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/554_Harder than Rock.json

@@ -0,0 +1,236 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": -73.40663,
+            "Y": 0.60187495,
+            "Z": -59.04644
+          },
+          "TerritoryId": 130,
+          "InteractionType": "WalkTo",
+          "$": "Sometimes the pathing gets blocked coming from Hamon"
+        },
+        {
+          "DataId": 2001285,
+          "Position": {
+            "X": -80.36932,
+            "Y": 0.6866455,
+            "Z": -59.55603
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 2001282,
+          "Position": {
+            "X": -21.74414,
+            "Y": 9.994568,
+            "Z": -78.50769
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 2001283,
+          "Position": {
+            "X": 37.03357,
+            "Y": 7.248047,
+            "Z": -98.8938
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 2001280,
+          "Position": {
+            "X": -162.46283,
+            "Y": 17.471558,
+            "Z": 60.196777
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Ul'dah] Adventurers' Guild",
+            "[Ul'dah] Thaumaturges' Guild"
+          ]
+        },
+        {
+          "DataId": 2001281,
+          "Position": {
+            "X": -254.74939,
+            "Y": 17.990356,
+            "Z": 67.33801
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Ul'dah] Thaumaturges' Guild",
+            "[Ul'dah] Aetheryte Plaza"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2001541,
+          "Position": {
+            "X": 224.7196,
+            "Y": 52.048462,
+            "Z": 79.45361
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Action",
+          "Action": "Bootshine",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Gate of the Sultana (Western Thanalan)"
+          ],
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 224.7196,
+            "Y": 52.048462,
+            "Z": 79.45361
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [131],
+          "CombatDelaySecondsAtStart": 1
+        },
+        {
+          "DataId": 2001542,
+          "Position": {
+            "X": 245.71594,
+            "Y": 52.475708,
+            "Z": 58.091064
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Action",
+          "Action": "Bootshine",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 245.71594,
+            "Y": 52.475708,
+            "Z": 58.091064
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [131],
+          "CombatDelaySecondsAtStart": 1
+        },
+        {
+          "DataId": 2001543,
+          "Position": {
+            "X": 224.01758,
+            "Y": 52.231567,
+            "Z": 41.367188
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Action",
+          "Action": "Bootshine",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 224.01758,
+            "Y": 52.231567,
+            "Z": 41.367188
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [131],
+          "CombatDelaySecondsAtStart": 1
+        },
+        {
+          "DataId": 2001544,
+          "Position": {
+            "X": 259.05237,
+            "Y": 53.421753,
+            "Z": 25.40625
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Action",
+          "Action": "Bootshine",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": 258.4417,
+            "Y": 52.01455,
+            "Z": 23.240385
+          },
+          "TerritoryId": 140,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [131],
+          "CombatDelaySecondsAtStart": 1
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "AetheryteShortcut": "Ul'dah",
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/558_The Spirit Is Willing.json

@@ -0,0 +1,180 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 265.54178,
+            "Y": -19.718353,
+            "Z": -128.44438
+          },
+          "TerritoryId": 141,
+          "AetheryteShortcut": "Central Thanalan - Black Brush Station",
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "CombatDelaySecondsAtStart": 0,
+          "ComplexCombatData": [
+            {
+              "DataId": 26,
+              "RewardItemId": 2000408,
+              "RewardItemCount": 5
+            }
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 359.2259,
+            "Y": -1.9503738,
+            "Z": -187.50148
+          },
+          "TerritoryId": 141,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 1003822,
+          "Position": {
+            "X": -27.390015,
+            "Y": -2.056931,
+            "Z": -146.92914
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Central Thanalan - Black Brush Station"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1001578,
+          "Position": {
+            "X": -35.446716,
+            "Y": -2.057618,
+            "Z": -154.95538
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Interact",
+          "Mount": true
+        },
+        {
+          "DataId": 1001445,
+          "Position": {
+            "X": -13.046509,
+            "Y": -2.0905762,
+            "Z": -184.40533
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Interact",
+          "Fly": true
+        },
+        {
+          "DataId": 1004148,
+          "Position": {
+            "X": 5.722107,
+            "Y": -1.985179,
+            "Z": -172.7779
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1003822,
+          "Position": {
+            "X": -27.390015,
+            "Y": -2.056931,
+            "Z": -146.92914
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 2001349,
+          "Position": {
+            "X": -241.41296,
+            "Y": 8.0720215,
+            "Z": -32.24237
+          },
+          "TerritoryId": 141,
+          "InteractionType": "SinglePlayerDuty",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "DataId": 1004149,
+          "Position": {
+            "X": -242.84735,
+            "Y": 7.405224,
+            "Z": -29.312622
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003827,
+          "Position": {
+            "X": -65.65961,
+            "Y": 0.9481947,
+            "Z": -51.98755
+          },
+          "TerritoryId": 130,
+          "AetheryteShortcut": "Ul'dah",
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 562
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/562_Keeping the Spirit Alive.json

@@ -0,0 +1,186 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1003827,
+          "Position": {
+            "X": -65.65961,
+            "Y": 0.9481947,
+            "Z": -51.98755
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2001391,
+          "Position": {
+            "X": -215.99152,
+            "Y": -29.495728,
+            "Z": 203.78418
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Action",
+          "Action": "Bootshine",
+          "Fly": true,
+          "AetheryteShortcut": "Eastern Thanalan - Camp Drybone"
+        },
+        {
+          "Position": {
+            "X": -215.99152,
+            "Y": -29.495728,
+            "Z": 203.78418
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "CombatDelaySecondsAtStart": 1,
+          "ComplexCombatData": [
+            {
+              "DataId": 139,
+              "MinimumKillCount": 1
+            },
+            {
+              "DataId": 136,
+              "MinimumKillCount": 2
+            }
+          ]
+        },
+        {
+          "DataId": 2001389,
+          "Position": {
+            "X": -242.4201,
+            "Y": -26.138794,
+            "Z": 229.17517
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Action",
+          "Action": "Bootshine",
+          "Mount": true
+        },
+        {
+          "Position": {
+            "X": -242.4201,
+            "Y": -26.138794,
+            "Z": 229.17517
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "CombatDelaySecondsAtStart": 1,
+          "ComplexCombatData": [
+            {
+              "DataId": 57,
+              "MinimumKillCount": 2
+            }
+          ]
+        },
+        {
+          "DataId": 2001390,
+          "Position": {
+            "X": -228.8396,
+            "Y": -27.8172,
+            "Z": 250.14111
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Action",
+          "Action": "Bootshine",
+          "Mount": true
+        },
+        {
+          "Position": {
+            "X": -228.8396,
+            "Y": -27.8172,
+            "Z": 250.14111
+          },
+          "TerritoryId": 145,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "CombatDelaySecondsAtStart": 1,
+          "ComplexCombatData": [
+            {
+              "DataId": 57,
+              "MinimumKillCount": 2
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Ul'dah"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "SinglePlayerDuty"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 566
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/566_Star-crossed Rivals.json

@@ -0,0 +1,167 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1003827,
+          "Position": {
+            "X": -65.65961,
+            "Y": 0.9481947,
+            "Z": -51.98755
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1003829,
+          "Position": {
+            "X": -147.32587,
+            "Y": 25.913446,
+            "Z": -359.76202
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 2001525,
+          "Position": {
+            "X": -203.81476,
+            "Y": 27.267822,
+            "Z": -351.76624
+          },
+          "TerritoryId": 146,
+          "InteractionType": "UseItem",
+          "ItemId": 2000409,
+          "RequiredQuestVariables": [[0], null, null, null, null, null]
+        },
+        {
+          "Position": {
+            "X": -258.89648,
+            "Y": 26.681297,
+            "Z": -322.03738
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Mount": true
+        },
+        {
+          "Position": {
+            "X": -102.12759,
+            "Y": 14.866777,
+            "Z": -187.7578
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "DataId": 2001523,
+          "Position": {
+            "X": -105.57721,
+            "Y": 14.999573,
+            "Z": -185.32086
+          },
+          "TerritoryId": 146,
+          "InteractionType": "UseItem",
+          "ItemId": 2000409,
+          "RequiredQuestVariables": [[16], null, null, null, null, null]
+        },
+        {
+          "DataId": 2001524,
+          "Position": {
+            "X": 197.4364,
+            "Y": 15.548889,
+            "Z": -450.58368
+          },
+          "TerritoryId": 146,
+          "InteractionType": "UseItem",
+          "ItemId": 2000409,
+          "RequiredQuestVariables": [[32], null, null, null, null, null],
+          "Fly": true
+        },
+        {
+          "DataId": 2001522,
+          "Position": {
+            "X": 22.171326,
+            "Y": 17.868286,
+            "Z": -600.24414
+          },
+          "TerritoryId": 146,
+          "InteractionType": "UseItem",
+          "ItemId": 2000409,
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1003829,
+          "Position": {
+            "X": -147.32587,
+            "Y": 25.913446,
+            "Z": -359.76202
+          },
+          "TerritoryId": 146,
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "NextQuestId": 567
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/567_Return of the Holyfist.json

@@ -0,0 +1,115 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1003830,
+          "Position": {
+            "X": -301.5335,
+            "Y": 5.0000005,
+            "Z": 471.3053
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": -262.6409,
+            "Y": 14.190942,
+            "Z": 594.23486
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "CombatDelaySecondsAtStart": 0,
+          "ComplexCombatData": [
+            {
+              "DataId": 357,
+              "MinimumKillCount": 5
+            }
+          ],
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1003830,
+          "Position": {
+            "X": -301.5335,
+            "Y": 5.0000005,
+            "Z": 471.3053
+          },
+          "TerritoryId": 146,
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Southern Thanalan - Forgotten Springs",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1003890,
+          "Position": {
+            "X": -21.805176,
+            "Y": 3.9999993,
+            "Z": -145.18964
+          },
+          "TerritoryId": 130,
+          "InteractionType": "SinglePlayerDuty",
+          "AetheryteShortcut": "Ul'dah"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/698_Burning Up the Quarter Malm.json

@@ -0,0 +1,148 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2001798,
+          "Position": {
+            "X": -107.9017,
+            "Y": 4.989685,
+            "Z": -105.4603
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Action",
+          "Action": "Bootshine"
+        },
+        {
+          "DataId": 2001799,
+          "Position": {
+            "X": -105.6365,
+            "Y": 4.9655,
+            "Z": -107.5618
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Action",
+          "Action": "Bootshine"
+        },
+        {
+          "DataId": 2001800,
+          "Position": {
+            "X": -77.62268,
+            "Y": 5.0201416,
+            "Z": -128.893
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Action",
+          "Action": "Bootshine"
+        },
+        {
+          "DataId": 2001801,
+          "Position": {
+            "X": -74.60144,
+            "Y": 4.8981323,
+            "Z": -130.69354
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Action",
+          "Action": "Bootshine"
+        },
+        {
+          "DataId": 2001802,
+          "Position": {
+            "X": -71.42755,
+            "Y": 5.0201416,
+            "Z": -132.34149
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Action",
+          "Action": "Bootshine"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "Position": {
+            "X": -210.32118,
+            "Y": 21.582167,
+            "Z": -94.337494
+          },
+          "TerritoryId": 141,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [771],
+          "Fly": true,
+          "AetheryteShortcut": "Central Thanalan - Black Brush Station",
+          "CombatDelaySecondsAtStart": 0,
+          "$": "Will stop once 3 Qiqirn Shellsweppers get hit by Snap Punch since it will move on to the next sequence"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": -118.55462,
+            "Y": 8.216448,
+            "Z": -82.81951
+          },
+          "TerritoryId": 141,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "AetheryteShortcut": "Ul'dah",
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 558
+        }
+      ]
+    }
+  ]
+}

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/1055_Paladin's Pledge.json

@@ -14,6 +14,7 @@
           },
           "TerritoryId": 131,
           "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
           "AethernetShortcut": [
             "[Ul'dah] Aetheryte Plaza",
             "[Ul'dah] Gladiators' Guild"

QuestPaths/2.x - A Realm Reborn/Class Quests/PLD/256_Kicking the Hornet's Nest.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1097_Forgotten but Not Gone.json

@@ -12,7 +12,13 @@
             "Z": 4.017052
           },
           "TerritoryId": 129,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         },
         {
           "DataId": 1000895,

QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1098_The Last Remnants.json

@@ -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,

QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1099_The Consequences of Anger.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1100_In the Image of the Ancients.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1101_For Your Fellow Man.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/SCH/1102_The Beast Within.json

@@ -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
+              ]
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1080_Only You Can Prevent Forest Ire.json

@@ -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
               }
             }
           }

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1081_O Brother, Where Art Thou.json

@@ -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
               }
             }
           }

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1082_Following in His Footsteps.json

@@ -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
               }
             }
           }

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1083_Yearn for the Urn.json

@@ -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
               }
             }
           }

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/1084_Heart of the Forest.json

@@ -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
               }
             }
           }

QuestPaths/3.x - Heavensward/Class Quests/WHM/1719_Taint Misbehaving.json

@@ -35,7 +35,8 @@
                   "Y": 8.712891,
                   "Z": 281.69678
                 },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
               }
             }
           }

QuestPaths/3.x - Heavensward/Class Quests/WHM/1724_Trials of the Padjals.json

@@ -56,7 +56,8 @@
                   "Y": 8.712891,
                   "Z": 281.69678
                 },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
               }
             }
           }

QuestPaths/3.x - Heavensward/Class Quests/WHM/1725_Hands of Healing.json

@@ -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
               }
             }
           }

QuestPaths/3.x - Heavensward/MSQ/B-3.1/2163_As Goes Light, So Goes Darkness.json

@@ -94,6 +94,7 @@
             "Y": 0.022254243,
             "Z": 4.623413
           },
+          "StopDistance": 7,
           "TerritoryId": 433,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/D-3.3/2247_Litany of Peace.json

@@ -27,6 +27,7 @@
             "Y": 24.458836,
             "Z": 0.62561035
           },
+          "StopDistance": 4,
           "TerritoryId": 418,
           "InteractionType": "Interact",
           "DialogueChoices": [
@@ -79,6 +80,7 @@
             "Y": 0.022254243,
             "Z": 4.623413
           },
+          "StopDistance": 7,
           "TerritoryId": 433,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2348_Honorable Heroes.json

@@ -78,6 +78,10 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "TerritoryId": 146,
+          "InteractionType": "EquipRecommended"
+        },
         {
           "DataId": 1017762,
           "Position": {

QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2771_Sheep Snatcher.json

@@ -28,7 +28,7 @@
             "Z": -210.22363
           },
           "TerritoryId": 622,
-          "InteractionType": "WaitForManualProgress",
+          "InteractionType": "Instruction",
           "Comment": "Snipe sheep"
         }
       ]

QuestPaths/4.x - Stormblood/Aether Currents/The Azim Steppe/2782_Forty Years and Counting.json

@@ -50,18 +50,15 @@
           },
           "TerritoryId": 622,
           "InteractionType": "Interact",
-          "$": "QW: 0 0    0 0    0 0 -> QW: 1 16    0 0    0 128"
-        },
-        {
-          "DataId": 2008926,
-          "Position": {
-            "X": 27.634033,
-            "Y": 115.464966,
-            "Z": -48.05072
-          },
-          "TerritoryId": 622,
-          "InteractionType": "Interact",
-          "$": "QW: 1 16    0 0    0 128 -> QW: 2 32    0 0    0 192"
+          "$": "QW: 0 0    0 0    0 0 -> QW: 1 16    0 0    0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 2008927,
@@ -71,7 +68,35 @@
             "Z": -49.5766
           },
           "TerritoryId": 622,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        },
+        {
+          "DataId": 2008926,
+          "Position": {
+            "X": 27.634033,
+            "Y": 115.464966,
+            "Z": -48.05072
+          },
+          "StopDistance": 4,
+          "TerritoryId": 622,
+          "InteractionType": "Interact",
+          "$": "QW: 1 16    0 0    0 128 -> QW: 2 32    0 0    0 192",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
@@ -91,4 +116,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2661_The Hidden Truth.json

@@ -83,6 +83,7 @@
             "Y": 74.88393,
             "Z": -118.30322
           },
+          "StopDistance": 5,
           "TerritoryId": 612,
           "InteractionType": "Interact"
         }
@@ -98,10 +99,11 @@
             "Y": 75.3867,
             "Z": -124.712036
           },
+          "StopDistance": 7,
           "TerritoryId": 612,
           "InteractionType": "CompleteQuest"
         }
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2632_The Palace of Lost Souls.json

@@ -113,7 +113,8 @@
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Ruby Sea - Tamamizu"
+          "AetheryteShortcut": "Ruby Sea - Tamamizu",
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {

QuestPaths/4.x - Stormblood/Aether Currents/The Ruby Sea/2693_The Sword in the Stone.json

@@ -20,15 +20,6 @@
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": 566.1683,
-            "Y": -60.550995,
-            "Z": -134.80696
-          },
-          "TerritoryId": 613,
-          "InteractionType": "WalkTo"
-        },
         {
           "DataId": 1023358,
           "Position": {
@@ -87,9 +78,9 @@
       "Steps": [
         {
           "Position": {
-            "X": 617.86127,
-            "Y": -29.12958,
-            "Z": -129.81326
+            "X": 617.17053,
+            "Y": -29.302427,
+            "Z": -130.22484
           },
           "TerritoryId": 613,
           "InteractionType": "Jump",
@@ -137,30 +128,13 @@
       "Steps": [
         {
           "Position": {
-            "X": 593.3238,
-            "Y": -45.048393,
-            "Z": -152.89952
-          },
-          "TerritoryId": 613,
-          "InteractionType": "Jump",
-          "StopDistance": 0.25,
-          "JumpDestination": {
-            "Position": {
-              "X": 566.00684,
-              "Y": -61.995552,
-              "Z": -146.04814
-            }
-          }
-        },
-        {
-          "Position": {
-            "X": 566.1683,
-            "Y": -60.550995,
-            "Z": -134.80696
+            "X": 570.09125,
+            "Y": -62.583626,
+            "Z": -145.46727
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
-          "Mount": true
+          "DisableNavmesh": true
         },
         {
           "DataId": 1023358,
@@ -175,4 +149,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/Aether Currents/Yanxia/2724_Something Smells.json

@@ -126,6 +126,17 @@
             4
           ]
         },
+        {
+          "Position": {
+            "X": 445.11514,
+            "Y": 40.55606,
+            "Z": -51.57855
+          },
+          "TerritoryId": 614,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "Mount": true
+        },
         {
           "DataId": 2008465,
           "Position": {

QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3044_A Sluggish Endeavor.json

@@ -35,7 +35,8 @@
             8578,
             8579,
             8580
-          ]
+          ],
+          "Fly": true
         }
       ]
     },

QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.json

@@ -21,6 +21,25 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1025120,
+          "Position": {
+            "X": -333.66907,
+            "Y": 43.042835,
+            "Z": -22.201904
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact",
+          "RequiredQuestVariables": [null, null, null, [2], null, null],
+          "Fly": true,
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_BANANA402_03051_Q1_000_000",
+              "Answer": "TEXT_BANANA402_03051_A1_000_001"
+            }
+          ]
+        },
         {
           "DataId": 1025062,
           "Position": {
@@ -30,6 +49,7 @@
           },
           "TerritoryId": 612,
           "InteractionType": "Combat",
+          "RequiredQuestVariables": [null, null, null, [3], null, null],
           "Fly": true,
           "DialogueChoices": [
             {
@@ -41,6 +61,25 @@
           "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [8587]
         },
+        {
+          "DataId": 1025119,
+          "Position": {
+            "X": -488.18192,
+            "Y": 81.128265,
+            "Z": -191.33289
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact",
+          "RequiredQuestVariables": [null, null, null, [2], null, null],
+          "Fly": true,
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_BANANA402_03051_Q1_000_000",
+              "Answer": "TEXT_BANANA402_03051_A1_000_001"
+            }
+          ]
+        },
         {
           "DataId": 1025061,
           "Position": {
@@ -50,11 +89,7 @@
           },
           "TerritoryId": 612,
           "InteractionType": "Combat",
-          "SkipConditions": {
-            "StepIf": {
-              "NotTargetable": true
-            }
-          },
+          "RequiredQuestVariables": [null, null, null, [3], null, null],
           "Fly": true,
           "DialogueChoices": [
             {
@@ -64,32 +99,28 @@
             }
           ],
           "EnemySpawnType": "AfterInteraction",
-          "KillEnemyDataIds": [8586],
-          "$": "This NPC will become an enemy"
+          "KillEnemyDataIds": [8586]
         },
         {
-          "DataId": 1025119,
+          "DataId": 1025060,
           "Position": {
-            "X": -488.18192,
-            "Y": 81.128265,
-            "Z": -191.33289
+            "X": -572.9916,
+            "Y": 112.44218,
+            "Z": -229.32788
           },
           "TerritoryId": 612,
-          "InteractionType": "Interact",
-          "SkipConditions": {
-            "StepIf": {
-              "NotTargetable": true
-            }
-          },
+          "InteractionType": "Combat",
+          "RequiredQuestVariables": [null, null, null, [2], null, null],
           "Fly": true,
           "DialogueChoices": [
             {
               "Type": "List",
               "Prompt": "TEXT_BANANA402_03051_Q1_000_000",
-              "Answer": "TEXT_BANANA402_03051_A1_000_001"
+              "Answer": "TEXT_BANANA402_03051_A1_000_002"
             }
           ],
-          "$": "This NPC will not become an enemy"
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [8585]
         },
         {
           "DataId": 1025118,
@@ -100,6 +131,7 @@
           },
           "TerritoryId": 612,
           "InteractionType": "Interact",
+          "RequiredQuestVariables": [null, null, null, [3], null, null],
           "Fly": true,
           "DialogueChoices": [
             {
@@ -122,6 +154,7 @@
           },
           "TerritoryId": 612,
           "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Fringes - Peering Stones",
           "Fly": true
         },
         {

QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3051_Criminal Crossings.md

@@ -0,0 +1,5 @@
+```
+0 0 0 x 0 0 | 
+      2       1025120 -> 1025119 -> 1025060
+      3       1025062 -> 1025061 -> 1025118
+```

QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.json

@@ -21,6 +21,32 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1025066,
+          "Position": {
+            "X": -155.90149,
+            "Y": 66.2623,
+            "Z": -366.93372
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Emote",
+          "Emote": "rally",
+          "Fly": true,
+          "RequiredQuestVariables": [null, null, [16], null, null, null]
+        },
+        {
+          "DataId": 1025064,
+          "Position": {
+            "X": 185.62585,
+            "Y": 68.93902,
+            "Z": -372.15234
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Emote",
+          "RequiredQuestVariables": [null, [1, 17], null, null, null, null],
+          "Emote": "soothe",
+          "Fly": true
+        },
         {
           "DataId": 1025063,
           "Position": {
@@ -30,6 +56,7 @@
           },
           "TerritoryId": 612,
           "InteractionType": "Emote",
+          "RequiredQuestVariables": [null, [2, 18], null, null, null, null],
           "Emote": "soothe",
           "Fly": true
         },
@@ -42,6 +69,7 @@
           },
           "TerritoryId": 612,
           "InteractionType": "Emote",
+          "RequiredQuestVariables": [null, null, [32], null, null, null],
           "Emote": "rally",
           "Fly": true
         }
@@ -58,6 +86,7 @@
           },
           "TerritoryId": 612,
           "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Fringes - Peering Stones",
           "Fly": true
         },
         {

QuestPaths/4.x - Stormblood/Allied Societies/Ananta/Dailies/3052_When Feathers Fly.md

@@ -0,0 +1,7 @@
+```
+0 0 x  x  0 0 | 1025063 1025064 1025065 1025066 
+    1  16                  x               x
+    2  16          x                       x
+    1  32                  x       x
+    2  32          x               x
+```

QuestPaths/4.x - Stormblood/Class Quests/MNK/2426_A Fistful of Resolve.json

@@ -0,0 +1,107 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1006749,
+          "Position": {
+            "X": -30.47229,
+            "Y": 13.599918,
+            "Z": 95.26196
+          },
+          "TerritoryId": 131,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Goldsmiths' Guild"
+          ],
+          "SkipConditions": {
+            "AethernetShortcutIf": {
+              "InSameTerritory": true
+            },
+            "AetheryteShortcutIf": {
+              "InTerritory": [130, 131]
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1022372,
+          "Position": {
+            "X": -224.90277,
+            "Y": 26.139341,
+            "Z": -353.38373
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "Mount": true
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1022373,
+          "Position": {
+            "X": -81.22388,
+            "Y": 39.42472,
+            "Z": -336.96503
+          },
+          "TerritoryId": 146,
+          "InteractionType": "Interact",
+          "Mount": true
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "AetheryteShortcut": "Mor Dhona",
+          "DialogueChoices": [
+            {
+              "Prompt": "TEXT_JOBMNK601_02426_Q2_000_000",
+              "Type": "List",
+              "Answer": "TEXT_JOBMNK601_02426_A2_000_001"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

QuestPaths/4.x - Stormblood/Class Quests/MNK/2427_Return of the Monk.json

@@ -0,0 +1,151 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1013971,
+          "Position": {
+            "X": 15.854065,
+            "Y": 28.620823,
+            "Z": -682.76495
+          },
+          "TerritoryId": 156,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Mor Dhona",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1022384,
+          "Position": {
+            "X": 76.920654,
+            "Y": 62.19928,
+            "Z": -669.4591
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Fringes - Castrum Oriens"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1022387,
+          "Position": {
+            "X": 49.94275,
+            "Y": 118.155785,
+            "Z": -746.0899
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Peaks - Ala Gannha"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1022390,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": 46.555176,
+            "Y": 117.997925,
+            "Z": -784.2374
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Action",
+          "Action": "Form Shift"
+        },
+        {
+          "DataId": 2008451,
+          "Position": {
+            "X": 46.555176,
+            "Y": 117.997925,
+            "Z": -784.2374
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Action",
+          "Action": "Twin Snakes"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 2008451,
+          "Position": {
+            "X": 46.555176,
+            "Y": 117.997925,
+            "Z": -784.2374
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Action",
+          "Action": "Dragon Kick"
+        }
+      ]
+    },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "DataId": 2008451,
+          "Position": {
+            "X": 46.555176,
+            "Y": 117.997925,
+            "Z": -784.2374
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Action",
+          "Action": "Demolish"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1022390,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 2428
+        }
+      ]
+    }
+  ]
+}

QuestPaths/4.x - Stormblood/Class Quests/MNK/2428_Cross-fist Training.json

@@ -0,0 +1,164 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1022390,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Peaks - Ala Gannha",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1003817,
+          "Position": {
+            "X": -74.57086,
+            "Y": 1.9999951,
+            "Z": -42.404846
+          },
+          "TerritoryId": 130,
+          "AetheryteShortcut": "Ul'dah",
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1022390,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Peaks - Ala Gannha"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1022404,
+          "Position": {
+            "X": 76.43237,
+            "Y": 62.148823,
+            "Z": -667.2923
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Fringes - Castrum Oriens"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "Position": {
+            "X": -96.72436,
+            "Y": 60.086643,
+            "Z": -602.3445
+          },
+          "TerritoryId": 612,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
+        {
+          "Position": {
+            "X": -109.40343,
+            "Y": 60.039776,
+            "Z": -612.03217
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "KillEnemyDataIds": [7217],
+          "CombatDelaySecondsAtStart": 0,
+          "Mount": false
+        },
+        {
+          "DataId": 1022405,
+          "Position": {
+            "X": -106.82843,
+            "Y": 60.07189,
+            "Z": -609.49115
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1022411,
+          "Position": {
+            "X": -107.927124,
+            "Y": 60.035603,
+            "Z": -609.76575
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 6,
+      "Steps": [
+        {
+          "DataId": 1022412,
+          "Position": {
+            "X": 103.77649,
+            "Y": 118.18349,
+            "Z": -707.393
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Peaks - Ala Gannha"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1023728,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "CompleteQuest",
+          "Fly": true,
+          "NextQuestId": 2429
+        }
+      ]
+    }
+  ]
+}

QuestPaths/4.x - Stormblood/Class Quests/MNK/2429_Choices and Paths.json

@@ -0,0 +1,149 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1023728,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Peaks - Ala Gannha",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1022437,
+          "Position": {
+            "X": 81.467896,
+            "Y": 118.391884,
+            "Z": -792.7825
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1022438,
+          "Position": {
+            "X": -61.112427,
+            "Y": -0.002525447,
+            "Z": -67.67377
+          },
+          "TerritoryId": 635,
+          "InteractionType": "Interact",
+          "Mount": true,
+          "AetheryteShortcut": "Rhalgr's Reach",
+          "AethernetShortcut": [
+            "[Rhalgr's Reach] Aetheryte Plaza",
+            "[Rhalgr's Reach] Western Rhalgr's Reach"
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1023728,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Peaks - Ala Gannha"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1022439,
+          "Position": {
+            "X": 162.40173,
+            "Y": 49.7417,
+            "Z": -251.9112
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact",
+          "Fly": true,
+          "AetheryteShortcut": "Fringes - Peering Stones"
+        }
+      ]
+    },
+    {
+      "Sequence": 5,
+      "Steps": [
+        {
+          "DataId": 1022442,
+          "Position": {
+            "X": -575.1583,
+            "Y": 110.899315,
+            "Z": -324.69672
+          },
+          "TerritoryId": 612,
+          "InteractionType": "SinglePlayerDuty",
+          "Fly": true,
+          "AetheryteShortcut": "Fringes - Castrum Oriens",
+          "$": "Will skip Sequence 6"
+        }
+      ]
+    },
+    {
+      "Sequence": 7,
+      "Steps": [
+        {
+          "DataId": 1022446,
+          "Position": {
+            "X": -586.2974,
+            "Y": 113.00655,
+            "Z": -312.7337
+          },
+          "TerritoryId": 612,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1022390,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Peaks - Ala Gannha",
+          "Fly": true,
+          "NextQuestId": 2430
+        }
+      ]
+    }
+  ]
+}

QuestPaths/4.x - Stormblood/Class Quests/MNK/2430_The Power to Protect.json

@@ -0,0 +1,119 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "plogon_enjoyer",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1022390,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Peaks - Ala Gannha",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          },
+          "DialogueChoices": [
+            {
+              "Prompt": "TEXT_JOBMNK700_02430_Q1_000_000",
+              "Type": "List",
+              "Answer": "TEXT_JOBMNK700_02430_A1_000_001"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1022532,
+          "Position": {
+            "X": 617.6089,
+            "Y": 271.0004,
+            "Z": -463.1266
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact",
+          "Fly": true
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1022548,
+          "Position": {
+            "X": 75.638916,
+            "Y": 62.111427,
+            "Z": -665.3696
+          },
+          "TerritoryId": 612,
+          "InteractionType": "SinglePlayerDuty",
+          "Fly": true,
+          "AetheryteShortcut": "Fringes - Castrum Oriens",
+          "$": "Will skip Sequence 5"
+        }
+      ]
+    },
+    {
+      "Sequence": 4,
+      "Steps": [
+        {
+          "DataId": 1022539,
+          "Position": {
+            "X": 54.36792,
+            "Y": 118.22339,
+            "Z": -785.12244
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1022538,
+          "Position": {
+            "X": 51.31604,
+            "Y": 118.32745,
+            "Z": -786.9841
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1022392,
+          "Position": {
+            "X": 53.147095,
+            "Y": 118.4737,
+            "Z": -788.4489
+          },
+          "TerritoryId": 620,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1022390,
+          "Position": {
+            "X": 51.132935,
+            "Y": 118.44431,
+            "Z": -789.27295
+          },
+          "TerritoryId": 620,
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 3211
+        }
+      ]
+    }
+  ]
+}

QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json

@@ -13,7 +13,21 @@
             "Z": 403.3722
           },
           "TerritoryId": 622,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Azim Steppe - Reunion",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": 525.10876,
+                  "Y": -19.50681,
+                  "Z": 403.3722
+                },
+                "MaximumDistance": 100,
+                "TerritoryId": 622
+              }
+            }
+          }
         }
       ]
     },

QuestPaths/4.x - Stormblood/Class Quests/WHM/2414_Unease in East End.json

@@ -35,7 +35,8 @@
                   "Y": 8.712891,
                   "Z": 281.69678
                 },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
               }
             }
           }

QuestPaths/4.x - Stormblood/Custom Deliveries/Kurenai/2704_Fathoms Below.json

@@ -13,7 +13,8 @@
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Ruby Sea - Tamamizu"
+          "AetheryteShortcut": "Ruby Sea - Tamamizu",
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {

QuestPaths/4.x - Stormblood/Custom Deliveries/Kurenai/2705_A Part of Your World.json

@@ -75,7 +75,8 @@
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Ruby Sea - Tamamizu"
+          "AetheryteShortcut": "Ruby Sea - Tamamizu",
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {

QuestPaths/4.x - Stormblood/Custom Deliveries/Kurenai/2706_The Elixir of Life.json

@@ -80,7 +80,8 @@
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
-          "Mount": true
+          "Mount": true,
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {

QuestPaths/4.x - Stormblood/MSQ/A1.1-Peaks 1/2453_Best Served with Cold Steel.json

@@ -26,6 +26,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1019517,
+          "Position": {
+            "X": -653.0099,
+            "Y": 129.91537,
+            "Z": -510.67374
+          },
+          "TerritoryId": 612,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2639
+        },
         {
           "DataId": 2007955,
           "Position": {

QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2456_The Prodigal Daughter.json

@@ -44,7 +44,8 @@
             "Z": -730.4951
           },
           "TerritoryId": 620,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Peaks - Ala Gannha"
         }
       ]
     },
@@ -64,4 +65,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/MSQ/A1.2-Fringes 1/2955_Death by a Thousand Rocks.json

@@ -34,7 +34,12 @@
             "Z": -300.8011
           },
           "TerritoryId": 620,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Rhalgr's Reach",
+          "AethernetShortcut": [
+            "[Rhalgr's Reach] Aetheryte Plaza",
+            "[Rhalgr's Reach] Peaks Gate"
+          ]
         }
       ]
     },
@@ -70,4 +75,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2461_Where Men Go as One.json

@@ -34,6 +34,7 @@
             "Y": 13.02367,
             "Z": -88.91437
           },
+          "StopDistance": 5,
           "TerritoryId": 635,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2466_Divide and Conquer.json

@@ -46,6 +46,25 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 1020841,
+          "Position": {
+            "X": 146.01355,
+            "Y": 118.1921,
+            "Z": -730.4951
+          },
+          "TerritoryId": 620,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2655,
+          "AetheryteShortcut": "Peaks - Ala Gannha",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                2655
+              ]
+            }
+          }
+        },
         {
           "DataId": 1020432,
           "Position": {

QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2467_Lies, Damn Lies, and Pirates.json

@@ -26,6 +26,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1019519,
+          "Position": {
+            "X": -613.1228,
+            "Y": 130,
+            "Z": -529.839
+          },
+          "TerritoryId": 612,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2661
+        },
         {
           "DataId": 1020434,
           "Position": {
@@ -59,4 +70,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2469_Not without Incident.json

@@ -101,7 +101,7 @@
             "Y": -6.9999976,
             "Z": -58.884644
           },
-          "StopDistance": 5,
+          "StopDistance": 6,
           "TerritoryId": 628,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2635_Future Rust, Future Dust.json

@@ -86,6 +86,25 @@
             }
           }
         },
+        {
+          "DataId": 1019486,
+          "Position": {
+            "X": -116.746826,
+            "Y": 0.6342248,
+            "Z": -55.832825
+          },
+          "TerritoryId": 635,
+          "InteractionType": "Interact",
+          "$": "2 16 0 0 0 160 -> 3 16 0 0 0 176",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            16
+          ]
+        },
         {
           "Position": {
             "X": -42.27211,
@@ -107,25 +126,6 @@
             }
           }
         },
-        {
-          "DataId": 1019486,
-          "Position": {
-            "X": -116.746826,
-            "Y": 0.6342248,
-            "Z": -55.832825
-          },
-          "TerritoryId": 635,
-          "InteractionType": "Interact",
-          "$": "2 16 0 0 0 160 -> 3 16 0 0 0 176",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            16
-          ]
-        },
         {
           "DataId": 1019490,
           "Position": {

QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2637_Ye Wayward Brothers.json

@@ -144,8 +144,9 @@
           },
           "TerritoryId": 635,
           "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Rhalgr's Reach",
           "AethernetShortcut": [
-            "[Rhalgr's Reach] Northeastern Rhalgr's Reach",
+            "[Rhalgr's Reach] Aetheryte Plaza",
             "[Rhalgr's Reach] Western Rhalgr's Reach"
           ]
         }

QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2470_The Man from Ul'dah.json

@@ -12,7 +12,7 @@
             "Y": -6.9999976,
             "Z": -55.832825
           },
-          "StopDistance": 5,
+          "StopDistance": 6,
           "TerritoryId": 628,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/4.x - Stormblood/MSQ/A2-Kugane/2475_Making the Catfish Sing.json

@@ -30,6 +30,7 @@
             "Y": 0,
             "Z": -2.3041382
           },
+          "StopDistance": 7,
           "TerritoryId": 639,
           "InteractionType": "Interact"
         }

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2479_To Bend with the Wind.json

@@ -35,6 +35,17 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 1019168,
+          "Position": {
+            "X": 501.33508,
+            "Y": 34.0062,
+            "Z": 781.70435
+          },
+          "TerritoryId": 613,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2673
+        },
         {
           "Position": {
             "X": 553.3004,

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2481_Alisaie's Stones.json

@@ -56,7 +56,15 @@
             6676
           ],
           "ItemId": 2002093,
-          "$": "0 2 0 0 0 0 -> 16 17 0 0 0 128"
+          "$": "0 2 0 0 0 0 -> 16 17 0 0 0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 2007913,
@@ -71,7 +79,15 @@
           "KillEnemyDataIds": [
             6676
           ],
-          "ItemId": 2002093
+          "ItemId": 2002093,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
@@ -103,6 +119,7 @@
             "Y": 9.2068815,
             "Z": -661.21924
           },
+          "StopDistance": 7,
           "TerritoryId": 613,
           "InteractionType": "Interact"
         }

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2482_Under the Sea.json

@@ -26,6 +26,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1022102,
+          "Position": {
+            "X": 97.8866,
+            "Y": 2.096308,
+            "Z": -617.79205
+          },
+          "TerritoryId": 613,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2687
+        },
         {
           "DataId": 1019951,
           "Position": {

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2484_In Soroban We Trust.json

@@ -26,6 +26,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1023357,
+          "Position": {
+            "X": 565.0873,
+            "Y": -62.272896,
+            "Z": -147.84473
+          },
+          "TerritoryId": 613,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2693
+        },
         {
           "DataId": 1019969,
           "Position": {
@@ -34,7 +45,8 @@
             "Z": -300.5265
           },
           "TerritoryId": 613,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Ruby Sea - Tamamizu"
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2486_In Darkness the Magatama Dreams.json

@@ -20,6 +20,25 @@
     {
       "Sequence": 1,
       "Steps": [
+          {
+            "DataId": 1023280,
+            "Position": {
+              "X": -62.790894,
+              "Y": -198.96509,
+              "Z": -64.34735
+            },
+            "TerritoryId": 613,
+            "InteractionType": "AcceptQuest",
+            "PickUpQuestId": 2632,
+            "DialogueChoices": [
+              {
+                "ExcelSheet": "quest/026/StmBdy001_02632",
+                "Type": "List",
+                "Prompt": "TEXT_STMBDY001_02632_Q1_000_050",
+                "Answer": "TEXT_STMBDY001_02632_A1_000_051"
+              }
+            ]
+          },
         {
           "Position": {
             "X": 21.067955,
@@ -72,7 +91,8 @@
             "Z": 221.51514
           },
           "TerritoryId": 613,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Mount": false
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2488_Breaking and Delivering.json

@@ -40,7 +40,8 @@
             "Z": -314.00232
           },
           "TerritoryId": 613,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "RestartNavigationIfCancelled": false
         },
         {
           "DataId": 1019981,
@@ -60,14 +61,26 @@
       "Steps": [
         {
           "Position": {
-            "X": -659.02277,
-            "Y": -21.210977,
-            "Z": 270.70654
+            "X": -583.7968,
+            "Y": -58.207996,
+            "Z": 244.92668
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "StopDistance": 0.25
+          "Mount": true
+        },
+        {
+          "Position": {
+            "X": -655.3086,
+            "Y": 0,
+            "Z": 270.4341
+          },
+          "TerritoryId": 613,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "DisableNavmesh": true,
+          "RestartNavigationIfCancelled": false
         },
         {
           "Position": {

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2489_The Lord of the Revel.json

@@ -65,7 +65,8 @@
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "RestartNavigationIfCancelled": false
         },
         {
           "DataId": 1019987,

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2490_Tide Goes in, Imperials Go Out.json

@@ -20,6 +20,27 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": -780.3967,
+            "Y": 7.9621,
+            "Z": -446.48938
+          },
+          "TerritoryId": 613,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                64
+              ]
+            }
+          }
+        },
         {
           "DataId": 1019991,
           "Position": {
@@ -47,6 +68,7 @@
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
+          "Mount": true,
           "SkipConditions": {
             "StepIf": {
               "CompletionQuestVariablesFlags": [

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2491_A Silence in Three Parts.json

@@ -29,7 +29,8 @@
           },
           "TerritoryId": 613,
           "InteractionType": "WalkTo",
-          "TargetTerritoryId": 614
+          "TargetTerritoryId": 614,
+          "Fly": true
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A3.1-Ruby Sea/2953_The Arrows of Misfortune.json

@@ -61,6 +61,7 @@
             "Y": 3.3707767,
             "Z": -534.4778
           },
+          "StopDistance": 7,
           "TerritoryId": 613,
           "InteractionType": "Interact"
         }
@@ -76,6 +77,7 @@
             "Y": 3.3707767,
             "Z": -534.4778
           },
+          "StopDistance": 7,
           "TerritoryId": 613,
           "InteractionType": "Interact"
         }

QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia 1/2492_Life after Doma.json

@@ -99,7 +99,8 @@
           "TerritoryId": 614,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "StopDistance": 0.25
+          "StopDistance": 0.25,
+          "RestartNavigationIfCancelled": false
         },
         {
           "DataId": 1020007,
@@ -114,4 +115,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia 1/2494_The Ones We Leave Behind.json

@@ -26,6 +26,28 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1019314,
+          "Position": {
+            "X": 421.77454,
+            "Y": -0.3000138,
+            "Z": -293.9651
+          },
+          "TerritoryId": 614,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2724
+        },
+        {
+          "DataId": 1019263,
+          "Position": {
+            "X": 451.56018,
+            "Y": 58.77665,
+            "Z": -188.3421
+          },
+          "TerritoryId": 614,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2728
+        },
         {
           "Position": {
             "X": 508.4545,
@@ -51,6 +73,7 @@
             "Y": 83.5696,
             "Z": 94.92627
           },
+          "StopDistance": 7,
           "TerritoryId": 614,
           "InteractionType": "Interact"
         }
@@ -134,4 +157,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia 1/2495_A New Ruby Tithe.json

@@ -66,6 +66,28 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "DataId": 1019316,
+          "Position": {
+            "X": 434.89734,
+            "Y": 68.02076,
+            "Z": -125.01721
+          },
+          "TerritoryId": 614,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2733
+        },
+        {
+          "DataId": 1019313,
+          "Position": {
+            "X": 465.26282,
+            "Y": 58.52148,
+            "Z": -171.09949
+          },
+          "TerritoryId": 614,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2730
+        },
         {
           "DataId": 1020024,
           "Position": {
@@ -89,7 +111,8 @@
             "Z": 147.23425
           },
           "TerritoryId": 614,
-          "InteractionType": "Interact"
+          "InteractionType": "Instruction",
+          "Comment": "Snipe soldiers"
         }
       ]
     },
@@ -104,7 +127,8 @@
             "Z": 237.04883
           },
           "TerritoryId": 614,
-          "InteractionType": "Interact"
+          "InteractionType": "Instruction",
+          "Comment": "Snipe soldiers"
         }
       ]
     },
@@ -134,7 +158,8 @@
             "Z": 603.2959
           },
           "TerritoryId": 614,
-          "InteractionType": "Interact"
+          "InteractionType": "Instruction",
+          "Comment": "Snipe soldiers"
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia 1/2496_The Will to Live.json

@@ -77,6 +77,7 @@
             "Y": 14.6418705,
             "Z": 620.35547
           },
+          "StopDistance": 4,
           "TerritoryId": 614,
           "InteractionType": "Interact"
         }
@@ -92,6 +93,7 @@
             "Y": 14.64187,
             "Z": 619.8672
           },
+          "StopDistance": 4,
           "TerritoryId": 614,
           "InteractionType": "Interact"
         }
@@ -135,7 +137,15 @@
           "TerritoryId": 614,
           "InteractionType": "Emote",
           "Emote": "imperialsalute",
-          "$": "0 0 0 0 0 0 -> 17 0 0 0 0 64"
+          "$": "0 0 0 0 0 0 -> 17 0 0 0 0 64",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1020040,
@@ -146,13 +156,25 @@
           },
           "TerritoryId": 614,
           "InteractionType": "Emote",
-          "Emote": "imperialsalute"
+          "Emote": "imperialsalute",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         }
       ]
     },
     {
       "Sequence": 6,
       "Steps": [
+        {
+          "TerritoryId": 614,
+          "InteractionType": "EquipRecommended"
+        },
         {
           "DataId": 1020042,
           "Position": {

QuestPaths/4.x - Stormblood/MSQ/A3.2-Yanxia 1/2497_Daughter of the Deep.json

@@ -20,10 +20,6 @@
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "TerritoryId": 614,
-          "InteractionType": "EquipRecommended"
-        },
         {
           "DataId": 2008011,
           "Position": {
@@ -35,6 +31,15 @@
           "InteractionType": "AttuneAetherCurrent",
           "AetherCurrentId": 2818199
         },
+        {
+          "Position": {
+            "X": 453.69717,
+            "Y": 14.463846,
+            "Z": 663.386
+          },
+          "TerritoryId": 614,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1020047,
           "Position": {
@@ -172,7 +177,8 @@
           "TerritoryId": 614,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "StopDistance": 0.25
+          "StopDistance": 0.25,
+          "RestartNavigationIfCancelled": false
         },
         {
           "DataId": 1023787,

QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2501_A Season for War.json

@@ -38,9 +38,9 @@
         },
         {
           "Position": {
-            "X": 259.30197,
-            "Y": 1.436653,
-            "Z": 337.41043
+            "X": 395.68478,
+            "Y": -8.147073,
+            "Z": 299.55774
           },
           "TerritoryId": 622,
           "InteractionType": "Combat",

QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2502_An Impossible Dream.json

@@ -26,6 +26,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1019347,
+          "Position": {
+            "X": 575.2803,
+            "Y": -19.505632,
+            "Z": 343.74
+          },
+          "TerritoryId": 622,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2760
+        },
         {
           "DataId": 1020279,
           "Position": {
@@ -54,4 +65,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2505_The Heart of Nations.json

@@ -69,25 +69,6 @@
             128
           ]
         },
-        {
-          "DataId": 2008246,
-          "Position": {
-            "X": 641.7792,
-            "Y": 5.996765,
-            "Z": -355.6115
-          },
-          "TerritoryId": 622,
-          "InteractionType": "Interact",
-          "$": "1 16 0 0 0 128 -> 2 32 0 0 0 192",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            64
-          ]
-        },
         {
           "DataId": 2008247,
           "Position": {
@@ -124,6 +105,25 @@
             null,
             16
           ]
+        },
+        {
+          "DataId": 2008246,
+          "Position": {
+            "X": 641.7792,
+            "Y": 5.996765,
+            "Z": -355.6115
+          },
+          "TerritoryId": 622,
+          "InteractionType": "Interact",
+          "$": "1 16 0 0 0 128 -> 2 32 0 0 0 192",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2506_A Trial Before the Trial.json

@@ -35,6 +35,17 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 1019405,
+          "Position": {
+            "X": 343.58728,
+            "Y": 26.261887,
+            "Z": -326.55835
+          },
+          "TerritoryId": 622,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2771
+        },
         {
           "DataId": 1020671,
           "Position": {
@@ -119,4 +130,4 @@
       ]
     }
   ]
-}
+}

QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2509_The Labors of Magnai.json

@@ -160,6 +160,24 @@
             16
           ]
         },
+        {
+          "DataId": 2008257,
+          "Position": {
+            "X": -194.2627,
+            "Y": -57.66388,
+            "Z": 105.97388
+          },
+          "TerritoryId": 622,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            1
+          ]
+        },
         {
           "DataId": 2008256,
           "Position": {
@@ -216,24 +234,6 @@
             null,
             8
           ]
-        },
-        {
-          "DataId": 2008257,
-          "Position": {
-            "X": -194.2627,
-            "Y": -57.66388,
-            "Z": 105.97388
-          },
-          "TerritoryId": 622,
-          "InteractionType": "Interact",
-          "CompletionQuestVariablesFlags": [
-            null,
-            null,
-            null,
-            null,
-            null,
-            1
-          ]
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A4-Azim Steppe/2511_Sworn Enemies of the Sun.json

@@ -42,15 +42,15 @@
       "Sequence": 2,
       "Steps": [
         {
-          "DataId": 1019424,
+          "DataId": 1023348,
           "Position": {
-            "X": 66.056274,
-            "Y": 114.904976,
-            "Z": -8.377258
+            "X": 79.24011,
+            "Y": 114.90497,
+            "Z": 95.994385
           },
           "TerritoryId": 622,
-          "InteractionType": "Interact",
-          "TargetTerritoryId": 622
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2782
         },
         {
           "Position": {
@@ -61,7 +61,8 @@
           "TerritoryId": 622,
           "InteractionType": "Emote",
           "Emote": "lookout",
-          "StopDistance": 0.25
+          "StopDistance": 0.25,
+          "AetheryteShortcut": "Azim Steppe - Reunion"
         }
       ]
     },