Updated some packets to 11.0.0

meji46 · Aug 4, 2024 · 071971a · 071971a
1 parent e9e8ac0
commit 071971a
Show file tree

Hide file tree

Showing 17 changed files with 412 additions and 19 deletions.
diff --git a/WowPacketParser/Enums/PlayerInteractionType.cs b/WowPacketParser/Enums/PlayerInteractionType.cs
@@ -0,0 +1,76 @@
+
+namespace WowPacketParser.Enums
+{
+    public enum PlayerInteractionType : uint
+    {
+        None                        = 0,
+        TradePartner                = 1,
+        Item                        = 2,
+        Gossip                      = 3,
+        QuestGiver                  = 4,
+        Merchant                    = 5,
+        TaxiNode                    = 6,
+        Trainer                     = 7,
+        Banker                      = 8,
+        AlliedRaceDetailsGiver      = 9,
+        GuildBanker                 = 10,
+        Registrar                   = 11,
+        Vendor                      = 12,
+        PetitionVendor              = 13,
+        GuildTabardVendor                = 14,
+        TalentMaster                = 15,
+        SpecializationMaster        = 16,
+        MailInfo                    = 17,
+        SpiritHealer                = 18,
+        AreaSpiritHealer            = 19,
+        Binder                      = 20,
+        Auctioneer                  = 21,
+        StableMaster                = 22,
+        BattleMaster                = 23,
+        Transmogrifier              = 24,
+        LFGDungeon                  = 25,
+        VoidStorageBanker           = 26,
+        BlackMarketAuctioneer       = 27,
+        AdventureMap                = 28,
+        WorldMap                    = 29,
+        GarrArchitect               = 30,
+        GarrTradeskill              = 31,
+        GarrMission                 = 32,
+        ShipmentCrafter             = 33,
+        GarrRecruitment             = 34,
+        GarrTalent                  = 35,
+        Trophy                      = 36,
+        PlayerChoice                = 37,
+        ArtifactForge               = 38,
+        ObliterumForge              = 39,
+        ScrappingMachine            = 40,
+        ContributionCollector       = 41,
+        AzeriteRespec               = 42,
+        IslandQueue                 = 43,
+        ItemInteraction             = 44,
+        ChromieTime                 = 45,
+        CovenantPreview             = 46,
+        AnimaDiversion              = 47,
+        LegendaryCrafting           = 48,
+        WeeklyRewards               = 49,
+        Soulbind                    = 50,
+        CovenantSanctum             = 51,
+        NewPlayerGuide              = 52,
+        ItemUpgrade                 = 53,
+        AdventureJournal            = 54,
+        Renown                      = 55,
+        AzeriteForge                = 56,
+        PerksProgramVendor          = 57,
+        ProfessionsCraftingOrder    = 58,
+        Professions                 = 59,
+        ProfessionsCustomerOrder    = 60,
+        TraitSystem                 = 61,
+        BarbersChoice               = 62,
+        JailersTowerBuffs           = 63,
+        MajorFactionRenown          = 64,
+        PersonalTabardVendor        = 65,
+        ForgeMaster                 = 66,
+        CharacterBanker             = 67,
+        AccountBanker               = 68
+    }
+}
diff --git a/WowPacketParser/Enums/TargetedDatabase.cs b/WowPacketParser/Enums/TargetedDatabase.cs
@@ -66,6 +66,7 @@ public enum TargetedDatabaseFlag : uint
         SinceWarlordsOfDraenor            = WarlordsOfDraenor | SinceLegion,
         SinceCataclysm                    = Cataclysm | SinceWarlordsOfDraenor,
 
-        SinceWarlordsOfDraenorTillShadowLands = WarlordsOfDraenor | Legion | BattleForAzeroth | Shadowlands
+        SinceWarlordsOfDraenorTillShadowLands = WarlordsOfDraenor | Legion | BattleForAzeroth | Shadowlands,
+        SinceBattleForAzerothTillDragonflight = BattleForAzeroth | Shadowlands | Dragonflight
     }
 }
