Update Endwalker paths + include aether current quests in MSQ

QuestPaths/6.x - Endwalker/Aether Currents/Garlemald/4232_Children Are Our Future.json

@@ -223,7 +223,8 @@
           "InteractionType": "WalkTo",
           "Sprint": false,
           "Mount": false,
-          "DelaySecondsAtStart": 5
+          "DelaySecondsAtStart": 5,
+          "RestartNavigationIfCancelled": false
         }
       ]
     },

QuestPaths/6.x - Endwalker/Aether Currents/Labyrinthos/4320_Gleaners Wish.json

@@ -13,7 +13,14 @@
             "Z": -74.906555
           },
           "TerritoryId": 956,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZI005_04320_Q1_000_000",
+              "Answer": "TEXT_AKTKZI005_04320_A1_000_003"
+            }
+          ]
         }
       ]
     },

QuestPaths/6.x - Endwalker/Aether Currents/Labyrinthos/4484_The Lad in Labyrinthos.json

@@ -13,7 +13,14 @@
             "Z": -23.758362
           },
           "TerritoryId": 956,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZI101_04484_Q1_000_000",
+              "Answer": "TEXT_AKTKZI101_04484_A1_000_002"
+            }
+          ]
         }
       ]
     },

QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4489_Steppe Child.json

@@ -20,8 +20,7 @@
               "Prompt": "TEXT_AKTKZA201_04489_Q1_000_004",
               "Answer": "TEXT_AKTKZA201_04489_A1_000_002"
             }
-          ],
+          ]
-          "Comment": "TODO I don't think dialogue choices as part of accepting a quest are handled yet"
         }
       ]
     },
@@ -84,6 +83,7 @@
             "Y": 41.614826,
             "Z": 409.53687
           },
+          "StopDistance": 5,
           "TerritoryId": 957,
           "InteractionType": "Interact"
         }

QuestPaths/6.x - Endwalker/Aether Currents/Ultima Thule/4342_Ending as One.json

@@ -29,9 +29,33 @@
           "TerritoryId": 960,
           "InteractionType": "Combat",
           "EnemySpawnType": "OverworldEnemies",
-          "KillEnemyDataIds": [
+          "ComplexCombatData": [
-            13315,
+            {
-            14097
+              "DataId": 13315,
+              "MinimumKillCount": 2,
+              "CompletionQuestVariablesFlags": [
+                null,
+                32,
+                null,
+                null,
+                null,
+                null
+              ]
+            },
+            {
+              "DataId": 14097,
+              "MinimumKillCount": 1,
+              "CompletionQuestVariablesFlags": [
+                null,
+                {
+                  "High": 3
+                },
+                null,
+                null,
+                null,
+                null
+              ]
+            }
           ],
           "$": "QuestVariables: 0 0-16-32 0 0 0 0"
         }

QuestPaths/6.x - Endwalker/Aether Currents/Ultima Thule/4346_A Most Stimulating Discussion.json

@@ -20,6 +20,28 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": 33.55028,
+            "Y": 269.00006,
+            "Z": -683.68896
+          },
+          "TerritoryId": 960,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Ultima Thule - Abode of the Ea",
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                64
+              ]
+            }
+          }
+        },
         {
           "DataId": 1040880,
           "Position": {
@@ -29,7 +51,14 @@
           },
           "TerritoryId": 960,
           "InteractionType": "Interact",
-          "AetheryteShortcut": "Ultima Thule - Abode of the Ea"
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
         },
         {
           "DataId": 1040881,
@@ -41,7 +70,22 @@
           "TerritoryId": 960,
           "InteractionType": "Interact",
           "$.0": "[2]",
-          "$.1": "QuestVariables if done after [3]: 32 17 0 0 0 160"
+          "$.1": "QuestVariables if done after [3]: 32 17 0 0 0 160",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZJ010_04346_Q1_000_000",
+              "Answer": "TEXT_AKTKZJ010_04346_A1_000_001"
+            }
+          ],
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            32
+          ]
         },
         {
           "DataId": 1040879,
@@ -53,7 +97,15 @@
           "TerritoryId": 960,
           "InteractionType": "Interact",
           "$.0": "[3]",
-          "$.1": "QuestVariables if done first: 16 1 0 0 0 128"
+          "$.1": "QuestVariables if done first: 16 1 0 0 0 128",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
         }
       ]
     },

QuestPaths/6.x - Endwalker/Aether Currents/Ultima Thule/4354_Combat Evolved.json

