Add aetheryte shortcuts to sequence 0 of class/job quests that didn't have any (and thus weren't eligible as priority quests)

Update SB paths + include aether current quests in MSQ (up until Azim Steppe)
Explicitly specify territoryId in NearPosition
2024-09-02 22:04:14 +02:00 · 2024-09-02 21:54:25 +02:00 · 2024-09-02 21:37:13 +02:00 · 2024-09-01 21:49:33 +02:00 · 2024-09-01 20:36:06 +02:00 · 2024-09-01 20:35:50 +02:00
186 changed files with 1597 additions and 354 deletions
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/GatheringPaths/4.x
+++ b/GatheringPaths/4.x
@ -10,7 +10,8 @@
      },
      "TerritoryId": 613,
      "InteractionType": "WalkTo",
-      "AetheryteShortcut": "Ruby Sea - Tamamizu"
+      "AetheryteShortcut": "Ruby Sea - Tamamizu",
+      "RestartNavigationIfCancelled": false
    },
    {
      "TerritoryId": 613,
--- a/Shadowbringers/The
+++ b/Shadowbringers/The
@ -4,7 +4,8 @@
  "Steps": [
    {
      "TerritoryId": 818,
-      "InteractionType": "None"
+      "InteractionType": "None",
+      "AetheryteShortcut": "Tempest - Ondo Cups"
    }
  ],
  "Groups": [
@ -128,4 +129,4 @@
      ]
    }
  ]
-}
+}
--- a/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
+++ b/QuestPathGenerator/RoslynElements/SkipConditionsExtensions.cs
@ -109,6 +109,9 @@ internal static class SkipConditionsExtensions
                                .AsSyntaxNodeOrToken(),
                            Assignment(nameof(NearPositionCondition.MaximumDistance),
                                    nearPositionCondition.MaximumDistance, emptyCondition.MaximumDistance)
+                                .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(NearPositionCondition.TerritoryId),
+                                    nearPositionCondition.TerritoryId, emptyCondition.TerritoryId)
                                .AsSyntaxNodeOrToken()))));
    }

--- a/Quests/BRD/1086_The
+++ b/Quests/BRD/1086_The
@ -8,7 +8,14 @@
        {
          "TerritoryId": 153,
          "InteractionType": "EquipItem",
-          "ItemId": 4546
+          "ItemId": 4546,
+          "AetheryteShortcut": "South Shroud - Quarrymill",
+          "Fly": true,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        },
        {
          "TerritoryId": 153,
@ -22,14 +29,7 @@
            "Z": -7.3396606
          },
          "TerritoryId": 153,
-          "InteractionType": "AcceptQuest",
-          "AetheryteShortcut": "South Shroud - Quarrymill",
-          "Fly": true,
-          "SkipConditions": {
-            "AetheryteShortcutIf": {
-              "InSameTerritory": true
-            }
-          }
+          "InteractionType": "AcceptQuest"
        }
      ]
    },
--- a/Quests/BTN/3_Way
+++ b/Quests/BTN/3_Way
@ -13,7 +13,20 @@
            "Z": -142.93127
          },
          "TerritoryId": 133,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Gridania",
+          "AethernetShortcut": [
+            "[Gridania] Aetheryte Plaza",
+            "[Gridania] Botanists' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                133
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MIN/192_So
+++ b/Quests/MIN/192_So
@ -14,6 +14,19 @@
          },
          "TerritoryId": 131,
          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          },
          "DialogueChoices": [
            {
              "Type": "YesNo",
--- a/Quests/MIN/597_Way
+++ b/Quests/MIN/597_Way
@ -13,7 +13,20 @@
            "Z": 153.2157
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MIN/599_My
+++ b/Quests/MIN/599_My
@ -13,7 +13,20 @@
            "Z": 157.42725
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MIN/600_Know
+++ b/Quests/MIN/600_Know
@ -13,7 +13,20 @@
            "Z": 157.42725
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Miners' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/MNK/532_Way
+++ b/Quests/MNK/532_Way
@ -13,7 +13,13 @@
            "Z": -51.163513
          },
          "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        }
      ]
    },
--- a/Quests/MNK/533_Way
+++ b/Quests/MNK/533_Way
@ -14,7 +14,13 @@
            "Z": -51.163513
          },
          "TerritoryId": 130,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        }
      ]
    }