diff --git a/WowPacketParser/SQL/Builders/WDBTemplates.cs b/WowPacketParser/SQL/Builders/WDBTemplates.cs
@@ -77,6 +77,23 @@ public static string QuestRewardDisplaySpell()
             return SQLUtil.Compare(Storage.QuestRewardDisplaySpells, templatesDb, StoreNameType.None);
         }
 
+        [BuilderMethod(true)]
+        public static string QuestTreasurePickers()
+        {
+            if (!Settings.SQLOutputFlag.HasAnyFlagBit(SQLOutput.quest_template))
+                return string.Empty;
+
+            if (Settings.TargetedDatabase < TargetedDatabase.TheWarWithin)
+                return string.Empty;
+
+            if (Storage.QuestTreasurePickersStorage.IsEmpty())
+                return string.Empty;
+
+            var templateDb = SQLDatabase.Get(Storage.QuestTreasurePickersStorage);
+
+            return SQLUtil.Compare(Storage.QuestTreasurePickersStorage, templateDb, StoreNameType.Quest);
+        }
+
         [BuilderMethod(true, Units = true)]
         public static string CreatureTemplate(Dictionary<WowGuid, Unit> units)
         {

diff --git a/WowPacketParser/Store/Objects/QuestTemplate.cs b/WowPacketParser/Store/Objects/QuestTemplate.cs
@@ -261,7 +261,7 @@ public sealed record QuestTemplate : IDataModel
         public ulong? AllowableRacesWod;
 
         [DBFieldName("QuestRewardID", TargetedDatabaseFlag.Legion)]
-        [DBFieldName("TreasurePickerID", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.AnyClassic)]
+        [DBFieldName("TreasurePickerID", TargetedDatabaseFlag.SinceBattleForAzerothTillDragonflight | TargetedDatabaseFlag.AnyClassic)]
         public int? QuestRewardID;
 
         [DBFieldName("Expansion", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.AnyClassic)]

diff --git a/WowPacketParser/Store/Objects/QuestTreasurePickers.cs b/WowPacketParser/Store/Objects/QuestTreasurePickers.cs
@@ -0,0 +1,19 @@
+using WowPacketParser.Enums;
+using WowPacketParser.Misc;
+using WowPacketParser.SQL;
+
+namespace WowPacketParser.Store.Objects
+{
+    [DBTableName("quest_treasure_pickers")]
+    public sealed record QuestTreasurePickers : IDataModel
+    {
+        [DBFieldName("QuestID", true)]
+        public uint? QuestID;
+
+        [DBFieldName("TreasurePickerID", true)]
+        public int? TreasurePickerID;
+
+        [DBFieldName("OrderIndex", true)]
+        public int? OrderIndex;
+    }
+}
diff --git a/WowPacketParser/Store/Storage.cs b/WowPacketParser/Store/Storage.cs
@@ -37,6 +37,7 @@ public static class Storage
         public static readonly DataBag<QuestObjective> QuestObjectives = new DataBag<QuestObjective>(new List<SQLOutput> { SQLOutput.quest_template });
         public static readonly DataBag<QuestVisualEffect> QuestVisualEffects = new DataBag<QuestVisualEffect>(new List<SQLOutput> { SQLOutput.quest_template });
         public static readonly DataBag<QuestRewardDisplaySpell> QuestRewardDisplaySpells = new DataBag<QuestRewardDisplaySpell>(new List<SQLOutput> { SQLOutput.quest_template });
+        public static readonly DataBag<QuestTreasurePickers> QuestTreasurePickersStorage = new DataBag<QuestTreasurePickers>(new List<SQLOutput> { SQLOutput.quest_template });
         public static readonly StoreDictionary<uint, CreatureTemplate> CreatureTemplates = new StoreDictionary<uint, CreatureTemplate>(new List<SQLOutput> { SQLOutput.creature_template });
         public static readonly DataBag<CreatureTemplateClassic> CreatureTemplatesClassic = new DataBag<CreatureTemplateClassic>(new List<SQLOutput> { SQLOutput.creature_template });
         public static readonly DataBag<CreatureTemplateNonWDB> CreatureTemplatesNonWDB = new DataBag<CreatureTemplateNonWDB>(new List<SQLOutput> { SQLOutput.creature_template });
@@ -1599,6 +1600,7 @@ public static void ClearContainers()
             QuestObjectives.Clear();
             QuestVisualEffects.Clear();
             QuestRewardDisplaySpells.Clear();
+            QuestTreasurePickersStorage.Clear();
             CreatureTemplates.Clear();
             CreatureTemplatesClassic.Clear();
             CreatureTemplatesNonWDB.Clear();

diff --git a/WowPacketParserModule.V10_0_0_46181/Parsers/QueryHandler.cs b/WowPacketParserModule.V10_0_0_46181/Parsers/QueryHandler.cs
@@ -148,7 +148,12 @@ public static void HandleQuestQueryResponse(Packet packet)
 
             var objectiveCount = packet.ReadUInt32("ObjectiveCount");
             quest.AllowableRacesWod = packet.ReadUInt64("AllowableRaces");
-            quest.QuestRewardID = packet.ReadInt32("TreasurePickerID");
+            var treasurePickerCount = 0u;
+            if (ClientVersion.RemovedInVersion(ClientType.TheWarWithin))
+                quest.QuestRewardID = packet.ReadInt32("TreasurePickerID");
+            else
+                treasurePickerCount = packet.ReadUInt32();
+
             quest.Expansion = packet.ReadInt32("Expansion");
             quest.ManagedWorldStateID = packet.ReadInt32("ManagedWorldStateID");
             quest.QuestSessionBonus = packet.ReadInt32("QuestSessionBonus");
@@ -160,6 +165,17 @@ public static void HandleQuestQueryResponse(Packet packet)
             for (uint i = 0; i < rewardDisplaySpellCount; ++i)
                 ReadQuestCompleteDisplaySpell(packet, (uint)id.Key, i, i, "RewardDisplaySpell");
 
+            for (uint i = 0; i < treasurePickerCount; ++i)
+            {
+                var treasurePickerID = packet.ReadInt32("TreasurePickerID");
+                QuestTreasurePickers pickers = new()
+                {
+                    QuestID = quest.ID,
+                    TreasurePickerID = treasurePickerID,
+                    OrderIndex = (int)i
+                };
+                Storage.QuestTreasurePickersStorage.Add(pickers);
+            }
             packet.ResetBitReader();
 
             uint logTitleLen = packet.ReadBits("logTitleLen", 9);
@@ -172,6 +188,8 @@ public static void HandleQuestQueryResponse(Packet packet)
             uint questTurnTargetNameLen = packet.ReadBits("questTurnTargetNameLen", 8);
             uint questCompletionLogLen = packet.ReadBits("questCompletionLogLen", 11);
             packet.ReadBit("ReadyForTranslation");
+            if (ClientVersion.AddedInVersion(ClientVersionBuild.V11_0_0_55666))
+                packet.ReadBit("ResetByScheduler");
 
             for (uint i = 0; i < objectiveCount; ++i)
             {
@@ -182,7 +200,12 @@ public static void HandleQuestQueryResponse(Packet packet)
                     ID = (uint)objectiveId.Key,
                     QuestID = (uint)id.Key
                 };
-                questInfoObjective.Type = packet.ReadByteE<QuestRequirementType>("Quest Requirement Type", i);
+
+                if (ClientVersion.AddedInVersion(ClientVersionBuild.V11_0_0_55666))
+                    questInfoObjective.Type = packet.ReadUInt32E<QuestRequirementType>("QuestRequirementType", i);
+                else
+                    questInfoObjective.Type = packet.ReadByteE<QuestRequirementType>("QuestRequirementType", i);
+
                 questInfoObjective.StorageIndex = packet.ReadSByte("StorageIndex", i);
                 questInfoObjective.Order = i;
                 questInfoObjective.ObjectID = packet.ReadInt32("ObjectID", i);
@@ -270,5 +293,37 @@ public static void HandleQuestQueryResponse(Packet packet)
 
             Storage.QuestTemplates.Add(quest, packet.TimeSpan);
         }
