Skip to content

Commit 1ab410f

Browse files
funjokerfunjoker
committed
Update TargetedDatabase and TargetedDatabase Flag
1 parent 4ad8d54 commit 1ab410f

3 files changed

Lines changed: 29 additions & 24 deletions

File tree

‎WowPacketParser/App.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
20: Classic
9595
21: WotlkClassic
9696
22: CataClassic
97+
23: MoPClassic
9798
-->
9899
<add key="TargetedDatabase" value="2"/>
99100

‎WowPacketParser/Enums/TargetedDatabase.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public enum TargetedDatabase : int
1818
// chose higher value to have some room for future
1919
Classic = 20,
2020
WotlkClassic = 21,
21-
CataClassic = 22
21+
CataClassic = 22,
22+
MoPClassic = 23
2223
}
2324

2425
[Flags]
@@ -41,7 +42,8 @@ public enum TargetedDatabaseFlag : uint
4142
Classic = 1 << TargetedDatabase.Classic,
4243
WotlkClassic = 1 << TargetedDatabase.WotlkClassic,
4344
CataClassic = 1 << TargetedDatabase.CataClassic,
44-
AnyClassic = Classic | WotlkClassic | CataClassic,
45+
MoPClassic = 1 << TargetedDatabase.MoPClassic,
46+
AnyClassic = Classic | WotlkClassic | CataClassic | MoPClassic,
4547

4648
Any = AnyRetail | AnyClassic,
4749

@@ -67,6 +69,8 @@ public enum TargetedDatabaseFlag : uint
6769
SinceCataclysm = Cataclysm | SinceWarlordsOfDraenor,
6870

6971
SinceWarlordsOfDraenorTillShadowLands = WarlordsOfDraenor | Legion | BattleForAzeroth | Shadowlands,
70-
SinceBattleForAzerothTillDragonflight = BattleForAzeroth | Shadowlands | Dragonflight
72+
SinceBattleForAzerothTillDragonflight = BattleForAzeroth | Shadowlands | Dragonflight,
73+
74+
SinceCataClassic = CataClassic | MoPClassic
7175
}
7276
}

‎WowPacketParser/Store/Objects/PlayerChoice.cs‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,37 @@ public sealed record PlayerChoiceTemplate : IDataModel
1010
[DBFieldName("ChoiceId", true)]
1111
public int? ChoiceId;
1212

13-
[DBFieldName("UiTextureKitId", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.CataClassic)]
13+
[DBFieldName("UiTextureKitId", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.SinceCataClassic)]
1414
public int? UiTextureKitId;
1515

