Minor cleanup for HW part 3/4

QuestPaths/3.x - Heavensward/Aether Currents/The Sea of Clouds/1910_Flying the Nest.json

@@ -89,7 +89,7 @@
             "Z": -630.0908
           },
           "TerritoryId": 401,
-          "InteractionType": "Say",
+          "InteractionType": "CompleteQuest",
           "ChatMessage": {
             "Key": "TEXT_HEAVNZ706_01910_SAY_000_000"
           }

QuestPaths/3.x - Heavensward/MSQ/B-3.1/2156_An Uncertain Future.json

@@ -12,6 +12,7 @@
             "Y": 0.022254243,
             "Z": 4.623413
           },
+          "StopDistance": 5,
           "TerritoryId": 433,
           "InteractionType": "AcceptQuest"
         }
@@ -53,6 +54,7 @@
             "Y": 24.388157,
             "Z": -4.3793945
           },
+          "StopDistance": 5,
           "TerritoryId": 418,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/MSQ/B-3.1/2157_Breaking the Cycle.json

@@ -12,12 +12,15 @@
             "Y": 24.391697,
             "Z": -2.8840332
           },
+          "StopDistance": 5,
           "TerritoryId": 418,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Ishgard",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -33,7 +36,8 @@
           },
           "TerritoryId": 398,
           "InteractionType": "Interact",
-          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather"
+          "AetheryteShortcut": "The Dravanian Forelands - Tailfeather",
+          "Fly": true
         }
       ]
     },
@@ -50,7 +54,8 @@
           "TerritoryId": 398,
           "InteractionType": "Interact",
           "StopDistance": 9,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
+          "Fly": true
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/B-3.1/2158_Another Time, Another Place.json

@@ -15,9 +15,11 @@
           "TerritoryId": 398,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/B-3.1/2161_Dreams of the Lost.json

@@ -30,7 +30,8 @@
           "TerritoryId": 398,
           "InteractionType": "Interact",
           "StopDistance": 9,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
+          "Fly": true
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/B-3.1/2162_Against the Dying of the Light.json

@@ -15,9 +15,11 @@
           "TerritoryId": 418,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Ishgard",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -56,6 +58,14 @@
           "AethernetShortcut": [
             "[Ishgard] The Jeweled Crozier",
             "[Ishgard] The Tribunal"
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
           ]
         },
         {
@@ -67,7 +77,15 @@
           },
           "TerritoryId": 419,
           "InteractionType": "Interact",
-          "$": "17 0 0 0 0 64 -> 33 16 0 0 0 96"
+          "$": "17 0 0 0 0 64 -> 33 16 0 0 0 96",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1016015,
@@ -77,7 +95,15 @@
             "Z": -106.6759
           },
           "TerritoryId": 419,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         }
       ]
     },
@@ -106,6 +132,7 @@
             "Y": -12.020877,
             "Z": 37.03357
           },
+          "StopDistance": 7,
           "TerritoryId": 418,
           "InteractionType": "Interact",
           "AethernetShortcut": [

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

@@ -15,9 +15,11 @@
           "TerritoryId": 418,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Ishgard",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -41,7 +43,19 @@
       ]
     },
     {
-      "Sequence": 2
+      "Sequence": 2,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
     },
     {
       "Sequence": 3,
@@ -53,6 +67,7 @@
             "Y": 27.79051,
             "Z": -140.36774
           },
+          "StopDistance": 7,
           "TerritoryId": 419,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2231_As It Once Was.json

@@ -12,6 +12,7 @@
             "Y": 16.009666,
             "Z": -3.189148
           },
+          "StopDistance": 7,
           "TerritoryId": 419,
           "InteractionType": "AcceptQuest"
         }
@@ -75,7 +76,15 @@
             "Z": -7.4921875
           },
           "TerritoryId": 351,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1016538,
@@ -85,7 +94,15 @@
             "Z": -9.964172
           },
           "TerritoryId": 351,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1016540,
