ARR path fixes

diff --git a/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md b/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..ce25e50355170f00c2dfe6364574eda86b639a50 100644 (file)
--- a/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md
+++ b/GatheringPaths/7.x - Dawntrail/Yak T'el/970.md
@@ -0,0 +1,23 @@
+# GatheringLeve 131336
+
+```
+Seed  | id  route |  34721 34722 34723 34724 34725 34726 
+41636 | [3]  741  |          x           x     x     x
+41637 | [2]  740  |    x           x     x     x
+41638 | [1]  739  |    x     x           x           x
+
+30140                  x           x     x     x
+30139 |                x     x           x     x
+30138 |                x           x     x           x
+30137 | [3]  741  |          x           x     x     x
+30136 | [2]  740  |    x           x     x     x
+30135 | [1]  739  |    x     x           x           x
+30134 | [0]  738  |    x           x     x           x
+
+49211 | [0]
+```
+
+```
+seq: 0 → running
+seq: 254 → done/prompting for return
+```

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json
index b4751491a2c3961949af3a98a8df277904597be4..70514ec1737367d2b52b8c10008866788d6d36c3 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/317_The Mountain That Strides.json
@@ -82,7 +82,8 @@
             "Z": 212.84802
           },
           "TerritoryId": 138,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Western La Noscea - Aleport"
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json
index f1cbf53a0fbb007d5d1730972174615672c7cd78..910850e371bdd9d4ef90130108468a21a48fa0e0 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/3864_Ziz Is So Ridiculous.json
@@ -12,6 +12,7 @@
             "Y": -44.86564,
             "Z": 262.745
           },
+          "StopDistance": 5,
           "TerritoryId": 154,
           "InteractionType": "AcceptQuest"
         }
@@ -44,8 +45,11 @@
           "TerritoryId": 154,
           "InteractionType": "Combat",
           "EnemySpawnType": "OverworldEnemies",
