From dc24fa482af0cd4d036b205493c3eb84019d2605 Mon Sep 17 00:00:00 2001
From: Liza Carvelli <liza@carvel.li>
Date: Sun, 16 Jun 2024 16:15:14 +0200
Subject: [PATCH] Path updates

---
 .../Thavnair/4259_Radiant Patrol.json             |  2 +-
 .../Ultima Thule/4342_Ending as One.json          |  5 ++++-
 .../MSQ/G-UltimaThule/4454_On Burdened Wings.json |  7 +++----
 .../MSQ/G-UltimaThule/4455_A Test of Will.json    |  3 ++-
 .../4456_Roads Paved of Sacrifice.json            |  7 ++++---
 .../MSQ/G-UltimaThule/4459_Victory x Lost.json    | 10 ++++++++++
 .../Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json  | 15 +++++++++++++--
 7 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/QuestPaths/Endwalker/AetherCurrents/Thavnair/4259_Radiant Patrol.json b/QuestPaths/Endwalker/AetherCurrents/Thavnair/4259_Radiant Patrol.json
index e2f52ee5..1a2464d2 100644
--- a/QuestPaths/Endwalker/AetherCurrents/Thavnair/4259_Radiant Patrol.json	
+++ b/QuestPaths/Endwalker/AetherCurrents/Thavnair/4259_Radiant Patrol.json	
@@ -74,7 +74,7 @@
             null,
             null,
             null,
-            null
+            -64
           ],
           "$": "QuestVariables after killing enemy: 17 1 0 0 0 64"
         },
diff --git a/QuestPaths/Endwalker/AetherCurrents/Ultima Thule/4342_Ending as One.json b/QuestPaths/Endwalker/AetherCurrents/Ultima Thule/4342_Ending as One.json
index dae22479..95a11351 100644
--- a/QuestPaths/Endwalker/AetherCurrents/Ultima Thule/4342_Ending as One.json	
+++ b/QuestPaths/Endwalker/AetherCurrents/Ultima Thule/4342_Ending as One.json	
@@ -29,7 +29,10 @@
           "TerritoryId": 960,
           "InteractionType": "Combat",
           "EnemySpawnType": "OverworldEnemies",
-          "Comment": "Kill 2 Drifting Ea, TODO: add data ids",
+          "KillEnemyDataIds": [
+            13315,
+            14097
+          ],
           "$": "QuestVariables: 0 0-16-32 0 0 0 0"
         }
       ]
diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4454_On Burdened Wings.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4454_On Burdened Wings.json
index 6d98ca47..a11bc3c1 100644
--- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4454_On Burdened Wings.json	
+++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4454_On Burdened Wings.json	
@@ -151,8 +151,8 @@
             null,
             64
           ],
-          "$.0": "[1]",
-          "$.1": "QuestVariables if done after [1]: 2 0 0 0 0 ??"
+          "$.0": "[2]",
+          "$.1": "QuestVariables if done after [1]: 2 0 0 0 0 96"
         },
         {
           "DataId": 2012281,
@@ -170,8 +170,7 @@
             null,
             null,
             128
-          ],
-          "Comment": "TODO Verify quest variables flags"
+          ]
         }
       ]
     },
diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4455_A Test of Will.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4455_A Test of Will.json
index 5a3d1b21..e2121017 100644
--- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4455_A Test of Will.json	
+++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4455_A Test of Will.json	
@@ -86,7 +86,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 960,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "Mount": false
         }
       ]
     }
diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4456_Roads Paved of Sacrifice.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4456_Roads Paved of Sacrifice.json
index 8b00f3f7..047c65c3 100644
--- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4456_Roads Paved of Sacrifice.json	
+++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4456_Roads Paved of Sacrifice.json	
@@ -107,9 +107,9 @@
       "Steps": [
         {
           "Position": {
-            "X": 26.119669,
-            "Y": 269.043,
-            "Z": -587.29144
+            "X": 37.10138,
+            "Y": 269.016,
+            "Z": -591.87366
           },
           "TerritoryId": 960,
           "InteractionType": "WalkTo",
@@ -132,6 +132,7 @@
           "StopDistance": 4,
           "TerritoryId": 960,
           "InteractionType": "Interact",
+          "DisableNavmesh": true,
           "CompletionQuestVariablesFlags": [
             null,
             null,
diff --git a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json
index 7f563d33..90d9ce0c 100644
--- a/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json	
+++ b/QuestPaths/Endwalker/MSQ/G-UltimaThule/4459_Victory x Lost.json	
@@ -32,6 +32,16 @@
           "InteractionType": "AttuneAetherCurrent",
           "AetherCurrentId": 2818393
         },
+        {
+          "Position": {
+            "X": 381.60245,
+            "Y": 289.09262,
+            "Z": -387.75546
+          },
+          "TerritoryId": 960,
+          "InteractionType": "WalkTo",
+          "Comment": "Avoids combat"
+        },
         {
           "DataId": 1039787,
           "Position": {
diff --git a/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json b/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json
index b7b4a500..cb4e6e37 100644
--- a/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json	
+++ b/QuestPaths/Endwalker/MSQ/K-6.4/4739_Bonds of Trust.json	
@@ -21,6 +21,18 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": 252.4148,
+            "Y": 10.8,
+            "Z": -659.2858
+          },
+          "TerritoryId": 958,
+          "InteractionType": "WalkTo",
+          "SkipIf": [
+            "FlyingUnlocked"
+          ]
+        },
         {
           "Position": {
             "X": -80.826256,
@@ -34,8 +46,7 @@
           "KillEnemyDataIds": [
             16332
           ],
-          "Fly": true,
-          "Comment": "TODO Verify that navmesh can still get you here if flying is locked, and doesn't get stuck on rubble"
+          "Fly": true
         }
       ]
     },