@@ -13,7 +13,14 @@
             "Z": 315.81592
           },
           "TerritoryId": 960,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZK001_04354_Q1_000_100",
+              "Answer": "TEXT_AKTKZK001_04354_A2_000_100"
+            }
+          ]
         }
       ]
     },
@@ -32,8 +39,7 @@
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             14044
-          ],
+          ]
-          "Comment": "Can maybe be automated to use item depending on quest vars??"
         }
       ]
     },

QuestPaths/6.x - Endwalker/Aether Currents/Ultima Thule/4355_Learn to Love.json

@@ -0,0 +1,113 @@
+{
+  "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
+  "Author": "liza",
+  "QuestSequence": [
+    {
+      "Sequence": 0,
+      "Steps": [
+        {
+          "DataId": 1041656,
+          "Position": {
+            "X": 510.3075,
+            "Y": 436.9997,
+            "Z": 307.17932
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest"
+        }
+      ]
+    },
+    {
+      "Sequence": 1,
+      "Steps": [
+        {
+          "DataId": 2012560,
+          "Position": {
+            "X": 510.3379,
+            "Y": 436.9724,
+            "Z": 307.20984
+          },
+          "TerritoryId": 960,
+          "InteractionType": "Interact"
+        }
+      ]
+    },
+    {
+      "Sequence": 2,
+      "Steps": [
+        {
+          "DataId": 2012752,
+          "Position": {
+            "X": 687.2511,
+            "Y": 440.48218,
+            "Z": 375.3567
+          },
+          "TerritoryId": 960,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            128
+          ]
+        },
+        {
+          "DataId": 2012753,
+          "Position": {
+            "X": 688.74634,
+            "Y": 440.45154,
+            "Z": 381.21606
+          },
+          "TerritoryId": 960,
+          "InteractionType": "Interact",
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            null,
+            64
+          ]
+        }
+      ]
+    },
+    {
+      "Sequence": 255,
+      "Steps": [
+        {
+          "Position": {
+            "X": 674.91565,
+            "Y": 440.4633,
+            "Z": 404.94272
+          },
+          "TerritoryId": 960,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 2012032,
+          "Position": {
+            "X": 661.76843,
+            "Y": 439.96326,
+            "Z": 411.73413
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AttuneAetherCurrent",
+          "AetherCurrentId": 2818391
+        },
+        {
+          "DataId": 1041656,
+          "Position": {
+            "X": 510.3075,
+            "Y": 436.9997,
+            "Z": 307.17932
+          },
+          "TerritoryId": 960,
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Ultima Thule - Base Omicron"
+        }
+      ]
+    }
+  ]
+}

QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4371_House of Divinities.json

@@ -21,6 +21,25 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1041331,
+          "Position": {
+            "X": 202.4414,
+            "Y": 1.769943,
+            "Z": 727.7484
+          },
+          "TerritoryId": 957,
+          "InteractionType": "AcceptQuest",
+          "DialogueChoices": [
+            {
+              "ExcelSheet": "quest/044/AktKza201_04489",
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZA201_04489_Q1_000_004",
+              "Answer": "TEXT_AKTKZA201_04489_A1_000_002"
+            }
+          ],
+          "PickUpQuestId": 4489
+        },
         {
           "DataId": 2011951,
           "Position": {

QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4374_A Boys Errand.json

@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1037670,
+          "Position": {
+            "X": -508.84262,
+            "Y": -3.7109916E-05,
+            "Z": -20.767578
+          },
+          "TerritoryId": 957,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4203
+        },
         {
           "DataId": 1038642,
           "Position": {

QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4384_Tracks in the Snow.json

@@ -329,7 +329,8 @@
           },
           "TerritoryId": 958,
           "InteractionType": "WalkTo",
-          "Mount": false
+          "Mount": false,
+          "RestartNavigationIfCancelled": false
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4385_How the Mighty Are Fallen.json

@@ -118,7 +118,12 @@
             "Z": 623.22424
           },
           "TerritoryId": 958,
-          "InteractionType": "Interact"
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
+          "KillEnemyDataIds": [
+            14085,
+            14086
+          ]
         }
       ]
     },
@@ -134,7 +139,8 @@
           },
           "TerritoryId": 958,
           "InteractionType": "Interact",
-          "Mount": false
+          "Mount": false,
+          "RestartNavigationIfCancelled": false
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4387_A Way Forward.json

@@ -153,6 +153,7 @@
             "Y": 0.21427588,
             "Z": 147.8446
           },
+          "StopDistance": 5,
           "TerritoryId": 958,
           "InteractionType": "CompleteQuest"
         }

QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4393_Strange Bedfellows.json

@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1041753,
+          "Position": {
+            "X": -321.49237,
+            "Y": 22.009079,
+            "Z": 424.00232
+          },
+          "TerritoryId": 958,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4498
+        },
         {
           "DataId": 1039917,
           "Position": {
@@ -121,10 +132,30 @@
                 null,
                 null,
                 64
-              ]
+              ],
+              "NearPosition": {
+                "Position": {
+                  "X": 496.94043,
+                  "Y": 10.887661,
+                  "Z": -418.57025
+                },
+                "TerritoryId": 958,
+                "MaximumDistance": 30
+              }
             }
           }
         },
+        {
+          "DataId": 1040633,
+          "Position": {
+            "X": 496.94043,
+            "Y": 10.887661,
+            "Z": -418.57025
+          },
+          "TerritoryId": 958,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4232
+        },
         {
           "DataId": 2012111,
           "Position": {

QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4394_In from the Cold.json

@@ -23,6 +23,36 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1040898,
+          "Position": {
+            "X": -433.12738,
+            "Y": 22.221891,
+            "Z": 460.80713
+          },
+          "TerritoryId": 958,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4216
+        },
+        {
+          "DataId": 1041765,
+          "Position": {
+            "X": -323.4455,
+            "Y": 22,
+            "Z": 487.81555
+          },
+          "TerritoryId": 958,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4502,
+          "AetheryteShortcut": "Garlemald - Camp Broken Glass",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                4502
+              ]
+            }
+          }
+        },
         {
           "DataId": 1039932,
           "Position": {
@@ -39,7 +69,21 @@
               "Prompt": "TEXT_AKTKMB115_04394_Q1_000_042",
               "Yes": true
             }
-          ]
+          ],
+          "AetheryteShortcut": "Garlemald - Camp Broken Glass",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "NearPosition": {
+                "Position": {
+                  "X": -357.99194,
+                  "Y": 22,
+                  "Z": 488.3954
+                },
+                "TerritoryId": 958,
+                "MaximumDistance": 200
+              }
+            }
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4396_A Trip to the Moon.json

@@ -72,7 +72,7 @@
             "Z": 632.41016
           },
           "TerritoryId": 959,
-          "InteractionType": "Interact",
+          "InteractionType": "Combat",
           "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
             14077

QuestPaths/6.x - Endwalker/MSQ/B-Garlemald/4397_Sea of Sorrow.json

@@ -187,7 +187,8 @@
             "Z": 523.24695
           },
           "TerritoryId": 959,
-          "InteractionType": "Interact",
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
             14076
           ]

QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4402_A Taste of the Moon.json

@@ -251,7 +251,8 @@
             "Z": -620.05035
           },
           "TerritoryId": 959,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DelaySecondsAtStart": 3
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4403_Styled a Hero.json

@@ -12,6 +12,7 @@
             "Y": -168,
             "Z": -618.7686
           },
+          "StopDistance": 5,
           "TerritoryId": 959,
           "InteractionType": "AcceptQuest"
         }

QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4404_Alls Vale That Endsvale.json

@@ -21,25 +21,34 @@
       "Sequence": 1,
       "Steps": [
         {
+          "DataId": 1037867,
           "Position": {
-            "X": 68.93551,
+            "X": -301.62512,
-            "Y": -48.912445,
+            "Y": -144.00002,
-            "Z": -683.716
+            "Z": -491.14215
           },
           "TerritoryId": 959,
-          "InteractionType": "WalkTo",
+          "InteractionType": "AcceptQuest",
-          "DisableNavmesh": true,
+          "PickUpQuestId": 4240,
-          "Mount": true
+          "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                4240
+              ]
+            }
+          }
         },
         {
+          "DataId": 1039520,
           "Position": {
-            "X": 86.32549,
+            "X": -287.8615,
-            "Y": -137.4167,
+            "Y": -143.50005,
-            "Z": -619.77936
+            "Z": -520.28687
           },
           "TerritoryId": 959,
-          "InteractionType": "WalkTo",
+          "InteractionType": "AcceptQuest",
-          "DisableNavmesh": true
+          "PickUpQuestId": 4241
         },
         {
           "DataId": 1038928,
@@ -49,7 +58,8 @@
             "Z": -504.26492
           },
           "TerritoryId": 959,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow"
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4406_Setting Things Straight.json

