Core/DataStores: updated DB2 structures to 4.4.2

5 files changed, 512 insertions, 380 deletions

diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
index 3a0e57b2b03..2f6a0460256 100644
--- a/src/server/database/Database/Implementation/HotfixDatabase.cpp
+++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -198,9 +198,10 @@ void HotfixDatabaseConnection::DoPrepareStatements()
 
     // ChrClasses.db2
     PrepareStatement(HOTFIX_SEL_CHR_CLASSES, "SELECT Name, Filename, NameMale, NameFemale, PetNameToken, ID, CreateScreenFileDataID, "
-        "SelectScreenFileDataID, IconFileDataID, LowResScreenFileDataID, Flags, StartingLevel, ArmorTypeMask, CinematicSequenceID, DefaultSpec, "
-        "HasStrengthAttackBonus, PrimaryStatPriority, DisplayPower, RangedAttackPowerPerAgility, AttackPowerPerAgility, AttackPowerPerStrength, "
-        "SpellClassSet, RolesMask, DamageBonusStat, HasRelicSlot FROM chr_classes WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+        "SelectScreenFileDataID, IconFileDataID, LowResScreenFileDataID, Flags, StartingLevel, SpellTextureBlobFileDataID, ArmorTypeMask, "
+        "CinematicSequenceID, DefaultSpec, HasStrengthAttackBonus, PrimaryStatPriority, DisplayPower, RangedAttackPowerPerAgility, "
+        "AttackPowerPerAgility, AttackPowerPerStrength, SpellClassSet, RolesMask, DamageBonusStat, HasRelicSlot FROM chr_classes"
+        " WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_CHR_CLASSES, "SELECT MAX(ID) + 1 FROM chr_classes", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_CHR_CLASSES, "SELECT ID, Name_lang, NameMale_lang, NameFemale_lang FROM chr_classes_locale"
         " WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
@@ -232,9 +233,9 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_CHR_CUSTOMIZATION_ELEMENT, "SELECT MAX(ID) + 1 FROM chr_customization_element", CONNECTION_SYNCH);
 
     // ChrCustomizationOption.db2
-    PrepareStatement(HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION, "SELECT Name, ID, SecondaryID, Flags, ChrRacesID, Sex, ChrModelID, OrderIndex, "
-        "ChrCustomizationCategoryID, OptionType, BarberShopCostModifier, ChrCustomizationID, ChrCustomizationReqID, SecondaryOrderIndex"
-        " FROM chr_customization_option WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+    PrepareStatement(HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION, "SELECT Name, ID, SecondaryID, Flags, ChrModelID, OrderIndex, ChrCustomizationCategoryID, "
+        "OptionType, BarberShopCostModifier, ChrCustomizationID, ChrCustomizationReqID, SecondaryOrderIndex FROM chr_customization_option"
+        " WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION, "SELECT MAX(ID) + 1 FROM chr_customization_option", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION, "SELECT ID, Name_lang FROM chr_customization_option_locale"
         " WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
@@ -827,8 +828,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PrepareStatement(HOTFIX_SEL_LFG_DUNGEONS, "SELECT ID, Name, Description, MinLevel, MaxLevel, TypeID, Subtype, Faction, IconTextureFileID, "
         "RewardsBgTextureFileID, PopupBgTextureFileID, ExpansionLevel, MapID, DifficultyID, MinGear, GroupID, OrderIndex, RequiredPlayerConditionID, "
         "TargetLevel, TargetLevelMin, TargetLevelMax, RandomID, ScenarioID, FinalEncounterID, CountTank, CountHealer, CountDamage, MinCountTank, "
-        "MinCountHealer, MinCountDamage, BonusReputationAmount, MentorItemLevel, MentorCharLevel, Flags1, Flags2 FROM lfg_dungeons"
-        " WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+        "MinCountHealer, MinCountDamage, MaxPremadeCountTank, MaxPremadeCountHealer, MaxPremadeCountDamage, BonusReputationAmount, MentorItemLevel, "
+        "MentorCharLevel, Flags1, Flags2 FROM lfg_dungeons WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_LFG_DUNGEONS, "SELECT MAX(ID) + 1 FROM lfg_dungeons", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_LFG_DUNGEONS, "SELECT ID, Name_lang, Description_lang FROM lfg_dungeons_locale WHERE (`VerifiedBuild` > 0) = ?"
         " AND locale = ?", CONNECTION_SYNCH);
@@ -880,8 +881,8 @@ void HotfixDatabaseConnection::DoPrepareStatements()
         " AND locale = ?", CONNECTION_SYNCH);
 
     // MapDifficulty.db2
-    PrepareStatement(HOTFIX_SEL_MAP_DIFFICULTY, "SELECT ID, Message, ItemContextPickerID, ContentTuningID, ItemContext, DifficultyID, LockID, "
-        "ResetInterval, MaxPlayers, Flags, MapID FROM map_difficulty WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+    PrepareStatement(HOTFIX_SEL_MAP_DIFFICULTY, "SELECT Message, ID, DifficultyID, LockID, ResetInterval, MaxPlayers, ItemContext, "
+        "ItemContextPickerID, Flags, ContentTuningID, WorldStateExpressionID, MapID FROM map_difficulty WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_MAP_DIFFICULTY, "SELECT MAX(ID) + 1 FROM map_difficulty", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_MAP_DIFFICULTY, "SELECT ID, Message_lang FROM map_difficulty_locale WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
 
@@ -980,23 +981,25 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_PHASE_X_PHASE_GROUP, "SELECT MAX(ID) + 1 FROM phase_x_phase_group", CONNECTION_SYNCH);
 
     // PlayerCondition.db2
-    PrepareStatement(HOTFIX_SEL_PLAYER_CONDITION, "SELECT RaceMask, FailureDescription, ID, MinLevel, MaxLevel, ClassMask, SkillLogic, LanguageID, "
+    PrepareStatement(HOTFIX_SEL_PLAYER_CONDITION, "SELECT ID, RaceMask, FailureDescription, MinLevel, MaxLevel, ClassMask, SkillLogic, LanguageID, "
         "MinLanguage, MaxLanguage, MaxFactionID, MaxReputation, ReputationLogic, CurrentPvpFaction, PvpMedal, PrevQuestLogic, CurrQuestLogic, "
         "CurrentCompletedQuestLogic, SpellLogic, ItemLogic, ItemFlags, AuraSpellLogic, WorldStateExpressionID, WeatherID, PartyStatus, "
         "LifetimeMaxPVPRank, AchievementLogic, Gender, NativeGender, AreaLogic, LfgLogic, CurrencyLogic, QuestKillID, QuestKillLogic, "
         "MinExpansionLevel, MaxExpansionLevel, MinAvgItemLevel, MaxAvgItemLevel, MinAvgEquippedItemLevel, MaxAvgEquippedItemLevel, PhaseUseFlags, "
         "PhaseID, PhaseGroupID, Flags, ChrSpecializationIndex, ChrSpecializationRole, ModifierTreeID, PowerType, PowerTypeComp, PowerTypeValue, "
-        "WeaponSubclassMask, MaxGuildLevel, MinGuildLevel, MaxExpansionTier, MinExpansionTier, MinPVPRank, MaxPVPRank, SkillID1, SkillID2, SkillID3, "
-        "SkillID4, MinSkill1, MinSkill2, MinSkill3, MinSkill4, MaxSkill1, MaxSkill2, MaxSkill3, MaxSkill4, MinFactionID1, MinFactionID2, "
-        "MinFactionID3, MinReputation1, MinReputation2, MinReputation3, PrevQuestID1, PrevQuestID2, PrevQuestID3, PrevQuestID4, CurrQuestID1, "
-        "CurrQuestID2, CurrQuestID3, CurrQuestID4, CurrentCompletedQuestID1, CurrentCompletedQuestID2, CurrentCompletedQuestID3, "
-        "CurrentCompletedQuestID4, SpellID1, SpellID2, SpellID3, SpellID4, ItemID1, ItemID2, ItemID3, ItemID4, ItemCount1, ItemCount2, ItemCount3, "
-        "ItemCount4, Explored1, Explored2, Time1, Time2, AuraSpellID1, AuraSpellID2, AuraSpellID3, AuraSpellID4, AuraStacks1, AuraStacks2, "
-        "AuraStacks3, AuraStacks4, Achievement1, Achievement2, Achievement3, Achievement4, AreaID1, AreaID2, AreaID3, AreaID4, LfgStatus1, "
-        "LfgStatus2, LfgStatus3, LfgStatus4, LfgCompare1, LfgCompare2, LfgCompare3, LfgCompare4, LfgValue1, LfgValue2, LfgValue3, LfgValue4, "
-        "CurrencyID1, CurrencyID2, CurrencyID3, CurrencyID4, CurrencyCount1, CurrencyCount2, CurrencyCount3, CurrencyCount4, QuestKillMonster1, "
-        "QuestKillMonster2, QuestKillMonster3, QuestKillMonster4, QuestKillMonster5, QuestKillMonster6, MovementFlags1, MovementFlags2"
-        " FROM player_condition WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+        "WeaponSubclassMask, MaxGuildLevel, MinGuildLevel, MaxExpansionTier, MinExpansionTier, MinPVPRank, MaxPVPRank, ContentTuningID, CovenantID, "
+        "TraitNodeEntryLogic, SkillID1, SkillID2, SkillID3, SkillID4, MinSkill1, MinSkill2, MinSkill3, MinSkill4, MaxSkill1, MaxSkill2, MaxSkill3, "
+        "MaxSkill4, MinFactionID1, MinFactionID2, MinFactionID3, MinReputation1, MinReputation2, MinReputation3, PrevQuestID1, PrevQuestID2, "
+        "PrevQuestID3, PrevQuestID4, CurrQuestID1, CurrQuestID2, CurrQuestID3, CurrQuestID4, CurrentCompletedQuestID1, CurrentCompletedQuestID2, "
+        "CurrentCompletedQuestID3, CurrentCompletedQuestID4, SpellID1, SpellID2, SpellID3, SpellID4, ItemID1, ItemID2, ItemID3, ItemID4, ItemCount1, "
+        "ItemCount2, ItemCount3, ItemCount4, Explored1, Explored2, Time1, Time2, AuraSpellID1, AuraSpellID2, AuraSpellID3, AuraSpellID4, AuraStacks1, "
+        "AuraStacks2, AuraStacks3, AuraStacks4, Achievement1, Achievement2, Achievement3, Achievement4, AreaID1, AreaID2, AreaID3, AreaID4, "
+        "LfgStatus1, LfgStatus2, LfgStatus3, LfgStatus4, LfgCompare1, LfgCompare2, LfgCompare3, LfgCompare4, LfgValue1, LfgValue2, LfgValue3, "
+        "LfgValue4, CurrencyID1, CurrencyID2, CurrencyID3, CurrencyID4, CurrencyCount1, CurrencyCount2, CurrencyCount3, CurrencyCount4, "
+        "QuestKillMonster1, QuestKillMonster2, QuestKillMonster3, QuestKillMonster4, QuestKillMonster5, QuestKillMonster6, MovementFlags1, "
+        "MovementFlags2, TraitNodeEntryID1, TraitNodeEntryID2, TraitNodeEntryID3, TraitNodeEntryID4, TraitNodeEntryMinRank1, TraitNodeEntryMinRank2, "
+        "TraitNodeEntryMinRank3, TraitNodeEntryMinRank4, TraitNodeEntryMaxRank1, TraitNodeEntryMaxRank2, TraitNodeEntryMaxRank3, "
+        "TraitNodeEntryMaxRank4 FROM player_condition WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_PLAYER_CONDITION, "SELECT MAX(ID) + 1 FROM player_condition", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_PLAYER_CONDITION, "SELECT ID, FailureDescription_lang FROM player_condition_locale WHERE (`VerifiedBuild` > 0) = ?"
         " AND locale = ?", CONNECTION_SYNCH);
@@ -1007,7 +1010,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_POWER_DISPLAY, "SELECT MAX(ID) + 1 FROM power_display", CONNECTION_SYNCH);
 
     // PowerType.db2