--- a/Quests/PLD/1055_Paladin's
+++ b/Quests/PLD/1055_Paladin's
@ -14,6 +14,7 @@
          },
          "TerritoryId": 131,
          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
          "AethernetShortcut": [
            "[Ul'dah] Aetheryte Plaza",
            "[Ul'dah] Gladiators' Guild"
--- a/Quests/PLD/256_Kicking
+++ b/Quests/PLD/256_Kicking
@ -13,7 +13,20 @@
            "Z": 39.81079
          },
          "TerritoryId": 131,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Ul'dah",
+          "AethernetShortcut": [
+            "[Ul'dah] Aetheryte Plaza",
+            "[Ul'dah] Gladiators' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                131
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1097_Forgotten
+++ b/Quests/SCH/1097_Forgotten
@ -12,7 +12,13 @@
            "Z": 4.017052
          },
          "TerritoryId": 129,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
        },
        {
          "DataId": 1000895,
--- a/Quests/SCH/1098_The
+++ b/Quests/SCH/1098_The
@ -8,7 +8,20 @@
        {
          "TerritoryId": 128,
          "InteractionType": "EquipItem",
-          "ItemId": 4550
+          "ItemId": 4550,
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        },
        {
          "DataId": 1006757,
--- a/Quests/SCH/1099_The
+++ b/Quests/SCH/1099_The
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1100_In
+++ b/Quests/SCH/1100_In
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1101_For
+++ b/Quests/SCH/1101_For
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/SCH/1102_The
+++ b/Quests/SCH/1102_The
@ -13,7 +13,20 @@
            "Z": -250.56848
          },
          "TerritoryId": 128,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Limsa Lominsa",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Aetheryte Plaza",
+            "[Limsa Lominsa] Marauders' Guild"
+          ],
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true,
+              "InTerritory": [
+                128
+              ]
+            }
+          }
        }
      ]
    },
--- a/Quests/WHM/1080_Only
+++ b/Quests/WHM/1080_Only
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -150,7 +151,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1081_O
+++ b/Quests/WHM/1081_O
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -157,7 +158,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1082_Following
+++ b/Quests/WHM/1082_Following
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -202,7 +203,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -293,7 +295,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -409,7 +412,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1083_Yearn
+++ b/Quests/WHM/1083_Yearn
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -194,7 +195,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1084_Heart
+++ b/Quests/WHM/1084_Heart
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -117,7 +118,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Heavensward/Aether
+++ b/Heavensward/Aether
@ -196,6 +196,17 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "Position": {
+            "X": -465.66104,
+            "Y": 43.041187,
+            "Z": 380.90747
+          },
+          "TerritoryId": 400,
+          "InteractionType": "WalkTo",
+          "Mount": true,
+          "DisableNavmesh": true
+        },
        {
          "DataId": 1013420,
          "Position": {
@ -204,8 +215,7 @@
            "Z": 347.0968
          },
          "TerritoryId": 400,
-          "InteractionType": "CompleteQuest",
-          "DisableNavmesh": true
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Forelands/1771_Some
+++ b/Forelands/1771_Some
@ -111,6 +111,7 @@
          },
          "TerritoryId": 398,
          "InteractionType": "WalkTo",
