Synchronize QuestFlagsEx and QuestFlagsEx2 enums with TC (8.1.5 / 31f…

…da79556e55375962a3c9e46f6dbdbf6e90d18) (TrinityCore#459)
Oroxzy · Jul 4, 2019 · ef2fe75 · ef2fe75
1 parent 17d8bff
commit ef2fe75
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 48 deletions.
diff --git a/WowPacketParser/Enums/QuestFlags2.cs b/WowPacketParser/Enums/QuestFlags2.cs
diff --git a/WowPacketParser/Enums/QuestFlagsEx.cs b/WowPacketParser/Enums/QuestFlagsEx.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace WowPacketParser.Enums
+{
+    [Flags]
+    public enum QuestFlagsEx : uint
+    {
+        None                                                    = 0x0000000,
+        KeepAdditionalItems                                     = 0x0000001,
+        SuppressGossipComplete                                  = 0x0000002,
+        SuppressGossipAccept                                    = 0x0000004,
+        DisallowPlayerAsQuestgiver                              = 0x0000008,
+        DisplayClassChoiceRewards                               = 0x0000010,
+        DisplaySpecChoiceRewards                                = 0x0000020,
+        RemoveFromLogOnPeriodicReset                            = 0x0000040,
+        AccountLevelQuest                                       = 0x0000080,
+        LegendaryQuest                                          = 0x0000100,
+        NoGuildXp                                               = 0x0000200,
+        ResetCacheOnAccept                                      = 0x0000400,
+        NoAbandonOnceAnyObjectiveComplete                       = 0x0000800,
+        RecastAcceptSpellOnLogin                                = 0x0001000,
+        UpdateZoneAuras                                         = 0x0002000,
+        NoCreditForProxy                                        = 0x0004000,
+        DisplayAsDailyQuest                                     = 0x0008000,
+        PartOfQuestLine                                         = 0x0010000,
+        QuestForInternalBuildsOnly                              = 0x0020000,
+        SuppressSpellLearnTextLine                              = 0x0040000,
+        DisplayHeaderAsObjectiveForTasks                        = 0x0080000,
+        GarrisonNonOwnersAllowed                                = 0x0100000,
+        RemoveQuestOnWeeklyReset                                = 0x0200000,
+        SuppressFarewellAudioAfterQuestAccept                   = 0x0400000,
+        RewardsBypassWeeklyCapsAndSeasonTotal                   = 0x0800000,
+        ClearProgressOfCriteriaTreeObjectivesOnAccept           = 0x1000000
+    }
+}
diff --git a/WowPacketParser/Enums/QuestFlags3.cs → WowPacketParser/Enums/QuestFlagsEx2.cs b/WowPacketParser/Enums/QuestFlags3.cs → WowPacketParser/Enums/QuestFlagsEx2.cs
@@ -3,10 +3,10 @@
 namespace WowPacketParser.Enums
 {
     [Flags]
-    public enum QuestFlags3 : uint
+    public enum QuestFlagsEx2 : uint
     {
-        None = 0x0,
-        Unknown1 = 0x1,
+        None           = 0x0,
+        Unknown1       = 0x1,
         NoWarModeBonus = 0x2
     }
 }
diff --git a/WowPacketParser/Parsing/Parsers/NpcHandler.cs b/WowPacketParser/Parsing/Parsers/NpcHandler.cs
@@ -414,7 +414,7 @@ public static void HandleNpcGossip(Packet packet)
                 packet.ReadInt32("Level", i);
                 packet.ReadUInt32E<QuestFlags>("Flags", i);
                 if (ClientVersion.AddedInVersion(ClientVersionBuild.V5_1_0_16309))
-                    packet.ReadUInt32E<QuestFlags2>("Flags 2", i);
+                    packet.ReadUInt32E<QuestFlagsEx>("Flags 2", i);
 
                 packet.ReadBool("Change Icon", i);
                 packet.ReadCString("Title", i);

diff --git a/WowPacketParser/Parsing/Parsers/QuestHandler.cs b/WowPacketParser/Parsing/Parsers/QuestHandler.cs
@@ -416,7 +416,7 @@ public static void HandleQuestQueryResponse510(Packet packet)
             quest.RewardKillHonor = packet.ReadSingle("RewardKillHonor");
             quest.StartItem = packet.ReadUInt32<ItemId>("StartItem");
             quest.Flags = packet.ReadUInt32E<QuestFlags>("Flags");
-            quest.FlagsEx = packet.ReadUInt32E<QuestFlags2>("FlagsEx");
+            quest.FlagsEx = packet.ReadUInt32E<QuestFlagsEx>("FlagsEx");
             quest.MinimapTargetMark = packet.ReadUInt32("MinimapTargetMark"); // missing enum. 1- Skull, 16 - Unknown, but exists
             quest.RewardTitle = packet.ReadUInt32("RewardTitle");
             quest.RequiredPlayerKills = packet.ReadUInt32("RequiredPlayerKills");
@@ -719,7 +719,7 @@ public static void HandleQuestUpdateComplete510(Packet packet)
             packet.ReadInt32("QuestTurn Portrait");
             packet.ReadByte("Unk Byte");
             packet.ReadUInt32E<QuestFlags>("Quest Flags");
-            packet.ReadUInt32E<QuestFlags2>("Quest Flags 2");
+            packet.ReadUInt32E<QuestFlagsEx>("Quest Flags 2");
             packet.ReadInt32("Unk Int32");
 
             var emoteCount = packet.ReadUInt32("Quest Emote Count");
@@ -769,7 +769,7 @@ public static void HandleQuestgiverQuestList(Packet packet)
                 packet.ReadInt32("Quest Level", i);
                 packet.ReadUInt32E<QuestFlags>("Quest Flags", i);
                 if (ClientVersion.AddedInVersion(ClientVersionBuild.V5_1_0_16309))
-                    packet.ReadUInt32E<QuestFlags2>("Quest Flags 2", i);
+                    packet.ReadUInt32E<QuestFlagsEx>("Quest Flags 2", i);
 
                 packet.ReadBool("Change icon", i);
                 packet.ReadCString("Title", i);
@@ -886,7 +886,7 @@ public static void HandleQuestgiverDetails510(Packet packet)
             packet.ReadUInt32("QuestTurn Portrait");
             packet.ReadBool("Auto Accept");
             packet.ReadUInt32E<QuestFlags>("Quest Flags");
-            packet.ReadUInt32E<QuestFlags2>("Quest Flags 2");
+            packet.ReadUInt32E<QuestFlagsEx>("Quest Flags 2");
             packet.ReadUInt32("Suggested Players");
             packet.ReadByte("Unknown byte");
             packet.ReadBool("Starts at AreaTrigger");
@@ -1046,7 +1046,7 @@ public static void HandleQuestRequestItems510(Packet packet)
             requestItems.EmoteOnCompleteDelay = packet.ReadUInt32("Delay");
             packet.ReadUInt32("Close Window on Cancel");
             packet.ReadUInt32E<QuestFlags>("Quest Flags");
-            packet.ReadUInt32E<QuestFlags2>("Quest Flags 2");
+            packet.ReadUInt32E<QuestFlagsEx>("Quest Flags 2");
             packet.ReadUInt32("Suggested Players");
             packet.ReadUInt32("Money");
 

diff --git a/WowPacketParser/Store/Objects/QuestTemplate.cs b/WowPacketParser/Store/Objects/QuestTemplate.cs
@@ -147,10 +147,10 @@ public sealed class QuestTemplate : IDataModel
 
         [DBFieldName("SpecialFlags", TargetedDatabase.Cataclysm, TargetedDatabase.WarlordsOfDraenor)]
         [DBFieldName("FlagsEx", TargetedDatabase.WarlordsOfDraenor)]
-        public QuestFlags2? FlagsEx;
+        public QuestFlagsEx? FlagsEx;
 
         [DBFieldName("FlagsEx2", TargetedDatabase.BattleForAzeroth)]
-        public QuestFlags3? FlagsEx2;
+        public QuestFlagsEx2? FlagsEx2;
 
         [DBFieldName("MinimapTargetMark", TargetedDatabase.Cataclysm, TargetedDatabase.WarlordsOfDraenor)]
         public uint? MinimapTargetMark;

diff --git a/WowPacketParser/WowPacketParser.csproj b/WowPacketParser/WowPacketParser.csproj
@@ -233,8 +233,8 @@
     <Compile Include="Enums\ItemFieldFlags.cs" />
     <Compile Include="Enums\ItemModifier.cs" />
     <Compile Include="Enums\LootError.cs" />
-    <Compile Include="Enums\QuestFlags2.cs" />
-    <Compile Include="Enums\QuestFlags3.cs" />
+    <Compile Include="Enums\QuestFlagsEx.cs" />
+    <Compile Include="Enums\QuestFlagsEx2.cs" />
     <Compile Include="Enums\QuestRequirementType.cs" />
     <Compile Include="Enums\CreatureFamily.cs" />
     <Compile Include="Enums\CreatureRank.cs" />

diff --git a/WowPacketParserModule.V5_3_0_16981/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_3_0_16981/Parsers/NpcHandler.cs
@@ -110,7 +110,7 @@ public static void HandleNpcGossip(Packet packet)
                 packet.ReadUInt32E<QuestFlags>("Flags", i);
                 packet.ReadWoWString("Title", titleLen[i], i);
                 packet.ReadUInt32("Icon", i);
-                packet.ReadUInt32E<QuestFlags2>("Flags 2", i);
+                packet.ReadUInt32E<QuestFlagsEx>("Flags 2", i);
                 packet.ReadInt32("Level", i);
                 packet.ReadUInt32<QuestId>("Quest ID", i);
             }