-          "KillEnemyDataIds": [
-            179
+          "ComplexCombatData": [
+            {
+              "DataId": 179,
+              "MinimumKillCount": 3
+            }
           ]
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json
index 30ec3ce6d4a8cfb18b5a75dc0064c4db409762f8..f5c52bb7cb60af6d6bced7ae818a7e1e88daa5b7 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A8-North Shroud, Murder investigation/787_Rock of Rancor.json
@@ -26,6 +26,15 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": -25.058176,
+            "Y": -40.87435,
+            "Z": 233.34166
+          },
+          "TerritoryId": 154,
+          "InteractionType": "WalkTo"
+        },
         {
           "Position": {
             "X": -195.16211,

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json
index 3b9419d4e252f33e66efcc56efb1c631ff6f99bd..c3a02a0ca1bd6a1f4ef810b8a9708819ac0b9953 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json
@@ -30,7 +30,12 @@
           "TerritoryId": 132,
           "InteractionType": "AcceptQuest",
           "PickUpQuestId": 802,
-          "AetheryteShortcut": "Gridania"
+          "AetheryteShortcut": "Gridania",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         },
         {
           "DataId": 1000171,

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json
index 137ffb4d41bdfdfbafc4dcc6e917129a291d108f..af38538f345eef127e61f64c9afac9d0264c682c 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/3865_Trial by Turtle.json
@@ -75,6 +75,26 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": -180.60515,
+            "Y": 17.857697,
+            "Z": -278.74887
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo"
+        },
+        {
+          "Position": {
+            "X": -183.61136,
+            "Y": 3.5857017,
+            "Z": -248.78667
+          },
+          "TerritoryId": 146,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
         {
           "DataId": 1004596,
           "Position": {
@@ -84,13 +104,11 @@
           },
           "TerritoryId": 146,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 146,
-          "AetheryteShortcut": "Southern Thanalan - Little Ala Mhigo"
+          "TargetTerritoryId": 146
         },
         {
           "TerritoryId": 146,
           "InteractionType": "AttuneAetheryte",
-          "StopDistance": 5,
           "Aetheryte": "Southern Thanalan - Forgotten Springs"
         },
         {

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json
index 9de0fe5b93b493874098c13bdc985cdb372bde8f..1688e2da3d052d6578365ca3aac920c5c4427fbf 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/809_Tales from the Tidus Slayer.json
@@ -41,6 +41,15 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": 674.84393,
+            "Y": 64.118355,
+            "Z": -203.85042
+          },
+          "TerritoryId": 135,
+          "InteractionType": "WalkTo"
+        },
         {
           "DataId": 1006264,
           "Position": {

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json
index 25e597649611a0c48a02047a008597b2cc5346c4..f6ebd61d3017e54e5c279776e23af48c8318b813 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B0-Company of Heroes/811_The Lominsan Way.json
@@ -58,7 +58,6 @@
         {
           "TerritoryId": 137,
           "InteractionType": "AttuneAetheryte",
-          "StopDistance": 5,
           "Aetheryte": "Eastern La Noscea - Costa Del Sol"
         },
         {

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json
index 22a884cc5531e2ab521f1096896db0d64db4aa7e..a20e8e2a9b03aa8daf3ce5905397e24bf340362b 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B1-Forgotten Springs/822_When the Worm Turns.json
@@ -35,8 +35,10 @@
           "TerritoryId": 146,
           "InteractionType": "Combat",
           "EnemySpawnType": "OverworldEnemies",
-          "KillEnemyDataIds": [
-            356
+          "ComplexCombatData": [
+            {
+              "DataId": 356
+            }
           ]
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json
index 52f4024e9940e12175f42cebf945b6efff89abde..0b849d7964066693807ca0fbdd0810563d4a0f3d 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B3-Eastern La Noscea, Wine/848_Battle Scars.json
@@ -27,11 +27,11 @@
       "Sequence": 1,
       "Steps": [
         {
-          "DataId": 2002061,
+          "DataId": 2002059,
           "Position": {
-            "X": -248.40167,
-            "Y": 33.98181,
-            "Z": 299.39722
+            "X": -282.88702,
+            "Y": 33.951294,
+            "Z": 308.24744
           },
           "TerritoryId": 137,
           "InteractionType": "Interact",
@@ -41,15 +41,15 @@
             null,
             null,
             null,
-            32
+            128
           ]
         },
         {
-          "DataId": 2002059,
+          "DataId": 2002061,
           "Position": {
-            "X": -282.88702,
-            "Y": 33.951294,
-            "Z": 308.24744
+            "X": -248.40167,
+            "Y": 33.98181,
+            "Z": 299.39722
           },
           "TerritoryId": 137,
           "InteractionType": "Interact",
@@ -59,9 +59,30 @@
             null,
             null,
             null,
-            128
+            32
           ]
         },
+        {
+          "Position": {
+            "X": -301.2062,
+            "Y": 35.646942,
+            "Z": 273.47797
+          },
+          "TerritoryId": 137,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                64
+              ]
+            }
+          }
+        },
         {
           "DataId": 2002060,
           "Position": {
@@ -69,6 +90,7 @@
             "Y": 33.89026,
             "Z": 276.53918
           },
+          "StopDistance": 4.5,
           "TerritoryId": 137,
           "InteractionType": "Interact",
           "CompletionQuestVariablesFlags": [

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json
index e5d5e2067dad840394c01c1f7732e246f649e8fa..8db84884377e49d63fc1f720507661a8cc404d35 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/B5-Western Thanalan/876_Bringing out the Dead.json
@@ -124,6 +124,16 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": -408.92343,
+            "Y": 23.167036,
+            "Z": -351.16223
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Vesper Bay Gate"
+        },
         {
           "DataId": 1006362,
           "Position": {
@@ -132,13 +142,38 @@
             "Z": -353.6584
           },
           "TerritoryId": 140,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DisableNavmesh": true
         }
       ]
     },
     {
       "Sequence": 4,
       "Steps": [
+        {
+          "Position": {
+            "X": -408.92343,
+            "Y": 23.167036,
+            "Z": -351.16223
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Vesper Bay Gate",
+          "DisableNavmesh": true,
+          "Mount": true,
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                64,
+                null
+              ]
+            }
+          }
+        },
         {
           "DataId": 1006344,
           "Position": {
@@ -202,13 +237,30 @@
           },
           "TerritoryId": 140,
           "InteractionType": "Interact",
-          "Comment": "TODO QW"
+          "CompletionQuestVariablesFlags": [
+            null,
+            null,
+            null,
+            null,
+            128,
+            null
+          ]
         }
       ]
     },
     {
       "Sequence": 5,
       "Steps": [
+        {
+          "Position": {
+            "X": -408.92343,
+            "Y": 23.167036,
+            "Z": -351.16223
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Vesper Bay Gate"
+        },
         {
           "DataId": 1006362,
           "Position": {

diff --git a/QuestPaths/Reusable Paths.md b/QuestPaths/Reusable Paths.md
index 7bbfa2f5c26054cb8958593269ef1906ae6112db..fca80551add63d5bbe37cf053e9aa13831fedcd3 100644 (file)
--- a/QuestPaths/Reusable Paths.md
+++ b/QuestPaths/Reusable Paths.md
@@ -20,6 +20,30 @@ that can sometimes be found as valid paths.
           "$": "Ul'dah Aetheryte to Immortal Flames"
         }
 ```
+
+## Western Thanalan
+
+Vesper Bay side of the gate:
+
+```json
+        {
+          "Position": {
+            "X": -408.92343,
+            "Y": 23.167036,
+            "Z": -351.16223
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo",
+          "$": "Vesper Bay Gate"
+        }
+```
+
+Horizon side of the gate:
+
+```json
+
+```
+
 ## Mor Dhona
 
 ```json

diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
index 56c0dabc9c21bf865a1b2d50c8cbe104425821f7..58b2921ad06e056aaaf2f08368969c76b5fe02c4 100644 (file)
--- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
+++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
@@ -40,6 +40,9 @@ internal sealed class MovementOverrideController
         // lower la noscea - Moraby Drydocks aetheryte
         new BlacklistedArea(135, new(156.11499f, 15.518433f, 673.21277f), 0.5f, 5f),
 
+        // upper la noscea
+        new BlacklistedPoint(139, new(366, -2.5f, 95.5f), new(362.65973f, -3.4f, 96.6896f), 2),
+
         // coerthas central highlands
         new BlacklistedPoint(155, new(-478.75f, 149.25f, -305.75f), new(-476.1802f, 149.06573f, -304.7811f)),
 

diff --git a/Questionable/Validation/QuestValidator.cs b/Questionable/Validation/QuestValidator.cs
index 137e62b46f968fb9c4aa4aa1ed6562e3a3c588ae..44f952f34e2af97b9309a76689a4cb74a0d98b5f 100644 (file)
--- a/Questionable/Validation/QuestValidator.cs
+++ b/Questionable/Validation/QuestValidator.cs
@@ -53,7 +53,7 @@ internal sealed class QuestValidator
                         {
                             var level = issue.Severity == EIssueSeverity.Error
                                 ? LogLevel.Warning
-                                : LogLevel.Information;
+                                : LogLevel.Debug;
                             _logger.Log(level,
                                 "Validation failed: {QuestId} ({QuestName}) / {QuestSequence} / {QuestStep} - {Description}",
                                 issue.ElementId, quest.Info.Name, issue.Sequence, issue.Step, issue.Description);