+          "Mount": true,
          "SkipConditions": {
            "StepIf": {
              "CompletionQuestVariablesFlags": [
--- a/Forelands/1790_Stolen
+++ b/Forelands/1790_Stolen
@ -20,6 +20,15 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": 67.682434,
+            "Y": -49.685223,
+            "Z": -148.21802
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 4001,
          "Position": {
--- a/Forelands/1797_The
+++ b/Forelands/1797_The
@ -118,6 +118,7 @@
          },
          "TerritoryId": 398,
          "InteractionType": "WalkTo",
+          "Mount": true,
          "SkipConditions": {
            "StepIf": {
              "CompletionQuestVariablesFlags": [
--- a/Heavensward/Aether
+++ b/Heavensward/Aether
@ -152,7 +152,8 @@
            "Z": 22.9953
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
        }
      ]
    }
--- a/Hinterlands/1945_Ebb
+++ b/Hinterlands/1945_Ebb
@ -98,6 +98,7 @@
            "Y": 205.6815,
            "Z": 31.631958
          },
+          "StopDistance": 5,
          "TerritoryId": 478,
          "InteractionType": "CompleteQuest",
          "AetheryteShortcut": "Idyllshire"
--- a/Hinterlands/1963_Taking
+++ b/Hinterlands/1963_Taking
@ -30,6 +30,17 @@
          "InteractionType": "WalkTo",
          "TargetTerritoryId": 399
        },
+        {
+          "DataId": 2006210,
+          "Position": {
+            "X": -487.48004,
+            "Y": 144.64026,
+            "Z": -285.359
+          },
+          "TerritoryId": 399,
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818088
+        },
        {
          "DataId": 1013651,
          "Position": {
--- a/Clouds/1909_Sleepless
+++ b/Clouds/1909_Sleepless
@ -20,6 +20,15 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": -44.83911,
+            "Y": -1.6023016,
+            "Z": -655.73804
+          },
+          "TerritoryId": 401,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 2005824,
          "Position": {
--- a/Quests/WAR/588_The
+++ b/Quests/WAR/588_The
@ -135,6 +135,20 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "Position": {
+            "X": 423.53406,
+            "Y": -26.253891,
+            "Z": -550.60297
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
        {
          "DataId": 2005573,
          "Position": {
@ -177,7 +191,8 @@
            "StepIf": {
              "Flying": "Unlocked"
            }
-          }
+          },
+          "DisableNavmesh": true
        }
      ]
    },
--- a/Quests/WHM/1719_Taint
+++ b/Quests/WHM/1719_Taint
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1724_Trials
+++ b/Quests/WHM/1724_Trials
@ -56,7 +56,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Quests/WHM/1725_Hands
+++ b/Quests/WHM/1725_Hands
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -116,7 +117,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
@ -244,7 +246,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Heavensward/MSQ/A1-Coerthas
+++ b/Heavensward/MSQ/A1-Coerthas
@ -12,6 +12,7 @@
            "Y": 0.014982708,
            "Z": -0.07635498
          },
+          "StopDistance": 7,
          "TerritoryId": 395,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A1-Coerthas
+++ b/Heavensward/MSQ/A1-Coerthas
@ -114,8 +114,7 @@
            "Z": 761.01306
          },
          "TerritoryId": 401,
-          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop"
+          "InteractionType": "CompleteQuest"
        }
      ]
    }
--- a/Heavensward/MSQ/A1-Coerthas
+++ b/Heavensward/MSQ/A1-Coerthas
@ -83,6 +83,15 @@
            128
          ]
        },
+        {
+          "Position": {
+            "X": -368.08698,
+            "Y": -185.05266,
+            "Z": 792.836
+          },
+          "TerritoryId": 401,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 1012360,
          "Position": {
--- a/Heavensward/MSQ/A2-Raubahn/1599_Flame
+++ b/Heavensward/MSQ/A2-Raubahn/1599_Flame
@ -20,6 +20,23 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1011952,
+          "Position": {
+            "X": -277.63788,
+            "Y": -184.59735,
+            "Z": 741.60376
+          },
+          "TerritoryId": 401,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "The Sea of Clouds - Camp Cloudtop",
+          "PickUpQuestId": 1748,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
+        },
        {
          "DataId": 1001029,
          "Position": {
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -47,6 +47,7 @@
            "Y": 16.009666,
            "Z": -9.567444
          },
+          "StopDistance": 7,
          "TerritoryId": 419,
          "InteractionType": "Interact",
          "TargetTerritoryId": 433
@ -63,6 +64,7 @@
            "Y": 0.022254243,
            "Z": -4.409851
          },
+          "StopDistance": 5,
          "TerritoryId": 433,
          "InteractionType": "CompleteQuest",
          "DialogueChoices": [
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -12,6 +12,7 @@
            "Y": 0.022254243,
            "Z": -4.409851
          },
+          "StopDistance": 5,
          "TerritoryId": 433,
          "InteractionType": "AcceptQuest"
        }
@ -27,7 +28,6 @@
            "Y": 1.1443481,
            "Z": 13.199036
          },
