Add default parsing format for QuestXQuestLineId

Shauren · Shauren · commit 43a76562c5e0 · 2026-03-28T21:02:52.000+01:00
diff --git a/WowPacketParser/Enums/StoreNameType.cs b/WowPacketParser/Enums/StoreNameType.cs
@@ -34,6 +34,7 @@ public enum StoreNameType
         QuestObjective      = 28,
         Sound               = 29,
         PhaseId             = 30,
+        QuestXQuestLine     = 31,
     }
 
     public static class StoreName
@@ -76,6 +77,8 @@ public static StoreNameType ToEnum<T>() where T : IId
                 return StoreNameType.Zone;
             if (typeof(T) == typeof(PhaseId))
                 return StoreNameType.PhaseId;
+            if (typeof(T) == typeof(QuestXQuestLineId))
+                return StoreNameType.QuestXQuestLine;
 
             throw new ArgumentOutOfRangeException(typeof(T).ToString());
         }
@@ -96,6 +99,7 @@ public struct ItemId : IId { }
     public struct LFGDungeonId : IId { }
     public struct MapId : IId { }
     public struct QuestId : IId { }
+    public struct QuestXQuestLineId : IId { }
     public struct SoundId : IId { }
     public struct SpellId :  IId { }
     public struct UnitId : IId { }
diff --git a/WowPacketParser/Misc/StoreGetters.cs b/WowPacketParser/Misc/StoreGetters.cs
@@ -67,6 +67,10 @@ public static string GetName(StoreNameType type, int entry, bool withEntry = tru
                         if (DBC.DBC.Phase.TryGetValue(entry, out var phase))
                             name = ((DBCPhaseFlags)phase.Flags).ToString();
                         break;
+                    case StoreNameType.QuestXQuestLine:
+                        if (DBC.DBC.QuestLineXQuest.TryGetValue(entry, out var questXQuestLine))
+                            name = $"QuestID: {questXQuestLine.QuestID} QuestLineID: {questXQuestLine.QuestLineID}";
+                        break;
                 }
                 if (name != string.Empty)
                 {
diff --git a/WowPacketParser/SQL/Builders/QuestMisc.cs b/WowPacketParser/SQL/Builders/QuestMisc.cs
@@ -1,4 +1,5 @@
-﻿using WowPacketParser.Enums;
+﻿using System.Linq;
+using WowPacketParser.Enums;
 using WowPacketParser.Misc;
 using WowPacketParser.Store;
 using WowPacketParser.Store.Objects;
@@ -188,12 +189,20 @@ public static string UIMapQuestLines()
             if (!Settings.SQLOutputFlag.HasAnyFlagBit(SQLOutput.quest_template))
                 return string.Empty;
 
-            if (Storage.UIMapQuestLines.IsEmpty())
+            var filteredUiMapQuestLines = Storage.UIMapQuestLines.Where(ui =>
+            {
+                if (DBC.DBC.QuestLineXQuest.TryGetValue((int)ui.Item1.QuestXQuestLineID, out var questLineXQuest))
+                    ui.Item1.QuestLineId = questLineXQuest.QuestLineID;
+
+                return ui.Item1.QuestLineId != null;
+            }).ToList();
+
+            if (filteredUiMapQuestLines.Count == 0)
                 return string.Empty;
 
-            var templatesDb = SQLDatabase.Get(Storage.UIMapQuestLines);
+            var templatesDb = SQLDatabase.Get(filteredUiMapQuestLines);
 
-            return SQLUtil.Compare(Storage.UIMapQuestLines, templatesDb, StoreNameType.None);
+            return SQLUtil.Compare(filteredUiMapQuestLines, templatesDb, StoreNameType.None);
         }
 
         [BuilderMethod]
diff --git a/WowPacketParser/Store/Objects/UIMapQuestLine.cs b/WowPacketParser/Store/Objects/UIMapQuestLine.cs
@@ -15,5 +15,7 @@ public sealed record UIMapQuestLine : IDataModel
 
         [DBFieldName("VerifiedBuild")]
         public int? VerifiedBuild = ClientVersion.BuildInt;
+
+        public uint QuestXQuestLineID;
     }
 }
