Skip to content

Commit 60ede28

Browse files
committed
Remove duplicate RewardFactionFlags from QuestTemplate
1 parent 47c1b30 commit 60ede28

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

WowPacketParser/Parsing/Parsers/QuestHandler.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,17 @@ public static void HandleQuestQueryResponse(Packet packet)
323323
if (ClientVersion.AddedInVersion(ClientVersionBuild.V3_3_0_10958))
324324
quest.RewardArenaPoints = packet.ReadUInt32("RewardArenaPoints");
325325

326-
// TODO: Find when was this added/removed and what is it
327-
if (ClientVersion.AddedInVersion(ClientVersionBuild.V3_3_0_10958) && (ClientVersion.RemovedInVersion(ClientVersionBuild.V4_0_1_13164)))
328-
packet.ReadInt32("Unknown Int32");
329-
330326
if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_0_1_13164))
331327
{
332328
quest.RewardSkillLineID = packet.ReadUInt32("RewardSkillLineID");
333329
quest.RewardNumSkillUps = packet.ReadUInt32("RewardNumSkillUps");
334-
quest.RewardReputationMask = packet.ReadUInt32("RewardReputationMask");
330+
}
331+
332+
if (ClientVersion.AddedInVersion(ClientVersionBuild.V3_3_0_10958))
333+
quest.RewardFactionFlags = packet.ReadUInt32("RewardFactionFlags");
334+
335+
if (ClientVersion.AddedInVersion(ClientVersionBuild.V4_0_1_13164))
336+
{
335337
quest.QuestGiverPortrait = packet.ReadUInt32("QuestGiverPortrait");
336338
quest.QuestTurnInPortrait = packet.ReadUInt32("QuestTurnInPortrait");
337339
}
@@ -502,7 +504,7 @@ public static void HandleQuestQueryResponse510(Packet packet)
502504
quest.RequiredPlayerKills = packet.ReadUInt32("RequiredPlayerKills");
503505
quest.RewardSkillLineID = packet.ReadUInt32("RewardSkillLineID");
504506
quest.RewardNumSkillUps = packet.ReadUInt32("RewardNumSkillUps");
505-
quest.RewardReputationMask = packet.ReadUInt32("RewRepMask");
507+
quest.RewardFactionFlags = packet.ReadUInt32("RewardFactionFlags");
506508
quest.QuestGiverPortrait = packet.ReadUInt32("QuestGiverPortrait");
507509
quest.QuestTurnInPortrait = packet.ReadUInt32("QuestTurnInPortrait");
508510

WowPacketParser/Store/Objects/QuestTemplate.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,6 @@ public sealed record QuestTemplate : IDataModel
177177
[DBFieldName("RewardNumSkillUps", TargetedDatabaseFlag.SinceWarlordsOfDraenor | TargetedDatabaseFlag.AnyClassic)]
178178
public uint? RewardNumSkillUps;
179179

180-
[DBFieldName("RewardReputationMask", TargetedDatabaseFlag.Cataclysm)]
181-
public uint? RewardReputationMask;
182-
183180
[DBFieldName("QuestGiverPortrait", TargetedDatabaseFlag.Cataclysm)]
184181
[DBFieldName("PortraitGiver", TargetedDatabaseFlag.SinceWarlordsOfDraenor | TargetedDatabaseFlag.AnyClassic)]
185182
public uint? QuestGiverPortrait;
@@ -251,7 +248,8 @@ public sealed record QuestTemplate : IDataModel
251248
[DBFieldName("RewardFactionOverride", 5)]
252249
public int?[] RewardFactionOverride;
253250

254-
[DBFieldName("RewardFactionFlags", TargetedDatabaseFlag.SinceWarlordsOfDraenor | TargetedDatabaseFlag.AnyClassic)]
251+
[DBFieldName("RewardReputationMask", TargetedDatabaseFlag.Cataclysm)]
252+
[DBFieldName("RewardFactionFlags", TargetedDatabaseFlag.TillWrathOfTheLichKing | TargetedDatabaseFlag.SinceWarlordsOfDraenor | TargetedDatabaseFlag.AnyClassic)]
255253
public uint? RewardFactionFlags;
256254

257255
[DBFieldName("AreaGroupID", TargetedDatabaseFlag.SinceWarlordsOfDraenor | TargetedDatabaseFlag.AnyClassic)]
@@ -306,9 +304,6 @@ public sealed record QuestTemplate : IDataModel
306304
[DBFieldName("RequiredItemCount", TargetedDatabaseFlag.TillCataclysm, 6)]
307305
public uint?[] RequiredItemCount;
308306

309-
[DBFieldName("Unknown0", TargetedDatabaseFlag.TillWrathOfTheLichKing)]
310-
public uint? Unk0;
311-
312307
[DBFieldName("RequiredSpell", TargetedDatabaseFlag.Cataclysm)]
313308
public uint? RequiredSpell;
314309

0 commit comments

Comments
 (0)