diff --git a/WowPacketParserModule.V5_4_0_17359/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_0_17359/Parsers/NpcHandler.cs
@@ -100,7 +100,7 @@ public static void HandleNpcGossip(Packet packet)
 
             for (int i = 0; i < questgossips; i++)
             {
-                packet.ReadUInt32E<QuestFlags2>("Flags 2", i);
+                packet.ReadUInt32E<QuestFlagsEx>("Flags 2", i);
                 packet.ReadUInt32("Icon", i);
                 packet.ReadWoWString("Title", titleLen[i], i);
                 packet.ReadUInt32E<QuestFlags>("Flags", i);

diff --git a/WowPacketParserModule.V5_4_1_17538/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_1_17538/Parsers/NpcHandler.cs
@@ -48,7 +48,7 @@ public static void HandleNpcGossip(Packet packet)
                 packet.ReadInt32("Level", i);
                 packet.ReadWoWString("Title", titleLen[i], i);
                 packet.ReadUInt32<QuestId>("Quest ID", i);
-                packet.ReadUInt32E<QuestFlags2>("Flags 2", i);
+                packet.ReadUInt32E<QuestFlagsEx>("Flags 2", i);
             }
 
             packet.ReadXORByte(guidBytes, 2);

diff --git a/WowPacketParserModule.V5_4_2_17658/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_2_17658/Parsers/NpcHandler.cs
@@ -91,7 +91,7 @@ public static void HandleNpcGossip(Packet packet)
                 packet.ReadUInt32("Icon", i);
                 packet.ReadWoWString("Title", titleLen[i], i);
                 packet.ReadUInt32<QuestId>("Quest ID", i);