@@ -95,7 +112,15 @@
             "Z": -4.196289
           },
           "TerritoryId": 351,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            8
+          ]
         },
         {
           "DataId": 1016543,
@@ -105,7 +130,15 @@
             "Z": 5.7526245
           },
           "TerritoryId": 351,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            16
+          ]
         },
         {
           "DataId": 1016542,
@@ -114,8 +147,17 @@
             "Y": -0.25946045,
             "Z": 2.4871826
           },
+          "StopDistance": 5,
           "TerritoryId": 351,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2232_The Word of the Mother.json

@@ -91,6 +91,7 @@
             "Y": 38.4364,
             "Z": 8.041443
           },
+          "StopDistance": 7,
           "TerritoryId": 463,
           "InteractionType": "CompleteQuest",
           "DialogueChoices": [

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2233_This War of Ours.json

@@ -12,6 +12,7 @@
             "Y": 38.4364,
             "Z": 8.041443
           },
+          "StopDistance": 7,
           "TerritoryId": 463,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2234_Staunch Conviction.json

@@ -15,9 +15,11 @@
           "TerritoryId": 397,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -34,7 +36,15 @@
           "TerritoryId": 397,
           "InteractionType": "Interact",
           "Fly": true,
-          "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128"
+          "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1016568,
@@ -46,7 +56,15 @@
           "TerritoryId": 397,
           "InteractionType": "Interact",
           "Fly": true,
-          "$": "16 1 0 0 0 128 -> 32 17 0 0 0 160"
+          "$": "16 1 0 0 0 128 -> 32 17 0 0 0 160",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1011236,
@@ -56,7 +74,15 @@
             "Z": 764.06494
           },
           "TerritoryId": 397,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2235_Once More, a Favor.json

@@ -15,9 +15,11 @@
           "TerritoryId": 397,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2236_For Those We Have Lost.json

@@ -15,9 +15,11 @@
           "TerritoryId": 397,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -48,7 +50,15 @@
           },
           "TerritoryId": 397,
           "InteractionType": "Interact",
-          "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128"
+          "$": "0 0 0 0 0 0 -> 16 1 0 0 0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "Position": {
@@ -69,7 +79,15 @@
           },
           "TerritoryId": 397,
           "InteractionType": "Interact",
-          "$": "16 1 0 0 0 128 -> 33 1 0 0 0 192"
+          "$": "16 1 0 0 0 128 -> 33 1 0 0 0 192",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1011235,
@@ -80,7 +98,15 @@
           },
           "TerritoryId": 397,
           "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2237_Consequences.json

@@ -15,9 +15,11 @@
           "TerritoryId": 397,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2238_Choices.json

@@ -15,9 +15,11 @@
           "TerritoryId": 397,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -68,6 +70,7 @@
             "Y": 24.391685,
             "Z": -2.9145508
           },
+          "StopDistance": 7,
           "TerritoryId": 418,
           "InteractionType": "Interact",
           "DialogueChoices": [
@@ -169,6 +172,7 @@
             "Y": 24.391685,
             "Z": -2.9145508
           },
+          "StopDistance": 7,
           "TerritoryId": 418,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2239_A Spectacle for the Ages.json

@@ -12,6 +12,7 @@
             "Y": 24.388157,
             "Z": -4.3793945
           },
+          "StopDistance": 7,
           "TerritoryId": 418,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2240_For Those We Can Yet Save.json

@@ -12,6 +12,7 @@
             "Y": 304.15384,
             "Z": -309.8955
           },
+          "StopDistance": 7,
           "TerritoryId": 155,
           "InteractionType": "AcceptQuest"
         }
@@ -27,6 +28,7 @@
             "Y": 1.2791227,
             "Z": 104.35632
           },
+          "StopDistance": 5,
           "TerritoryId": 418,
           "InteractionType": "Interact"
         }
@@ -59,6 +61,7 @@
             "Y": 217.95152,
             "Z": 762.72217
           },