-          "StopDistance": 7,
          "TerritoryId": 433,
          "InteractionType": "Interact",
          "TargetTerritoryId": 419
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -87,6 +87,17 @@
    {
      "Sequence": 4,
      "Steps": [
+        {
+          "DataId": 1011240,
+          "Position": {
+            "X": 493.15625,
+            "Y": 200.2377,
+            "Z": 663.01965
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1744
+        },
        {
          "DataId": 2005536,
          "Position": {
--- a/Heavensward/MSQ/A3.1-Coerthas
+++ b/Heavensward/MSQ/A3.1-Coerthas
@ -20,6 +20,39 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1011910,
+          "Position": {
+            "X": -298.26813,
+            "Y": 126.67049,
+            "Z": -1.4191895
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1759
+        },
+        {
+          "DataId": 1011907,
+          "Position": {
+            "X": -288.8686,
+            "Y": 127.06639,
+            "Z": 13.199036
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1760
+        },
+        {
+          "DataId": 1011911,
+          "Position": {
+            "X": -279.56055,
+            "Y": 127.08131,
+            "Z": 13.595764
+          },
+          "TerritoryId": 397,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 2111
+        },
        {
          "Position": {
            "X": -365.48965,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -20,6 +20,16 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": -826.9342,
+            "Y": 117.95439,
+            "Z": -642.92413
+          },
+          "TerritoryId": 397,
+          "InteractionType": "WalkTo",
+          "Fly": true
+        },
        {
          "Position": {
            "X": -850.3646,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -35,6 +35,17 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "DataId": 1011916,
+          "Position": {
+            "X": 470.02356,
+            "Y": -49.89133,
+            "Z": 20.370789
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1771
+        },
        {
          "Position": {
            "X": 634.0371,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -105,6 +105,17 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "DataId": 1011929,
+          "Position": {
+            "X": 70.81714,
+            "Y": -49.2083,
+            "Z": -141.55798
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1790
+        },
        {
          "Position": {
            "X": 70.535545,
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -90,13 +90,52 @@
      "Sequence": 255,
      "Steps": [
        {
+          "DataId": 1011916,
          "Position": {
-            "X": 123.44939,
-            "Y": -60.88712,
-            "Z": -118.79085
+            "X": 470.02356,
+            "Y": -49.89133,
+            "Z": 20.370789
          },
          "TerritoryId": 398,
-          "InteractionType": "WalkTo"
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1797,
+          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1797
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1011937,
+          "Position": {
+            "X": -305.56195,
+            "Y": 39.04307,
+            "Z": 22.9953
+          },
+          "TerritoryId": 398,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1802,
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1802
+              ]
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": 22.235865,
+            "Y": -24.754946,
+            "Z": -119.65716
+          },
+          "TerritoryId": 398,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
        },
        {
          "DataId": 1014544,
@ -106,7 +145,8 @@
            "Z": -142.50409
          },
          "TerritoryId": 398,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "DisableNavmesh": true
        }
      ]
    }
--- a/Heavensward/MSQ/A3.2-The
+++ b/Heavensward/MSQ/A3.2-The
@ -12,7 +12,7 @@
            "Y": -50.325172,
            "Z": -146.95972
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 398,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,7 +12,7 @@
            "Y": -69.42934,
            "Z": 693.5072
          },
-          "StopDistance": 5,
+          "StopDistance": 6.5,
          "TerritoryId": 400,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -31,6 +31,17 @@
          "DisableNavmesh": true,
          "Mount": true
        },
+        {
+          "DataId": 1012284,
+          "Position": {
+            "X": 363.24097,
+            "Y": -73.25598,
+            "Z": 678.4314
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1819
+        },
        {
          "Position": {
            "X": 286.46622,
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -155,7 +155,7 @@
            "Y": -69.42934,
            "Z": 693.5072
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "CompleteQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,7 +12,7 @@
            "Y": -69.42934,
            "Z": 693.5072
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -58,6 +58,25 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1012285,
+          "Position": {
+            "X": 247.11987,
+            "Y": -42.33362,
+            "Z": 565.3314
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1823,
+          "AetheryteShortcut": "The Churning Mists - Moghome",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1823
+              ]
+            }
+          }
+        },
        {
          "DataId": 1013202,
          "Position": {
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -85,6 +85,7 @@
            "Y": 123.72873,
            "Z": 210.74231
          },
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "CompleteQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,6 +12,7 @@
            "Y": 123.72873,
            "Z": 210.74231
          },
+          "StopDistance": 7,
          "TerritoryId": 400,
          "InteractionType": "AcceptQuest"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -20,6 +20,17 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1013434,
+          "Position": {
+            "X": 517.9064,
+            "Y": -1.1917055,
+            "Z": -354.63495
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1835
+        },
        {
          "DataId": 1012720,
          "Position": {
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -12,6 +12,7 @@
            "Y": 16.979584,
            "Z": -37.521973
          },
+          "StopDistance": 7,
          "TerritoryId": 418,
          "InteractionType": "AcceptQuest"
        }
@ -58,6 +59,7 @@
            "Y": 0,
            "Z": -3.1281738
          },
+          "StopDistance": 7,
          "TerritoryId": 212,
          "InteractionType": "Interact"
        }
--- a/Heavensward/MSQ/A3.3-The
+++ b/Heavensward/MSQ/A3.3-The
@ -21,6 +21,25 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1013420,
+          "Position": {
+            "X": -511.46716,
+            "Y": 50,
+            "Z": 347.0968
+          },
+          "TerritoryId": 400,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "The Churning Mists - Zenith",
+          "PickUpQuestId": 1828,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                1828
+              ]
+            }
+          }
+        },
        {
          "DataId": 1013172,
          "Position": {
@ -30,7 +49,6 @@
          },
          "TerritoryId": 400,
          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "The Churning Mists - Zenith",
          "Fly": true
        }
      ]
