Fix 'A Relic Reborn' showing under 'Manderville Weapons'

diff --git a/Questionable/Data/QuestData.cs b/Questionable/Data/QuestData.cs
index 1993c41428c7b4a06ce85ee785f05f728b60dbf8..328bcfcc32c97f6c1b37e6a4229f7300b9e26f44 100644 (file)
--- a/Questionable/Data/QuestData.cs
+++ b/Questionable/Data/QuestData.cs
@@ -42,6 +42,7 @@ internal sealed class QuestData
     {
         JournalGenreOverrides journalGenreOverrides = new()
         {
+            ARelicRebornQuests = dataManager.GetExcelSheet<Quest>().GetRow(65742).JournalGenre.RowId,
             RadzAtHanSideQuests = dataManager.GetExcelSheet<Quest>().GetRow(69805).JournalGenre.RowId,
             ThavnairSideQuests = dataManager.GetExcelSheet<Quest>().GetRow(70025).JournalGenre.RowId,
         };
@@ -228,15 +229,6 @@ internal sealed class QuestData
         // follow-up quests to picking a GC
         AddGcFollowUpQuests();
 
-        // update relic quests to be in a different journal category
-        ushort[] zodiacStartingQuests = [1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1579];
-        foreach (var questId in zodiacStartingQuests)
-        {
-            var quest = ((QuestInfo)_quests[new QuestId(questId)]);
-            quest.JournalGenre = 82;
-            quest.SortKey = 0;
-        }
-
         RedeemableItems = quests.Where(x => x is QuestInfo)
             .Cast<QuestInfo>()
             .SelectMany(x => x.ItemRewards)

diff --git a/Questionable/Model/JournalGenreOverrides.cs b/Questionable/Model/JournalGenreOverrides.cs
index bafd72821ab1b2b3d6e5c6704d67e3360bb61fbf..86340b1661963c823e2411067c5978a0112c2b70 100644 (file)
--- a/Questionable/Model/JournalGenreOverrides.cs
+++ b/Questionable/Model/JournalGenreOverrides.cs
@@ -2,6 +2,7 @@
 
 internal sealed class JournalGenreOverrides
 {
+    public required uint ARelicRebornQuests { get; init; }
     public required uint ThavnairSideQuests { get; init; }
     public required uint RadzAtHanSideQuests { get; init; }
 }

diff --git a/Questionable/Model/QuestInfo.cs b/Questionable/Model/QuestInfo.cs
index a5f3de7ca1547cf32eb7683913836f3556a445cd..8f5a6ebc278950bd73f16329326f9ed79db9c326 100644 (file)
--- a/Questionable/Model/QuestInfo.cs
+++ b/Questionable/Model/QuestInfo.cs
@@ -54,13 +54,17 @@ internal sealed class QuestInfo : IQuestInfo
             .Where(x => x.Value != 0)
             .ToImmutableList();
         QuestLockJoin = (EQuestJoin)quest.QuestLockJoin;
-        JournalGenre = QuestId.Value switch
+
+        ValueTuple<uint?, ushort?> genreAndSortKey = QuestId.Value switch
         {
-            >= 4196 and <= 4209 => journalGenreOverrides.ThavnairSideQuests,
-            4173 => journalGenreOverrides.RadzAtHanSideQuests,
-            _ => quest.JournalGenre.ValueNullable?.RowId,
+            >= 1119 and <= 1127 or 1579 => (journalGenreOverrides.ARelicRebornQuests, 0),
+            >= 4196 and <= 4209 => (journalGenreOverrides.ThavnairSideQuests, null),
+            4173 => (journalGenreOverrides.RadzAtHanSideQuests, null),
+            _ => (quest.JournalGenre.ValueNullable?.RowId, null),
         };
-        SortKey = quest.SortKey;
+        JournalGenre = genreAndSortKey.Item1;
+        SortKey = genreAndSortKey.Item2 ?? quest.SortKey;
+
         IsMainScenarioQuest = quest.JournalGenre.ValueNullable?.Icon == 61412;
         CompletesInstantly = quest.TodoParams[0].ToDoCompleteSeq == 0;
         PreviousInstanceContent = quest.InstanceContent.Select(x => (ushort)x.RowId).Where(x => x != 0).ToList();