Update dungeon/trial json schema to allow notes (similar to quest battles)

QuestPathGenerator/RoslynElements/DutyOptionsExtensions.cs

@@ -0,0 +1,30 @@
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Questionable.Model.Questing;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+using static Questionable.QuestPathGenerator.RoslynShortcuts;
+
+namespace Questionable.QuestPathGenerator.RoslynElements;
+
+internal static class DutyOptionsExtensions
+{
+    public static ExpressionSyntax ToExpressionSyntax(this DutyOptions dutyOptions)
+    {
+        var emptyOptions = new DutyOptions();
+        return ObjectCreationExpression(
+                IdentifierName(nameof(DutyOptions)))
+            .WithInitializer(
+                InitializerExpression(
+                    SyntaxKind.ObjectInitializerExpression,
+                    SeparatedList<ExpressionSyntax>(
+                        SyntaxNodeList(
+                            Assignment(nameof(DutyOptions.Enabled),
+                                    dutyOptions.Enabled, emptyOptions.Enabled)
+                                .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(DutyOptions.ContentFinderConditionId),
+                                    dutyOptions.ContentFinderConditionId, emptyOptions.ContentFinderConditionId)
+                                .AsSyntaxNodeOrToken(),
+                            AssignmentList(nameof(DutyOptions.Notes), dutyOptions.Notes)
+                                .AsSyntaxNodeOrToken()))));
+    }
+}

QuestPathGenerator/RoslynElements/QuestStepExtensions.cs

@@ -117,11 +117,8 @@ internal static class QuestStepExtensions
                             Assignment(nameof(QuestStep.JumpDestination), step.JumpDestination,
                                     emptyStep.JumpDestination)
                                 .AsSyntaxNodeOrToken(),
-                            Assignment(nameof(QuestStep.ContentFinderConditionId),
+                            Assignment(nameof(QuestStep.DutyOptions), step.DutyOptions,
-                                    step.ContentFinderConditionId, emptyStep.ContentFinderConditionId)
+                                    emptyStep.DutyOptions)
-                                .AsSyntaxNodeOrToken(),
-                            Assignment(nameof(QuestStep.AutoDutyEnabled),
-                                    step.AutoDutyEnabled, emptyStep.AutoDutyEnabled)
                                 .AsSyntaxNodeOrToken(),
                             Assignment(nameof(QuestStep.SinglePlayerDutyOptions), step.SinglePlayerDutyOptions,
                                 emptyStep.SinglePlayerDutyOptions)

QuestPathGenerator/RoslynShortcuts.cs

@@ -62,6 +62,7 @@ public static class RoslynShortcuts
                 ComplexCombatData complexCombatData => complexCombatData.ToExpressionSyntax(),
                 QuestWorkValue questWorkValue => questWorkValue.ToExpressionSyntax(),
                 List<QuestWorkValue> list => list.ToExpressionSyntax(), // TODO fix in AssignmentList
+                DutyOptions dutyOptions => dutyOptions.ToExpressionSyntax(),
                 SinglePlayerDutyOptions dutyOptions => dutyOptions.ToExpressionSyntax(),
                 SkipConditions skipConditions => skipConditions.ToExpressionSyntax(),
                 SkipStepConditions skipStepConditions => skipStepConditions.ToExpressionSyntax(),

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/245_It's Probably Pirates.json