--- a/Heavensward/MSQ/A4-Ishgard/1641_The
+++ b/Heavensward/MSQ/A4-Ishgard/1641_The
@ -21,6 +21,18 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "DataId": 1014720,
+          "Position": {
+            "X": 13.809326,
+            "Y": 15.96505,
+            "Z": -13.870483
+          },
+          "StopDistance": 7,
+          "TerritoryId": 419,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1874
+        },
        {
          "DataId": 1011223,
          "Position": {
@ -37,8 +49,9 @@
              "Yes": true
            }
          ],
+          "AetheryteShortcut": "Ishgard",
          "AethernetShortcut": [
-            "[Ishgard] The Last Vigil",
+            "[Ishgard] Aetheryte Plaza",
            "[Ishgard] The Forgotten Knight"
          ]
        },
--- a/Heavensward/MSQ/A5-Sea
+++ b/Heavensward/MSQ/A5-Sea
@ -38,7 +38,7 @@
            "Z": 113.54166
          },
          "TerritoryId": 401,
-          "InteractionType": "SinglePlayerDuty",
+          "InteractionType": "Emote",
          "Emote": "lookout",
          "StopDistance": 0.25
        }
@ -54,10 +54,9 @@
            "Z": 77.39858
          },
          "TerritoryId": 401,
-          "InteractionType": "Emote",
+          "InteractionType": "SinglePlayerDuty",
          "Emote": "lookout",
-          "StopDistance": 0.25,
-          "Comment": "Solo Duty triggered by emoting?"
+          "StopDistance": 0.25
        }
      ]
    },
--- a/Heavensward/MSQ/A5-Sea
+++ b/Heavensward/MSQ/A5-Sea
@ -20,6 +20,17 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1012069,
+          "Position": {
+            "X": -647.0283,
+            "Y": -51.05719,
+            "Z": -417.74628
+          },
+          "TerritoryId": 401,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1909
+        },
        {
          "DataId": 1012064,
          "Position": {
@ -35,6 +46,17 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "DataId": 1012068,
+          "Position": {
+            "X": -597.0398,
+            "Y": -51.05185,
+            "Z": -387.0451
+          },
+          "TerritoryId": 401,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1910
+        },
        {
          "DataId": 2006231,
          "Position": {
@ -68,6 +90,7 @@
            "Y": -14.730623,
            "Z": -537.56006
          },
+          "StopDistance": 7,
          "TerritoryId": 401,
          "InteractionType": "Interact",
          "DialogueChoices": [
@ -100,7 +123,7 @@
            "Y": -14.153766,
            "Z": -543.0228
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 401,
          "InteractionType": "CompleteQuest"
        }
--- a/Heavensward/MSQ/A5-Sea
+++ b/Heavensward/MSQ/A5-Sea
@ -12,7 +12,7 @@
            "Y": -14.153766,
            "Z": -543.0228
          },
-          "StopDistance": 5,
+          "StopDistance": 7,
          "TerritoryId": 401,
          "InteractionType": "AcceptQuest"
        }
--- a/Hinterlands/1653_Tataru's
+++ b/Hinterlands/1653_Tataru's
@ -21,6 +21,15 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "Position": {
+            "X": 43.620056,
+            "Y": -7.9655867,
+            "Z": 103.63884
+          },
+          "TerritoryId": 132,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 1000691,
          "Position": {
--- a/Hinterlands/1654_Onward
+++ b/Hinterlands/1654_Onward
@ -45,7 +45,8 @@
          },
          "TerritoryId": 398,
          "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather"
+          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
+          "Fly": true
        }
      ]
    }