+          "StopDistance": 7,
           "TerritoryId": 397,
           "InteractionType": "CompleteQuest",
           "DialogueChoices": [

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2241_Causes and Costs.json

@@ -12,12 +12,15 @@
             "Y": 217.95152,
             "Z": 762.72217
           },
+          "StopDistance": 7,
           "TerritoryId": 397,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Coerthas Western Highlands - Falcon's Nest",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/D-3.3/2242_The Man Within.json

@@ -12,6 +12,7 @@
             "Y": 15.96505,
             "Z": -0.22894287
           },
+          "StopDistance": 7,
           "TerritoryId": 419,
           "InteractionType": "AcceptQuest"
         }
@@ -27,6 +28,7 @@
             "Y": 16.009666,
             "Z": -9.567444
           },
+          "StopDistance": 7,
           "TerritoryId": 419,
           "InteractionType": "Interact",
           "TargetTerritoryId": 433
@@ -38,6 +40,7 @@
             "Y": 0.022254243,
             "Z": 4.623413
           },
+          "StopDistance": 7,
           "TerritoryId": 433,
           "InteractionType": "Interact"
         }
@@ -46,17 +49,6 @@
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "DataId": 2005334,
-          "Position": {
-            "X": -0.015319824,
-            "Y": 1.1443481,
-            "Z": 13.199036
-          },
-          "TerritoryId": 433,
-          "InteractionType": "Interact",
-          "TargetTerritoryId": 419
-        },
         {
           "DataId": 1016807,
           "Position": {

QuestPaths/3.x - Heavensward/MSQ/D-3.3/2243_An Ally for Ishgard.json

@@ -27,6 +27,7 @@
             "Y": 24.386719,
             "Z": -2.3347168
           },
+          "StopDistance": 7,
           "TerritoryId": 418,
           "InteractionType": "Interact"
         }
@@ -45,7 +46,8 @@
           "TerritoryId": 398,
           "InteractionType": "CompleteQuest",
           "StopDistance": 9,
-          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine"
+          "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
+          "Fly": true
         }
       ]
     }

QuestPaths/3.x - Heavensward/MSQ/D-3.3/2244_Winning Over the Wyrm.json

@@ -12,12 +12,15 @@
             "Y": 39.04307,
             "Z": 33.6156
           },
+          "StopDistance": 5,
           "TerritoryId": 398,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "The Dravanian Forelands - Anyx Trine",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -66,6 +69,7 @@
             "Y": 123.72871,
             "Z": 210.95593
           },
+          "StopDistance": 5,
           "TerritoryId": 400,
           "InteractionType": "Interact"
         }
@@ -107,6 +111,7 @@
             "Y": 123.72872,
             "Z": 210.77283
           },
+          "StopDistance": 7,
           "TerritoryId": 400,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/D-3.3/2245_An End to the Song.json

@@ -12,17 +12,32 @@
             "Y": 123.72871,
             "Z": 210.95593
           },
+          "StopDistance": 7,
           "TerritoryId": 400,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "The Churning Mists - Zenith",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
     {
-      "Sequence": 1
+      "Sequence": 1,
+      "Steps": [
+        {
+          "Position": {
+            "X": 0,
+            "Y": 0,
+            "Z": 0
+          },
+          "TerritoryId": 1,
+          "InteractionType": "WalkTo",
+          "Comment": "Filler"
+        }
+      ]
     },
     {
       "Sequence": 2,

QuestPaths/3.x - Heavensward/MSQ/D-3.3/2246_Heroes of the Hour.json

@@ -15,9 +15,11 @@
           "TerritoryId": 418,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Ishgard",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2341_Promises Kept.json

@@ -12,6 +12,7 @@
             "Y": 15.96505,
             "Z": -0.22894287
           },
+          "StopDistance": 7,
           "TerritoryId": 419,
           "InteractionType": "AcceptQuest"
         }
@@ -46,6 +47,7 @@
             "Y": 16.009666,
             "Z": -9.567444
           },
+          "StopDistance": 7,
           "TerritoryId": 419,
           "InteractionType": "Interact",
           "TargetTerritoryId": 433