16-
[DBFieldName("SoundKitId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
16+
[DBFieldName("SoundKitId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
1717
public uint? SoundKitId;
1818

19-
[DBFieldName("CloseSoundKitId", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic)]
19+
[DBFieldName("CloseSoundKitId", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.SinceCataClassic)]
2020
public uint? CloseSoundKitId;
2121

22-
[DBFieldName("Duration", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic, nullable: true)]
22+
[DBFieldName("Duration", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.SinceCataClassic, nullable: true)]
2323
public long? Duration;
2424

2525
[DBFieldName("Question", LocaleConstant.enUS)]
2626
public string Question;
2727

28-
[DBFieldName("PendingChoiceText", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic, LocaleConstant.enUS)]
28+
[DBFieldName("PendingChoiceText", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.SinceCataClassic, LocaleConstant.enUS)]
2929
public string PendingChoiceText;
3030

3131
[DBFieldName("InfiniteRange", TargetedDatabaseFlag.SinceTheWarWithin)]
3232
public int InfiniteRange;
3333

34-
[DBFieldName("HideWarboardHeader", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.CataClassic)]
34+
[DBFieldName("HideWarboardHeader", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.SinceCataClassic)]
3535
public int HideWarboardHeader;
3636

37-
[DBFieldName("KeepOpenAfterChoice", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
37+
[DBFieldName("KeepOpenAfterChoice", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
3838
public int KeepOpenAfterChoice;
3939

40-
[DBFieldName("ShowChoicesAsList", TargetedDatabaseFlag.SinceTheWarWithin)]
40+
[DBFieldName("ShowChoicesAsList", TargetedDatabaseFlag.SinceTheWarWithin | TargetedDatabaseFlag.MoPClassic)]
4141
public int ShowChoicesAsList;
4242

43-
[DBFieldName("ForceDontShowChoicesAsList", TargetedDatabaseFlag.SinceTheWarWithin)]
43+
[DBFieldName("ForceDontShowChoicesAsList", TargetedDatabaseFlag.SinceTheWarWithin | TargetedDatabaseFlag.MoPClassic)]
4444
public int ForceDontShowChoicesAsList;
4545

4646
[DBFieldName("VerifiedBuild")]
@@ -56,7 +56,7 @@ public sealed record PlayerChoiceResponseTemplate : IDataModel
5656
[DBFieldName("ResponseId", true)]
5757
public int? ResponseId;
5858

59-
[DBFieldName("ResponseIdentifier", TargetedDatabaseFlag.Shadowlands | TargetedDatabaseFlag.Dragonflight | TargetedDatabaseFlag.CataClassic)]
59+
[DBFieldName("ResponseIdentifier", TargetedDatabaseFlag.Shadowlands | TargetedDatabaseFlag.Dragonflight | TargetedDatabaseFlag.SinceCataClassic)]
6060
public short? ResponseIdentifier;
6161

6262
[DBFieldName("Index")]
@@ -65,28 +65,28 @@ public sealed record PlayerChoiceResponseTemplate : IDataModel
6565
[DBFieldName("ChoiceArtFileId")]
6666
public int? ChoiceArtFileId;
6767

68-
[DBFieldName("Flags", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
68+
[DBFieldName("Flags", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
6969
public int? Flags;
7070

71-
[DBFieldName("WidgetSetId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
71+
[DBFieldName("WidgetSetId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
7272
public uint? WidgetSetId;
7373

74-
[DBFieldName("UiTextureAtlasElementID", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
74+
[DBFieldName("UiTextureAtlasElementID", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
7575
public uint? UiTextureAtlasElementID;
7676

77-
[DBFieldName("SoundKitId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
77+
[DBFieldName("SoundKitId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
7878
public uint? SoundKitId;
7979

80-
[DBFieldName("GroupId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
80+
[DBFieldName("GroupId", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
8181
public int? GroupId;
8282

83-
[DBFieldName("Header", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.CataClassic, LocaleConstant.enUS)]
83+
[DBFieldName("Header", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.SinceCataClassic, LocaleConstant.enUS)]
8484
public string Header;
8585

86-
[DBFieldName("Subheader", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
86+
[DBFieldName("Subheader", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
8787
public string Subheader;
8888

89-
[DBFieldName("ButtonTooltip", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic, LocaleConstant.enUS)]
89+
[DBFieldName("ButtonTooltip", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic, LocaleConstant.enUS)]
9090
public string ButtonTooltip;
9191

9292
[DBFieldName("Answer", LocaleConstant.enUS)]
@@ -95,13 +95,13 @@ public sealed record PlayerChoiceResponseTemplate : IDataModel
9595
[DBFieldName("Description", LocaleConstant.enUS)]
9696
public string Description;
9797

98-
[DBFieldName("Confirmation", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.CataClassic, LocaleConstant.enUS)]
98+
[DBFieldName("Confirmation", TargetedDatabaseFlag.SinceLegion | TargetedDatabaseFlag.SinceCataClassic, LocaleConstant.enUS)]
9999
public string Confirmation;
100100

101-
[DBFieldName("RewardQuestID", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.CataClassic)]
101+
[DBFieldName("RewardQuestID", TargetedDatabaseFlag.SinceBattleForAzeroth | TargetedDatabaseFlag.SinceCataClassic)]
102102
public uint? RewardQuestID;
103103

104-
[DBFieldName("UiTextureKitID", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.CataClassic)]
104+
[DBFieldName("UiTextureKitID", TargetedDatabaseFlag.SinceShadowlands | TargetedDatabaseFlag.SinceCataClassic)]
105105
public uint? UiTextureKitID;
106106

107107
[DBFieldName("VerifiedBuild")]

0 commit comments

Comments
 (0)