Update playerchoice sql output

Author: Shauren

WowPacketParser/Store/Objects/PlayerChoice.cs

@@ -19,7 +19,7 @@ public sealed record PlayerChoiceTemplate : IDataModel
         [DBFieldName("CloseSoundKitId", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic)]
         public uint? CloseSoundKitId;
 
-        [DBFieldName("Duration", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic)]
+        [DBFieldName("Duration", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic, nullable: true)]
         public long? Duration;
 
         [DBFieldName("Question", LocaleConstant.enUS)]
@@ -28,12 +28,21 @@ public sealed record PlayerChoiceTemplate : IDataModel
         [DBFieldName("PendingChoiceText", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic, LocaleConstant.enUS)]
         public string PendingChoiceText;
 
+        [DBFieldName("InfiniteRange", TargetedDatabaseFlag.SinceTheWarWithin)]
+        public int InfiniteRange;
+
         [DBFieldName("HideWarboardHeader", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.CataClassic)]
         public int HideWarboardHeader;
 
         [DBFieldName("KeepOpenAfterChoice", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
         public int KeepOpenAfterChoice;
 
+        [DBFieldName("ShowChoicesAsList", TargetedDatabaseFlag.SinceTheWarWithin)]
+        public int ShowChoicesAsList;
+
+        [DBFieldName("ForceDontShowChoicesAsList", TargetedDatabaseFlag.SinceTheWarWithin)]
+        public int ForceDontShowChoicesAsList;
+
         [DBFieldName("VerifiedBuild")]
         public int? VerifiedBuild = ClientVersion.BuildInt;
     }
@@ -47,10 +56,10 @@ public sealed record PlayerChoiceResponseTemplate : IDataModel
         [DBFieldName("ResponseId", true)]
         public int? ResponseId;
 
-        [DBFieldName("ResponseIdentifier", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic)]
+        [DBFieldName("ResponseIdentifier", TargetedDatabaseFlag.Shadowlands | TargetedDatabaseFlag.Dragonflight | TargetedDatabaseFlag.CataClassic)]
         public short? ResponseIdentifier;
 
-        [DBFieldName("Index", true)]
+        [DBFieldName("Index")]
         public uint? Index;
 
         [DBFieldName("ChoiceArtFileId")]

WowPacketParserModule.V9_0_1_36216/Parsers/QuestHandler.cs

@@ -1,4 +1,5 @@
-using WowPacketParser.Enums;
+using System;
+using WowPacketParser.Enums;
 using WowPacketParser.Misc;
 using WowPacketParser.Parsing;
 using WowPacketParser.Store;
@@ -557,15 +558,29 @@ public static void HandleDisplayPlayerChoice(Packet packet)
                 packet.ReadByte("NumRerolls");
             long? duration = null;
             if (ClientVersion.AddedInVersion(ClientVersionBuild.V9_2_0_42423))
-                duration = packet.ReadInt64("Duration");
+            {
+                var expireTimeUtc = packet.ReadTime64("ExpireTime");
+                if (expireTimeUtc != DateTime.UnixEpoch)
+                {
+                    duration = (long)Math.Round((expireTimeUtc - TimeZoneInfo.ConvertTimeToUtc(packet.Time, TimeZoneInfo.Local)).TotalSeconds, MidpointRounding.AwayFromZero);
+                    packet.AddValue("Duration", duration);
+                }
+            }
             packet.ResetBitReader();
             var questionLength = packet.ReadBits(8);
             var pendingChoiceTextLength = 0u;
             if (ClientVersion.AddedInVersion(ClientVersionBuild.V9_2_0_42423))
                 pendingChoiceTextLength = packet.ReadBits(8);
-            packet.ReadBit("InfiniteRange");
+            var infiniteRange = packet.ReadBit("InfiniteRange");
             var hideWarboardHeader = packet.ReadBit("HideWarboardHeader");
             var keepOpenAfterChoice = packet.ReadBit("KeepOpenAfterChoice");
+            byte showChoicesAsList = 0;
+            byte forceDontShowChoicesAsList = 0;
+            if (ClientVersion.AddedInVersion(ClientVersionBuild.V11_1_5_60392))
+            {
+                showChoicesAsList = packet.ReadBit("ShowChoicesAsList");
+                forceDontShowChoicesAsList = packet.ReadBit("ForceDontShowChoicesAsList");
+            }
 
             for (var i = 0u; i < responseCount; ++i)
                 ReadPlayerChoiceResponse(packet, choiceId, i, "PlayerChoiceResponse", i);
@@ -584,8 +599,11 @@ public static void HandleDisplayPlayerChoice(Packet packet)
                 Duration = duration,
                 Question = question,
                 PendingChoiceText = pendingChoiceText,
+                InfiniteRange = infiniteRange,
                 HideWarboardHeader = hideWarboardHeader,
-                KeepOpenAfterChoice = keepOpenAfterChoice
+                KeepOpenAfterChoice = keepOpenAfterChoice,
+                ShowChoicesAsList = showChoicesAsList,
+                ForceDontShowChoicesAsList = forceDontShowChoicesAsList
             }, packet.TimeSpan);
 
             if (ClientLocale.PacketLocale != LocaleConstant.enUS)
@@ -611,7 +629,7 @@ public static void ReadPlayerChoiceResponseMawPower(Packet packet, params object
                 packet.ReadInt32("Rarity", indexes);
                 packet.ReadUInt32("RarityColor", indexes);
             }
-            packet.ReadInt32("Unused901_2", indexes);
+            packet.ReadInt32("BorderUiTextureAtlasMemberID", indexes);
             packet.ReadInt32("SpellID", indexes);
             packet.ReadInt32("MaxStacks", indexes);
             if (ClientVersion.AddedInVersion(ClientVersionBuild.V9_2_0_42423))