@@ -62,6 +64,7 @@
             "Y": 0.022254245,
             "Z": -1.3275757
           },
+          "StopDistance": 5,
           "TerritoryId": 433,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2342_Shadows of the First.json

@@ -12,6 +12,7 @@
             "Y": 0.022254245,
             "Z": -1.3275757
           },
+          "StopDistance": 5,
           "TerritoryId": 433,
           "InteractionType": "AcceptQuest"
         }
@@ -70,6 +71,7 @@
             "Y": 331.81714,
             "Z": -308.8579
           },
+          "StopDistance": 7,
           "TerritoryId": 155,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2343_Two Sides of a Coin.json

@@ -12,6 +12,7 @@
             "Y": 331.81714,
             "Z": -308.8579
           },
+          "StopDistance": 7,
           "TerritoryId": 155,
           "InteractionType": "AcceptQuest"
         }
@@ -47,6 +48,7 @@
             "Y": 24.384384,
             "Z": -4.715088
           },
+          "StopDistance": 7,
           "TerritoryId": 418,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2344_Unlikely Allies.json

@@ -15,9 +15,11 @@
           "TerritoryId": 180,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Outer La Noscea - Camp Overlook",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2345_The Beast That Mourned at the Heart of the Mountain.json

@@ -15,9 +15,11 @@
           "TerritoryId": 180,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Outer La Noscea - Camp Overlook",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -184,6 +186,7 @@
             "Y": 24.240011,
             "Z": -632.4712
           },
+          "StopDistance": 7,
           "TerritoryId": 180,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2346_Beneath a Star-filled Sky.json

@@ -15,9 +15,11 @@
           "TerritoryId": 180,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Outer La Noscea - Camp Overlook",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -109,6 +111,7 @@
             "Y": 0,
             "Z": -3.2502441
           },
+          "StopDistance": 5,
           "TerritoryId": 212,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2347_When We Were Free.json

@@ -12,12 +12,15 @@
             "Y": 27.660244,
             "Z": -397.72644
           },
+          "StopDistance": 5,
           "TerritoryId": 146,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -33,8 +36,15 @@
           },
           "TerritoryId": 146,
           "InteractionType": "Interact",
-          "Fly": true,
+          "$": "0 0 0 0 0 0 -> 1 0 0 0 0 32",
-          "$": "0 0 0 0 0 0 -> 1 0 0 0 0 32"
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1006224,
@@ -46,7 +56,15 @@
           "TerritoryId": 146,
           "InteractionType": "Interact",
           "Mount": true,
-          "$": "1 0 0 0 0 32 -> 2 0 0 0 0 160"
+          "$": "1 0 0 0 0 32 -> 2 0 0 0 0 160",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         },
         {
           "DataId": 1006213,
@@ -57,7 +75,15 @@
           },
           "TerritoryId": 146,
           "InteractionType": "Interact",
-          "Fly": true
+          "Fly": true,
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         }
       ]
     },
@@ -72,8 +98,7 @@
             "Z": -397.72644
           },
           "TerritoryId": 146,
-          "InteractionType": "Interact",
+          "InteractionType": "Interact"
-          "Fly": true
         }
       ]
     },
@@ -88,14 +113,23 @@
             "Z": -352.98694
           },
           "TerritoryId": 146,