-                packet.ReadUInt32E<QuestFlags2>("Flags 2", i);
+                packet.ReadUInt32E<QuestFlagsEx>("Flags 2", i);
             }
 
             packet.ReadXORByte(guidBytes, 7);

diff --git a/WowPacketParserModule.V5_4_7_17898/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_7_17898/Parsers/NpcHandler.cs
@@ -95,7 +95,7 @@ public static void HandleNpcGossip(Packet packet)
 
             for (var i = 0; i < questgossips; ++i)
             {
-                packet.ReadUInt32E<QuestFlags2>("Flags 2", i);
+                packet.ReadUInt32E<QuestFlagsEx>("Flags 2", i);
                 packet.ReadUInt32<QuestId>("Quest ID", i);
                 packet.ReadInt32("Level", i);
                 packet.ReadUInt32("Icon", i);

diff --git a/WowPacketParserModule.V5_4_7_17898/Parsers/QuestHandler.cs b/WowPacketParserModule.V5_4_7_17898/Parsers/QuestHandler.cs
@@ -316,7 +316,7 @@ public static void HandleQuestgiverDetails(Packet packet)
             packet.ReadInt32("unk8");
             packet.ReadInt32("unk9");
             packet.ReadInt32("unk10");
-            packet.ReadUInt32E<QuestFlags2>("Quest Flags 2");
+            packet.ReadUInt32E<QuestFlagsEx>("Quest Flags 2");
             packet.ReadUInt32E<QuestFlags>("Quest Flags");
             packet.ReadInt32("unk13");
             packet.ReadInt32("unk14");

diff --git a/WowPacketParserModule.V5_4_8_18291/Parsers/NpcHandler.cs b/WowPacketParserModule.V5_4_8_18291/Parsers/NpcHandler.cs
@@ -97,7 +97,7 @@ public static void HandleNpcGossip(Packet packet)
                 packet.ReadInt32("Level", i);//8
                 packet.ReadUInt32("Icon", i);//4
                 packet.ReadUInt32<QuestId>("Quest ID", i); //528
-                packet.ReadUInt32E<QuestFlags2>("Flags 2", i);//532
+                packet.ReadUInt32E<QuestFlagsEx>("Flags 2", i);//532
             }
 
             packet.ReadXORByte(guidBytes, 1);