--- a/Hinterlands/1656_Golems
+++ b/Hinterlands/1656_Golems
@ -27,6 +27,7 @@
            "Y": 205.62819,
            "Z": 26.901611
          },
+          "StopDistance": 7,
          "TerritoryId": 478,
          "InteractionType": "Interact"
        }
@ -47,7 +48,15 @@
          "$": "0 0 0 0 0 0 -> 1 0 0 0 0 64",
          "ChatMessage": {
            "Key": "TEXT_HEAVNA607_01656_SAYTODO_000"
-          }
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
        },
        {
          "DataId": 1012413,
@ -60,7 +69,15 @@
          "InteractionType": "Say",
          "ChatMessage": {
            "Key": "TEXT_HEAVNA607_01656_SAYTODO_000"
-          }
+          },
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
        }
      ]
    },
--- a/Heavensward/MSQ/A6-The
+++ b/Heavensward/MSQ/A6-The
@ -20,6 +20,21 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1012287,
+          "Position": {
+            "X": -28.397034,
+            "Y": 100.969696,
+            "Z": -186.4195
+          },
+          "TerritoryId": 399,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1936,
+          "AethernetShortcut": [
+            "[Idyllshire] Aetheryte Plaza",
+            "[Idyllshire] Epilogue Gate (Eastern Hinterlands)"
+          ]
+        },
        {
          "DataId": 1012416,
          "Position": {
--- a/Hinterlands/1658_Leaving
+++ b/Hinterlands/1658_Leaving
@ -20,6 +20,17 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1012102,
+          "Position": {
+            "X": 72.40405,
+            "Y": 205.6815,
+            "Z": 31.631958
+          },
+          "TerritoryId": 478,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1945
+        },
        {
          "DataId": 1012419,
          "Position": {
--- a/Hinterlands/1659_Matoya's
+++ b/Hinterlands/1659_Matoya's
@ -21,6 +21,17 @@
    {
      "Sequence": 1,
      "Steps": [
+        {
+          "DataId": 1012133,
+          "Position": {
+            "X": -26.840637,
+            "Y": 206.49944,
+            "Z": 28.67163
+          },
+          "TerritoryId": 478,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1963
+        },
        {
          "Position": {
            "X": 71.86769,
@ -29,18 +40,15 @@
          },
          "TerritoryId": 478,
          "InteractionType": "WalkTo",
-          "TargetTerritoryId": 399
-        },
-        {
-          "DataId": 2006210,
-          "Position": {
-            "X": -487.48004,
-            "Y": 144.64026,
-            "Z": -285.359
+          "TargetTerritoryId": 399,
+          "SkipConditions": {
+            "StepIf": {
+              "InTerritory": [
+                399
+              ]
+            }
          },
-          "TerritoryId": 399,
-          "InteractionType": "AttuneAetherCurrent",
-          "AetherCurrentId": 2818088
+          "$": "Skipped if already in the Hinterlands, since 'Taking Stock' already leaves you closer to the entrance to Matoya's cave"
        },
        {
          "DataId": 2006214,
--- a/Hinterlands/1660_Forbidden
+++ b/Hinterlands/1660_Forbidden
@ -44,7 +44,7 @@
            "Y": 38.43,
            "Z": 3.5552979
          },
-          "StopDistance": 7,
+          "StopDistance": 6,
          "TerritoryId": 463,
          "InteractionType": "Interact"
        }
@ -53,6 +53,17 @@
    {
      "Sequence": 3,
      "Steps": [
+        {
+          "DataId": 1012141,
+          "Position": {
+            "X": 35.690796,
+            "Y": 38.43,
+            "Z": 12.985352
+          },
+          "TerritoryId": 463,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 1966
+        },
        {
          "DataId": 2005337,
          "Position": {
@ -114,7 +125,8 @@
          },
          "TerritoryId": 399,
          "InteractionType": "WalkTo",
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "Mount": true
        },
        {
          "DataId": 2005336,
--- a/Heavensward/MSQ/A6-The
+++ b/Heavensward/MSQ/A6-The
@ -28,6 +28,7 @@
            "Y": -14.52896,
            "Z": 41.153564
          },
+          "StopDistance": 7,
          "TerritoryId": 419,
          "InteractionType": "Interact"
        }
--- a/Heavensward/MSQ/A7-Azys
+++ b/Heavensward/MSQ/A7-Azys
@ -61,7 +61,8 @@
            "Z": -659.2356
          },
          "TerritoryId": 402,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DisableNavmesh": true
        }
      ]
    },
--- a/Heavensward/MSQ/A7-Azys
+++ b/Heavensward/MSQ/A7-Azys
@ -35,6 +35,15 @@
    {
      "Sequence": 2,
      "Steps": [
+        {
+          "Position": {
+            "X": 642.1002,
+            "Y": -32.964188,
+            "Z": -532.8383
+          },
+          "TerritoryId": 402,
+          "InteractionType": "WalkTo"
+        },
        {
          "DataId": 2005568,
          "Position": {
--- a/Heavensward/MSQ/B-3.1/2163_As
+++ b/Heavensward/MSQ/B-3.1/2163_As
@ -94,6 +94,7 @@
            "Y": 0.022254243,
            "Z": 4.623413
          },
+          "StopDistance": 7,
          "TerritoryId": 433,
          "InteractionType": "CompleteQuest"
        }
--- a/Heavensward/MSQ/D-3.3/2247_Litany
+++ b/Heavensward/MSQ/D-3.3/2247_Litany
@ -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"
        }
--- a/Heavensward/MSQ/E-3.4/2348_Honorable
+++ b/Heavensward/MSQ/E-3.4/2348_Honorable
@ -78,6 +78,10 @@
    {
      "Sequence": 255,
      "Steps": [
+        {
+          "TerritoryId": 146,
+          "InteractionType": "EquipRecommended"
+        },
        {
          "DataId": 1017762,
          "Position": {
--- a/Steppe/2771_Sheep
+++ b/Steppe/2771_Sheep
@ -28,7 +28,7 @@
            "Z": -210.22363
          },
          "TerritoryId": 622,
-          "InteractionType": "WaitForManualProgress",
+          "InteractionType": "Instruction",
          "Comment": "Snipe sheep"
        }
      ]
--- a/Steppe/2782_Forty
+++ b/Steppe/2782_Forty
@ -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 @@
      ]
    }
  ]
-}
+}
--- a/Fringes/2639_Magiteknical
+++ b/Fringes/2639_Magiteknical
@ -49,8 +49,7 @@
          },
          "StopDistance": 0.5,
          "TerritoryId": 612,