-          "InteractionType": "Interact",
+          "InteractionType": "Interact"
-          "Fly": true
         }
       ]
     },
     {
       "Sequence": 4,
       "Steps": [
+        {
+          "Position": {
+            "X": -58.848705,
+            "Y": 26.173487,
+            "Z": -385.86462
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "$": "Little Ala Mhigo eastern gate"
+        },
         {
           "DataId": 1017756,
           "Position": {

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

@@ -12,6 +12,7 @@
             "Y": 13.09844,
             "Z": -441.48932
           },
+          "StopDistance": 5,
           "TerritoryId": 146,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2349_One Life for One World.json

@@ -58,6 +58,7 @@
             "Y": 0.90783566,
             "Z": -3.4638672
           },
+          "StopDistance": 5,
           "TerritoryId": 146,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2350_An Ending to Mark a New Beginning.json

@@ -12,6 +12,7 @@
             "Y": 0.90783566,
             "Z": -3.4638672
           },
+          "StopDistance": 5,
           "TerritoryId": 146,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/F-3.5/2352_An Envoy for Ishgard.json

@@ -12,6 +12,7 @@
             "Y": 24.458836,
             "Z": -5.5390625
           },
+          "StopDistance": 5,
           "TerritoryId": 418,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/F-3.5/2353_An Allied Decision.json

@@ -15,9 +15,11 @@
           "TerritoryId": 132,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Gridania",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/F-3.5/2354_Griffin, Griffin on the Wall.json

@@ -15,9 +15,11 @@
           "TerritoryId": 156,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Mor Dhona",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -47,6 +49,7 @@
             "Y": 0,
             "Z": -4.501404
           },
+          "StopDistance": 7,
           "TerritoryId": 351,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/MSQ/F-3.5/2355_Louisoix's Finest Student.json

@@ -12,6 +12,7 @@
             "Y": 7.1708746,
             "Z": 485.43518
           },
+          "StopDistance": 5,
           "TerritoryId": 152,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/G-3.56/2356_The Obvious Solution.json

@@ -12,6 +12,7 @@
             "Y": 0.01804012,
             "Z": -7.7669067
           },
+          "StopDistance": 5,
           "TerritoryId": 351,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/G-3.56/2357_The Greater Obeisance.json

@@ -46,6 +46,7 @@
             "Y": -19.000002,
             "Z": 106.67578
           },
+          "StopDistance": 7,
           "TerritoryId": 132,
           "InteractionType": "Interact",
           "DialogueChoices": [
@@ -68,6 +69,7 @@
             "Y": -15.185763,
             "Z": -431.7846
           },
+          "StopDistance": 7,
           "TerritoryId": 156,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/MSQ/G-3.56/2358_Fly Free, My Pretty.json

@@ -12,6 +12,7 @@
             "Y": 0,
             "Z": -3.2807007
           },
+          "StopDistance": 5,
           "TerritoryId": 351,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/3.x - Heavensward/MSQ/G-3.56/2359_The Far Edge of Fate.json

@@ -12,6 +12,7 @@
             "Y": -19.000027,
             "Z": 93.30884
           },
+          "StopDistance": 5,
           "TerritoryId": 132,
           "InteractionType": "AcceptQuest"
         }
@@ -57,6 +58,7 @@
             "Y": -1.9294398,
             "Z": 4.6845093
           },
+          "StopDistance": 5,
           "TerritoryId": 205,
           "InteractionType": "Interact"
         }

QuestPaths/3.x - Heavensward/Unlocks/Ishgard Restoration/3672_Towards the Firmament.json

@@ -15,9 +15,11 @@
           "TerritoryId": 418,
           "InteractionType": "AcceptQuest",
           "AetheryteShortcut": "Ishgard",
-          "SkipIf": [
+          "SkipConditions": {
-            "AetheryteShortcutIfInSameTerritory"
+            "AetheryteShortcutIf": {
-          ]
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },
@@ -76,6 +78,7 @@
             "Y": -12.634913,
             "Z": -33.951355
           },
+          "StopDistance": 7,
           "TerritoryId": 419,
           "InteractionType": "Interact"
         }
@@ -118,7 +121,8 @@
             "Z": 163.46985
           },
           "TerritoryId": 886,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "NextQuestId": 3725
         }
       ]
     }

QuestPaths/3.x - Heavensward/Unlocks/Ishgard Restoration/3725_A Home in the Firmament.json

