instant quests sort and ng+ header remove

CHANGELOG.md

@@ -1,3 +1,4 @@
 - Feature: added "instant" quests (So You Want To Be A Questionable User) to Journal Progress > Other Quests > Special Quests > Instant Quests -alydev
   - the "Instant Quests" label can be right clicked to select "Add all to priority quests", this will let users run all available one-step quasi-quests in one go (in theory!)
+  - bug fix: don't apply NG+ label to Instant Quests category; sort by quest ID -alydev
 - Feature: replaced button labels (visible on hover) to quick access buttons -alydev

Directory.Build.targets

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
-        <Version>15.306.1.10</Version>
+        <Version>15.306.1.11</Version>
     </PropertyGroup>
 
     <PropertyGroup>

Questionable/Data/JournalData.cs

@@ -14,17 +14,17 @@ public JournalData(IDataManager dataManager, QuestData questData, QuestRegistry
         QuestRedo limsaStart = dataManager.GetExcelSheet<QuestRedo>().GetRow(1);
         QuestRedo gridaniaStart = dataManager.GetExcelSheet<QuestRedo>().GetRow(2);
         QuestRedo uldahStart = dataManager.GetExcelSheet<QuestRedo>().GetRow(3);
-        Genre genreLimsa = new(uint.MaxValue - 3, _L("Starting in Limsa Lominsa"), 1,
+        Genre genreLimsa = new(StartingInLimsa, _L("Starting in Limsa Lominsa"), 1,
             new uint[] { 108, 109 }.Concat(limsaStart.QuestRedoParam.Select(x => x.Quest.RowId))
                 .Where(x => x != 0)
                 .Select(x => questData.GetQuestInfo(QuestId.FromRowId(x)))
                 .ToList());
-        Genre genreGridania = new(uint.MaxValue - 2, _L("Starting in Gridania"), 1,
+        Genre genreGridania = new(StartingInGridania, _L("Starting in Gridania"), 1,
             new uint[] { 85, 123, 124 }.Concat(gridaniaStart.QuestRedoParam.Select(x => x.Quest.RowId))
                 .Where(x => x != 0)
                 .Select(x => questData.GetQuestInfo(QuestId.FromRowId(x)))
                 .ToList());
-        Genre genreUldah = new(uint.MaxValue - 1, _L("Starting in Ul'dah"), 1,
+        Genre genreUldah = new(StartingInUldah, _L("Starting in Ul'dah"), 1,
             new uint[] { 568, 569, 570 }.Concat(uldahStart.QuestRedoParam.Select(x => x.Quest.RowId))
                 .Where(x => x != 0)
                 .Select(x => questData.GetQuestInfo(QuestId.FromRowId(x)))
@@ -35,10 +35,11 @@ public JournalData(IDataManager dataManager, QuestData questData, QuestRegistry
             .RemoveAll(x =>
                 genreLimsa.Quests.Contains(x) || genreGridania.Quests.Contains(x) || genreUldah.Quests.Contains(x));
 
-        Genre instantGenre = new(uint.MaxValue - 4, _L("Instant Quests"), SpecialQuests,
+        Genre instantGenre = new(InstantQuests, _L("Instant Quests"), SpecialQuests,
             questRegistry.AllQuests
                      .Where(x => x.Info is QuestInfo qInfo && qInfo.CompletesInstantly)
                      .Select(x => x.Info)
+                     .OrderBy(x => x.QuestId.Value)
                      .ToList()
         );
         genres = genres.Append(instantGenre).ToList();
@@ -52,7 +53,11 @@ public JournalData(IDataManager dataManager, QuestData questData, QuestRegistry
             .Select(x => new Section(x, Categories.Where(y => y.SectionId == x.RowId).ToList()))
             .ToList();
     }
-    const uint SpecialQuests = 98;
+    public const uint StartingInUldah = uint.MaxValue - 1;
+    public const uint StartingInGridania = uint.MaxValue - 2;
+    public const uint StartingInLimsa = uint.MaxValue - 3;
+    public const uint InstantQuests = uint.MaxValue - 4;
+    public const uint SpecialQuests = 98;
 
     public List<Genre> Genres { get; }
     public List<Category> Categories { get; }

Questionable/Windows/JournalComponents/QuestJournalComponent.cs

@@ -135,7 +135,7 @@ private void DrawGenre(FilteredGenre filter)
         ImGui.TableNextColumn();
 
         string genreName = filter.Genre.Name;
-        if (questRegistry.TryGetQuest(filter.Quests[0].QuestId, out Quest? q))
+        if (filter.Genre.Id != JournalData.InstantQuests && questRegistry.TryGetQuest(filter.Quests[0].QuestId, out Quest? q))
         {
             RedoIndex redoIndex = redoUtil.GetChapter(q.Id.Value);
             if (redoIndex.Index != -1)