diff --git a/WowPacketParserModule.V10_0_0_46181/Parsers/QuestHandler.cs b/WowPacketParserModule.V10_0_0_46181/Parsers/QuestHandler.cs
@@ -348,27 +348,8 @@ public static void HandleUiMapQuestLinesResponse(Packet packet)
 
             for (int i = 0; i < questLineXQuestCount; i++)
             {
-                var questLineXQuestId = packet.ReadUInt32();
-
-                if (Settings.UseDBC && DBC.QuestLineXQuest.ContainsKey((int)questLineXQuestId))
-                {
-                    if (DBC.QuestLineXQuest.TryGetValue((int)questLineXQuestId, out var questLineXQuest))
-                    {
-                        var questLineId = questLineXQuest.QuestLineID;
-                        var questId = questLineXQuest.QuestID;
-
-                        UIMapQuestLine uiMapQuestLine = new()
-                        {
-                            UIMapId = (uint)uiMap,
-                            QuestLineId = questLineId
-                        };
-                        Storage.UIMapQuestLines.Add(uiMapQuestLine, packet.TimeSpan);
-
-                        packet.WriteLine($"[{i}] QuestLineXQuestID: {questLineXQuestId} (QuestID: {questId} QuestLineID: {questLineId})");
-                    }
-                }
-                else
-                    packet.AddValue($"QuestLineXQuestID", questLineXQuestId, i);
+                var questLineXQuestId = packet.ReadUInt32<QuestXQuestLineId>("QuestLineXQuestID", i);
+                Storage.UIMapQuestLines.Add(new() { UIMapId = (uint)uiMap, QuestXQuestLineID = questLineXQuestId }, packet.TimeSpan);
             }
 
             for (int i = 0; i < questCount; i++)
diff --git a/WowPacketParserModule.V11_0_0_55666/Parsers/QuestHandler.cs b/WowPacketParserModule.V11_0_0_55666/Parsers/QuestHandler.cs
@@ -388,27 +388,8 @@ public static void HandleUiMapQuestLinesResponse(Packet packet)
 
             for (int i = 0; i < questLineXQuestCount; i++)
             {
-                var questLineXQuestId = packet.ReadUInt32();
-
-                if (Settings.UseDBC && DBC.QuestLineXQuest.ContainsKey((int)questLineXQuestId))
-                {
-                    if (DBC.QuestLineXQuest.TryGetValue((int)questLineXQuestId, out var questLineXQuest))
-                    {
-                        var questLineId = questLineXQuest.QuestLineID;
-                        var questId = questLineXQuest.QuestID;
-
-                        UIMapQuestLine uiMapQuestLine = new()
-                        {
-                            UIMapId = (uint)uiMap,
-                            QuestLineId = questLineId
-                        };
-                        Storage.UIMapQuestLines.Add(uiMapQuestLine, packet.TimeSpan);
-
-                        packet.WriteLine($"[{i}] QuestLineXQuestID: {questLineXQuestId} (QuestID: {questId} QuestLineID: {questLineId})");
-                    }
-                }
-                else
-                    packet.AddValue($"QuestLineXQuestID", questLineXQuestId, i);
+                var questLineXQuestId = packet.ReadUInt32<QuestXQuestLineId>("QuestLineXQuestID", i);
+                Storage.UIMapQuestLines.Add(new() { UIMapId = (uint)uiMap, QuestXQuestLineID = questLineXQuestId }, packet.TimeSpan);
             }
 
             for (int i = 0; i < questCount; i++)

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,10 @@ public static string GetName(StoreNameType type, int entry, bool withEntry = tru`
`67`	`67`	`if (DBC.DBC.Phase.TryGetValue(entry, out var phase))`
`68`	`68`	`name = ((DBCPhaseFlags)phase.Flags).ToString();`
`69`	`69`	`break;`
	`70`	`+ case StoreNameType.QuestXQuestLine:`
	`71`	`+ if (DBC.DBC.QuestLineXQuest.TryGetValue(entry, out var questXQuestLine))`
	`72`	`+ name = $"QuestID: {questXQuestLine.QuestID} QuestLineID: {questXQuestLine.QuestLineID}";`
	`73`	`+ break;`
`70`	`74`	`}`
`71`	`75`	`if (name != string.Empty)`
`72`	`76`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,7 @@ public sealed record UIMapQuestLine : IDataModel`
`15`	`15`
`16`	`16`	`[DBFieldName("VerifiedBuild")]`
`17`	`17`	`public int? VerifiedBuild = ClientVersion.BuildInt;`
	`18`	`+`
	`19`	`+ public uint QuestXQuestLineID;`
`18`	`20`	`}`
`19`	`21`	`}`