Update sorting order for duties; exclude unsupported duties

diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json
index 165a1839cd8328cf963e3a1a236bedc787794a68..e0157efee276e0c0047a7c15ca6fa05ab3a55542 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json
@@ -71,8 +71,7 @@
         {
           "TerritoryId": 155,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 5,
-          "AutoDutyEnabled": true
+          "ContentFinderConditionId": 5
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1132_Gilding the Bilious (Twin Adder).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1132_Gilding the Bilious (Twin Adder).json
index 4defc6a918fea520b6e3160b69b8ca3e4ab3ba37..178a0b5a4ebf103e87290584551816397f640487 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1132_Gilding the Bilious (Twin Adder).json
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1132_Gilding the Bilious (Twin Adder).json
@@ -71,8 +71,7 @@
         {
           "TerritoryId": 155,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 5,
-          "AutoDutyEnabled": true
+          "ContentFinderConditionId": 5
         }
       ]
     },

diff --git a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1133_Gilding the Bilious (Immortal Flames).json b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1133_Gilding the Bilious (Immortal Flames).json
index cf83d8a4ca6ce59cadda18c15a748b2784cf2bca..8915d67142fced8efdc5c5d75a97ad74d309e933 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1133_Gilding the Bilious (Immortal Flames).json
+++ b/QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1133_Gilding the Bilious (Immortal Flames).json
@@ -71,8 +71,7 @@
         {
           "TerritoryId": 155,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 5,
-          "AutoDutyEnabled": true
+          "ContentFinderConditionId": 5
         }
       ]
     },

diff --git a/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/2111_For All the Nights to Come.json b/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/2111_For All the Nights to Come.json
index 5961d3e18aa6f119d51a02f33386c4b8e8e29214..5c9fa391d2d9129e5ea7ce18d377e79862d4fc83 100644 (file)
--- a/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/2111_For All the Nights to Come.json
+++ b/QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/2111_For All the Nights to Come.json
@@ -38,8 +38,7 @@
         {
           "TerritoryId": 397,
           "InteractionType": "Duty",
-          "ContentFinderConditionId": 36,
-          "AutoDutyEnabled": true
+          "ContentFinderConditionId": 36
         }
       ]
     },

diff --git a/Questionable/Windows/ConfigWindow.cs b/Questionable/Windows/ConfigWindow.cs
index eaf8f62266e48ae1f5bc918f4da6c33b4bc7e5ce..397faeba416de2c45e982dfd1958562c333cee63 100644 (file)
--- a/Questionable/Windows/ConfigWindow.cs
+++ b/Questionable/Windows/ConfigWindow.cs
@@ -90,7 +90,8 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
         _mountNames = DefaultMounts.Select(x => x.Name).Concat(mounts.Select(x => x.Name)).ToArray();
 
         _contentFinderConditionNames = dataManager.GetExcelSheet<DawnContent>()
-            .Where(x => x.RowId > 0)
+            .Where(x => x is { RowId: > 0, Unknown16: false })
+            .OrderBy(x => x.Unknown15) // SortKey for the support UI
             .Select(x => x.Content.ValueNullable)
             .Where(x => x != null)
             .Select(x => x!.Value)
@@ -106,9 +107,7 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
             })
             .GroupBy(x => x.Expansion)
             .ToDictionary(x => x.Key,
-                x => x.OrderBy(y => y.Level)
-                    .ThenBy(y => y.ContentType)
-                    .ThenBy(y => y.SortKey)
+                x => x
                     .Select(y => new DutyInfo(y.CfcId, y.TerritoryId, $"{SeIconChar.LevelEn.ToIconChar()}{FormatLevel(y.Level)} {y.Name}"))
                     .ToList());
     }