Minor DT updates

diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json
index 0b2f9730ec90a5b3afb5351db8ee5e2fc1fc41fe..8a245a1e8c76218bb4daf6988c4b200970d2eae6 100644 (file)
--- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json
+++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.json
@@ -1,7 +1,6 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
-  "Disabled": true,
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -32,7 +31,35 @@
           "InteractionType": "UseItem",
           "ItemId": 2003420,
           "Fly": true,
-          "AetheryteShortcut": "Thavnair - Palaka's Stand"
+          "AetheryteShortcut": "Thavnair - Palaka's Stand",
+          "RequiredQuestVariables": [
+            null,
+            [19],
+            null,
+            null,
+            null,
+            null
+          ]
+        },
+        {
+          "DataId": 2012885,
+          "Position": {
+            "X": 108.17114,
+            "Y": 8.224609,
+            "Z": -373.22046
+          },
+          "TerritoryId": 957,
+          "InteractionType": "UseItem",
+          "ItemId": 2003420,
+          "Fly": true,
+          "RequiredQuestVariables": [
+            null,
+            [18],
+            null,
+            null,
+            null,
+            null
+          ]
         },
         {
           "DataId": 2012886,
@@ -45,7 +72,14 @@
           "InteractionType": "UseItem",
           "ItemId": 2003420,
           "Fly": true,
-          "AetheryteShortcut": "Thavnair - Palaka's Stand"
+          "RequiredQuestVariables": [
+            null,
+            [17],
+            null,
+            null,
+            null,
+            null
+          ]
         }
       ]
     },
@@ -60,7 +94,33 @@
             "Z": -294.36182
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [0],
+            null,
+            null,
+            null
+          ]
+        },
+        {
+          "DataId": 2012885,
+          "Position": {
+            "X": 108.17114,
+            "Y": 8.224609,
+            "Z": -373.22046
+          },
+          "TerritoryId": 957,
+          "InteractionType": "Interact",
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [64],
+            null,
+            null,
+            null
+          ]
         },
         {
           "DataId": 2012886,
@@ -70,7 +130,15 @@
             "Z": -327.5349
           },
           "TerritoryId": 957,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "RequiredQuestVariables": [
+            null,
+            null,
+            [128],
+            null,
+            null,
+            null
+          ]
         }
       ]
     },

diff --git a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md
index 3a9f3bf733dddf108ad0c1d8e5627b02d38c0133..db23cef7817000d41a92975a2b6043fbad58d44e 100644 (file)
--- a/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md
+++ b/QuestPaths/6.x - Endwalker/Tribal/Arkasodara/Dailies/4563_Seedy Affair.md
@@ -1,8 +1,17 @@
 ## Seedy Affair
 
-QuestWork:
+Step 1:
 ```
 0 ?? 0 0 0 0
   17         → 2012886
+  18         → 2012885
   19         → 2012884
 ```
+
+Step 2
+```
+0 0 ??  0 0 0
+    128       → 2012886
+    64        → 2012885
+    0         → 2012884
+```

