Post-ShB updates

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
index 8913f7501e2aa969b3f69176586e485146cce655..bee1224a887fff60029927ccf8b507fde9f72483 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
@@ -23,6 +23,59 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "TerritoryId": 819,
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] Tessellation (Lakeland)"
+          ],
+          "InteractionType": "None"
+        },
+        {
+          "Position": {
+            "X": 55.589294,
+            "Y": 2.0276523,
+            "Z": 669.1557
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          },
+          "Comment": "these bridges have navmesh problems"
+        },
+        {
+          "Position": {
+            "X": 15.410904,
+            "Y": 2.2598603,
+            "Z": 677.3755
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -54.93826,
+            "Y": 3.1323283,
+            "Z": 690.1962
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "Position": {
             "X": -115.65658,
@@ -32,7 +85,6 @@
           "StopDistance": 0.5,
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Lakeland - Fort Jobb",
           "Fly": true
         },
         {

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3676_Good for the Soul.json b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3676_Good for the Soul.json
index 44e0a9ef949d1c6f8592a5e458a301c787d109b9..bdc83665785a95b2e9efcebf9bf8d38841198915 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3676_Good for the Soul.json
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3676_Good for the Soul.json
@@ -58,6 +58,20 @@
     {
       "Sequence": 3,
       "Steps": [
+        {
+          "Position": {
+            "X": -27.96634,
+            "Y": 41.707367,
+            "Z": -482.99057
+          },
+          "TerritoryId": 815,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "DataId": 2010811,
           "Position": {

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3679_For the People.json b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3679_For the People.json
index 3b3d2587d0029109c517e3cbb250e6faafdf96cb..0d7a977a4d9764da550f0efd96f079760453bf81 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3679_For the People.json
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3679_For the People.json
@@ -36,6 +36,22 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 1028319,
+          "Position": {
+            "X": -454.7036,
+            "Y": 65.77815,
+            "Z": 58.27417
+          },
+          "TerritoryId": 814,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 814,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "DataId": 1031751,
           "Position": {

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json
index ba1d3b18d470d545a398cb3846365acc1ec139d3..b63b800c97d2f72bde94c8770fdf7ee8719db3e7 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3767_Deep Designs.json
@@ -51,6 +51,49 @@
             }
           }
         },
+        {
+          "Position": {
+            "X": -559.0543,
+            "Y": 394.95718,
+            "Z": -611.97614
+          },
+          "TerritoryId": 818,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -681.43286,
+            "Y": 404.5379,
+            "Z": -693.3609
+          },
+          "TerritoryId": 818,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -675.946,
+            "Y": 408.10754,
+            "Z": -711.8061
+          },
+          "TerritoryId": 818,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "Position": {
             "X": -423.6145,

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3768_A Whale's Tale.json b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3768_A Whale's Tale.json
index 92f7c836695796dfede2fcae185c6647f6d859da..546fe9cc0488542257c873ddb542e7e7ce000354 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3768_A Whale's Tale.json
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3768_A Whale's Tale.json
@@ -20,6 +20,73 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "TerritoryId": 819,
+          "AetheryteShortcut": "Crystarium",
+          "AethernetShortcut": [
+            "[Crystarium] Aetheryte Plaza",
+            "[Crystarium] Tessellation (Lakeland)"
+          ],
+          "InteractionType": "None"
+        },
+        {
+          "Position": {
+            "X": 55.589294,
+            "Y": 2.0276523,
+            "Z": 669.1557
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          },
+          "Comment": "these bridges have navmesh problems"
+        },
+        {
+          "Position": {
+            "X": 15.410904,
+            "Y": 2.2598603,
+            "Z": 677.3755
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -82.79376,
+            "Y": 11.970126,
+            "Z": 765.8721
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -234.70464,
+            "Y": 1.0942776,
+            "Z": 738.40204
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "Position": {
             "X": -269.44116,
@@ -28,7 +95,6 @@
           },
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
-          "AetheryteShortcut": "Lakeland - Fort Jobb",
           "Fly": true
         },
         {
@@ -72,7 +138,12 @@
           "InteractionType": "WalkTo",
           "Mount": true,
           "Fly": true,
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Locked"
+            }
+          }
         },
         {
           "Position": {
@@ -83,7 +154,44 @@
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
           "Fly": true,
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Locked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -565.32196,
+            "Y": -1.9743931,
+            "Z": 799.9003
+          },
+          "StopDistance": 1,
+          "TerritoryId": 813,
+          "InteractionType": "Dive",
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+
+          "Position": {
+            "X": -630.4265,
+            "Y": -29.862,
+            "Z": 752.5597
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "Mount": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
         },
         {
           "DataId": 2010280,
@@ -105,6 +213,16 @@
             64
           ]
         },
+        {
+          "Position": {
+            "X": -654.167,
+            "Y": -41.328938,
+            "Z": 741.29126
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "Mount": true
+        },
         {
           "DataId": 2010278,
           "Position": {
@@ -133,6 +251,7 @@
           },
           "TerritoryId": 813,
           "InteractionType": "Interact",
+          "Mount": true,
           "CompletionQuestVariablesFlags": [
             null,
             null,
@@ -140,8 +259,7 @@
             null,
             null,
             32
-          ],
-          "Comment": "TODO Check if pathfinding works automatically now"
+          ]
         }
       ]
     },
@@ -151,14 +269,44 @@
         {
           "Position": {
             "X": -643.2488,
-            "Y": 4.133975,
+            "Y": -1.974393,
             "Z": 714.8211
           },
           "TerritoryId": 813,
           "InteractionType": "WalkTo",
           "Mount": true,
           "Fly": true,
-          "DisableNavmesh": true
+          "DisableNavmesh": true,
+          "RestartNavigationIfCancelled": false
+        },
+        {
+          "Position": {
+            "X": -573.45654,
+            "Y": 0.39776123,
+            "Z": 810.7269
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": -619.98676,
+            "Y": 24.866888,
+            "Z": 794.4714
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "Mount": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
         },
         {
           "DataId": 1030333,
@@ -191,6 +339,50 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": -82.79376,
+            "Y": 11.970126,
+            "Z": 765.8721
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": 15.410904,
+            "Y": 2.2598603,
+            "Z": 677.3755
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
+        {
+          "Position": {
+            "X": 55.589294,
+            "Y": 2.0276523,
+            "Z": 669.1557
+          },
+          "TerritoryId": 813,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true,
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          },
+          "Comment": "these bridges have navmesh problems"
+        },
         {
           "DataId": 1032554,
           "Position": {

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3779_Nothing Unsaid.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3779_Nothing Unsaid.json
index 7510d8d54ec8eee66b3e897618b0510700a48614..bae145efc0df25012110abd66770e36ea272d31d 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3779_Nothing Unsaid.json
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3779_Nothing Unsaid.json
@@ -28,7 +28,7 @@
             "Y": -2.59839E-07,
             "Z": -1.4801636
           },
-          "StopDistance": 5,
+          "StopDistance": 7,
           "TerritoryId": 819,
           "InteractionType": "Interact"
         }

diff --git a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3780_The Journey Continues.json b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3780_The Journey Continues.json
index 5911a4f309212a26f91a181dd2d4d90a368bba54..1b46d4a46f6fea23f569a43b83132761012d86b3 100644 (file)
--- a/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3780_The Journey Continues.json
+++ b/QuestPaths/5.x - Shadowbringers/MSQ/I-5.3/3780_The Journey Continues.json
@@ -54,6 +54,20 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": -221.27931,
+            "Y": 55.081436,
+            "Z": -553.9665
+          },
+          "TerritoryId": 816,
+          "InteractionType": "WalkTo",
+          "SkipConditions": {
+            "StepIf": {
+              "Flying": "Unlocked"
+            }
+          }
+        },
         {
           "DataId": 1033872,
           "Position": {

diff --git a/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4489_Steppe Child.json b/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4489_Steppe Child.json
index d16392255b7a7c1a5a3f9bb9e913f88f418a6ce1..9477c821ffa88f2980fba4197d62b3579271cbf7 100644 (file)
--- a/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4489_Steppe Child.json
+++ b/QuestPaths/6.x - Endwalker/Aether Currents/Thavnair/4489_Steppe Child.json
@@ -83,7 +83,7 @@
             "Y": 41.614826,
             "Z": 409.53687
           },
-          "StopDistance": 5,
+          "StopDistance": 7,
           "TerritoryId": 957,
           "InteractionType": "Interact"
         }

diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
index 451c4bfcf7b1601f78b8be31d6b6c432d6e06ac3..7b7186ef91a611c95c2ea7326942b1ab675ca77f 100644 (file)
--- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
+++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
@@ -60,6 +60,7 @@ internal sealed class MovementOverrideController
 
         // leaving Idyllshire through the west gate attempts to run into this wall
         new BlacklistedPoint(399, new(-514.4851f, 149.63762f, -480.58087f), new(-528.78656f, 151.17374f, -473.07077f), 5, true),
+        new BlacklistedPoint(399, new(-534.5f, 153, -476.75f), new(-528.78656f, 151.17374f, -473.07077f), 5, true),
 
         // Idyllshire: random rocks in the north, passable one way only
         new BlacklistedPoint(478, new(14.5f, 215.25f, -101.5f), new(18.133032f, 215.44998f, -107.83075f), 5),