-    PrepareStatement(HOTFIX_SEL_POWER_TYPE, "SELECT ID, NameGlobalStringTag, CostGlobalStringTag, PowerTypeEnum, MinPower, MaxBasePower, CenterPower, "
+    PrepareStatement(HOTFIX_SEL_POWER_TYPE, "SELECT NameGlobalStringTag, CostGlobalStringTag, ID, PowerTypeEnum, MinPower, MaxBasePower, CenterPower, "
         "DefaultPower, DisplayModifier, RegenInterruptTimeMS, RegenPeace, RegenCombat, Flags FROM power_type WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_POWER_TYPE, "SELECT MAX(ID) + 1 FROM power_type", CONNECTION_SYNCH);
 
@@ -1102,7 +1105,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PREPARE_LOCALE_STMT(HOTFIX_SEL_SCENARIO, "SELECT ID, Name_lang FROM scenario_locale WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
 
     // ScenarioStep.db2
-    PrepareStatement(HOTFIX_SEL_SCENARIO_STEP, "SELECT ID, Description, Title, ScenarioID, CriteriatreeID, RewardQuestID, RelatedStep, Supersedes, "
+    PrepareStatement(HOTFIX_SEL_SCENARIO_STEP, "SELECT Description, Title, ID, ScenarioID, CriteriatreeID, RewardQuestID, RelatedStep, Supersedes, "
         "OrderIndex, Flags, VisibilityPlayerConditionID, WidgetSetID FROM scenario_step WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_SCENARIO_STEP, "SELECT MAX(ID) + 1 FROM scenario_step", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_SCENARIO_STEP, "SELECT ID, Description_lang, Title_lang FROM scenario_step_locale WHERE (`VerifiedBuild` > 0) = ?"
@@ -1523,7 +1526,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
 
     // Vignette.db2
     PrepareStatement(HOTFIX_SEL_VIGNETTE, "SELECT ID, Name, PlayerConditionID, VisibleTrackingQuestID, QuestFeedbackEffectID, Flags, MaxHeight, "
-        "MinHeight, VignetteType, RewardQuestID FROM vignette WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+        "MinHeight, VignetteType, RewardQuestID, Unknown1156 FROM vignette WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_VIGNETTE, "SELECT MAX(ID) + 1 FROM vignette", CONNECTION_SYNCH);
     PREPARE_LOCALE_STMT(HOTFIX_SEL_VIGNETTE, "SELECT ID, Name_lang FROM vignette_locale WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH);
 
diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
index c54fb69e4df..1e7ce97ecb3 100644
--- a/src/server/game/DataStores/DB2LoadInfo.h
+++ b/src/server/game/DataStores/DB2LoadInfo.h
@@ -159,7 +159,7 @@ struct AreaTriggerLoadInfo
         { false, FT_FLOAT, "BoxYaw" },
         { true, FT_BYTE, "ShapeType" },
         { true, FT_SHORT, "ShapeID" },
-        { true, FT_SHORT, "AreaTriggerActionSetID" },
+        { true, FT_INT, "AreaTriggerActionSetID" },
         { true, FT_BYTE, "Flags" },
     };
 
@@ -489,7 +489,7 @@ struct ChrClassUiDisplayLoadInfo
 
 struct ChrClassesLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[25] =
+    static constexpr DB2FieldMeta Fields[26] =
     {
         { false, FT_STRING, "Name" },
         { false, FT_STRING_NOT_LOCALIZED, "Filename" },
@@ -503,6 +503,7 @@ struct ChrClassesLoadInfo
         { false, FT_INT, "LowResScreenFileDataID" },
         { true, FT_INT, "Flags" },
         { true, FT_INT, "StartingLevel" },
+        { false, FT_INT, "SpellTextureBlobFileDataID" },
         { false, FT_INT, "ArmorTypeMask" },
         { false, FT_SHORT, "CinematicSequenceID" },
         { false, FT_SHORT, "DefaultSpec" },
@@ -518,7 +519,7 @@ struct ChrClassesLoadInfo
         { false, FT_BYTE, "HasRelicSlot" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 25, &ChrClassesMeta::Instance, HOTFIX_SEL_CHR_CLASSES };
+    static constexpr DB2LoadInfo Instance{ Fields, 26, &ChrClassesMeta::Instance, HOTFIX_SEL_CHR_CLASSES };
 };
 
 struct ChrClassesXPowerTypesLoadInfo
@@ -594,14 +595,12 @@ struct ChrCustomizationElementLoadInfo
 
 struct ChrCustomizationOptionLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[14] =
+    static constexpr DB2FieldMeta Fields[12] =
     {
         { false, FT_STRING, "Name" },
         { false, FT_INT, "ID" },
         { false, FT_SHORT, "SecondaryID" },
         { true, FT_INT, "Flags" },
-        { true, FT_INT, "ChrRacesID" },
-        { true, FT_INT, "Sex" },
         { false, FT_INT, "ChrModelID" },
         { true, FT_INT, "OrderIndex" },
         { true, FT_INT, "ChrCustomizationCategoryID" },
@@ -612,7 +611,7 @@ struct ChrCustomizationOptionLoadInfo
         { true, FT_INT, "SecondaryOrderIndex" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 14, &ChrCustomizationOptionMeta::Instance, HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION };
+    static constexpr DB2LoadInfo Instance{ Fields, 12, &ChrCustomizationOptionMeta::Instance, HOTFIX_SEL_CHR_CUSTOMIZATION_OPTION };
 };
 
 struct ChrCustomizationReqLoadInfo
@@ -1101,8 +1100,8 @@ struct CurvePointLoadInfo
     {
         { false, FT_FLOAT, "PosX" },
         { false, FT_FLOAT, "PosY" },
-        { false, FT_FLOAT, "PosPreSquishX" },
-        { false, FT_FLOAT, "PosPreSquishY" },
+        { false, FT_FLOAT, "PreSLSquishPosX" },
+        { false, FT_FLOAT, "PreSLSquishPosY" },
         { false, FT_INT, "ID" },
         { false, FT_INT, "CurveID" },
         { false, FT_BYTE, "OrderIndex" },
@@ -2490,7 +2489,7 @@ struct ItemSparseLoadInfo
         { false, FT_BYTE, "PageMaterialID" },
         { false, FT_BYTE, "LanguageID" },
         { false, FT_BYTE, "Bonding" },
-        { false, FT_BYTE, "DamageType" },
+        { false, FT_BYTE, "DamageDamageType" },
         { false, FT_BYTE, "ContainerSlots" },
         { false, FT_BYTE, "RequiredPVPMedal" },
         { false, FT_BYTE, "RequiredPVPRank" },
@@ -2676,7 +2675,7 @@ struct LanguagesLoadInfo
 
 struct LfgDungeonsLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[35] =
+    static constexpr DB2FieldMeta Fields[38] =
     {
         { false, FT_INT, "ID" },
         { false, FT_STRING, "Name" },
@@ -2708,6 +2707,9 @@ struct LfgDungeonsLoadInfo
         { false, FT_BYTE, "MinCountTank" },
         { false, FT_BYTE, "MinCountHealer" },
         { false, FT_BYTE, "MinCountDamage" },
+        { false, FT_BYTE, "MaxPremadeCountTank" },
+        { false, FT_BYTE, "MaxPremadeCountHealer" },
+        { false, FT_BYTE, "MaxPremadeCountDamage" },
         { false, FT_SHORT, "BonusReputationAmount" },
         { false, FT_SHORT, "MentorItemLevel" },
         { false, FT_BYTE, "MentorCharLevel" },
@@ -2715,7 +2717,7 @@ struct LfgDungeonsLoadInfo
         { true, FT_INT, "Flags2" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 35, &LFGDungeonsMeta::Instance, HOTFIX_SEL_LFG_DUNGEONS };
+    static constexpr DB2LoadInfo Instance{ Fields, 38, &LFGDungeonsMeta::Instance, HOTFIX_SEL_LFG_DUNGEONS };
 };
 
 struct LightLoadInfo
@@ -2902,7 +2904,7 @@ struct MapLoadInfo
         { false, FT_BYTE, "MaxPlayers" },
         { true, FT_SHORT, "WindSettingsID" },
         { true, FT_INT, "ZmpFileDataID" },
-        { true, FT_INT, "Unknown1154" },
+        { true, FT_INT, "PreloadFileDataID" },
         { true, FT_INT, "Flags1" },
         { true, FT_INT, "Flags2" },
         { true, FT_INT, "Flags3" },
@@ -2931,22 +2933,23 @@ struct MapChallengeModeLoadInfo
 
 struct MapDifficultyLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[11] =
+    static constexpr DB2FieldMeta Fields[12] =
     {
-        { false, FT_INT, "ID" },
         { false, FT_STRING, "Message" },
-        { false, FT_INT, "ItemContextPickerID" },
-        { true, FT_INT, "ContentTuningID" },
-        { true, FT_INT, "ItemContext" },
-        { false, FT_BYTE, "DifficultyID" },
-        { false, FT_BYTE, "LockID" },
+        { false, FT_INT, "ID" },
+        { true, FT_INT, "DifficultyID" },
+        { true, FT_INT, "LockID" },
         { false, FT_BYTE, "ResetInterval" },
-        { false, FT_BYTE, "MaxPlayers" },
-        { false, FT_BYTE, "Flags" },
+        { true, FT_INT, "MaxPlayers" },
+        { false, FT_BYTE, "ItemContext" },
+        { true, FT_INT, "ItemContextPickerID" },
+        { true, FT_INT, "Flags" },
+        { true, FT_INT, "ContentTuningID" },
+        { true, FT_INT, "WorldStateExpressionID" },
         { false, FT_INT, "MapID" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 11, &MapDifficultyMeta::Instance, HOTFIX_SEL_MAP_DIFFICULTY };
+    static constexpr DB2LoadInfo Instance{ Fields, 12, &MapDifficultyMeta::Instance, HOTFIX_SEL_MAP_DIFFICULTY };
 };
 
 struct MapDifficultyXConditionLoadInfo
@@ -3012,8 +3015,8 @@ struct MountCapabilityLoadInfo
         { true, FT_INT, "ReqSpellKnownID" },
         { true, FT_INT, "ModSpellAuraID" },
         { true, FT_SHORT, "ReqMapID" },
-        { true, FT_INT, "Unknown1154_0" },
-        { true, FT_INT, "Unknown1154_1" },
+        { true, FT_INT, "PlayerConditionID" },
+        { true, FT_INT, "FlightCapabilityID" },
     };
 
     static constexpr DB2LoadInfo Instance{ Fields, 10, &MountCapabilityMeta::Instance, HOTFIX_SEL_MOUNT_CAPABILITY };
@@ -3239,16 +3242,16 @@ struct PhaseXPhaseGroupLoadInfo
 
 struct PlayerConditionLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[147] =
+    static constexpr DB2FieldMeta Fields[162] =
     {
+        { false, FT_INT, "ID" },
         { true, FT_LONG, "RaceMask" },
         { false, FT_STRING, "FailureDescription" },
-        { false, FT_INT, "ID" },
         { false, FT_SHORT, "MinLevel" },
         { false, FT_SHORT, "MaxLevel" },
         { true, FT_INT, "ClassMask" },
         { false, FT_INT, "SkillLogic" },
-        { false, FT_BYTE, "LanguageID" },
+        { true, FT_INT, "LanguageID" },
         { false, FT_BYTE, "MinLanguage" },
         { true, FT_INT, "MaxLanguage" },
         { false, FT_SHORT, "MaxFactionID" },
@@ -3264,7 +3267,7 @@ struct PlayerConditionLoadInfo
         { false, FT_BYTE, "ItemFlags" },
         { false, FT_INT, "AuraSpellLogic" },
         { false, FT_SHORT, "WorldStateExpressionID" },
-        { false, FT_BYTE, "WeatherID" },
+        { true, FT_INT, "WeatherID" },
         { false, FT_BYTE, "PartyStatus" },
         { false, FT_BYTE, "LifetimeMaxPVPRank" },
         { false, FT_INT, "AchievementLogic" },
@@ -3273,7 +3276,7 @@ struct PlayerConditionLoadInfo
         { false, FT_INT, "AreaLogic" },
         { false, FT_INT, "LfgLogic" },
         { false, FT_INT, "CurrencyLogic" },
-        { false, FT_INT, "QuestKillID" },
+        { true, FT_INT, "QuestKillID" },
         { false, FT_INT, "QuestKillLogic" },
         { true, FT_BYTE, "MinExpansionLevel" },
         { true, FT_BYTE, "MaxExpansionLevel" },
@@ -3298,6 +3301,9 @@ struct PlayerConditionLoadInfo
         { true, FT_BYTE, "MinExpansionTier" },
         { false, FT_BYTE, "MinPVPRank" },
         { false, FT_BYTE, "MaxPVPRank" },
+        { true, FT_INT, "ContentTuningID" },
+        { true, FT_INT, "CovenantID" },
+        { false, FT_INT, "TraitNodeEntryLogic" },
         { false, FT_SHORT, "SkillID1" },
         { false, FT_SHORT, "SkillID2" },
         { false, FT_SHORT, "SkillID3" },
@@ -3316,18 +3322,18 @@ struct PlayerConditionLoadInfo
         { false, FT_BYTE, "MinReputation1" },
         { false, FT_BYTE, "MinReputation2" },
         { false, FT_BYTE, "MinReputation3" },
-        { false, FT_INT, "PrevQuestID1" },
-        { false, FT_INT, "PrevQuestID2" },
-        { false, FT_INT, "PrevQuestID3" },
-        { false, FT_INT, "PrevQuestID4" },
-        { false, FT_INT, "CurrQuestID1" },
-        { false, FT_INT, "CurrQuestID2" },
-        { false, FT_INT, "CurrQuestID3" },
-        { false, FT_INT, "CurrQuestID4" },
-        { false, FT_INT, "CurrentCompletedQuestID1" },
-        { false, FT_INT, "CurrentCompletedQuestID2" },
-        { false, FT_INT, "CurrentCompletedQuestID3" },
-        { false, FT_INT, "CurrentCompletedQuestID4" },
+        { true, FT_INT, "PrevQuestID1" },
+        { true, FT_INT, "PrevQuestID2" },
+        { true, FT_INT, "PrevQuestID3" },
+        { true, FT_INT, "PrevQuestID4" },
+        { true, FT_INT, "CurrQuestID1" },
+        { true, FT_INT, "CurrQuestID2" },
+        { true, FT_INT, "CurrQuestID3" },
+        { true, FT_INT, "CurrQuestID4" },
+        { true, FT_INT, "CurrentCompletedQuestID1" },
+        { true, FT_INT, "CurrentCompletedQuestID2" },
+        { true, FT_INT, "CurrentCompletedQuestID3" },
+        { true, FT_INT, "CurrentCompletedQuestID4" },
         { true, FT_INT, "SpellID1" },
         { true, FT_INT, "SpellID2" },
         { true, FT_INT, "SpellID3" },
@@ -3388,9 +3394,21 @@ struct PlayerConditionLoadInfo
         { false, FT_INT, "QuestKillMonster6" },
         { true, FT_INT, "MovementFlags1" },
         { true, FT_INT, "MovementFlags2" },
+        { true, FT_INT, "TraitNodeEntryID1" },
+        { true, FT_INT, "TraitNodeEntryID2" },
+        { true, FT_INT, "TraitNodeEntryID3" },
+        { true, FT_INT, "TraitNodeEntryID4" },
+        { false, FT_SHORT, "TraitNodeEntryMinRank1" },
+        { false, FT_SHORT, "TraitNodeEntryMinRank2" },
+        { false, FT_SHORT, "TraitNodeEntryMinRank3" },
+        { false, FT_SHORT, "TraitNodeEntryMinRank4" },
+        { false, FT_SHORT, "TraitNodeEntryMaxRank1" },
+        { false, FT_SHORT, "TraitNodeEntryMaxRank2" },
+        { false, FT_SHORT, "TraitNodeEntryMaxRank3" },
+        { false, FT_SHORT, "TraitNodeEntryMaxRank4" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 147, &PlayerConditionMeta::Instance, HOTFIX_SEL_PLAYER_CONDITION };
+    static constexpr DB2LoadInfo Instance{ Fields, 162, &PlayerConditionMeta::Instance, HOTFIX_SEL_PLAYER_CONDITION };
 };
 
 struct PowerDisplayLoadInfo
@@ -3412,9 +3430,9 @@ struct PowerTypeLoadInfo
 {
     static constexpr DB2FieldMeta Fields[13] =
     {
-        { false, FT_INT, "ID" },
         { false, FT_STRING_NOT_LOCALIZED, "NameGlobalStringTag" },
         { false, FT_STRING_NOT_LOCALIZED, "CostGlobalStringTag" },
+        { false, FT_INT, "ID" },
         { true, FT_BYTE, "PowerTypeEnum" },
         { true, FT_INT, "MinPower" },
         { true, FT_INT, "MaxBasePower" },
@@ -3713,12 +3731,12 @@ struct ScenarioStepLoadInfo
 {
     static constexpr DB2FieldMeta Fields[12] =
     {
-        { false, FT_INT, "ID" },
         { false, FT_STRING, "Description" },
         { false, FT_STRING, "Title" },
+        { false, FT_INT, "ID" },
         { false, FT_SHORT, "ScenarioID" },
         { false, FT_INT, "CriteriatreeID" },
-        { false, FT_INT, "RewardQuestID" },
+        { true, FT_INT, "RewardQuestID" },
         { true, FT_INT, "RelatedStep" },
         { false, FT_SHORT, "Supersedes" },
         { false, FT_BYTE, "OrderIndex" },
@@ -5218,7 +5236,7 @@ struct VehicleSeatLoadInfo
 
 struct VignetteLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[10] =
+    static constexpr DB2FieldMeta Fields[11] =
     {
         { false, FT_INT, "ID" },
         { false, FT_STRING, "Name" },
@@ -5230,9 +5248,10 @@ struct VignetteLoadInfo
         { false, FT_FLOAT, "MinHeight" },
         { true, FT_BYTE, "VignetteType" },
         { true, FT_INT, "RewardQuestID" },
+        { true, FT_BYTE, "Unknown1156" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 10, &VignetteMeta::Instance, HOTFIX_SEL_VIGNETTE };
+    static constexpr DB2LoadInfo Instance{ Fields, 11, &VignetteMeta::Instance, HOTFIX_SEL_VIGNETTE };
 };
 
 struct WmoAreaTableLoadInfo
diff --git a/src/server/game/DataStores/DB2Metadata.h b/src/server/game/DataStores/DB2Metadata.h
index 00aadbe5b32..1b977fbbe13 100644
--- a/src/server/game/DataStores/DB2Metadata.h
+++ b/src/server/game/DataStores/DB2Metadata.h
@@ -20,6 +20,47 @@
 
 #include "DB2Meta.h"
 
+struct AccountStoreCategoryMeta
+{
+    static constexpr DB2MetaField Fields[6] =
+    {
+        { FT_STRING, 1, true },
+        { FT_INT, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_BYTE, 1, false },
+    };
+
+    static constexpr DB2Meta Instance{ 6220124, 1, 6, 6, 0xE78C9607, Fields, 2 };
+};
+
+struct AccountStoreItemMeta
+{
+    static constexpr DB2MetaField Fields[17] =
+    {
+        { FT_STRING, 1, true },
+        { FT_STRING, 1, true },
+        { FT_INT, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 6197817, 2, 17, 17, 0x818F4DA6, Fields, 3 };
+};
+
 struct AchievementMeta
 {
     static constexpr DB2MetaField Fields[15] =
@@ -604,11 +645,11 @@ struct AreaTriggerMeta
         { FT_FLOAT, 1, true },
         { FT_BYTE, 1, true },
         { FT_SHORT, 1, true },
-        { FT_SHORT, 1, true },
+        { FT_INT, 1, true },
         { FT_BYTE, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1354401, 2, 16, 16, 0x86990AE2, Fields, 3 };
+    static constexpr DB2Meta Instance{ 1354401, 2, 16, 16, 0xB4ACA6C2, Fields, 3 };
 };
 
 struct AreaTriggerActionSetMeta
@@ -1895,7 +1936,7 @@ struct ChrClassVillainMeta
 
 struct ChrClassesMeta
 {
-    static constexpr DB2MetaField Fields[25] =
+    static constexpr DB2MetaField Fields[26] =
     {
         { FT_STRING, 1, true },
         { FT_STRING_NOT_LOCALIZED, 1, true },
@@ -1910,6 +1951,7 @@ struct ChrClassesMeta
         { FT_INT, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, false },
+        { FT_INT, 1, false },
         { FT_SHORT, 1, false },
         { FT_SHORT, 1, false },
         { FT_BYTE, 1, false },
@@ -1924,7 +1966,7 @@ struct ChrClassesMeta
         { FT_BYTE, 1, false },
     };
 
-    static constexpr DB2Meta Instance{ 1361031, 5, 25, 25, 0xEC50880B, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1361031, 5, 26, 26, 0xE20D59D3, Fields, -1 };
 };
 
 struct ChrClassesXPowerTypesMeta
@@ -2143,7 +2185,7 @@ struct ChrCustomizationMaterialMeta
 
 struct ChrCustomizationOptionMeta
 {
-    static constexpr DB2MetaField Fields[14] =
+    static constexpr DB2MetaField Fields[12] =
     {
         { FT_STRING, 1, true },
         { FT_INT, 1, false },
@@ -2153,15 +2195,13 @@ struct ChrCustomizationOptionMeta
         { FT_INT, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
         { FT_FLOAT, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 3384247, 1, 14, 14, 0x452E4462, Fields, 6 };
+    static constexpr DB2Meta Instance{ 3384247, 1, 12, 12, 0x6714C155, Fields, 4 };
 };
 
 struct ChrCustomizationReqMeta
@@ -3913,6 +3953,24 @@ struct GameClockDebugMeta
     static constexpr DB2Meta Instance{ 2922072, 0, 2, 2, 0x08DEAF7F, Fields, -1 };
 };
 
+struct GameModeMeta
+{
+    static constexpr DB2MetaField Fields[9] =
+    {
+        { FT_STRING_NOT_LOCALIZED, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 5008306, -1, 9, 9, 0x60A1CBA9, Fields, -1 };
+};
+
 struct GameObjectAnimGroupMemberMeta
 {
     static constexpr DB2MetaField Fields[4] =
@@ -4076,6 +4134,39 @@ struct GarrAbilityEffectMeta
     static constexpr DB2Meta Instance{ 966241, 0, 12, 12, 0xCEA59782, Fields, 1 };
 };
 
+struct GarrBuildingMeta
+{
+    static constexpr DB2MetaField Fields[24] =
+    {
+        { FT_STRING, 1, true },
+        { FT_STRING, 1, true },
+        { FT_STRING, 1, true },
+        { FT_STRING, 1, true },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
+        { FT_SHORT, 1, false },
+        { FT_INT, 1, true },
+        { FT_SHORT, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_INT, 1, true },
+        { FT_SHORT, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_INT, 1, true },
+        { FT_BYTE, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_BYTE, 1, false },
+    };
+
+    static constexpr DB2Meta Instance{ 929747, -1, 24, 24, 0x7785BDDC, Fields, -1 };
+};
+
 struct GarrBuildingDoodadSetMeta
 {
     static constexpr DB2MetaField Fields[5] =
@@ -4090,6 +4181,107 @@ struct GarrBuildingDoodadSetMeta
     static constexpr DB2Meta Instance{ 943937, -1, 5, 5, 0x8D671E1C, Fields, -1 };
 };
 
+struct GarrBuildingPlotInstMeta
+{
+    static constexpr DB2MetaField Fields[5] =
+    {
+        { FT_FLOAT, 2, true },
+        { FT_INT, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_SHORT, 1, false },
+    };
+
+    static constexpr DB2Meta Instance{ 983298, 1, 5, 5, 0x772B63F1, Fields, 2 };
+};
+
+struct GarrClassSpecMeta
+{
+    static constexpr DB2MetaField Fields[8] =
+    {
+        { FT_STRING, 1, true },
+        { FT_STRING, 1, true },
+        { FT_STRING, 1, true },
+        { FT_INT, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+    };
+
+    static constexpr DB2Meta Instance{ 981570, 3, 8, 8, 0xEBFDA71A, Fields, -1 };
+};
+
+struct GarrClassSpecPlayerCondMeta
+{
+    static constexpr DB2MetaField Fields[6] =
+    {
+        { FT_STRING, 1, true },
+        { FT_INT, 1, false },
+        { FT_INT, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_BYTE, 1, false },
+    };
+
+    static constexpr DB2Meta Instance{ 1380674, -1, 6, 6, 0x5EB2C2BE, Fields, -1 };
+};
+
+struct GarrFollowerSetXFollowerMeta
+{
+    static constexpr DB2MetaField Fields[2] =
+    {
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 1361029, -1, 2, 1, 0x078F8ACE, Fields, 1 };
+};
+
+struct GarrFollowerTypeMeta
+{
+    static constexpr DB2MetaField Fields[7] =
+    {
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+    };
+
+    static constexpr DB2Meta Instance{ 1118784, -1, 7, 7, 0xA2093B95, Fields, -1 };
+};
+
+struct GarrFollowerUICreatureMeta
+{
+    static constexpr DB2MetaField Fields[6] =
+    {
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
+        { FT_FLOAT, 1, true },
+        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 1412636, -1, 6, 5, 0x3B69F3A8, Fields, 5 };
+};
+
+struct GarrFollowerXAbilityMeta
+{
+    static constexpr DB2MetaField Fields[4] =
+    {
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 968468, -1, 4, 3, 0x11D80996, Fields, 3 };
+};
+
 struct GarrItemLevelUpgradeDataMeta
 {
     static constexpr DB2MetaField Fields[5] =
@@ -4217,75 +4409,52 @@ struct GarrMissionXEncounterMeta
     static constexpr DB2Meta Instance{ 967960, 0, 5, 4, 0xBED2763F, Fields, 4 };
 };
 
-struct GarrSpecializationMeta
+struct GarrMissionXFollowerMeta
 {
-    static constexpr DB2MetaField Fields[7] =
+    static constexpr DB2MetaField Fields[3] =
     {
-        { FT_STRING, 1, true },
-        { FT_STRING, 1, true },
-        { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
         { FT_INT, 1, true },
-        { FT_FLOAT, 2, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 937647, -1, 7, 7, 0x0A0EBC1C, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1359096, -1, 3, 2, 0x68F00E16, Fields, 2 };
 };
 
-struct GarrStringMeta
+struct GarrMssnBonusAbilityMeta
 {
-    static constexpr DB2MetaField Fields[1] =
+    static constexpr DB2MetaField Fields[5] =
     {
-        { FT_STRING, 1, true },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_SHORT, 1, false },
+        { FT_FLOAT, 1, true },
+        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1416758, -1, 1, 1, 0x7D513539, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1138458, -1, 5, 5, 0xA15614BC, Fields, -1 };
 };
 
-struct GarrTalentMeta
+struct GarrPlotBuildingMeta
 {
-    static constexpr DB2MetaField Fields[20] =
+    static constexpr DB2MetaField Fields[2] =
     {
-        { FT_STRING, 1, true },
-        { FT_STRING, 1, true },
-        { FT_INT, 1, false },
-        { FT_INT, 1, false },
-        { FT_BYTE, 1, true },
-        { FT_BYTE, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, false },
-        { FT_INT, 1, false },
-        { FT_INT, 1, false },
-        { FT_INT, 1, false },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, false },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, false },
-        { FT_BYTE, 1, true },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
     };
 
-    static constexpr DB2Meta Instance{ 1361032, 2, 20, 20, 0x798A1C42, Fields, 3 };
+    static constexpr DB2Meta Instance{ 929743, -1, 2, 2, 0xA5104F1A, Fields, -1 };
 };
 
-struct GarrTalentTreeMeta
+struct GarrPlotInstanceMeta
 {
-    static constexpr DB2MetaField Fields[7] =
+    static constexpr DB2MetaField Fields[2] =
     {
-        { FT_STRING, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_BYTE, 1, true },
-        { FT_BYTE, 1, true },
-        { FT_BYTE, 1, true },
-        { FT_SHORT, 1, false },
+        { FT_STRING_NOT_LOCALIZED, 1, true },
+        { FT_BYTE, 1, false },
     };
 
-    static constexpr DB2Meta Instance{ 1361030, -1, 7, 7, 0x6EF3E315, Fields, -1 };
+    static constexpr DB2Meta Instance{ 929742, -1, 2, 2, 0x9403779B, Fields, -1 };
 };
 
 struct GarrTypeMeta
@@ -4542,14 +4711,13 @@ struct GroundEffectTextureMeta
 
 struct GroupFinderActivityMeta
 {
-    static constexpr DB2MetaField Fields[17] =
+    static constexpr DB2MetaField Fields[19] =
     {
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, true },
-        { FT_INT, 1, true },
-        { FT_BYTE, 1, false },
+        { FT_SHORT, 1, false },
         { FT_INT, 1, false },
         { FT_SHORT, 1, false },
         { FT_INT, 1, true },
@@ -4558,12 +4726,15 @@ struct GroupFinderActivityMeta
         { FT_SHORT, 1, false },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
         { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 974813, -1, 17, 17, 0xEFC65E60, Fields, -1 };
+    static constexpr DB2Meta Instance{ 974813, -1, 19, 19, 0x1EE9C586, Fields, -1 };
 };
 
 struct GroupFinderActivityGrpMeta
@@ -4590,16 +4761,15 @@ struct GroupFinderActivityXPvpBracketMeta
 
 struct GroupFinderCategoryMeta
 {
-    static constexpr DB2MetaField Fields[5] =
+    static constexpr DB2MetaField Fields[4] =
     {
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
-        { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
         { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 974812, -1, 5, 5, 0x9DAC32FE, Fields, -1 };
+    static constexpr DB2Meta Instance{ 974812, -1, 4, 4, 0x039D6BF9, Fields, -1 };
 };
 
 struct GuildColorBackgroundMeta
@@ -5625,21 +5795,22 @@ struct ItemSpecOverrideMeta
 
 struct ItemSubClassMeta
 {
-    static constexpr DB2MetaField Fields[10] =
+    static constexpr DB2MetaField Fields[11] =
     {
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
+        { FT_INT, 1, false },
         { FT_BYTE, 1, true },
         { FT_BYTE, 1, true },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, true },
-        { FT_SHORT, 1, true },
-        { FT_BYTE, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
         { FT_BYTE, 1, true },
         { FT_BYTE, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1261604, -1, 10, 10, 0x02E77143, Fields, 2 };
+    static constexpr DB2Meta Instance{ 1261604, 2, 11, 11, 0x1E67DB87, Fields, 3 };
 };
 
 struct ItemSubClassMaskMeta
@@ -5953,7 +6124,7 @@ struct LFGDungeonGroupMeta
 
 struct LFGDungeonsMeta
 {
-    static constexpr DB2MetaField Fields[33] =
+    static constexpr DB2MetaField Fields[36] =
     {
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
@@ -5984,13 +6155,16 @@ struct LFGDungeonsMeta
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, false },
         { FT_SHORT, 1, false },
         { FT_SHORT, 1, false },
         { FT_BYTE, 1, false },
         { FT_INT, 2, true },
     };
 
-    static constexpr DB2Meta Instance{ 1361033, -1, 33, 33, 0x35344C90, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1361033, -1, 36, 36, 0xC1EF299A, Fields, -1 };
 };
 
 struct LFGRoleRequirementMeta
@@ -6559,21 +6733,23 @@ struct MapChallengeModeMeta
 
 struct MapDifficultyMeta
 {
-    static constexpr DB2MetaField Fields[10] =
+    static constexpr DB2MetaField Fields[12] =
     {
         { FT_STRING, 1, true },
         { FT_INT, 1, false },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
         { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
         { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
-        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
         { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1367868, -1, 10, 9, 0x96E6A624, Fields, 9 };
+    static constexpr DB2Meta Instance{ 1367868, 1, 12, 11, 0xCF621FA3, Fields, 11 };
 };
 
 struct MapDifficultyRedirectMeta
@@ -6713,60 +6889,6 @@ struct ModelRibbonQualityMeta
     static constexpr DB2Meta Instance{ 1399953, -1, 2, 1, 0x6444FDE5, Fields, 1 };
 };
 
-struct ModelSoundMeta
-{
-    static constexpr DB2MetaField Fields[2] =
-    {
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5393273, -1, 2, 2, 0xB38E4BBC, Fields, -1 };
-};
-
-struct ModelSoundAnimEntryMeta
-{
-    static constexpr DB2MetaField Fields[2] =
-    {
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5393274, -1, 2, 2, 0x324E0B06, Fields, 0 };
-};
-
-struct ModelSoundEntryMeta
-{
-    static constexpr DB2MetaField Fields[1] =
-    {
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5393275, -1, 1, 1, 0x4A95649C, Fields, 0 };
-};
-
-struct ModelSoundOverrideMeta
-{
-    static constexpr DB2MetaField Fields[2] =
-    {
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5393276, -1, 2, 2, 0x1B5019C8, Fields, 0 };
-};
-
-struct ModelSoundSettingsMeta
-{
-    static constexpr DB2MetaField Fields[2] =
-    {
-        { FT_BYTE, 1, false },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5682517, -1, 2, 1, 0xDB67A4DC, Fields, 1 };
-};
-
 struct ModelSoundTagEntryMeta
 {
     static constexpr DB2MetaField Fields[6] =
@@ -6983,119 +7105,6 @@ struct MythicPlusSeasonMeta
     static constexpr DB2Meta Instance{ 2400282, 0, 5, 5, 0xDC94262F, Fields, -1 };
 };
 
-struct MythicPlusSeasonRewardLevelsMeta
-{
-    static constexpr DB2MetaField Fields[4] =
-    {
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 2123783, -1, 4, 3, 0x83142F7A, Fields, 3 };
-};
-
-struct MythicPlusSeasonTrackedAffixMeta
-{
-    static constexpr DB2MetaField Fields[5] =
-    {
-        { FT_INT, 1, false },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 4067473, 0, 5, 4, 0xEFDAF463, Fields, 4 };
-};
-
-struct MythicPlusSeasonTrackedMapMeta
-{
-    static constexpr DB2MetaField Fields[2] =
-    {
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 4521365, -1, 2, 1, 0x03958F0D, Fields, 1 };
-};
-
-struct NPCCraftingOrderCustomerMeta
-{
-    static constexpr DB2MetaField Fields[6] =
-    {
-        { FT_INT, 1, true },
-        { FT_FLOAT, 1, true },
-        { FT_FLOAT, 1, true },
-        { FT_INT, 1, true },
-        { FT_FLOAT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5875492, -1, 6, 6, 0x4A3AC30B, Fields, -1 };
-};
-
-struct NPCCraftingOrderCustomerXLabelMeta
-{
-    static constexpr DB2MetaField Fields[3] =
-    {
-        { FT_INT, 1, false },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5875493, 0, 3, 3, 0xA5267D1B, Fields, 1 };
-};
-
-struct NPCCraftingOrderSetMeta
-{
-    static constexpr DB2MetaField Fields[11] =
-    {
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_FLOAT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5875494, -1, 11, 11, 0xF05BCCBD, Fields, -1 };
-};
-
-struct NPCCraftingOrderSetXCraftOrderMeta
-{
-    static constexpr DB2MetaField Fields[6] =
-    {
-        { FT_INT, 1, false },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5875495, 0, 6, 6, 0x8CB4AEB8, Fields, 1 };
-};
-
-struct NPCCraftingOrderSetXCustomerMeta
-{
-    static constexpr DB2MetaField Fields[4] =
-    {
-        { FT_INT, 1, false },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-    };
-
-    static constexpr DB2Meta Instance{ 5875496, 0, 4, 4, 0x3464F1DD, Fields, 2 };
-};
-
 struct NPCCraftingOrderSetXTreasureMeta
 {
     static constexpr DB2MetaField Fields[4] =
@@ -7578,16 +7587,15 @@ struct PlayerCompanionInfoMeta
 
 struct PlayerConditionMeta
 {
-    static constexpr DB2MetaField Fields[81] =
+    static constexpr DB2MetaField Fields[86] =
     {
         { FT_LONG, 1, true },
         { FT_STRING, 1, true },
-        { FT_INT, 1, false },
         { FT_SHORT, 1, false },
         { FT_SHORT, 1, false },
         { FT_INT, 1, true },
         { FT_INT, 1, false },
-        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
         { FT_BYTE, 1, false },
         { FT_INT, 1, true },
         { FT_SHORT, 1, false },
@@ -7603,7 +7611,7 @@ struct PlayerConditionMeta
         { FT_BYTE, 1, false },
         { FT_INT, 1, false },
         { FT_SHORT, 1, false },
-        { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, false },
         { FT_INT, 1, false },
@@ -7612,7 +7620,7 @@ struct PlayerConditionMeta
         { FT_INT, 1, false },
         { FT_INT, 1, false },
         { FT_INT, 1, false },
-        { FT_INT, 1, false },
+        { FT_INT, 1, true },
         { FT_INT, 1, false },
         { FT_BYTE, 1, true },
         { FT_BYTE, 1, true },
@@ -7637,14 +7645,17 @@ struct PlayerConditionMeta
         { FT_BYTE, 1, true },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, false },
         { FT_SHORT, 4, false },
         { FT_SHORT, 4, false },
         { FT_SHORT, 4, false },
         { FT_INT, 3, false },
         { FT_BYTE, 3, false },
-        { FT_INT, 4, false },
-        { FT_INT, 4, false },
-        { FT_INT, 4, false },
+        { FT_INT, 4, true },
+        { FT_INT, 4, true },
+        { FT_INT, 4, true },
         { FT_INT, 4, true },
         { FT_INT, 4, true },
         { FT_INT, 4, false },
@@ -7661,9 +7672,12 @@ struct PlayerConditionMeta
         { FT_INT, 4, false },
         { FT_INT, 6, false },
         { FT_INT, 2, true },
+        { FT_INT, 4, true },
+        { FT_SHORT, 4, false },
+        { FT_SHORT, 4, false },
     };
 
-    static constexpr DB2Meta Instance{ 1045411, 2, 81, 81, 0x6594A070, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1045411, -1, 86, 86, 0x395C1D28, Fields, -1 };
 };
 
 struct PlayerDataElementAccountMeta
@@ -7692,22 +7706,24 @@ struct PlayerDataElementCharacterMeta
 
 struct PlayerDataFlagAccountMeta
 {
-    static constexpr DB2MetaField Fields[1] =
+    static constexpr DB2MetaField Fields[2] =
     {
         { FT_INT, 1, true },
+        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 5426706, -1, 1, 1, 0x2A4C0DDD, Fields, -1 };
+    static constexpr DB2Meta Instance{ 5426706, -1, 2, 2, 0x23ECE2B1, Fields, -1 };
 };
 
 struct PlayerDataFlagCharacterMeta
 {
-    static constexpr DB2MetaField Fields[1] =
+    static constexpr DB2MetaField Fields[2] =
     {
         { FT_INT, 1, true },
+        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 5426708, -1, 1, 1, 0x2A4C0DDD, Fields, -1 };
+    static constexpr DB2Meta Instance{ 5426708, -1, 2, 2, 0x23ECE2B1, Fields, -1 };
 };
 
 struct PlayerInteractionInfoMeta
@@ -7803,10 +7819,11 @@ struct PowerDisplayMeta
 
 struct PowerTypeMeta
 {
-    static constexpr DB2MetaField Fields[12] =
+    static constexpr DB2MetaField Fields[13] =
     {
         { FT_STRING_NOT_LOCALIZED, 1, true },
         { FT_STRING_NOT_LOCALIZED, 1, true },
+        { FT_INT, 1, false },
         { FT_BYTE, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
@@ -7819,7 +7836,7 @@ struct PowerTypeMeta
         { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1266022, -1, 12, 12, 0x06F44DB5, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1266022, 2, 13, 13, 0x14BBEEA1, Fields, -1 };
 };
 
 struct PrestigeLevelInfoMeta
@@ -7952,6 +7969,18 @@ struct PvpTierMeta
     static constexpr DB2Meta Instance{ 2066871, -1, 8, 8, 0x8F30CD7C, Fields, 5 };
 };
 
+struct QuestDrivenScenarioMeta
+{
+    static constexpr DB2MetaField Fields[3] =
+    {
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 5917361, -1, 3, 3, 0x408DD33F, Fields, -1 };
+};
+
 struct QuestFactionRewardMeta
 {
     static constexpr DB2MetaField Fields[1] =
@@ -8252,6 +8281,23 @@ struct RenownRewardsMeta
     static constexpr DB2Meta Instance{ 3743117, -1, 18, 18, 0xBB3B0072, Fields, 3 };
 };
 
+struct RenownRewardsPlunderstormMeta
+{
+    static constexpr DB2MetaField Fields[8] =
+    {
+        { FT_STRING, 1, true },
+        { FT_STRING, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 5662591, -1, 8, 8, 0x30F69B43, Fields, 2 };
+};
+
 struct ResearchBranchMeta
 {
     static constexpr DB2MetaField Fields[6] =
@@ -8498,14 +8544,15 @@ struct ScenarioEventEntryMeta
 
 struct ScenarioStepMeta
 {
-    static constexpr DB2MetaField Fields[11] =
+    static constexpr DB2MetaField Fields[12] =
     {
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
-        { FT_SHORT, 1, false },
         { FT_INT, 1, false },
+        { FT_SHORT, 1, false },
         { FT_INT, 1, false },
         { FT_INT, 1, true },
+        { FT_INT, 1, true },
         { FT_SHORT, 1, false },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, false },
@@ -8513,7 +8560,7 @@ struct ScenarioStepMeta
         { FT_SHORT, 1, false },
     };
 
-    static constexpr DB2Meta Instance{ 1132761, -1, 11, 11, 0xB195828F, Fields, 2 };
+    static constexpr DB2Meta Instance{ 1132761, 2, 12, 12, 0x00430C03, Fields, 3 };
 };
 
 struct SceneScriptMeta
@@ -8620,12 +8667,13 @@ struct ScreenEffectTypeMeta
 
 struct ScreenLocationMeta
 {
-    static constexpr DB2MetaField Fields[1] =
+    static constexpr DB2MetaField Fields[2] =
     {
         { FT_STRING_NOT_LOCALIZED, 1, true },
+        { FT_BYTE, 1, false },
     };
 
-    static constexpr DB2Meta Instance{ 1279416, -1, 1, 1, 0x4E07A6EC, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1279416, -1, 2, 2, 0xB5DB4956, Fields, -1 };
 };
 
 struct SeamlessSiteMeta
@@ -9518,7 +9566,7 @@ struct SpellEffectMeta
         { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1140088, -1, 29, 28, 0xA02CDD57, Fields, 28 };
+    static constexpr DB2Meta Instance{ 1140088, -1, 29, 28, 0x7F31EDF7, Fields, 28 };
 };
 
 struct SpellEffectAutoDescriptionMeta
@@ -11093,6 +11141,37 @@ struct UIArrowCalloutMeta
     static constexpr DB2Meta Instance{ 5011999, 2, 9, 9, 0x11F1EB32, Fields, -1 };
 };
 
+struct UIButtonMeta
+{
+    static constexpr DB2MetaField Fields[5] =
+    {
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 6237799, -1, 5, 5, 0x88A0B057, Fields, -1 };
+};
+
+struct UICinematicIntroInfoMeta
+{
+    static constexpr DB2MetaField Fields[8] =
+    {
+        { FT_STRING, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 6155772, -1, 8, 8, 0x44820FD5, Fields, -1 };
+};
+
 struct UIEventToastMeta
 {
     static constexpr DB2MetaField Fields[22] =
@@ -11168,6 +11247,21 @@ struct UIGenericWidgetDisplayMeta
     static constexpr DB2Meta Instance{ 4861207, 3, 10, 10, 0x712E00ED, Fields, -1 };
 };
 
+struct UIMapPinInfoMeta
+{
+    static constexpr DB2MetaField Fields[6] =
+    {
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 6237800, -1, 6, 6, 0xE8E5C344, Fields, -1 };
+};
+
 struct UIScriptedAnimationEffectMeta
 {
     static constexpr DB2MetaField Fields[27] =
@@ -11453,13 +11547,15 @@ struct UiMapXMapArtMeta
 
 struct UiModelSceneMeta
 {
-    static constexpr DB2MetaField Fields[2] =
+    static constexpr DB2MetaField Fields[4] =
     {
+        { FT_INT, 1, false },
         { FT_BYTE, 1, true },
-        { FT_BYTE, 1, false },
+        { FT_BYTE, 1, true },
+        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1548215, -1, 2, 2, 0xD35977BB, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1548215, 0, 4, 4, 0x7A47260D, Fields, -1 };
 };
 
 struct UiModelSceneActorMeta
@@ -11877,7 +11973,7 @@ struct VehicleUIIndicatorMeta
 
 struct VignetteMeta
 {
-    static constexpr DB2MetaField Fields[9] =
+    static constexpr DB2MetaField Fields[10] =
     {
         { FT_STRING, 1, true },
         { FT_INT, 1, false },
@@ -11888,9 +11984,10 @@ struct VignetteMeta
         { FT_FLOAT, 1, true },
         { FT_BYTE, 1, true },
         { FT_INT, 1, true },
+        { FT_BYTE, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 892861, -1, 9, 9, 0x429A3D94, Fields, -1 };
+    static constexpr DB2Meta Instance{ 892861, -1, 10, 10, 0xA6472C0E, Fields, -1 };
 };
 
 struct VirtualAttachmentMeta
@@ -12212,7 +12309,7 @@ struct WorldEffectMeta
         { FT_SHORT, 1, false },
     };
 
-    static constexpr DB2Meta Instance{ 1343312, -1, 6, 6, 0xE8D95F3E, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1343312, -1, 6, 6, 0x2134DDFE, Fields, -1 };
 };
 
 struct WorldElapsedTimerMeta
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 73138b85eae..3221e0d1518 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -136,7 +136,7 @@ struct AreaTriggerEntry
     float BoxYaw;
     int8 ShapeType;
     int16 ShapeID;
-    int16 AreaTriggerActionSetID;
+    int32 AreaTriggerActionSetID;
     int8 Flags;
 
     AreaTriggerShapeType GetShapeType() const { return static_cast<AreaTriggerShapeType>(ShapeType); }
@@ -406,6 +406,7 @@ struct ChrClassesEntry
     uint32 LowResScreenFileDataID;
     int32 Flags;
     int32 StartingLevel;
+    uint32 SpellTextureBlobFileDataID;
     uint32 ArmorTypeMask;
     uint16 CinematicSequenceID;
     uint16 DefaultSpec;
@@ -482,8 +483,6 @@ struct ChrCustomizationOptionEntry
     uint32 ID;
     uint16 SecondaryID;
     int32 Flags;
-    int32 ChrRacesID;
-    int32 Sex;
     uint32 ChrModelID;
     int32 OrderIndex;
     int32 ChrCustomizationCategoryID;
@@ -2184,6 +2183,9 @@ struct LFGDungeonsEntry
     uint8 MinCountTank;
     uint8 MinCountHealer;
     uint8 MinCountDamage;
+    uint8 MaxPremadeCountTank;
+    uint8 MaxPremadeCountHealer;
+    uint8 MaxPremadeCountDamage;
     uint16 BonusReputationAmount;
     uint16 MentorItemLevel;
     uint8 MentorCharLevel;
@@ -2361,16 +2363,17 @@ struct MapChallengeModeEntry
 // structure for MapDifficulty.db2
 struct MapDifficultyEntry
 {
+    LocalizedString Message;
     uint32 ID;
-    LocalizedString Message;                                // m_message_lang (text showed when transfer to map failed)
-    uint32 ItemContextPickerID;
-    int32 ContentTuningID;
-    int32 ItemContext;
-    uint8 DifficultyID;
-    uint8 LockID;
+    int32 DifficultyID;
+    int32 LockID;
     uint8 ResetInterval;
-    uint8 MaxPlayers;
-    uint8 Flags;
+    int32 MaxPlayers;
+    uint8 ItemContext;
+    int32 ItemContextPickerID;
+    int32 Flags;
+    int32 ContentTuningID;
+    int32 WorldStateExpressionID;
     uint32 MapID;
 
     bool HasResetSchedule() const { return ResetInterval != MAP_DIFFICULTY_RESET_ANYTIME; }
@@ -2600,14 +2603,14 @@ struct PhaseXPhaseGroupEntry
 // structure for PlayerCondition.db2
 struct PlayerConditionEntry
 {
+    uint32 ID;
     Trinity::RaceMask<int64> RaceMask;
     LocalizedString FailureDescription;
-    uint32 ID;
     uint16 MinLevel;
     uint16 MaxLevel;
     int32 ClassMask;
     uint32 SkillLogic;
-    uint8 LanguageID;
+    int32 LanguageID;
     uint8 MinLanguage;
     int32 MaxLanguage;
     uint16 MaxFactionID;
@@ -2623,7 +2626,7 @@ struct PlayerConditionEntry
     uint8 ItemFlags;
     uint32 AuraSpellLogic;
     uint16 WorldStateExpressionID;
-    uint8 WeatherID;
+    int32 WeatherID;
     uint8 PartyStatus;
     uint8 LifetimeMaxPVPRank;
     uint32 AchievementLogic;
@@ -2632,7 +2635,7 @@ struct PlayerConditionEntry
     uint32 AreaLogic;
     uint32 LfgLogic;
     uint32 CurrencyLogic;
-    uint32 QuestKillID;
+    int32 QuestKillID;
     uint32 QuestKillLogic;
     int8 MinExpansionLevel;
     int8 MaxExpansionLevel;
@@ -2657,14 +2660,17 @@ struct PlayerConditionEntry
     int8 MinExpansionTier;
     uint8 MinPVPRank;
     uint8 MaxPVPRank;
+    int32 ContentTuningID;
+    int32 CovenantID;
+    uint32 TraitNodeEntryLogic;
     std::array<uint16, 4> SkillID;
     std::array<uint16, 4> MinSkill;
     std::array<uint16, 4> MaxSkill;
     std::array<uint32, 3> MinFactionID;
     std::array<uint8, 3> MinReputation;
-    std::array<uint32, 4> PrevQuestID;
-    std::array<uint32, 4> CurrQuestID;
-    std::array<uint32, 4> CurrentCompletedQuestID;
+    std::array<int32, 4> PrevQuestID;
+    std::array<int32, 4> CurrQuestID;
+    std::array<int32, 4> CurrentCompletedQuestID;
     std::array<int32, 4> SpellID;
     std::array<int32, 4> ItemID;
     std::array<uint32, 4> ItemCount;
@@ -2681,6 +2687,9 @@ struct PlayerConditionEntry
     std::array<uint32, 4> CurrencyCount;
     std::array<uint32, 6> QuestKillMonster;
     std::array<int32, 2> MovementFlags;
+    std::array<int32, 4> TraitNodeEntryID;
+    std::array<uint16, 4> TraitNodeEntryMinRank;
+    std::array<uint16, 4> TraitNodeEntryMaxRank;
 };
 
 // structure for PowerDisplay.db2
@@ -2697,9 +2706,9 @@ struct PowerDisplayEntry
 // structure for PowerType.db2
 struct PowerTypeEntry
 {
-    uint32 ID;
     char const* NameGlobalStringTag;
     char const* CostGlobalStringTag;
+    uint32 ID;
     int8 PowerTypeEnum;
     int32 MinPower;
     int32 MaxBasePower;
@@ -2889,12 +2898,12 @@ struct ScenarioEntry
 // structure for ScenarioStep.db2
 struct ScenarioStepEntry
 {
-    uint32 ID;
     LocalizedString Description;
     LocalizedString Title;
+    uint32 ID;
     uint16 ScenarioID;
     uint32 CriteriatreeID;
-    uint32 RewardQuestID;
+    int32 RewardQuestID;
     int32 RelatedStep;                                              // Bonus step can only be completed if scenario is in the step specified in this field
     uint16 Supersedes;                                              // Used in conjunction with Proving Grounds scenarios, when sequencing steps (Not using step order?)
     uint8 OrderIndex;
@@ -3985,6 +3994,7 @@ struct VignetteEntry
     float MinHeight;
     int8 VignetteType;
     int32 RewardQuestID;
+    int8 Unknown1156;
 
     EnumFlag<VignetteFlags> GetFlags() const { return static_cast<VignetteFlags>(Flags); }
     bool IsInfiniteAOI() const { return GetFlags().HasFlag(VignetteFlags::InfiniteAOI | VignetteFlags::ZoneInfiniteAOI); }
diff --git a/src/tools/map_extractor/loadlib/DBFilesClientList.h b/src/tools/map_extractor/loadlib/DBFilesClientList.h
index 953a8e3e24e..5c750479c74 100644
--- a/src/tools/map_extractor/loadlib/DBFilesClientList.h
+++ b/src/tools/map_extractor/loadlib/DBFilesClientList.h
@@ -26,6 +26,8 @@ struct DB2FileInfo
 
 DB2FileInfo const DBFilesClientList[] =
 {
+    { 6220124, "AccountStoreCategory.db2" },
+    { 6197817, "AccountStoreItem.db2" },
     { 1260179, "Achievement.db2" },
     { 1324299, "Achievement_Category.db2" },
     { 4572795, "ActionBarGroup.db2" },
@@ -275,6 +277,7 @@ DB2FileInfo const DBFilesClientList[] =
     { 1278178, "GMSurveyQuestions.db2" },
     { 1283020, "GMSurveySurveys.db2" },
     { 2922072, "GameClockDebug.db2" },
+    { 5008306, "GameMode.db2" },
     { 3565753, "GameObjectAnimGroupMember.db2" },
     { 1266737, "GameObjectArtKit.db2" },
     { 1302847, "GameObjectDiffAnimMap.db2" },
@@ -286,7 +289,15 @@ DB2FileInfo const DBFilesClientList[] =
     { 966238, "GarrAbility.db2" },
     { 1020248, "GarrAbilityCategory.db2" },
     { 966241, "GarrAbilityEffect.db2" },
+    { 929747, "GarrBuilding.db2" },
     { 943937, "GarrBuildingDoodadSet.db2" },
+    { 983298, "GarrBuildingPlotInst.db2" },
+    { 981570, "GarrClassSpec.db2" },
+    { 1380674, "GarrClassSpecPlayerCond.db2" },
+    { 1361029, "GarrFollowerSetXFollower.db2" },
+    { 1118784, "GarrFollowerType.db2" },
+    { 1412636, "GarrFollowerUICreature.db2" },
+    { 968468, "GarrFollowerXAbility.db2" },
     { 1572314, "GarrItemLevelUpgradeData.db2" },
     { 967963, "GarrMechanic.db2" },
     { 1391531, "GarrMechanicSetXMechanic.db2" },
@@ -295,10 +306,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 1125220, "GarrMissionTexture.db2" },
     { 984174, "GarrMissionType.db2" },
     { 967960, "GarrMissionXEncounter.db2" },
-    { 937647, "GarrSpecialization.db2" },
-    { 1416758, "GarrString.db2" },
-    { 1361032, "GarrTalent.db2" },
-    { 1361030, "GarrTalentTree.db2" },
+    { 1359096, "GarrMissionXFollower.db2" },
+    { 1138458, "GarrMssnBonusAbility.db2" },
+    { 929743, "GarrPlotBuilding.db2" },
+    { 929742, "GarrPlotInstance.db2" },
     { 1333161, "GarrType.db2" },
     { 976037, "GarrUiAnimClassInfo.db2" },
     { 976035, "GarrUiAnimRaceInfo.db2" },
@@ -462,11 +473,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 1465904, "ModelAnimCloakDampening.db2" },
     { 1337833, "ModelFileData.db2" },
     { 1399953, "ModelRibbonQuality.db2" },
-    { 5393273, "ModelSound.db2" },
-    { 5393274, "ModelSoundAnimEntry.db2" },
-    { 5393275, "ModelSoundEntry.db2" },
-    { 5393276, "ModelSoundOverride.db2" },
-    { 5682517, "ModelSoundSettings.db2" },
     { 5393277, "ModelSoundTagEntry.db2" },
     { 3390956, "ModifiedCraftingSpellSlot.db2" },
     { 1267645, "ModifierTree.db2" },
@@ -482,14 +488,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 1965589, "MultiTransitionProperties.db2" },
     { 5161908, "MusicOverride.db2" },
     { 2400282, "MythicPlusSeason.db2" },
-    { 2123783, "MythicPlusSeasonRewardLevels.db2" },
-    { 4067473, "MythicPlusSeasonTrackedAffix.db2" },
-    { 4521365, "MythicPlusSeasonTrackedMap.db2" },
-    { 5875492, "NPCCraftingOrderCustomer.db2" },
-    { 5875493, "NPCCraftingOrderCustomerXLabel.db2" },
-    { 5875494, "NPCCraftingOrderSet.db2" },
-    { 5875495, "NPCCraftingOrderSetXCraftOrder.db2" },
-    { 5875496, "NPCCraftingOrderSetXCustomer.db2" },
     { 5912882, "NPCCraftingOrderSetXTreasure.db2" },
     { 1340661, "NPCModelItemSlotDisplayInfo.db2" },
     { 1282621, "NPCSounds.db2" },
@@ -549,6 +547,7 @@ DB2FileInfo const DBFilesClientList[] =
     { 1891534, "PvpTalentCategory.db2" },
     { 1950197, "PvpTalentSlotUnlock.db2" },
     { 2066871, "PvpTier.db2" },
+    { 5917361, "QuestDrivenScenario.db2" },
     { 1282622, "QuestFactionReward.db2" },
     { 1343388, "QuestFeedbackEffect.db2" },
     { 1120960, "QuestInfo.db2" },
@@ -570,6 +569,7 @@ DB2FileInfo const DBFilesClientList[] =
     { 1716803, "RelicSlotTierRequirement.db2" },
     { 1671256, "RelicTalent.db2" },
     { 3743117, "RenownRewards.db2" },
+    { 5662591, "RenownRewardsPlunderstorm.db2" },
     { 1133729, "ResearchBranch.db2" },
     { 1133711, "ResearchField.db2" },
     { 1134090, "ResearchProject.db2" },
@@ -756,10 +756,13 @@ DB2FileInfo const DBFilesClientList[] =
     { 1140687, "TransportRotation.db2" },
     { 975024, "Trophy.db2" },
     { 5011999, "UIArrowCallout.db2" },
+    { 6237799, "UIButton.db2" },
+    { 6155772, "UICinematicIntroInfo.db2" },
     { 3946498, "UIEventToast.db2" },
     { 1729547, "UIExpansionDisplayInfo.db2" },
     { 1729546, "UIExpansionDisplayInfoIcon.db2" },
     { 4861207, "UIGenericWidgetDisplay.db2" },
+    { 6237800, "UIMapPinInfo.db2" },
     { 3556601, "UIScriptedAnimationEffect.db2" },
     { 3055924, "UiCamFbackTalkingHeadChrRace.db2" },
     { 1261406, "UiCamFbackTransmogChrRace.db2" },