+
+         [Parser(Opcode.CMSG_SPAWN_TRACKING_UPDATE)]
+         public static void HandleSpawnTrackingVignette(Packet packet)
+         {
+             var count = packet.ReadUInt32("SpawnTrackingCount");
+
+             for (var i = 0; i < count; i++)
+             {
+                 packet.ReadUInt32("SpawnTrackingID", i);
+                 packet.ReadInt32("ObjectID", i);
+                 packet.ReadInt32("ObjectTypeMask", i);
+             }
+         }
+
+         [Parser(Opcode.SMSG_QUEST_POI_UPDATE_RESPONSE)]
+         public static void HandleQuestPOIUpdateResponse(Packet packet)
+         {
+             var count = packet.ReadUInt32("SpawnTrackingCount");
+
+             for (var i = 0; i < count; i++)
+             {
+                 var spawnTrackingId = packet.ReadUInt32("SpawnTrackingID", i);
+                 packet.ReadInt32("ObjectID", i);
+                 var phaseId = packet.ReadInt32("PhaseID", i);
+                 var phaseGroup = packet.ReadInt32("PhaseGroupID", i);
+                 var phaseUseFlags = packet.ReadInt32("PhaseUseFlags", i);
+
+                 packet.ResetBitReader();
+
+                 packet.ReadBit("Visible", i);
+             }
+         }
     }
 }
