From cd6ef3c5f1a7adc71bf186bb3df4722e3f6e5bff Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Mon, 30 Dec 2024 15:57:55 +0100 Subject: [PATCH] Update sorting order for duties; exclude unsupported duties --- .../Dungeons/1131_Gilding the Bilious (Maelstrom).json | 3 +-- .../Dungeons/1132_Gilding the Bilious (Twin Adder).json | 3 +-- .../1133_Gilding the Bilious (Immortal Flames).json | 3 +-- .../2111_For All the Nights to Come.json | 3 +-- Questionable/Windows/ConfigWindow.cs | 7 +++---- 5 files changed, 7 insertions(+), 12 deletions(-) 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 165a1839..e0157efe 100644 --- 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 4defc6a9..178a0b5a 100644 --- 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 cf83d8a4..8915d671 100644 --- 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 5961d3e1..5c9fa391 100644 --- 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 eaf8f622..397faeba 100644 --- 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() - .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()); }