@@ -109,9 +109,9 @@
           "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
           "JumpDestination": {
             "Position": {
-              "X": 307.72073,
+              "X": 315.84082,
-              "Y": -143.15913,
+              "Y": -156.2339,
-              "Z": -563.4788
+              "Z": -577.15063
             },
             "StopDistance": 5
           }

QuestPaths/6.x - Endwalker/MSQ/C-MareLamentorum/4407_Heart of the Matter.json

@@ -21,6 +21,42 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1041555,
+          "Position": {
+            "X": 26.443848,
+            "Y": -129.20917,
+            "Z": -536.9497
+          },
+          "TerritoryId": 959,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4516,
+          "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [4516]
+            }
+          }
+        },
+        {
+          "DataId": 1041123,
+          "Position": {
+            "X": -81.864685,
+            "Y": -132.74333,
+            "Z": -521.6602
+          },
+          "TerritoryId": 959,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4253,
+          "DialogueChoices": [
+            {
+              "ExcelSheet": "quest/042/AktKze014_04253",
+              "Type": "List",
+              "Prompt": "TEXT_AKTKZE014_04253_Q1_000_000",
+              "Answer": "TEXT_AKTKZE014_04253_A1_000_002"
+            }
+          ]
+        },
         {
           "DataId": 2012664,
           "Position": {
@@ -30,7 +66,6 @@
           },
           "TerritoryId": 959,
           "InteractionType": "Interact",
-          "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
           "TargetTerritoryId": 959
         },
         {

QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4416_Simple Pleasures.json

@@ -113,15 +113,26 @@
       "Sequence": 255,
       "Steps": [
         {
+          "DataId": 1040669,
           "Position": {
-            "X": 425.544,
+            "X": 381.64343,
-            "Y": 3.1257756,
+            "Y": 3.1891773,
-            "Z": -218.32741
+            "Z": -207.20227
           },
           "TerritoryId": 957,
-          "InteractionType": "WalkTo",
+          "InteractionType": "AcceptQuest",
-          "Mount": true,
+          "PickUpQuestId": 4259
-          "DisableNavmesh": true
+        },
+        {
+          "DataId": 1040864,
+          "Position": {
+            "X": 462.51624,
+            "Y": 14.320099,
+            "Z": -219.86731
+          },
+          "TerritoryId": 957,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4257
         },
         {
           "DataId": 1039064,

QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4417_Under His Wing.json

@@ -12,7 +12,7 @@
             "Y": 3.1168795,
             "Z": -262.62305
           },
-          "StopDistance": 5,
+          "StopDistance": 8,
           "TerritoryId": 957,
           "InteractionType": "AcceptQuest"
         }
@@ -29,7 +29,8 @@
             "Z": -597.83325
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Fly": true
         }
       ]
     },
@@ -45,7 +46,8 @@
           "TerritoryId": 957,
           "InteractionType": "WalkTo",
           "Comment": "Travel to Radz-at-Han",