diff --git a/QuestPaths/7.x - Dawntrail/Aether Currents/Heritage Found/5156_Phyt for Survival.json b/QuestPaths/7.x - Dawntrail/Aether Currents/Heritage Found/5156_Phyt for Survival.json
index 73bae9b340b182049167fcfb954955862bd88d01..fa12310454aaff6a91461eaeec1f5a6eaa315184 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/Aether Currents/Heritage Found/5156_Phyt for Survival.json
+++ b/QuestPaths/7.x - Dawntrail/Aether Currents/Heritage Found/5156_Phyt for Survival.json
@@ -1,7 +1,6 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
-  "Comment": "Work in Progress",
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -47,6 +46,165 @@
     {
       "Sequence": 2,
       "Steps": [
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -442.6795,
+            "Y": 40.021717,
+            "Z": -293.11053
+          },
+          "StopDistance": 1,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -447.5891,
+            "Y": 42.70318,
+            "Z": -318.90863
+          },
+          "StopDistance": 1,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -498.92047,
+            "Y": 40.894764,
+            "Z": -325.42456
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "Position": {
+            "X": -529.6522,
+            "Y": 41.341557,
+            "Z": -311.63504
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "Combat",
+          "EnemySpawnType": "AutoOnEnterArea",
+          "ComplexCombatData": [
+            {
+              "DataId": 17679,
+              "MinimumKillCount": 1,
+              "IgnoreQuestMarker": true
+            }
+          ],
+          "CombatDelaySecondsAtStart": 2,
+          "DisableNavmesh": true
+        },
+        {
+          "Position": {
+            "X": -539.79065,
+            "Y": 42.696747,
+            "Z": -313.67438
+          },
+          "TerritoryId": 1191,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -549.0783,
+            "Y": 38.5679,
+            "Z": -342.1571
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -558.5067,
+            "Y": 35.95048,
+            "Z": -376.88058
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -596.211,
+            "Y": 30.139477,
+            "Z": -387.31094
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -608.17377,
+            "Y": 17.933014,
+            "Z": -420.98196
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -611.266,
+            "Y": 10.040784,
+            "Z": -443.45764
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -609.279,
+            "Y": 1.6734335,
+            "Z": -468.76624
+          },
+          "StopDistance": 0.5,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
+        {
+          "DataId": 17678,
+          "Position": {
+            "X": -592.7062,
+            "Y": -2.4803436,
+            "Z": -489.28055
+          },
+          "StopDistance": 1,
+          "TerritoryId": 1191,
+          "InteractionType": "WaitForNpcAtPosition",
+          "DisableNavmesh": true,
+          "NpcWaitDistance": 5
+        },
         {
           "DataId": 1049501,
           "Position": {
@@ -55,8 +213,7 @@
             "Z": -489.28055
           },
           "TerritoryId": 1191,
-          "InteractionType": "Instruction",
-          "Comment": "Needs manual babysitting, NPC will stop any time they are hit (even if you de-aggro the enemy)"
+          "InteractionType": "Interact"
         }
       ]
     },

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4913_Saddled Up.json b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4913_Saddled Up.json
index 4fb9580b9baffb68c495e868039ee8135660e42e..5d6d955cdf619716a8d53bcb26ed07116247b283 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4913_Saddled Up.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4913_Saddled Up.json
@@ -70,16 +70,6 @@
           "InteractionType": "AttuneAetheryte",
           "Aetheryte": "Shaaloani - Sheshenewezi Springs"
         },