@@ -0,0 +1,250 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1031681,
+          "Position": {
+            "X": 8.102478,
+            "Y": -16.00001,
+            "Z": 146.34924
+          },
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1031677,
+          "Position": {
+            "X": 52.750366,
+            "Y": -16,
+            "Z": 168.9325
+          },
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1031692,
+          "Position": {
+            "X": 52.780884,
+            "Y": -16.000002,
+            "Z": 170.61108
+          },
+          "StopDistance": 5,
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "Position": {
+            "X": 39.29597,
+            "Y": -16.000002,
+            "Z": 140.2944
+          },
+          "TerritoryId": 886,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 1031680,
+          "Position": {
+            "X": 40.482178,
+            "Y": -16.000002,
+            "Z": 138.47559
+          },
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1031693,
+          "Position": {
+            "X": -21.25586,
+            "Y": -16,
+            "Z": 138.93335
+          },
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1031694,
+          "Position": {
+            "X": -18.60083,
+            "Y": -16,
+            "Z": 138.99438
+          },
+          "StopDistance": 7,
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1031695,
+          "Position": {
+            "X": -32.852783,
+            "Y": -16,
+            "Z": 169.9397
+          },
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1031681,
+          "Position": {
+            "X": 8.102478,
+            "Y": -16.00001,
+            "Z": 146.34924
+          },
+          "TerritoryId": 886,
+          "InteractionType": "Interact"
+        },
+        {
+          "DataId": 1031992,
+          "Position": {
+            "X": -8.255188,
+            "Y": -16,
+            "Z": 162.43225
+          },
+          "TerritoryId": 886,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 1031683,
+          "Position": {
+            "X": 13.260071,
+            "Y": -15.2,
+            "Z": 183.64221
+          },
+          "TerritoryId": 886,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 418
+        },
+        {
+          "DataId": 1031995,
+          "Position": {
+            "X": 21.86615,
+            "Y": -12.021002,
+            "Z": 54.184692
+          },
+          "TerritoryId": 418,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 1032843,
+          "Position": {
+            "X": 21.774597,
+            "Y": -12.020998,
+            "Z": 54.09314
+          },
+          "TerritoryId": 418,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 3,
+      "Steps": [
+        {
+          "DataId": 1012163,
+          "Position": {
+            "X": 128.25195,
+            "Y": 24.458832,
+            "Z": -0.6867676
+          },
+          "TerritoryId": 418,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Ishgard] The Brume",
+            "[Ishgard] The Forgotten Knight"
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        },
+        {
+          "DataId": 1011192,
+          "Position": {
+            "X": 88.36499,
+            "Y": 15.094684,
+            "Z": 31.296265
+          },
+          "TerritoryId": 418,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 1012180,
+          "Position": {
+            "X": -174.18176,
+            "Y": -12.555469,
+            "Z": -21.561035
+          },
+          "TerritoryId": 419,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Ishgard] The Forgotten Knight",
+            "[Ishgard] The Jeweled Crozier"
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "DataId": 1031682,
+          "Position": {
+            "X": 152.97156,
+            "Y": -20.000004,
+            "Z": 63.767456
+          },
+          "TerritoryId": 418,
+          "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Ishgard] The Jeweled Crozier",
+            "[Ishgard] The Brume"
+          ],
+          "TargetTerritoryId": 886
+        },
+        {
+          "DataId": 1031991,
+          "Position": {
+            "X": -7.7669067,
+            "Y": -16.000002,
+            "Z": 163.3783
+          },
+          "TerritoryId": 886,
+          "InteractionType": "CompleteQuest"
+        }
+      ]
+    }
+  ]
+}

QuestPaths/quest-v1.json

@@ -677,7 +677,14 @@
                   "if": {
                     "properties": {
                       "InteractionType": {
+                        "anyOf": [
+                          {
                             "const": "Say"
+                          },
+                          {
+                            "const": "CompleteQuest"
+                          }
+                        ]
                       }
                     }
                   },
@@ -698,7 +705,18 @@
                           "Key"
                         ]
                       }
+                    }
+                  }
                 },
+                {
+                  "if": {
+                    "properties": {
+                      "InteractionType": {
+                        "const": "Say"
+                      }
+                    }
+                  },
+                  "then": {
                     "required": [
                       "ChatMessage"
                     ]