@@ -112,8 +112,10 @@
         {
           "TerritoryId": 138,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 4,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/343_Lord of the Inferno.json

@@ -75,8 +75,10 @@
         {
           "TerritoryId": 146,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 56,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/660_Into a Copper Hell.json

@@ -62,8 +62,10 @@
         {
           "TerritoryId": 140,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 3,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/677_Fire in the Gloom.json

@@ -57,8 +57,10 @@
         {
           "TerritoryId": 148,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 2,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/514_Into the Beast's Maw.json

@@ -44,8 +44,10 @@
         {
           "TerritoryId": 153,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 1,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/A9-Haukke Manor/801_Skeletons in Her Closet.json

@@ -66,8 +66,13 @@
         {
           "TerritoryId": 148,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 6,
-          "AutoDutyEnabled": false
+            "Enabled": false,
+            "Notes": [
+              "(after boss 2) Will not pick up the bloody parchment, and instead run off to open a random unrelated chest that it can't reach"
+            ]
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/B2-Eastern La Noscea, Brayflox, Cheese and Wine/832_The Things We Do for Cheese.json

@@ -85,8 +85,13 @@
         {
           "TerritoryId": 137,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 8,
-          "AutoDutyEnabled": false
+            "Enabled": false,
+            "Notes": [
+              "(boss 2) Will walk out of the boss arena to try and attack optional enemies on the upper level, thus resetting the boss and breaking the path"
+            ]
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/B4-Titan/857_Lord of Crags.json

@@ -45,8 +45,10 @@
         {
           "TerritoryId": 139,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 57,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/C1-Coerthas Central Highlands, The Enterprise/952_In Pursuit of the Past.json

@@ -59,8 +59,14 @@
         {
           "TerritoryId": 155,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 11,
-          "AutoDutyEnabled": true
+            "Enabled": false,
+            "Notes": [
+              "(boss 1) AI will not face cleaves away from healer, typically killing them",
+              "(boss 3) AI will not face cleaves away from healer, which doesn't always kill them"
+            ]
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/C3-Garuda/519_Lady of the Vortex.json

@@ -38,8 +38,10 @@
         {
           "TerritoryId": 331,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 58,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/3873_Rock the Castrum.json

@@ -195,8 +195,10 @@
         {
           "TerritoryId": 147,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 15,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json

@@ -46,8 +46,10 @@
         {
           "TerritoryId": 147,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 16,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },
@@ -72,8 +74,10 @@
         {
           "TerritoryId": 1053,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 830,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/E4-2.4/75_The Path of the Righteous.json

@@ -88,8 +88,10 @@
         {
           "TerritoryId": 155,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 27,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/E5-2.5/366_The Rising Chorus.json

@@ -107,8 +107,10 @@
         {
           "TerritoryId": 156,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 32,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A3.2-The Dravanian Forelands/1617_Mourn in Passing.json

@@ -78,8 +78,10 @@
         {
           "TerritoryId": 398,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 37,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A3.3-The Churning Mists/1634_Into the Aery.json

@@ -42,8 +42,10 @@
         {
           "TerritoryId": 418,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 39,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A4-Ishgard/1640_A Knight's Calling.json

@@ -59,8 +59,10 @@
         {
           "TerritoryId": 419,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 34,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A6-The Dravanian Hinterlands/1660_Forbidden Knowledge.json

@@ -110,8 +110,10 @@
         {
           "TerritoryId": 399,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 31,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A7-Azys Lla/1669_Heavensward.json

@@ -62,8 +62,10 @@
         {
           "TerritoryId": 402,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 38,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },
@@ -88,7 +90,10 @@
         {
           "TerritoryId": 402,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 90
+          "DutyOptions": {
+            "ContentFinderConditionId": 90,
+            "Enabled": false
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/C-3.2/2232_The Word of the Mother.json

@@ -77,8 +77,11 @@
         {
           "TerritoryId": 463,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 141,
-          "AutoDutyEnabled": true
+            "Enabled": true,
+            "TestedAutoDutyVersion": "0.0.0.191"
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2342_Shadows of the First.json

@@ -57,8 +57,14 @@
         {
           "TerritoryId": 155,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 182,
-          "AutoDutyEnabled": false
+            "Enabled": false,
+            "Notes": [
+              "(after boss 1) the drawbridges being up will lead you to die from the spikes",
+              "(after boss 1) the lift isn't working properly"
+            ]
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/E-3.4/2345_The Beast That Mourned at the Heart of the Mountain.json

@@ -198,7 +198,10 @@
         {
           "TerritoryId": 180,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 60
+          "DutyOptions": {
+            "ContentFinderConditionId": 60,
+            "Enabled": false
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/F-3.5/2354_Griffin, Griffin on the Wall.json

@@ -109,8 +109,10 @@
         {
           "TerritoryId": 152,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 219,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A1.3-Rhalgr's Reach 2/2469_Not without Incident.json

@@ -87,8 +87,10 @@
         {
           "TerritoryId": 680,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 238,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A5-Yanxia 2/2524_The Die Is Cast.json

@@ -114,8 +114,10 @@
         {
           "TerritoryId": 614,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 241,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json

@@ -114,8 +114,10 @@
         {
           "TerritoryId": 620,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 242,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/B-4.1/2964_The Mad King's Trove.json

@@ -98,8 +98,10 @@
         {
           "TerritoryId": 621,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 279,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/E-4.4/3144_Feel the Burn.json

@@ -40,8 +40,10 @@
         {
           "TerritoryId": 614,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 585,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/4.x - Stormblood/MSQ/F-4.5/3183_The Face of War.json

@@ -27,8 +27,10 @@
         {
           "TerritoryId": 829,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 611,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/5.x - Shadowbringers/MSQ/A4-Crystarium 2/3300_The Lightwardens.json

@@ -120,8 +120,10 @@
         {
           "TerritoryId": 813,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 676,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/5.x - Shadowbringers/MSQ/B-Il Mheg/3312_The Key to the Castle.json

@@ -49,8 +49,10 @@
         {
           "TerritoryId": 816,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 649,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/5.x - Shadowbringers/MSQ/C-Rak'tika/3340_The Burden of Knowledge.json

@@ -61,8 +61,10 @@
         {
           "TerritoryId": 817,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 651,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/5.x - Shadowbringers/MSQ/E-Kholusia 2/3643_Extinguishing the Last Light.json

@@ -62,8 +62,10 @@
         {
           "TerritoryId": 814,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 659,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },
@@ -88,7 +90,10 @@
         {
           "TerritoryId": 880,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 666
+          "DutyOptions": {
+            "ContentFinderConditionId": 666,
+            "Enabled": false
+          }
         }
       ]
     },

QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json

@@ -40,8 +40,10 @@
         {
           "TerritoryId": 814,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 714,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json

@@ -55,8 +55,10 @@
         {
           "TerritoryId": 957,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 783,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json

@@ -71,8 +71,10 @@
         {
           "TerritoryId": 957,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 789,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json

@@ -39,8 +39,10 @@
         {
           "TerritoryId": 961,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 787,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json

@@ -38,8 +38,13 @@
         {
           "TerritoryId": 956,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 786,
-          "AutoDutyEnabled": false
+            "Enabled": false,
+            "Notes": [
+              "No VBM module"
+            ]
+          }
         }
       ]
     },
@@ -64,8 +69,10 @@
         {
           "TerritoryId": 1030,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 790,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json

@@ -23,8 +23,13 @@
         {
           "TerritoryId": 957,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 844,
-          "AutoDutyEnabled": false
+            "Enabled": false,
+            "Notes": [
+              "No VBM module"
+            ]
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json

@@ -71,8 +71,13 @@
         {
           "TerritoryId": 1056,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 869,
-          "AutoDutyEnabled": false
+            "Enabled": false,
+            "Notes": [
+              "No VBM module"
+            ]
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/J-6.3/4674_King of the Mountain.json

@@ -56,9 +56,10 @@
         {
           "TerritoryId": 958,
           "InteractionType": "Duty",
-          "Comment": "Lapis Manalis",
+          "DutyOptions": {
             "ContentFinderConditionId": 896,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/K-6.4/4736_Going Haam.json

@@ -160,8 +160,13 @@
         {
           "TerritoryId": 962,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 822,
-          "AutoDutyEnabled": true
+            "Enabled": false,
+            "Notes": [
+              "Navigation issues for area transitions"
+            ]
+          }
         }
       ]
     },

QuestPaths/6.x - Endwalker/MSQ/L-6.5/4748_Down in the Dark.json

@@ -24,8 +24,10 @@
         {
           "TerritoryId": 1162,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 823,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/A-Kozama'uka1-Urqopacha1/4879_For All Turali.json

@@ -58,8 +58,10 @@
         {
           "TerritoryId": 1185,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 826,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/B-Kozama'uka2-Urqopacha2/4891_The High Luminary.json

@@ -23,8 +23,10 @@
         {
           "TerritoryId": 1187,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 824,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/C-Yak T'el/4909_Road to the Golden City.json

@@ -115,8 +115,10 @@
         {
           "TerritoryId": 1189,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 829,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/D-Shaaloani-HeritageFound1/4926_All Aboard.json

@@ -60,8 +60,10 @@
         {
           "TerritoryId": 1219,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 831,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/E-SolutionNine-HeritageFound2/4945_The Resilient Son.json

@@ -49,8 +49,10 @@
         {
           "TerritoryId": 1191,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 825,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },
@@ -75,7 +77,13 @@
         {
           "TerritoryId": 1220,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 995
+          "DutyOptions": {
+            "ContentFinderConditionId": 995,
+            "Enabled": false,
+            "Notes": [
+              "No VBM module"
+            ]
+          }
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/F-Living Memory/4959_Dawntrail.json

@@ -56,8 +56,10 @@
         {
           "TerritoryId": 1192,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 827,
-          "AutoDutyEnabled": true
+            "Enabled": true
+          }
         }
       ]
     },
@@ -82,7 +84,10 @@
         {
           "TerritoryId": 1221,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 984
+          "DutyOptions": {
+            "ContentFinderConditionId": 984,
+            "Enabled": false
+          }
         }
       ]
     },

QuestPaths/7.x - Dawntrail/MSQ/G-7.1/5246_In Search of the Past.json

@@ -122,8 +122,14 @@
         {
           "TerritoryId": 1191,
           "InteractionType": "Duty",
+          "DutyOptions": {
             "ContentFinderConditionId": 1008,
-          "AutoDutyEnabled": true
+            "Enabled": true,
+            "Notes": [
+              "(boss 2) Requires vbm's auto-turn gaze option",
+              "(boss 3) Dashes (such as on SMN) will dash into the hole"
+            ]
+          }
         }
       ]
     },

QuestPaths/quest-v1.json

@@ -1237,15 +1237,37 @@
             }
           },
           "then": {
+            "properties": {
+              "DutyOptions": {
+                "type": "object",
                 "properties": {
                   "ContentFinderConditionId": {
                     "type": "integer",
                     "exclusiveMinimum": 0,
                     "exclusiveMaximum": 3000
                   },
-              "AutoDutyEnabled": {
+                  "Enabled": {
                     "type": "boolean"
                   },
+                  "Notes": {
+                    "type": "array",
+                    "items": {
+                      "type": "string"
+                    }
+                  },
+                  "TestedAutoDutyVersion": {
+                    "type": "string",
+                    "pattern": "^0\\.\\d+\\.\\d+\\.\\d+$"
+                  },
+                  "$": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "ContentFinderConditionId",
+                  "Enabled"
+                ]
+              },
               "DataId": {
                 "type": "null"
               },
@@ -1254,7 +1276,7 @@
               }
             },
             "required": [
-              "ContentFinderConditionId"
+              "DutyOptions"
             ]
           }
         },

Questionable.Model/Questing/DutyOptions.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Questionable.Model.Questing;
+
+public class DutyOptions
+{
+    public bool Enabled { get; set; }
+    public uint ContentFinderConditionId { get; set; }
+    public List<string> Notes { get; set; } = [];
+}

Questionable.Model/Questing/QuestStep.cs

@@ -73,8 +73,7 @@ public sealed class QuestStep
     public float? CombatDelaySecondsAtStart { get; set; }
 
     public JumpDestination? JumpDestination { get; set; }
-    public uint? ContentFinderConditionId { get; set; }
+    public DutyOptions? DutyOptions { get; set; }
-    public bool AutoDutyEnabled { get; set; }
     public SinglePlayerDutyOptions? SinglePlayerDutyOptions { get; set; }
     public byte SinglePlayerDutyIndex => SinglePlayerDutyOptions?.Index ?? 0;
     public SkipConditions? SkipConditions { get; set; }

Questionable/Controller/QuestRegistry.cs

@@ -165,8 +165,8 @@ internal sealed class QuestRegistry
             foreach (var dutyStep in quest.AllSteps().Where(x =>
                          x.Step.InteractionType is EInteractionType.Duty or EInteractionType.SinglePlayerDuty))
             {
-                if (dutyStep.Step is { InteractionType: EInteractionType.Duty, ContentFinderConditionId: not null })
+                if (dutyStep.Step is { InteractionType: EInteractionType.Duty, DutyOptions: { } dutyOptions })
-                    _contentFinderConditionIds[dutyStep.Step.ContentFinderConditionId!.Value] =
+                    _contentFinderConditionIds[dutyOptions.ContentFinderConditionId] =
                         (quest.Id, dutyStep.Step);
                 else if (dutyStep.Step.InteractionType == EInteractionType.SinglePlayerDuty &&
                          _territoryData.TryGetContentFinderConditionForSoloInstance(quest.Id,
@@ -262,15 +262,15 @@ internal sealed class QuestRegistry
             .ToList();
     }
 
-    public bool TryGetDutyByContentFinderConditionId(uint cfcId, out bool autoDutyEnabledByDefault)
+    public bool TryGetDutyByContentFinderConditionId(uint cfcId, [NotNullWhen(true)] out DutyOptions? dutyOptions)
     {
         if (_contentFinderConditionIds.TryGetValue(cfcId, out var value))
         {
-            autoDutyEnabledByDefault = value.Step.AutoDutyEnabled;
+            dutyOptions = value.Step.DutyOptions;
-            return true;
+            return dutyOptions != null;
         }
 
-        autoDutyEnabledByDefault = false;
+        dutyOptions = null;
         return false;
     }
 }

Questionable/Controller/Steps/Common/SendNotification.cs

@@ -23,9 +23,9 @@ internal static class SendNotification
             {
                 EInteractionType.Snipe when !automatonIpc.IsAutoSnipeEnabled =>
                     new Task(step.InteractionType, step.Comment),
-                EInteractionType.Duty when !autoDutyIpc.IsConfiguredToRunContent(step.ContentFinderConditionId, step.AutoDutyEnabled) =>
+                EInteractionType.Duty when !autoDutyIpc.IsConfiguredToRunContent(step.DutyOptions) =>
-                    new Task(step.InteractionType, step.ContentFinderConditionId.HasValue
+                    new Task(step.InteractionType, step.DutyOptions?.ContentFinderConditionId is {} contentFinderConditionId
-                        ? territoryData.GetContentFinderCondition(step.ContentFinderConditionId.Value)?.Name
+                        ? territoryData.GetContentFinderCondition(contentFinderConditionId)?.Name
                         : step.Comment),
                 EInteractionType.SinglePlayerDuty when !bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions) =>
                     new Task(step.InteractionType, quest.Info.Name),

Questionable/Controller/Steps/Interactions/Duty.cs

@@ -23,17 +23,17 @@ internal static class Duty
             if (step.InteractionType != EInteractionType.Duty)
                 yield break;
 
-            ArgumentNullException.ThrowIfNull(step.ContentFinderConditionId);
+            ArgumentNullException.ThrowIfNull(step.DutyOptions);
 
-            if (autoDutyIpc.IsConfiguredToRunContent(step.ContentFinderConditionId, step.AutoDutyEnabled))
+            if (autoDutyIpc.IsConfiguredToRunContent(step.DutyOptions))
             {
-                yield return new StartAutoDutyTask(step.ContentFinderConditionId.Value);
+                yield return new StartAutoDutyTask(step.DutyOptions.ContentFinderConditionId);
-                yield return new WaitAutoDutyTask(step.ContentFinderConditionId.Value);
+                yield return new WaitAutoDutyTask(step.DutyOptions.ContentFinderConditionId);
                 yield return new WaitAtEnd.WaitNextStepOrSequence();
             }
             else
             {
-                yield return new OpenDutyFinderTask(step.ContentFinderConditionId.Value);
+                yield return new OpenDutyFinderTask(step.DutyOptions.ContentFinderConditionId);
             }
         }
     }

Questionable/Controller/Steps/Shared/WaitAtEnd.cs

@@ -53,7 +53,7 @@ internal static class WaitAtEnd
                 case EInteractionType.Snipe:
                     return [new WaitNextStepOrSequence()];
 
-                case EInteractionType.Duty when !autoDutyIpc.IsConfiguredToRunContent(step.ContentFinderConditionId, step.AutoDutyEnabled):
+                case EInteractionType.Duty when !autoDutyIpc.IsConfiguredToRunContent(step.DutyOptions):
                 case EInteractionType.SinglePlayerDuty when !bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions):
                     return [new EndAutomation()];
 

Questionable/Data/TerritoryData.cs

@@ -19,7 +19,7 @@ internal sealed class TerritoryData
     private readonly ImmutableDictionary<ushort, uint> _dutyTerritories;
     private readonly ImmutableDictionary<uint, string> _instanceNames;
     private readonly ImmutableDictionary<uint, ContentFinderConditionData> _contentFinderConditions;
-    private readonly ImmutableDictionary<(ElementId QuestId, byte Index), uint> _questsToCfc;
+    private readonly ImmutableDictionary<(ElementId QuestId, byte Index), uint> _questBattlesToContentFinderCondition;
 
     public TerritoryData(IDataManager dataManager)
     {
@@ -52,7 +52,7 @@ internal sealed class TerritoryData
             .Select(x => new ContentFinderConditionData(x, dataManager.Language))
             .ToImmutableDictionary(x => x.ContentFinderConditionId, x => x);
 
-        _questsToCfc = dataManager.GetExcelSheet<Quest>()
+        _questBattlesToContentFinderCondition = dataManager.GetExcelSheet<Quest>()
             .Where(x => x is { RowId: > 0, IssuerLocation.RowId: > 0 })
             .SelectMany(GetQuestBattles)
             .Select(x => (x.QuestId, x.Index,
@@ -90,7 +90,7 @@ internal sealed class TerritoryData
     public bool TryGetContentFinderConditionForSoloInstance(ElementId questId, byte index,
         [NotNullWhen(true)] out ContentFinderConditionData? contentFinderConditionData)
     {
-        if (_questsToCfc.TryGetValue((questId, index), out uint cfcId))
+        if (_questBattlesToContentFinderCondition.TryGetValue((questId, index), out uint cfcId))
             return _contentFinderConditions.TryGetValue(cfcId, out contentFinderConditionData);
         else
         {
@@ -101,7 +101,7 @@ internal sealed class TerritoryData
 
     public IEnumerable<(ElementId QuestId, byte Index, ContentFinderConditionData Data)> GetAllQuestsWithQuestBattles()
     {
-        return _questsToCfc.Select(x => (x.Key.QuestId, x.Key.Index, _contentFinderConditions[x.Value]));
+        return _questBattlesToContentFinderCondition.Select(x => (x.Key.QuestId, x.Key.Index, _contentFinderConditions[x.Value]));
     }
 
     private static string FixName(string name, ClientLanguage language)

Questionable/External/AutoDutyIpc.cs

@@ -4,6 +4,7 @@ using Dalamud.Plugin.Ipc.Exceptions;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps;
 using Questionable.Data;
+using Questionable.Model.Questing;
 
 namespace Questionable.External;
 
@@ -31,22 +32,22 @@ internal sealed class AutoDutyIpc
         _stop = pluginInterface.GetIpcSubscriber<object>("AutoDuty.Stop");
     }
 
-    public bool IsConfiguredToRunContent(uint? cfcId, bool enabledByDefault)
+    public bool IsConfiguredToRunContent(DutyOptions? dutyOptions)
     {
-        if (cfcId == null)
+        if (dutyOptions == null || dutyOptions.ContentFinderConditionId == 0)
             return false;
 
         if (!_configuration.Duties.RunInstancedContentWithAutoDuty)
             return false;
 
-        if (_configuration.Duties.BlacklistedDutyCfcIds.Contains(cfcId.Value))
+        if (_configuration.Duties.BlacklistedDutyCfcIds.Contains(dutyOptions.ContentFinderConditionId))
             return false;
 
-        if (_configuration.Duties.WhitelistedDutyCfcIds.Contains(cfcId.Value) &&
+        if (_configuration.Duties.WhitelistedDutyCfcIds.Contains(dutyOptions.ContentFinderConditionId) &&
-            _territoryData.TryGetContentFinderCondition(cfcId.Value, out _))
+            _territoryData.TryGetContentFinderCondition(dutyOptions.ContentFinderConditionId, out _))
             return true;
 
-        return enabledByDefault && HasPath(cfcId.Value);
+        return dutyOptions.Enabled && HasPath(dutyOptions.ContentFinderConditionId);
     }
 
     public bool HasPath(uint cfcId)

Questionable/Windows/ConfigComponents/ConfigComponent.cs

@@ -1,5 +1,9 @@
+using System.Collections.Generic;
 using System.Text;
 using Dalamud.Game.Text;
+using Dalamud.Interface;
+using Dalamud.Interface.Colors;
+using Dalamud.Interface.Utility.Raii;
 using Dalamud.Plugin;
 using ImGuiNET;
 
@@ -61,4 +65,29 @@ internal abstract class ConfigComponent
             ++byteCount;
         return Encoding.UTF8.GetString(ptr, byteCount);
     }
+
+    protected static void DrawNotes(bool enabledByDefault, IReadOnlyList<string> notes)
+    {
+        using var color = new ImRaii.Color();
+        color.Push(ImGuiCol.TextDisabled, !enabledByDefault ? ImGuiColors.DalamudYellow : ImGuiColors.ParsedBlue);
+
+        ImGui.SameLine();
+        using (ImRaii.PushFont(UiBuilder.IconFont))
+        {
+            if (!enabledByDefault)
+                ImGui.TextDisabled(FontAwesomeIcon.ExclamationTriangle.ToIconString());
+            else
+                ImGui.TextDisabled(FontAwesomeIcon.InfoCircle.ToIconString());
+        }
+
+        if (!ImGui.IsItemHovered())
+            return;
+
+        using var _ = ImRaii.Tooltip();
+
+        ImGui.TextColored(ImGuiColors.DalamudYellow,
+            "While testing, the following issues have been found:");
+        foreach (string note in notes)
+            ImGui.BulletText(note);
+    }
 }

Questionable/Windows/ConfigComponents/DutyConfigComponent.cs

@@ -18,6 +18,7 @@ using Questionable.Controller;
 using Questionable.Data;
 using Questionable.External;
 using Questionable.Model;
+using Questionable.Model.Questing;
 
 namespace Questionable.Windows.ConfigComponents;
 
@@ -125,12 +126,11 @@ internal sealed class DutyConfigComponent : ConfigComponent
                     {
                         foreach (var (cfcId, territoryId, name) in cfcNames)
                         {
-                            if (_questRegistry.TryGetDutyByContentFinderConditionId(cfcId,
+                            if (_questRegistry.TryGetDutyByContentFinderConditionId(cfcId, out DutyOptions? dutyOptions))
-                                    out bool autoDutyEnabledByDefault))
                             {
                                 ImGui.TableNextRow();
 
-                                string[] labels = autoDutyEnabledByDefault
+                                string[] labels = dutyOptions.Enabled
                                     ? SupportedCfcOptions
                                     : UnsupportedCfcOptions;
                                 int value = 0;
@@ -159,6 +159,8 @@ internal sealed class DutyConfigComponent : ConfigComponent
                                     if (runInstancedContentWithAutoDuty && !_autoDutyIpc.HasPath(cfcId))
                                         ImGuiComponents.HelpMarker("This duty is not supported by AutoDuty",
                                             FontAwesomeIcon.Times, ImGuiColors.DalamudRed);
+                                    else if (dutyOptions.Notes.Count > 0)
+                                        DrawNotes(dutyOptions.Enabled, dutyOptions.Notes);
                                 }
 
                                 if (ImGui.TableNextColumn())

Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs

@@ -460,32 +460,7 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
                             FontAwesomeIcon.Times, ImGuiColors.DalamudRed);
                     }
                     else if (dutyInfo.Notes.Count > 0)
-                    {
+                        DrawNotes(dutyInfo.EnabledByDefault, dutyInfo.Notes);
-                        using var color = new ImRaii.Color();
-                        if (!dutyInfo.EnabledByDefault)
-                            color.Push(ImGuiCol.TextDisabled, ImGuiColors.DalamudYellow);
-                        else
-                            color.Push(ImGuiCol.TextDisabled, ImGuiColors.ParsedBlue);
-
-                        ImGui.SameLine();
-                        using (ImRaii.PushFont(UiBuilder.IconFont))
-                        {
-                            if (!dutyInfo.EnabledByDefault)
-                                ImGui.TextDisabled(FontAwesomeIcon.ExclamationTriangle.ToIconString());
-                            else
-                                ImGui.TextDisabled(FontAwesomeIcon.InfoCircle.ToIconString());
-                        }
-
-                        if (ImGui.IsItemHovered())
-                        {
-                            using var _ = ImRaii.Tooltip();
-
-                            ImGui.TextColored(ImGuiColors.DalamudYellow,
-                                "While testing, the following issues have been found:");
-                            foreach (string note in dutyInfo.Notes)
-                                ImGui.BulletText(note);
-                        }
-                    }
                 }
 
                 if (ImGui.TableNextColumn())