diff --git a/WowPacketParserModule.V5_4_8_18291/Parsers/QuestHandler.cs b/WowPacketParserModule.V5_4_8_18291/Parsers/QuestHandler.cs
@@ -474,7 +474,7 @@ public static void HandleQuestOfferReward(Packet packet)
             }
 
             packet.ReadUInt32E<QuestFlags>("Quest Flags");
-            packet.ReadUInt32E<QuestFlags2>("Quest Flags2");
+            packet.ReadUInt32E<QuestFlagsEx>("Quest Flags2");
             packet.ReadUInt32("XPValue");
             packet.ReadUInt32("CharTitleId");
             packet.ReadUInt32("RewardChoiceItemId[2]");

diff --git a/WowPacketParserModule.V6_0_2_19033/Parsers/QuestHandler.cs b/WowPacketParserModule.V6_0_2_19033/Parsers/QuestHandler.cs
@@ -232,7 +232,7 @@ public static void HandleQuestQueryResponse(Packet packet)
 
             quest.StartItem = packet.ReadUInt32("StartItem");
             quest.Flags = packet.ReadUInt32E<QuestFlags>("Flags");
-            quest.FlagsEx = packet.ReadUInt32E<QuestFlags2>("FlagsEx");
+            quest.FlagsEx = packet.ReadUInt32E<QuestFlagsEx>("FlagsEx");
 
             quest.RewardItem = new uint?[4];
             quest.RewardAmount = new uint?[4];

diff --git a/WowPacketParserModule.V7_0_3_22248/Parsers/QuestHandler.cs b/WowPacketParserModule.V7_0_3_22248/Parsers/QuestHandler.cs
@@ -142,7 +142,7 @@ public static void HandleQuestQueryResponse(Packet packet)
 
             quest.StartItem = packet.ReadUInt32("StartItem");
             quest.Flags = packet.ReadUInt32E<QuestFlags>("Flags");
-            quest.FlagsEx = packet.ReadUInt32E<QuestFlags2>("FlagsEx");
+            quest.FlagsEx = packet.ReadUInt32E<QuestFlagsEx>("FlagsEx");
 
             quest.RewardItem = new uint?[4];
             quest.RewardAmount = new uint?[4];

diff --git a/WowPacketParserModule.V8_0_1_27101/Parsers/QuestHandler.cs b/WowPacketParserModule.V8_0_1_27101/Parsers/QuestHandler.cs
@@ -208,8 +208,8 @@ public static void HandleQuestQueryResponse(Packet packet)
 
             quest.StartItem = (uint)packet.ReadInt32("StartItem");
             quest.Flags = packet.ReadInt32E<QuestFlags>("Flags");
-            quest.FlagsEx = packet.ReadInt32E<QuestFlags2>("FlagsEx");
-            quest.FlagsEx2 = packet.ReadInt32E<QuestFlags3>("FlagsEx2");
+            quest.FlagsEx = packet.ReadInt32E<QuestFlagsEx>("FlagsEx");
+            quest.FlagsEx2 = packet.ReadInt32E<QuestFlagsEx2>("FlagsEx2");
 
             quest.RewardItem = new uint?[4];
             quest.RewardAmount = new uint?[4];