diff --git a/WowPacketParserModule.V11_0_0_55666/Parsers/BankHandler.cs b/WowPacketParserModule.V11_0_0_55666/Parsers/BankHandler.cs
@@ -0,0 +1,17 @@
+using System.Text;
+using WowPacketParser.Enums;
+using WowPacketParser.Misc;
+using WowPacketParser.Parsing;
+
+namespace WowPacketParserModule.V11_0_0_55666.Parsers
+{
+    public static class BankHandler
+    {
+        [Parser(Opcode.CMSG_BANKER_ACTIVATE)]
+        public static void HandleBankerActivate(Packet packet)
+        {
+            packet.ReadPackedGuid128("Banker");
+            packet.ReadInt32E<PlayerInteractionType>("InteractionType");
+        }
+    }
+}
diff --git a/WowPacketParserModule.V6_0_2_19033/Parsers/CharacterHandler.cs b/WowPacketParserModule.V6_0_2_19033/Parsers/CharacterHandler.cs
@@ -154,8 +154,13 @@ public static void HandlePowerUpdate(Packet packet)
             var int32 = packet.ReadInt32("Count");
             for (var i = 0; i < int32; i++)
             {
-                packet.ReadInt32("Power", i);
+                if (ClientVersion.RemovedInVersion(ClientType.TheWarWithin))
+                    packet.ReadInt32("Power", i);
+
                 packet.ReadByteE<PowerType>("PowerType", i);
+
+                if (ClientVersion.AddedInVersion(ClientType.TheWarWithin))
+                    packet.ReadInt32("Power", i);
             }
         }
 

diff --git a/WowPacketParserModule.V6_0_2_19033/Parsers/CombatLogHandler.cs b/WowPacketParserModule.V6_0_2_19033/Parsers/CombatLogHandler.cs
@@ -164,7 +164,10 @@ public static void HandleSpellLogExecute(Packet packet)
                 {
                     packet.ReadPackedGuid128("Victim");
                     packet.ReadInt32("Points");
-                    packet.ReadInt32("PowerType");
+                    if (ClientVersion.RemovedInVersion(ClientType.TheWarWithin))
+                        packet.ReadUInt32E<Powers>("PowerType");
+                    else
+                        packet.ReadByteE<Powers>("PowerType");
                     packet.ReadSingle("Amplitude");
                 }
 

diff --git a/WowPacketParserModule.V6_0_2_19033/Parsers/SessionHandler.cs b/WowPacketParserModule.V6_0_2_19033/Parsers/SessionHandler.cs
@@ -325,8 +325,13 @@ public static void HandleTimeQueryResponse(Packet packet)
         [Parser(Opcode.CMSG_CONNECT_TO_FAILED)]
         public static void HandleRedirectFailed(Packet packet)
         {
-            packet.ReadUInt32("Serial");
+            if (ClientVersion.RemovedInVersion(ClientType.TheWarWithin))
+                packet.ReadUInt32("Serial");
+
             packet.ReadSByte("Con");
+
+            if (ClientVersion.AddedInVersion(ClientType.TheWarWithin))
+                packet.ReadUInt32("Serial");
         }
 
         [Parser(Opcode.CMSG_SUSPEND_TOKEN_RESPONSE)]