-          "TargetTerritoryId": 963
+          "TargetTerritoryId": 963,
+          "Fly": true
         },
         {
           "DataId": 1040354,

QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4426_Aether to Aether.json

@@ -21,6 +21,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1041328,
+          "Position": {
+            "X": 166.39954,
+            "Y": 9.457411,
+            "Z": 236.34692
+          },
+          "TerritoryId": 961,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4507
+        },
         {
           "DataId": 1040073,
           "Position": {

QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4428_Verdict and Execution.json

@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1037969,
+          "Position": {
+            "X": -611.90204,
+            "Y": -22.39482,
+            "Z": 510.42944
+          },
+          "TerritoryId": 961,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4288
+        },
         {
           "DataId": 1040092,
           "Position": {

QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4433_A Flower upon Your Return.json

@@ -69,6 +69,54 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "DataId": 1041369,
+          "Position": {
+            "X": -639.85657,
+            "Y": 162.30406,
+            "Z": -189.47137
+          },
+          "TerritoryId": 961,
+          "InteractionType": "AcceptQuest",
+          "AetheryteShortcut": "Elpis - Poieten Oikos",
+          "PickUpQuestId": 4511,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                4511
+              ]
+            }
+          }
+        },
+        {
+          "DataId": 1041847,
+          "Position": {
+            "X": -484.2146,
+            "Y": 141.86789,
+            "Z": -97.21527
+          },
+          "TerritoryId": 961,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4313,
+          "AetheryteShortcut": "Elpis - Poieten Oikos",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "QuestsCompleted": [
+                4313
+              ]
+            }
+          },
+          "$": "Teleporting at the start of the quest, as navmesh gets stuck on a rock otherwise"
+        },
+        {
+          "Position": {
+            "X": -531.21313,
+            "Y": 159.97144,
+            "Z": -244.95073
+          },
+          "TerritoryId": 961,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 2012151,
           "Position": {
@@ -78,7 +126,6 @@
           },
           "TerritoryId": 961,
           "InteractionType": "Interact",
-          "AetheryteShortcut": "Elpis - Poieten Oikos",
           "DialogueChoices": [
             {
               "Type": "YesNo",

QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4445_Sage Council.json

@@ -20,6 +20,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1041667,
+          "Position": {
+            "X": 443.96118,
+            "Y": 65.162,
+            "Z": -105.4552
+          },
+          "TerritoryId": 956,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4480
+        },
         {
           "Position": {
             "X": 5.4520116,

QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4446_Hither and Yarns.json

@@ -21,6 +21,55 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1041129,
+          "Position": {
+            "X": -23.575256,
+            "Y": -31.53021,
+            "Z": 1.8463135
+          },
+          "TerritoryId": 956,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4329
+        },
+        {
+          "DataId": 1041683,
+          "Position": {
+            "X": -29.984009,
+            "Y": -31.53043,
+            "Z": -23.758362
+          },
+          "TerritoryId": 956,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4484,
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "ExcelSheet": "quest/044/AktKzi101_04484",
+              "Prompt": "TEXT_AKTKZI101_04484_Q1_000_000",
+              "Answer": "TEXT_AKTKZI101_04484_A1_000_002"
+            }
+          ]
+        },
+        {
+          "DataId": 1041313,
+          "Position": {
+            "X": 89.28052,
+            "Y": -17.530382,
+            "Z": -74.906555
+          },
+          "TerritoryId": 956,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4320,
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "ExcelSheet": "quest/043/AktKzi005_04320",
+              "Prompt": "TEXT_AKTKZI005_04320_Q1_000_000",
+              "Answer": "TEXT_AKTKZI005_04320_A1_000_003"
+            }
+          ]
+        },
         {
           "DataId": 1040444,
           "Position": {

QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4448_Bonds of Adamantite.json

@@ -129,7 +129,8 @@
             "Z": 301.63266
           },
           "TerritoryId": 956,
-          "InteractionType": "WalkTo"
+          "InteractionType": "WalkTo",
+          "RestartNavigationIfCancelled": false
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json

@@ -21,6 +21,28 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1040876,
+          "Position": {
+            "X": 49.42395,
+            "Y": 269.25684,
+            "Z": -523.2472
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4342
+        },
+        {
+          "DataId": 1038016,
+          "Position": {
+            "X": 105.42456,
+            "Y": 269.29584,
+            "Z": -454.3069
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4346
+        },
         {
           "DataId": 1039787,
           "Position": {

QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4460_x.json

@@ -22,15 +22,34 @@
       "Sequence": 1,
       "Steps": [
         {
-          "DataId": 2012032,
+          "DataId": 1041656,
           "Position": {
-            "X": 661.76843,
+            "X": 510.3075,
-            "Y": 439.96326,
+            "Y": 436.9997,
-            "Z": 411.73413
+            "Z": 307.17932
           },
           "TerritoryId": 960,
-          "InteractionType": "AttuneAetherCurrent",
+          "InteractionType": "AcceptQuest",
-          "AetherCurrentId": 2818391
+          "PickUpQuestId": 4355
+        },
+        {
+          "DataId": 1038043,
+          "Position": {
+            "X": 470.4203,
+            "Y": 437.00183,
+            "Z": 315.81592
+          },
+          "TerritoryId": 960,
+          "InteractionType": "AcceptQuest",
+          "PickUpQuestId": 4354,
+          "DialogueChoices": [
+            {
+              "Type": "List",
+              "ExcelSheet": "quest/043/AktKzk001_04354",
+              "Prompt": "TEXT_AKTKZK001_04354_Q1_000_100",
+              "Answer": "TEXT_AKTKZK001_04354_A2_000_100"
+            }
+          ]
         },
         {
           "DataId": 1040343,

QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4463_You're Not Alone.json

@@ -212,7 +212,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 960,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "DisableNavmesh": true
         }
       ]
     }

QuestPaths/6.x - Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json

@@ -18,7 +18,8 @@
             "Z": 4.2266846
           },
           "TerritoryId": 960,
-          "InteractionType": "AcceptQuest"
+          "InteractionType": "AcceptQuest",
+          "DisableNavmesh": true
         }
       ]
     },