-          "InteractionType": "Instruction",
-          "Comment": "Manual combat",
+          "InteractionType": "Combat",
          "EnemySpawnType": "AutoOnEnterArea",
          "KillEnemyDataIds": [
            7504
@ -69,8 +68,7 @@
          },
          "StopDistance": 2,
          "TerritoryId": 612,
-          "InteractionType": "Instruction",
-          "Comment": "Manual combat",
+          "InteractionType": "Combat",
          "EnemySpawnType": "AutoOnEnterArea",
          "KillEnemyDataIds": [
            7505
--- a/Stormblood/Aether
+++ b/Stormblood/Aether
@ -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"
        }
      ]
    }
  ]
-}
+}
--- a/Stormblood/Aether
+++ b/Stormblood/Aether
@ -113,7 +113,8 @@
          },
          "TerritoryId": 613,
          "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Ruby Sea - Tamamizu"
+          "AetheryteShortcut": "Ruby Sea - Tamamizu",
+          "RestartNavigationIfCancelled": false
        },
        {
          "Position": {
--- a/Stormblood/Aether
+++ b/Stormblood/Aether
@ -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 @@
      ]
    }
  ]
-}
+}
--- a/Currents/Yanxia/2724_Something
+++ b/Currents/Yanxia/2724_Something
@ -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": {
--- a/Quests/WAR/2904_The
+++ b/Quests/WAR/2904_The
@ -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
+              }
+            }
+          }
        }
      ]
    },
--- a/Quests/WHM/2414_Unease
+++ b/Quests/WHM/2414_Unease
@ -35,7 +35,8 @@
                  "Y": 8.712891,
                  "Z": 281.69678
                },
-                "MaximumDistance": 3
+                "MaximumDistance": 3,
+                "TerritoryId": 153
              }
            }
          }
--- a/Deliveries/Kurenai/2704_Fathoms
+++ b/Deliveries/Kurenai/2704_Fathoms
@ -13,7 +13,8 @@
          },
          "TerritoryId": 613,
          "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Ruby Sea - Tamamizu"