-        {
-          "Position": {
-            "X": -288.2827,
-            "Y": 18.558346,
-            "Z": -133.59453
-          },
-          "TerritoryId": 1190,
-          "InteractionType": "WalkTo",
-          "$": "Sheshenewezi Springs Navmesh workaround"
-        },
         {
           "DataId": 1046957,
           "Position": {
@@ -145,17 +135,6 @@
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "Position": {
-            "X": -288.2827,
-            "Y": 18.558346,
-            "Z": -133.59453
-          },
-          "TerritoryId": 1190,
-          "InteractionType": "WalkTo",
-          "$": "Sheshenewezi Springs Navmesh workaround",
-          "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs"
-        },
         {
           "DataId": 1046991,
           "Position": {
@@ -164,7 +143,8 @@
             "Z": -178.88159
           },
           "TerritoryId": 1190,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs"
         }
       ]
     }

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4917_On Track.json b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4917_On Track.json
index 8dc4153a61dc30af42af237d00f2069bbe740990..ea0ebbdf3a1e5f3c534b3910210b0a75cdd96920 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4917_On Track.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4917_On Track.json
@@ -20,17 +20,6 @@
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -288.2827,
-            "Y": 18.558346,
-            "Z": -133.59453
-          },
-          "TerritoryId": 1190,
-          "InteractionType": "WalkTo",
-          "$": "Sheshenewezi Springs Navmesh workaround",
-          "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs"
-        },
         {
           "DataId": 1048057,
           "Position": {
@@ -39,7 +28,8 @@
             "Z": -178.8205
           },
           "TerritoryId": 1190,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "AetheryteShortcut": "Shaaloani - Sheshenewezi Springs"
         }
       ]
     },

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json
index 91b252d16ee38d18c94d5e93f093a947b72746ab..75b7fa15af92764744407b31cb4f2c21f5812c0c 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4929_A Day in the Life.json
@@ -1,7 +1,6 @@
 {
   "$schema": "https://carvel.li/questionable/quest-1.0",
   "Author": "liza",
-  "Comment": "TODO Maybe switch the order for sequence 2",
   "QuestSequence": [
     {
       "Sequence": 0,
@@ -21,16 +20,6 @@
     {
       "Sequence": 1,
       "Steps": [
-        {
-          "Position": {
-            "X": -105.24525,
-            "Y": 29.019762,
-            "Z": -348.05893
-          },
-          "TerritoryId": 1191,
-          "InteractionType": "WalkTo",
-          "$": "Farm Navmesh workaround"
-        },
         {
           "DataId": 1047405,
           "Position": {
@@ -46,16 +35,6 @@
     {
       "Sequence": 2,
       "Steps": [
-        {
-          "Position": {
-            "X": -105.24525,
-            "Y": 29.019762,
-            "Z": -348.05893
-          },
-          "TerritoryId": 1191,
-          "InteractionType": "WalkTo",
-          "$": "Farm Navmesh workaround"
-        },
         {
           "DataId": 1047408,
           "Position": {
@@ -179,16 +158,6 @@
     {
       "Sequence": 255,
       "Steps": [
-        {
-          "Position": {
-            "X": -105.24525,
-            "Y": 29.019762,
-            "Z": -348.05893
-          },
-          "TerritoryId": 1191,
-          "InteractionType": "WalkTo",
-          "$": "Farm Navmesh workaround"
-        },
         {
           "DataId": 1047406,
           "Position": {

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json
index 70c6474d0923e8e57b8bfadac003bae2fe31f319..0248d8c91eab68e0ab573d037461be54d95bf99f 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4935_Her People, Her Family.json
@@ -90,8 +90,7 @@
           },
           "TerritoryId": 1186,
           "InteractionType": "CompleteQuest",
-          "AetheryteShortcut": "Solution Nine",
-          "Comment": "TODO Check if there is a missing sequence #4 now, or if this works correctly"
+          "AetheryteShortcut": "Solution Nine"
         }
       ]
     }

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json
index 0ead69e5c3e1551cd35c8cdb73910a8816c8e846..8995efb2a7278dce218b67481901c998159e3ab7 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json
@@ -67,7 +67,7 @@
         {
           "TerritoryId": 1220,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 885
+          "ContentFinderConditionId": 995
         }
       ]
     },

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json
index aaf0fa8fa35ffa7bf52aafaf9cf395f5f736949a..a28d55dbec0bf838d2c09744a1bb1380231e8426 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4948_Through the Gate of Gold.json
@@ -157,6 +157,16 @@
           "Aetheryte": "Living Memory - Leynode Mnemo",
           "DisableNavmesh": true
         },
+        {
+          "Position": {
+            "X": 3.7348669,
+            "Y": 50.12495,
+            "Z": 660.56006
+          },
+          "TerritoryId": 1192,
+          "InteractionType": "WalkTo",
+          "$": "Leynode Mnemo to Meso Terminal waypoint"
+        },
         {
           "DataId": 1047837,
           "Position": {

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json
index c772e098becdc4e534471bcd18b03cda98be36ac..561983edd2622c4ff9eac2b56a071aaf6b18df82 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4951_The Land of Dreams.json
@@ -12,6 +12,7 @@
             "Y": 14.900001,
             "Z": 312.42847
           },
+          "StopDistance": 7,
           "TerritoryId": 1192,
           "InteractionType": "AcceptQuest"
         }

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4957_In Search of Discovery.json b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4957_In Search of Discovery.json
index 5b6c99cff4052797356f9f7716f83477420981ca..681cb33523ff6f096ab4b2af9ef06bf48e47a4f9 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4957_In Search of Discovery.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4957_In Search of Discovery.json
@@ -172,15 +172,6 @@
           "InteractionType": "AttuneAetherCurrent",
           "AetherCurrentId": 2818488
         },
-        {
-          "Position": {
-            "X": -297.6204,
-            "Y": 30.000608,
-            "Z": -346.82278
-          },
-          "TerritoryId": 1192,
-          "InteractionType": "WalkTo"
-        },
         {
           "DataId": 1047999,
           "Position": {
@@ -189,7 +180,8 @@
             "Z": -445.76184
           },
           "TerritoryId": 1192,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "Living Memory - Leynode Aero"
         }
       ]
     }

diff --git a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json
index 6d7e89c04ad63a30fe261fcbffe98fe4ec5a7831..ab5d6c69e30a196a4d7ced87dfca6328d5bdd989 100644 (file)
--- a/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json
+++ b/QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json
@@ -25,6 +25,17 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "Position": {
+            "X": 3.7348669,
+            "Y": 50.12495,
+            "Z": 660.56006
+          },
+          "TerritoryId": 1192,
+          "InteractionType": "WalkTo",
+          "AetheryteShortcut": "Living Memory - Leynode Mnemo",
+          "$": "Leynode Mnemo to Meso Terminal waypoint"
+        },
         {
           "DataId": 1048014,
           "Position": {
@@ -33,8 +44,7 @@
             "Z": 363.05774
           },
           "TerritoryId": 1192,
-          "InteractionType": "Interact",
-          "AetheryteShortcut": "Living Memory - Leynode Mnemo"
+          "InteractionType": "Interact"
         }
       ]
     },

diff --git a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
index 87ec23bf50072353ce81914555de758a5e07575a..32ddab9989aaa3e4badc66bcac50c7b9f483230e 100644 (file)
--- a/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
+++ b/Questionable/Controller/NavigationOverrides/MovementOverrideController.cs
@@ -46,6 +46,9 @@ internal sealed class MovementOverrideController
 
         new BlacklistedPoint(1189, new(574f, -142.25f, 504.25f), new(574.44183f, -142.12766f, 507.60065f)),
 
+        // sheshenewezi springs aetheryte: couple of barrel rings that get in the way if you go north
+        new BlacklistedPoint(1190, new(-292.29004f, 18.598045f, -133.83907f), new(-288.20895f, 18.652182f, -132.67445f), 4),
+
         // heritage found: yyupye's halo (farm, npc: Mahuwsa)
         new BlacklistedPoint(1191, new(-108f, 29.25f, -350.75f), new(-107.56289f, 29.008266f, -348.80087f)),
         new BlacklistedPoint(1191, new(-105.75f, 29.75f, -351f), new(-105.335304f, 29.017048f, -348.85077f)),

diff --git a/Questionable/Windows/QuestSelectionWindow.cs b/Questionable/Windows/QuestSelectionWindow.cs
index 592e2b82c178031e965d45b659dd98d49236295a..d9e0f8709954805b57f4e2cd62a23fdcba16ce2d 100644 (file)
--- a/Questionable/Windows/QuestSelectionWindow.cs
+++ b/Questionable/Windows/QuestSelectionWindow.cs
@@ -210,6 +210,14 @@ internal sealed class QuestSelectionWindow : LWindow
             if (ImGui.TableNextColumn())
             {
                 ImGui.AlignTextToFramePadding();
+
+                if (knownQuest != null && knownQuest.Root.Disabled)
+                {
+                    using var _ = _pluginInterface.UiBuilder.IconFontFixedWidthHandle.Push();
+                    ImGui.TextColored(ImGuiColors.DalamudOrange, FontAwesomeIcon.Ban.ToIconString());
+                    ImGui.SameLine();
+                }
+
                 ImGui.TextUnformatted(quest.Name);
             }