JerryWester/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests Activity

Update sorting order for duties; exclude unsupported duties

Browse Source
This commit is contained in:
Liza 2024-12-30 15:57:55 +01:00
parent 8d3f37e6d4
commit cd6ef3c5f1
Signed by: liza
GPG Key ID: 2C41B84815CF6445
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1131_Gilding the Bilious (Maelstrom).json
View File

@ -71,8 +71,7 @@
{ {
"TerritoryId": 155, "TerritoryId": 155,
"InteractionType": "Duty", "InteractionType": "Duty",
"ContentFinderConditionId": 5, "ContentFinderConditionId": 5
"AutoDutyEnabled": true
} }
] ]
}, },

3
QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1132_Gilding the Bilious (Twin Adder).json
View File

@ -71,8 +71,7 @@
{ {
"TerritoryId": 155, "TerritoryId": 155,
"InteractionType": "Duty", "InteractionType": "Duty",
"ContentFinderConditionId": 5, "ContentFinderConditionId": 5
"AutoDutyEnabled": true
} }
] ]
}, },

3
QuestPaths/2.x - A Realm Reborn/Unlocks/Dungeons/1133_Gilding the Bilious (Immortal Flames).json
View File

@ -71,8 +71,7 @@
{ {
"TerritoryId": 155, "TerritoryId": 155,
"InteractionType": "Duty", "InteractionType": "Duty",
"ContentFinderConditionId": 5, "ContentFinderConditionId": 5
"AutoDutyEnabled": true
} }
] ]
}, },

3
QuestPaths/3.x - Heavensward/Aether Currents/Coerthas Western Highlands/2111_For All the Nights to Come.json
View File

@ -38,8 +38,7 @@
{ {
"TerritoryId": 397, "TerritoryId": 397,
"InteractionType": "Duty", "InteractionType": "Duty",
"ContentFinderConditionId": 36, "ContentFinderConditionId": 36
"AutoDutyEnabled": true
} }
] ]
}, },

7
Questionable/Windows/ConfigWindow.cs
View File

@ -90,7 +90,8 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
_mountNames = DefaultMounts.Select(x => x.Name).Concat(mounts.Select(x => x.Name)).ToArray(); _mountNames = DefaultMounts.Select(x => x.Name).Concat(mounts.Select(x => x.Name)).ToArray();
_contentFinderConditionNames = dataManager.GetExcelSheet<DawnContent>() _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) .Select(x => x.Content.ValueNullable)
.Where(x => x != null) .Where(x => x != null)
.Select(x => x!.Value) .Select(x => x!.Value)
@ -106,9 +107,7 @@ internal sealed class ConfigWindow : LWindow, IPersistableWindowConfig
}) })
.GroupBy(x => x.Expansion) .GroupBy(x => x.Expansion)
.ToDictionary(x => x.Key, .ToDictionary(x => x.Key,
x => x.OrderBy(y => y.Level) x => x
.ThenBy(y => y.ContentType)
.ThenBy(y => y.SortKey)
.Select(y => new DutyInfo(y.CfcId, y.TerritoryId, $"{SeIconChar.LevelEn.ToIconChar()}{FormatLevel(y.Level)} {y.Name}")) .Select(y => new DutyInfo(y.CfcId, y.TerritoryId, $"{SeIconChar.LevelEn.ToIconChar()}{FormatLevel(y.Level)} {y.Name}"))
.ToList()); .ToList());
} }