+          "AetheryteShortcut": "Ruby Sea - Tamamizu",
+          "RestartNavigationIfCancelled": false
        },
        {
          "Position": {
--- a/Deliveries/Kurenai/2705_A
+++ b/Deliveries/Kurenai/2705_A
@ -75,7 +75,8 @@
          },
          "TerritoryId": 613,
          "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Ruby Sea - Tamamizu"
+          "AetheryteShortcut": "Ruby Sea - Tamamizu",
+          "RestartNavigationIfCancelled": false
        },
        {
          "Position": {
--- a/Deliveries/Kurenai/2706_The
+++ b/Deliveries/Kurenai/2706_The
@ -80,7 +80,8 @@
          },
          "TerritoryId": 613,
          "InteractionType": "WalkTo",
-          "Mount": true
+          "Mount": true,
+          "RestartNavigationIfCancelled": false
        },
        {
          "Position": {
--- a/Stormblood/MSQ/A1.1-Peaks
+++ b/Stormblood/MSQ/A1.1-Peaks
@ -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": {
--- a/Stormblood/MSQ/A1.2-Fringes
+++ b/Stormblood/MSQ/A1.2-Fringes
@ -44,7 +44,8 @@
            "Z": -730.4951
          },
          "TerritoryId": 620,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Peaks - Ala Gannha"
        }
      ]
    },
@ -64,4 +65,4 @@
      ]
    }
  ]
-}
+}
--- a/Stormblood/MSQ/A1.2-Fringes
+++ b/Stormblood/MSQ/A1.2-Fringes
@ -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 @@
      ]
    }
  ]
-}
+}
--- a/Stormblood/MSQ/A1.3-Rhalgr's
+++ b/Stormblood/MSQ/A1.3-Rhalgr's
@ -34,6 +34,7 @@
            "Y": 13.02367,
            "Z": -88.91437
          },
+          "StopDistance": 5,
          "TerritoryId": 635,
          "InteractionType": "CompleteQuest"
        }
--- a/Stormblood/MSQ/A1.3-Rhalgr's
+++ b/Stormblood/MSQ/A1.3-Rhalgr's
@ -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": {
--- a/Stormblood/MSQ/A1.3-Rhalgr's
+++ b/Stormblood/MSQ/A1.3-Rhalgr's
@ -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 @@
      ]
    }
  ]
-}
+}
--- a/Stormblood/MSQ/A1.3-Rhalgr's
+++ b/Stormblood/MSQ/A1.3-Rhalgr's
@ -101,7 +101,7 @@
            "Y": -6.9999976,
            "Z": -58.884644
          },
-          "StopDistance": 5,
+          "StopDistance": 6,
          "TerritoryId": 628,
          "InteractionType": "CompleteQuest"
        }
--- a/Stormblood/MSQ/A1.3-Rhalgr's
+++ b/Stormblood/MSQ/A1.3-Rhalgr's
@ -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": {
--- a/Stormblood/MSQ/A1.3-Rhalgr's
+++ b/Stormblood/MSQ/A1.3-Rhalgr's
@ -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"
          ]
        }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Liza	8baf287604	Add aetheryte shortcuts to sequence 0 of class/job quests that didn't have any (and thus weren't eligible as priority quests)	2024-09-02 22:04:14 +02:00
Liza	8638e291b1	Update SB paths + include aether current quests in MSQ (up until Azim Steppe)	2024-09-02 21:54:25 +02:00
Liza	617e1d11c3	Explicitly specify territoryId in NearPosition	2024-09-02 21:37:13 +02:00
Liza	8848947aca	Update gathering paths	2024-09-01 21:49:33 +02:00
Liza	e8b9124119	Code cleanup	2024-09-01 20:36:06 +02:00
Liza	272050d11b	Don't allow debug overlay to be closed via ESC	2024-09-01 20:35:50 +02:00
Liza	7c62a85a8a	Make sequence 0 non-interruptible, as you otherwise get quests with a lower priority than the MSQ	2024-09-01 15:44:59 +02:00
Liza	7f348207d3	Add experimental combat module for Magiteknical Failure (aether current quest)	2024-09-01 15:14:37 +02:00
Liza	d7aa4243d7	Add EnemySpawnType - AfterAction	2024-09-01 14:21:26 +02:00
Liza	86f764aca3	Reduce the max melee distance for RSR	2024-08-31 22:31:06 +02:00
Liza	842715337c	Update HW paths + include aether current quests in MSQ	2024-08-31 22:21:36 +02:00
Liza	d76242adfe	Fix emote use in 'Familiar Faces' once and for all	2024-08-31 21:50:50 +02:00
Liza	c193789d3c	Ignore NextQuestId for job quests	2024-08-31 19:41:59 +02:00