Tools/Extractors: updated extractors

6 files changed, 69 insertions, 266 deletions

diff --git a/src/tools/extractor_common/ExtractorDB2LoadInfo.h b/src/tools/extractor_common/ExtractorDB2LoadInfo.h
index 54ff44fd989..bf43b2a81f3 100644
--- a/src/tools/extractor_common/ExtractorDB2LoadInfo.h
+++ b/src/tools/extractor_common/ExtractorDB2LoadInfo.h
@@ -23,18 +23,17 @@
 
 struct CinematicCameraLoadInfo
 {
-    static constexpr DB2MetaField MetaFields[5] =
+    static constexpr DB2MetaField MetaFields[4] =
     {
         { FT_FLOAT, 3, true },
         { FT_INT, 1, false },
         { FT_FLOAT, 1, true },
         { FT_INT, 1, false },
-        { FT_INT, 1, false },
     };
 
-    static constexpr DB2Meta MetaInstance{ 1294214, -1, 5, 5, 0x4B3DF171, MetaFields, -1 };
+    static constexpr DB2Meta MetaInstance{ 1294214, -1, 4, 4, 0x744B99BC, MetaFields, -1 };
 
-    static constexpr DB2FieldMeta Fields[8] =
+    static constexpr DB2FieldMeta Fields[7] =
     {
         { false, FT_INT, "ID" },
         { false, FT_FLOAT, "OriginX" },
@@ -43,31 +42,29 @@ struct CinematicCameraLoadInfo
         { false, FT_INT, "SoundID" },
         { false, FT_FLOAT, "OriginFacing" },
         { false, FT_INT, "FileDataID" },
-        { false, FT_INT, "ConversationID" },
     };
 
-    static constexpr DB2FileLoadInfo Instance{ Fields, 8, & MetaInstance };
+    static constexpr DB2FileLoadInfo Instance{ Fields, 7, & MetaInstance };
 };
 
 struct GameobjectDisplayInfoLoadInfo
 {
-    static constexpr DB2MetaField MetaFields[8] =
+    static constexpr DB2MetaField MetaFields[6] =
     {
+        { FT_STRING_NOT_LOCALIZED, 1, true },
         { FT_FLOAT, 6, true },
         { FT_INT, 1, true },
         { FT_SHORT, 1, true },
         { FT_FLOAT, 1, true },
         { FT_FLOAT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta MetaInstance{ 1266277, -1, 8, 8, 0x7F774625, MetaFields, -1 };
+    static constexpr DB2Meta MetaInstance{ 1266277, -1, 6, 6, 0xB59CF0B2, MetaFields, -1 };
 
-    static constexpr DB2FieldMeta Fields[14] =
+    static constexpr DB2FieldMeta Fields[12] =
     {
         { false, FT_INT, "ID" },
+        { false, FT_STRING_NOT_LOCALIZED, "ModelName" },
         { false, FT_FLOAT, "GeoBoxMinX" },
         { false, FT_FLOAT, "GeoBoxMinY" },
         { false, FT_FLOAT, "GeoBoxMinZ" },
@@ -78,12 +75,9 @@ struct GameobjectDisplayInfoLoadInfo
         { true, FT_SHORT, "ObjectEffectPackageID" },
         { false, FT_FLOAT, "OverrideLootEffectScale" },
         { false, FT_FLOAT, "OverrideNameScale" },
-        { true, FT_INT, "AlternateDisplayType" },
-        { true, FT_INT, "ClientCreatureDisplayInfoID" },
-        { true, FT_INT, "ClientItemID" },
     };
 
-    static constexpr DB2FileLoadInfo Instance{ Fields, 14, &MetaInstance };
+    static constexpr DB2FileLoadInfo Instance{ Fields, 12, &MetaInstance };
 };
 
 struct LiquidMaterialLoadInfo
@@ -226,7 +220,7 @@ struct LiquidTypeLoadInfo
 
 struct MapLoadInfo
 {
-    static constexpr DB2MetaField MetaFields[24] =
+    static constexpr DB2MetaField MetaFields[22] =
     {
         { FT_STRING_NOT_LOCALIZED, 1, true },
         { FT_STRING, 1, true },
@@ -234,7 +228,6 @@ struct MapLoadInfo
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
-        { FT_FLOAT, 2, true },
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, true },
         { FT_BYTE, 1, false },
@@ -245,18 +238,17 @@ struct MapLoadInfo
         { FT_SHORT, 1, true },
         { FT_BYTE, 1, false },
         { FT_FLOAT, 1, true },
+        { FT_INT, 1, true },
         { FT_SHORT, 1, true },
         { FT_BYTE, 1, false },
         { FT_SHORT, 1, true },
         { FT_INT, 1, true },
-        { FT_INT, 1, true },
-        { FT_INT, 1, true },
         { FT_INT, 3, true },
     };
 
-    static constexpr DB2Meta MetaInstance{ 1349477, -1, 24, 24, 0x15542FE8, MetaFields, -1 };
+    static constexpr DB2Meta MetaInstance{ 1349477, -1, 22, 22, 0xEE526FA5, MetaFields, -1 };
 
-    static constexpr DB2FieldMeta Fields[28] =
+    static constexpr DB2FieldMeta Fields[25] =
     {
         { false, FT_INT, "ID" },
         { false, FT_STRING_NOT_LOCALIZED, "Directory" },
@@ -265,8 +257,6 @@ struct MapLoadInfo
         { false, FT_STRING, "MapDescription1" },
         { false, FT_STRING, "PvpShortDescription" },
         { false, FT_STRING, "PvpLongDescription" },
-        { false, FT_FLOAT, "CorpseX" },
-        { false, FT_FLOAT, "CorpseY" },
         { false, FT_BYTE, "MapType" },
         { true, FT_BYTE, "InstanceType" },
         { false, FT_BYTE, "ExpansionID" },
@@ -277,18 +267,17 @@ struct MapLoadInfo
         { true, FT_SHORT, "CosmeticParentMapID" },
         { false, FT_BYTE, "TimeOffset" },
         { false, FT_FLOAT, "MinimapIconScale" },
+        { true, FT_INT, "RaidOffset" },
         { true, FT_SHORT, "CorpseMapID" },
         { false, FT_BYTE, "MaxPlayers" },
         { true, FT_SHORT, "WindSettingsID" },
         { true, FT_INT, "ZmpFileDataID" },
-        { true, FT_INT, "WdtFileDataID" },
-        { true, FT_INT, "NavigationMaxDistance" },
         { true, FT_INT, "Flags1" },
         { true, FT_INT, "Flags2" },
         { true, FT_INT, "Flags3" },
     };
 
-    static constexpr DB2FileLoadInfo Instance{ Fields, 28, &MetaInstance };
+    static constexpr DB2FileLoadInfo Instance{ Fields, 25, &MetaInstance };
 };
 
 #endif // ExtractorDB2LoadInfo_h__
diff --git a/src/tools/map_extractor/System.cpp b/src/tools/map_extractor/System.cpp
index cdcb9aff2c8..a12dbb21317 100644
--- a/src/tools/map_extractor/System.cpp
+++ b/src/tools/map_extractor/System.cpp
@@ -51,7 +51,6 @@ std::shared_ptr<CASC::Storage> CascStorage;
 struct MapEntry
 {
     uint32 Id = 0;
-    int32 WdtFileDataId = 0;
     std::string Name;
     std::string Directory;
 };
@@ -110,7 +109,7 @@ float CONF_flat_liquid_delta_limit = 0.001f; // If max - min less this value - l
 
 uint32 CONF_Locale = 0;
 
-char const* CONF_Product = "wow";
+char const* CONF_Product = "wow_classic_beta";
 char const* CONF_Region = "eu";
 bool CONF_UseRemoteCasc = false;
 
@@ -287,7 +286,6 @@ void ReadMapDBC()
 
         MapEntry map;
         map.Id = record.GetId();
-        map.WdtFileDataId = record.GetInt32("WdtFileDataID");
         map.Name = record.GetString("MapName");
         map.Directory = record.GetString("Directory");
         idToIndex[map.Id] = map_ids.size();
@@ -302,15 +300,12 @@ void ReadMapDBC()
         {
             MapEntry map;
             map.Id = copy.NewRowId;
-            map.WdtFileDataId = map_ids[itr->second].WdtFileDataId;
             map.Name = map_ids[itr->second].Name;
             map.Directory = map_ids[itr->second].Directory;
             map_ids.push_back(map);
         }
     }
 
-    map_ids.erase(std::remove_if(map_ids.begin(), map_ids.end(), [](MapEntry const& map) { return !map.WdtFileDataId; }), map_ids.end());
-
     printf("Done! (" SZFMTD " maps loaded)\n", map_ids.size());
 }
 
@@ -1089,7 +1084,8 @@ void ExtractMaps(uint32 build)
         // Loadup map grid data
         ChunkedFile wdt;
         std::bitset<(WDT_MAP_SIZE) * (WDT_MAP_SIZE)> existingTiles;
-        if (wdt.loadFile(CascStorage, map_ids[z].WdtFileDataId, Trinity::StringFormat("WDT for map {}", map_ids[z].Id), false))
+        std::string fileName = Trinity::StringFormat("World\\Maps\\{}\\{}.wdt", map_ids[z].Directory.c_str(), map_ids[z].Directory.c_str());
+        if (wdt.loadFile(CascStorage, fileName, false))
         {
             FileChunk* mphd = wdt.GetChunk("MPHD");
             FileChunk* main = wdt.GetChunk("MAIN");
@@ -1109,7 +1105,7 @@ void ExtractMaps(uint32 build)
                     }
                     else
                     {
-                        std::string storagePath = Trinity::StringFormat(R"(World\Maps\{}\{}_{}_{}.adt)", map_ids[z].Directory, map_ids[z].Directory, x, y);
+                        std::string storagePath = Trinity::StringFormat("World\\Maps\\{}\\{}_{}_{}.adt", map_ids[z].Directory, map_ids[z].Directory, x, y);
                         existingTiles[y * WDT_MAP_SIZE + x] = ConvertADT(storagePath, map_ids[z].Name, outputFileName, y, x, build, ignoreDeepWater);
                     }
                 }
@@ -1336,26 +1332,24 @@ void ExtractGameTables()
 
     DB2FileInfo GameTables[] =
     {
-        { 1582086, "ArtifactKnowledgeMultiplier.txt" },
-        { 1391662, "ArtifactLevelXP.txt" },
         { 1391663, "BarberShopCostBase.txt" },
-        { 1391664, "BaseMp.txt" },
-        { 4494528, "BaseProfessionRatings.txt" },
-        { 1391665, "BattlePetTypeDamageMod.txt" },
-        { 1391666, "BattlePetXP.txt" },
+        { 3999262, "ChanceToMeleeCrit.txt" },
+        { 3999263, "ChanceToMeleeCritbase.txt" },
+        { 3999265, "ChanceToSpellCrit.txt" },
+        { 3999264, "ChanceToSpellCritBase.txt" },
         { 1391669, "CombatRatings.txt" },
-        { 1391670, "CombatRatingsMultByILvl.txt" },
-        { 1391671, "HonorLevel.txt" },
-        { 1391642, "HpPerSta.txt" },
-        { 2012881, "ItemLevelByLevel.txt" },
-        { 1726830, "ItemLevelSquish.txt" },
-        { 1391643, "ItemSocketCostPerLevel.txt" },
         { 1391651, "NPCManaCostScaler.txt" },
-        { 4492239, "ProfessionRatings.txt" },
-        { 1391659, "SandboxScaling.txt" },
+        { 5464960, "OCTBaseHPByClass.txt" },
+        { 4049853, "OCTBaseMPByClass.txt" },
+        { 4526467, "OCTClassCombatRatingScalar.txt" },
+        { 5464961, "OCTHPPerStamina.txt" },
+        { 3953485, "OCTRegenHP.txt" },
+        { 2238239, "OCTRegenMP.txt" },
+        { 3953486, "RegenHPPerSpt.txt" },
+        { 2238240, "RegenMPPerSpt.txt" },
+        { 2200979, "ShieldBlockRegular.txt" },
         { 1391660, "SpellScaling.txt" },
-        { 1980632, "StaminaMultByILvl.txt" },
-        { 1391661, "xp.txt" }
+        { 4640503, "TeamContributionPoints.txt" }
     };
 
     uint32 count = 0;
diff --git a/src/tools/map_extractor/loadlib/DBFilesClientList.h b/src/tools/map_extractor/loadlib/DBFilesClientList.h
index c1c319a85cd..5bfacd211e1 100644
--- a/src/tools/map_extractor/loadlib/DBFilesClientList.h
+++ b/src/tools/map_extractor/loadlib/DBFilesClientList.h
@@ -31,8 +31,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 4572795, "ActionBarGroup.db2" },
     { 4572797, "ActionBarGroupEntry.db2" },
     { 1115949, "AdventureJournal.db2" },
+    { 5599873, "AdventureJournalItem.db2" },
     { 1267070, "AdventureMapPOI.db2" },
     { 1710672, "AlliedRace.db2" },
+    { 1720145, "AlliedRaceRacialAbility.db2" },
     { 5156218, "AltMinimap.db2" },
     { 5156219, "AltMinimapFiledata.db2" },
     { 5156220, "AltMinimapWMO.db2" },
@@ -50,6 +52,7 @@ DB2FileInfo const DBFilesClientList[] =
     { 3286804, "AnimaCylinder.db2" },
     { 3153990, "AnimaMaterial.db2" },
     { 1375431, "AnimationData.db2" },
+    { 2140223, "AoiBox.db2" },
     { 2123730, "AreaConditionalData.db2" },
     { 1537162, "AreaFarClipOverride.db2" },
     { 1093406, "AreaGroupMember.db2" },
@@ -58,19 +61,17 @@ DB2FileInfo const DBFilesClientList[] =
     { 1353545, "AreaTable.db2" },
     { 1354401, "AreaTrigger.db2" },
     { 1352378, "AreaTriggerActionSet.db2" },
-    { 4266572, "AreaTriggerBoundedPlane.db2" },
     { 1332554, "AreaTriggerBox.db2" },
     { 1937227, "AreaTriggerCreateProperties.db2" },
     { 1121943, "AreaTriggerCylinder.db2" },
-    { 4223661, "AreaTriggerDisk.db2" },
     { 1315630, "AreaTriggerSphere.db2" },
+    { 3849793, "ArenaCcItem.db2" },
     { 5226140, "ArenaTrackedItem.db2" },
     { 1284818, "ArmorLocation.db2" },
     { 1007934, "Artifact.db2" },
     { 1116407, "ArtifactAppearance.db2" },
     { 1116408, "ArtifactAppearanceSet.db2" },
     { 1376210, "ArtifactCategory.db2" },
-    { 2029780, "ArtifactItemToTransmog.db2" },
     { 1007937, "ArtifactPower.db2" },
     { 1133731, "ArtifactPowerLink.db2" },
     { 1597467, "ArtifactPowerPicker.db2" },
@@ -91,11 +92,9 @@ DB2FileInfo const DBFilesClientList[] =
     { 1846040, "AzeritePowerSetMember.db2" },
     { 1846043, "AzeriteTierUnlock.db2" },
     { 2446322, "AzeriteTierUnlockSet.db2" },
-    { 2564314, "AzeriteUnlockMapping.db2" },
     { 1284819, "BankBagSlotPrices.db2" },
     { 1373459, "BannedAddons.db2" },
     { 1237437, "BarberShopStyle.db2" },
-    { 2499852, "BarrageEffect.db2" },
     { 841610, "BattlePetAbility.db2" },
     { 801575, "BattlePetAbilityEffect.db2" },
     { 801576, "BattlePetAbilityState.db2" },
@@ -108,19 +107,17 @@ DB2FileInfo const DBFilesClientList[] =
     { 841622, "BattlePetSpecies.db2" },
     { 801581, "BattlePetSpeciesState.db2" },
     { 801582, "BattlePetSpeciesXAbility.db2" },
-    { 3669304, "BattlePetSpeciesXCovenant.db2" },
     { 801583, "BattlePetState.db2" },
     { 801584, "BattlePetVisual.db2" },
     { 1360265, "BattlemasterList.db2" },
+    { 5549327, "BattlepayCurrency.db2" },
     { 1525607, "BeamEffect.db2" },
-    { 3491563, "BeckonTrigger.db2" },
     { 1467254, "BoneWindModifierModel.db2" },
     { 1416756, "BoneWindModifiers.db2" },
     { 1983274, "BonusRoll.db2" },
     { 1367866, "Bounty.db2" },
     { 1367865, "BountySet.db2" },
     { 841604, "BroadcastText.db2" },
-    { 2166900, "BroadcastTextDuration.db2" },
     { 1117695, "CameraEffect.db2" },
     { 1117696, "CameraEffectEntry.db2" },
     { 1343308, "CameraMode.db2" },
@@ -132,16 +129,15 @@ DB2FileInfo const DBFilesClientList[] =
     { 1068162, "Cfg_Categories.db2" },
     { 1080949, "Cfg_Configs.db2" },
     { 1082876, "Cfg_Regions.db2" },
-    { 2965645, "ChallengeModeItemBonusOverride.db2" },
     { 1343386, "CharBaseInfo.db2" },
     { 1375798, "CharBaseSection.db2" },
     { 1360262, "CharComponentTextureLayouts.db2" },
     { 1360263, "CharComponentTextureSections.db2" },
     { 1256914, "CharHairGeosets.db2" },
     { 2388725, "CharSectionCondition.db2" },
+    { 1365366, "CharSections.db2" },
     { 972425, "CharShipment.db2" },
     { 972405, "CharShipmentContainer.db2" },
-    { 3055696, "CharStartKit.db2" },
     { 1237591, "CharStartOutfit.db2" },
     { 1349054, "CharTitles.db2" },
     { 1028733, "CharacterFaceBoneSet.db2" },
@@ -154,13 +150,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 1117084, "ChatProfanity.db2" },
     { 1306188, "ChrClassRaceSex.db2" },
     { 1267497, "ChrClassTitle.db2" },
-    { 3754770, "ChrClassUIChrModelInfo.db2" },
     { 1316515, "ChrClassUIDisplay.db2" },
     { 1267498, "ChrClassVillain.db2" },
     { 1361031, "ChrClasses.db2" },
     { 1121420, "ChrClassesXPowerTypes.db2" },
-    { 3671168, "ChrCreateClassAnimTarget.db2" },
-    { 3671169, "ChrCreateClassAnimTargetInfo.db2" },
     { 3590348, "ChrCustClientChoiceConversion.db2" },
     { 5387095, "ChrCustGeoComponentLink.db2" },
     { 3952714, "ChrCustItemGeoModify.db2" },
@@ -184,12 +177,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 3384313, "ChrModel.db2" },
     { 3566562, "ChrModelMaterial.db2" },
     { 3548976, "ChrModelTextureLayer.db2" },
-    { 3507821, "ChrRaceRacialAbility.db2" },
+    { 3536417, "ChrModelTextureTarget.db2" },
     { 3490304, "ChrRaceXChrModel.db2" },
     { 1305311, "ChrRaces.db2" },
-    { 4566929, "ChrRacesCreateScreenIcon.db2" },
     { 5320971, "ChrRacesPing.db2" },
-    { 4195187, "ChrSelectBackgroundCDI.db2" },
     { 1343390, "ChrSpecialization.db2" },
     { 984529, "ChrUpgradeBucket.db2" },
     { 984528, "ChrUpgradeBucketSpell.db2" },
@@ -199,13 +190,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 1939843, "ClientSceneEffect.db2" },
     { 1465903, "CloakDampening.db2" },
     { 2175218, "CloneEffect.db2" },
-    { 5152111, "CollectableSourceEncounter.db2" },
-    { 5152908, "CollectableSourceEncounterSparse.db2" },
-    { 5152112, "CollectableSourceInfo.db2" },
-    { 5205183, "CollectableSourceQuest.db2" },
-    { 5205600, "CollectableSourceQuestSparse.db2" },
-    { 5163410, "CollectableSourceVendor.db2" },
-    { 5159897, "CollectableSourceVendorSparse.db2" },
     { 1120958, "CombatCondition.db2" },
     { 3067644, "CommentatorIndirectSpell.db2" },
     { 1664251, "CommentatorStartLocation.db2" },
@@ -217,31 +201,13 @@ DB2FileInfo const DBFilesClientList[] =
     { 3501965, "ConditionalContentTuning.db2" },
     { 5345180, "ConditionalItemAppearance.db2" },
     { 1709409, "ConfigurationWarning.db2" },
-    { 4668112, "ContentRestrictionRule.db2" },
-    { 4281307, "ContentRestrictionRuleSet.db2" },
     { 1962930, "ContentTuning.db2" },
-    { 2976765, "ContentTuningXExpected.db2" },
-    { 4659576, "ContentTuningXLabel.db2" },
     { 1587153, "Contribution.db2" },
     { 2143633, "ContributionStyle.db2" },
     { 2143634, "ContributionStyleContainer.db2" },
     { 1260801, "ConversationLine.db2" },
-    { 3220711, "CorruptionEffects.db2" },
-    { 3384973, "Covenant.db2" },
-    { 4545611, "CraftingData.db2" },
-    { 4659601, "CraftingDataEnchantQuality.db2" },
-    { 4545612, "CraftingDataItemQuality.db2" },
-    { 4373536, "CraftingDifficulty.db2" },
-    { 4373537, "CraftingDifficultyQuality.db2" },
-    { 4529122, "CraftingOrder.db2" },
-    { 4688652, "CraftingOrderHouse.db2" },
-    { 4373538, "CraftingQuality.db2" },
-    { 4541803, "CraftingReagentEffect.db2" },
-    { 4382197, "CraftingReagentQuality.db2" },
-    { 5049814, "CraftingReagentRequirement.db2" },
     { 841631, "Creature.db2" },
     { 879282, "CreatureDifficulty.db2" },
-    { 4044373, "CreatureDifficultyTreasure.db2" },
     { 1146692, "CreatureDispXUiCamera.db2" },
     { 1108759, "CreatureDisplayInfo.db2" },
     { 1332686, "CreatureDisplayInfoCond.db2" },
@@ -253,15 +219,14 @@ DB2FileInfo const DBFilesClientList[] =
     { 1146698, "CreatureDisplayInfoTrn.db2" },
     { 1351351, "CreatureFamily.db2" },
     { 1131322, "CreatureImmunities.db2" },
-    { 3055733, "CreatureLabel.db2" },
     { 1365368, "CreatureModelData.db2" },
     { 1125666, "CreatureMovementInfo.db2" },
     { 1344466, "CreatureSoundData.db2" },
     { 4178576, "CreatureSoundFidget.db2" },
+    { 3032554, "CreatureSpellData.db2" },
     { 1131315, "CreatureType.db2" },
     { 1587158, "CreatureXContribution.db2" },
     { 1864302, "CreatureXDisplayInfo.db2" },
-    { 3055738, "CreatureXUiWidgetSet.db2" },
     { 1263817, "Criteria.db2" },
     { 1263818, "CriteriaTree.db2" },
     { 1345969, "CriteriaTreeXEffect.db2" },
@@ -292,12 +257,9 @@ DB2FileInfo const DBFilesClientList[] =
     { 1343313, "Exhaustion.db2" },
     { 1937326, "ExpectedStat.db2" },
     { 1969773, "ExpectedStatMod.db2" },
-    { 3527889, "ExtraAbilityInfo.db2" },
     { 1361972, "Faction.db2" },
     { 1343595, "FactionGroup.db2" },
     { 1361579, "FactionTemplate.db2" },
-    { 4501047, "FlightCapability.db2" },
-    { 4644249, "FlightCapabilityXGlideEvent.db2" },
     { 1308056, "FootprintTextures.db2" },
     { 1267647, "FootstepTerrainLookup.db2" },
     { 1237638, "FriendshipRepReaction.db2" },
@@ -308,22 +270,16 @@ DB2FileInfo const DBFilesClientList[] =
     { 1278178, "GMSurveyQuestions.db2" },
     { 1283020, "GMSurveySurveys.db2" },
     { 2922072, "GameClockDebug.db2" },
-    { 5008306, "GameMode.db2" },
     { 3565753, "GameObjectAnimGroupMember.db2" },
     { 1266737, "GameObjectArtKit.db2" },
     { 1302847, "GameObjectDiffAnimMap.db2" },
     { 1266277, "GameObjectDisplayInfo.db2" },
     { 1345272, "GameObjectDisplayInfoXSoundKit.db2" },
-    { 4621877, "GameObjectLabel.db2" },
     { 841620, "GameObjects.db2" },
-    { 3405438, "GameParameter.db2" },
     { 1368021, "GameTips.db2" },
     { 966238, "GarrAbility.db2" },
     { 1020248, "GarrAbilityCategory.db2" },
     { 966241, "GarrAbilityEffect.db2" },
-    { 3305399, "GarrAutoCombatant.db2" },
-    { 3305400, "GarrAutoSpell.db2" },
-    { 3307335, "GarrAutoSpellEffect.db2" },
     { 929747, "GarrBuilding.db2" },
     { 943937, "GarrBuildingDoodadSet.db2" },
     { 983298, "GarrBuildingPlotInst.db2" },
@@ -346,7 +302,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 1391531, "GarrMechanicSetXMechanic.db2" },
     { 967964, "GarrMechanicType.db2" },
     { 967962, "GarrMission.db2" },
-    { 3055759, "GarrMissionSet.db2" },
     { 1125220, "GarrMissionTexture.db2" },
     { 984174, "GarrMissionType.db2" },
     { 967960, "GarrMissionXEncounter.db2" },
@@ -360,25 +315,13 @@ DB2FileInfo const DBFilesClientList[] =
     { 940404, "GarrSiteLevelPlotInst.db2" },
     { 937647, "GarrSpecialization.db2" },
     { 1416758, "GarrString.db2" },
-    { 3195601, "GarrTalTreeXGarrTalResearch.db2" },
     { 1361032, "GarrTalent.db2" },
-    { 3514438, "GarrTalentCost.db2" },
-    { 3534056, "GarrTalentMapPOI.db2" },
-    { 3069763, "GarrTalentRank.db2" },
-    { 4382239, "GarrTalentRankGroupEntry.db2" },
-    { 4389481, "GarrTalentRankGroupResearchMod.db2" },
-    { 3195518, "GarrTalentResearch.db2" },
-    { 3612617, "GarrTalentSocketProperties.db2" },
     { 1361030, "GarrTalentTree.db2" },
     { 1333161, "GarrType.db2" },
     { 976037, "GarrUiAnimClassInfo.db2" },
     { 976035, "GarrUiAnimRaceInfo.db2" },
     { 1343604, "GemProperties.db2" },
-    { 4644012, "GlideEvent.db2" },
-    { 4682325, "GlideEventBlendTimes.db2" },
     { 4328468, "GlobalColor.db2" },
-    { 3752002, "GlobalCurve.db2" },
-    { 3756368, "GlobalGameContentTuning.db2" },
     { 4082838, "GlobalPlayerCondition.db2" },
     { 4082839, "GlobalPlayerConditionSet.db2" },
     { 1394440, "GlobalStrings.db2" },
@@ -386,10 +329,9 @@ DB2FileInfo const DBFilesClientList[] =
     { 948546, "GlyphExclusiveCategory.db2" },
     { 1345274, "GlyphProperties.db2" },
     { 948496, "GlyphRequiredSpec.db2" },
+    { 1130095, "GlyphSlot.db2" },
     { 4278503, "GossipNPCOption.db2" },
     { 4335720, "GossipNPCOptionDisplayInfo.db2" },
-    { 4407361, "GossipXGarrTalentTrees.db2" },
-    { 3622253, "GossipXUIDisplayInfo.db2" },
     { 2433582, "GradientEffect.db2" },
     { 1308057, "GroundEffectDoodad.db2" },
     { 1308499, "GroundEffectTexture.db2" },
@@ -428,26 +370,12 @@ DB2FileInfo const DBFilesClientList[] =
     { 1283022, "ItemArmorTotal.db2" },
     { 1278179, "ItemBagFamily.db2" },
     { 959070, "ItemBonus.db2" },
-    { 1805807, "ItemBonusList.db2" },
-    { 3755382, "ItemBonusListGroup.db2" },
-    { 3025306, "ItemBonusListGroupEntry.db2" },
     { 1320358, "ItemBonusListLevelDelta.db2" },
-    { 2924997, "ItemBonusListWarforgeLevelDelta.db2" },
-    { 5155639, "ItemBonusSeason.db2" },
-    { 5155640, "ItemBonusSeasonBonusListGroup.db2" },
-    { 5155641, "ItemBonusSeasonUpgradeCost.db2" },
-    { 3026822, "ItemBonusSequenceSpell.db2" },
-    { 3055768, "ItemBonusTree.db2" },
-    { 4407505, "ItemBonusTreeGroupEntry.db2" },
     { 987134, "ItemBonusTreeNode.db2" },
     { 1247926, "ItemChildEquipment.db2" },
     { 1140189, "ItemClass.db2" },
-    { 5128111, "ItemCondition.db2" },
     { 1405665, "ItemContextPickerEntry.db2" },
-    { 4337196, "ItemConversion.db2" },
-    { 4337197, "ItemConversionEntry.db2" },
     { 801670, "ItemCurrencyCost.db2" },
-    { 3755770, "ItemCurrencyValue.db2" },
     { 1277740, "ItemDamageAmmo.db2" },
     { 1277743, "ItemDamageOneHand.db2" },
     { 1277739, "ItemDamageOneHandCaster.db2" },
@@ -459,28 +387,21 @@ DB2FileInfo const DBFilesClientList[] =
     { 4050937, "ItemDisplayInfoModelMatRes.db2" },
     { 969941, "ItemEffect.db2" },
     { 801681, "ItemExtendedCost.db2" },
-    { 2358574, "ItemFallbackVisual.db2" },
-    { 5152256, "ItemFixup.db2" },
-    { 5475699, "ItemFixupAction.db2" },
-    { 5015219, "ItemGroupIlvlScalingEntry.db2" },
     { 1283023, "ItemGroupSounds.db2" },
     { 1588911, "ItemLevelSelector.db2" },
     { 1624937, "ItemLevelSelectorQuality.db2" },
     { 1624933, "ItemLevelSelectorQualitySet.db2" },
     { 1237440, "ItemLimitCategory.db2" },
     { 1378590, "ItemLimitCategoryCondition.db2" },
-    { 4677533, "ItemLogicalCost.db2" },
-    { 4677534, "ItemLogicalCostGroup.db2" },
     { 982457, "ItemModifiedAppearance.db2" },
     { 1278399, "ItemModifiedAppearanceExtra.db2" },
     { 1332559, "ItemNameDescription.db2" },
-    { 3723474, "ItemNameSlotOverride.db2" },
     { 1302240, "ItemPetFood.db2" },
     { 1121231, "ItemPriceBase.db2" },
+    { 1237441, "ItemRandomProperties.db2" },
+    { 1237592, "ItemRandomSuffix.db2" },
     { 1270315, "ItemRangedDisplayInfo.db2" },
-    { 5150118, "ItemRecraft.db2" },
-    { 4548446, "ItemSalvage.db2" },
-    { 4549058, "ItemSalvageLoot.db2" },
+    { 5633983, "ItemReforge.db2" },
     { 1273408, "ItemSearchName.db2" },
     { 1343609, "ItemSet.db2" },
     { 1314689, "ItemSetSpell.db2" },
@@ -489,10 +410,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 1134576, "ItemSpecOverride.db2" },
     { 1261604, "ItemSubClass.db2" },
     { 1302852, "ItemSubClassMask.db2" },
+    { 801687, "ItemUpgrade.db2" },
     { 1343605, "ItemVisuals.db2" },
     { 3043873, "ItemVisualsXEffect.db2" },
     { 987133, "ItemXBonusTree.db2" },
-    { 3177687, "ItemXItemEffect.db2" },
     { 1240336, "JournalEncounter.db2" },
     { 1301155, "JournalEncounterCreature.db2" },
     { 1344467, "JournalEncounterItem.db2" },
@@ -508,10 +429,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 1285009, "JournalTierXInstance.db2" },
     { 801693, "Keychain.db2" },
     { 1344761, "KeystoneAffix.db2" },
+    { 1343606, "LFGDungeonExpansion.db2" },
     { 1135058, "LFGDungeonGroup.db2" },
     { 1361033, "LFGDungeons.db2" },
     { 982805, "LFGRoleRequirement.db2" },
-    { 4281309, "LabelXContentRestrictRuleSet.db2" },
     { 984702, "LanguageWords.db2" },
     { 1135325, "Languages.db2" },
     { 1339818, "LfgDungeonsGroupingMap.db2" },
@@ -519,15 +440,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 1375580, "LightData.db2" },
     { 1334669, "LightParams.db2" },
     { 1308501, "LightSkybox.db2" },
-    { 4680119, "LightWorldShadow.db2" },
     { 2003383, "Lightning.db2" },
     { 1132538, "LiquidMaterial.db2" },
     { 1308058, "LiquidObject.db2" },
     { 1371380, "LiquidType.db2" },
-    { 2261065, "LiquidTypeXTexture.db2" },
-    { 4276965, "LivingWorldObjectTemplate.db2" },
-    { 4276966, "LivingWorldObjectTemplateModel.db2" },
-    { 2478235, "LoadingScreenSkin.db2" },
     { 1302239, "LoadingScreenTaxiSplines.db2" },
     { 1266541, "LoadingScreens.db2" },
     { 801706, "Locale.db2" },
@@ -535,9 +451,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 1343608, "Lock.db2" },
     { 1284823, "LockType.db2" },
     { 1098785, "LookAtController.db2" },
-    { 3311370, "LoreText.db2" },
-    { 3479846, "LoreTextPublic.db2" },
-    { 3390955, "MCRSlotXMCRCategory.db2" },
     { 1240344, "MailTemplate.db2" },
     { 1587159, "ManagedWorldState.db2" },
     { 1587155, "ManagedWorldStateBuff.db2" },
@@ -551,13 +464,11 @@ DB2FileInfo const DBFilesClientList[] =
     { 1597466, "MapCelestialBody.db2" },
     { 801709, "MapChallengeMode.db2" },
     { 1367868, "MapDifficulty.db2" },
+    { 4913557, "MapDifficultyRedirect.db2" },
     { 1375435, "MapDifficultyXCondition.db2" },
     { 1719707, "MapLoadingScreen.db2" },
-    { 4633656, "MapRenderScale.db2" },
     { 801710, "MarketingPromotionsXLocale.db2" },
     { 1294217, "Material.db2" },
-    { 2991315, "MawPower.db2" },
-    { 2997952, "MawPowerRarity.db2" },
     { 1347274, "MinorTalent.db2" },
     { 1710117, "MissileTargeting.db2" },
     { 1465904, "ModelAnimCloakDampening.db2" },
@@ -569,19 +480,13 @@ DB2FileInfo const DBFilesClientList[] =
     { 5393276, "ModelSoundOverride.db2" },
     { 5512584, "ModelSoundOverrideName.db2" },
     { 5393277, "ModelSoundTagEntry.db2" },
-    { 3386486, "ModifiedCraftingCategory.db2" },
-    { 4530643, "ModifiedCraftingItem.db2" },
-    { 3386487, "ModifiedCraftingReagentItem.db2" },
-    { 3386488, "ModifiedCraftingReagentSlot.db2" },
     { 3390956, "ModifiedCraftingSpellSlot.db2" },
     { 1267645, "ModifierTree.db2" },
     { 921760, "Mount.db2" },
     { 1114709, "MountCapability.db2" },
-    { 2923510, "MountEquipment.db2" },
     { 1114674, "MountType.db2" },
     { 1114715, "MountTypeXCapability.db2" },
     { 1576117, "MountXDisplay.db2" },
-    { 3989477, "MountXSpellVisualKitPicker.db2" },
     { 1332556, "Movie.db2" },
     { 1301154, "MovieFileData.db2" },
     { 1339819, "MovieVariation.db2" },
@@ -611,10 +516,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 1394275, "PVPBracketTypes.db2" },
     { 1339820, "PVPDifficulty.db2" },
     { 972287, "PVPItem.db2" },
-    { 2992916, "PVPScoreboardCellInfo.db2" },
-    { 2992917, "PVPScoreboardColumnHeader.db2" },
-    { 2992918, "PVPScoreboardLayout.db2" },
-    { 2992919, "PVPStat.db2" },
     { 1271600, "PageTextMaterial.db2" },
     { 1252503, "PaperDollItemFrame.db2" },
     { 1581183, "ParagonReputation.db2" },
@@ -622,24 +523,11 @@ DB2FileInfo const DBFilesClientList[] =
     { 3396285, "Particulate.db2" },
     { 2053913, "ParticulateSound.db2" },
     { 801732, "Path.db2" },
-    { 2428705, "PathEdge.db2" },
     { 801733, "PathNode.db2" },
     { 801734, "PathNodeProperty.db2" },
     { 801735, "PathProperty.db2" },
-    { 4519766, "PerksActivity.db2" },
-    { 5524226, "PerksActivityCondition.db2" },
-    { 4694317, "PerksActivityTag.db2" },
-    { 4519767, "PerksActivityThreshold.db2" },
-    { 4519768, "PerksActivityThresholdGroup.db2" },
-    { 5330797, "PerksActivityXHolidays.db2" },
-    { 4519781, "PerksActivityXInterval.db2" },
-    { 4694318, "PerksActivityXTag.db2" },
-    { 5389878, "PerksUITheme.db2" },
-    { 4281310, "PerksVendorCategory.db2" },
-    { 4281311, "PerksVendorItem.db2" },
-    { 5386256, "PerksVendorItemUIGroup.db2" },
-    { 4281312, "PerksVendorItemUIInfo.db2" },
-    { 4872513, "PerksVendorItemXInterval.db2" },
+    { 2179604, "PetLoyalty.db2" },
+    { 2179609, "PetPersonality.db2" },
     { 1348558, "Phase.db2" },
     { 1267336, "PhaseShiftZoneSounds.db2" },
     { 987581, "PhaseXPhaseGroup.db2" },
@@ -653,25 +541,12 @@ DB2FileInfo const DBFilesClientList[] =
     { 1332557, "PowerDisplay.db2" },
     { 1266022, "PowerType.db2" },
     { 1275869, "PrestigeLevelInfo.db2" },
-    { 4542069, "ProfTraitPathNode.db2" },
-    { 4542084, "ProfTraitPerkNode.db2" },
-    { 4542085, "ProfTraitTree.db2" },
-    { 4999865, "ProfTraitTreeHighlight.db2" },
     { 4508544, "Profession.db2" },
-    { 4505297, "ProfessionEffect.db2" },
-    { 4556715, "ProfessionEffectType.db2" },
-    { 4452078, "ProfessionPropPoints.db2" },
-    { 4623413, "ProfessionRating.db2" },
-    { 4505298, "ProfessionTrait.db2" },
-    { 4505494, "ProfessionTraitXEffect.db2" },
-    { 4505299, "ProfessionTraitXLabel.db2" },
-    { 4868299, "ProfessionXRating.db2" },
-    { 1585723, "PvpBrawl.db2" },
     { 4699082, "PvpRating.db2" },
+    { 1307154, "PvpReward.db2" },
     { 1591100, "PvpScalingEffect.db2" },
     { 1591098, "PvpScalingEffectType.db2" },
     { 2966426, "PvpSeason.db2" },
-    { 2470695, "PvpSeasonRewardLevels.db2" },
     { 1302853, "PvpTalent.db2" },
     { 1891534, "PvpTalentCategory.db2" },
     { 1950197, "PvpTalentSlotUnlock.db2" },
@@ -692,13 +567,8 @@ DB2FileInfo const DBFilesClientList[] =
     { 1028735, "QuestV2CliTask.db2" },
     { 1573634, "QuestXGroupActivity.db2" },
     { 1139378, "QuestXP.db2" },
-    { 3448517, "QuestXUIQuestDetailsTheme.db2" },
-    { 3923421, "QuestXUiWidgetSet.db2" },
-    { 3405439, "RTPC.db2" },
-    { 3405440, "RTPCData.db2" },
     { 3081207, "RafActivity.db2" },
     { 1310245, "RandPropPoints.db2" },
-    { 3671785, "RecipeProgressionGroupEntry.db2" },
     { 1716803, "RelicSlotTierRequirement.db2" },
     { 1671256, "RelicTalent.db2" },
     { 3743117, "RenownRewards.db2" },
@@ -711,10 +581,11 @@ DB2FileInfo const DBFilesClientList[] =
     { 1307153, "RewardPackXCurrencyType.db2" },
     { 1307155, "RewardPackXItem.db2" },
     { 1398908, "RibbonQuality.db2" },
-    { 3256786, "RopeEffect.db2" },
-    { 3500241, "RuneforgeLegendaryAbility.db2" },
+    { 801749, "RulesetItemUpgrade.db2" },
     { 1712172, "SDReplacementModel.db2" },
     { 2056369, "SSAOSettings.db2" },
+    { 1141728, "ScalingStatDistribution.db2" },
+    { 4719537, "ScalingStatValues.db2" },
     { 1139062, "Scenario.db2" },
     { 1141065, "ScenarioEventEntry.db2" },
     { 1132761, "ScenarioStep.db2" },
@@ -734,16 +605,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 1954391, "SiegeableProperties.db2" },
     { 1240935, "SkillLine.db2" },
     { 1266278, "SkillLineAbility.db2" },
+    { 2179610, "SkillLineCategory.db2" },
     { 4505477, "SkillLineXTraitTree.db2" },
     { 1240406, "SkillRaceClassInfo.db2" },
     { 3581893, "SkySceneXPlayerCondition.db2" },
-    { 3488583, "Soulbind.db2" },
-    { 3594380, "SoulbindConduit.db2" },
-    { 4069554, "SoulbindConduitEnhancedSocket.db2" },
-    { 3604984, "SoulbindConduitItem.db2" },
-    { 3620681, "SoulbindConduitRank.db2" },
-    { 3858895, "SoulbindConduitRankProperties.db2" },
-    { 3490472, "SoulbindUIDisplayInfo.db2" },
     { 1310628, "SoundAmbience.db2" },
     { 1267065, "SoundAmbienceFlavor.db2" },
     { 1310246, "SoundBus.db2" },
@@ -758,9 +623,9 @@ DB2FileInfo const DBFilesClientList[] =
     { 1307289, "SoundKitChild.db2" },
     { 1237435, "SoundKitEntry.db2" },
     { 1307288, "SoundKitFallback.db2" },
+    { 1665033, "SoundKitName.db2" },
     { 4618887, "SoundMixGroup.db2" },
     { 1266542, "SoundOverride.db2" },
-    { 3405441, "SoundParameter.db2" },
     { 1279417, "SoundProviderPreferences.db2" },
     { 4756178, "SoundWaterfallEmitter.db2" },
     { 1313612, "SourceInfo.db2" },
@@ -774,6 +639,7 @@ DB2FileInfo const DBFilesClientList[] =
     { 1139952, "SpellAuraOptions.db2" },
     { 981566, "SpellAuraRestrictions.db2" },
     { 1280615, "SpellAuraVisXChrSpec.db2" },
+    { 5634801, "SpellAuraVisXTalentTab.db2" },
     { 1280616, "SpellAuraVisibility.db2" },
     { 1134089, "SpellCastTimes.db2" },
     { 1002166, "SpellCastingRequirements.db2" },
@@ -781,21 +647,14 @@ DB2FileInfo const DBFilesClientList[] =
     { 1280619, "SpellCategory.db2" },
     { 1343310, "SpellChainEffects.db2" },
     { 979663, "SpellClassOptions.db2" },
-    { 2428696, "SpellClutterAreaEffectCounts.db2" },
-    { 2428707, "SpellClutterFrameRates.db2" },
-    { 2428708, "SpellClutterImpactModelCounts.db2" },
-    { 2428697, "SpellClutterKitDistances.db2" },
-    { 2428733, "SpellClutterMissileDist.db2" },
-    { 2428698, "SpellClutterWeaponTrailDist.db2" },
     { 1139924, "SpellCooldowns.db2" },
+    { 2620904, "SpellCraftUI.db2" },
     { 1140004, "SpellDescriptionVariables.db2" },
     { 1137829, "SpellDispelType.db2" },
     { 1137828, "SpellDuration.db2" },
     { 1140088, "SpellEffect.db2" },
     { 1888495, "SpellEffectAutoDescription.db2" },
     { 1310248, "SpellEffectEmission.db2" },
-    { 4507381, "SpellEmpower.db2" },
-    { 4871072, "SpellEmpowerStage.db2" },
     { 1140011, "SpellEquippedItems.db2" },
     { 1146819, "SpellFlyout.db2" },
     { 1134085, "SpellFlyoutItem.db2" },
@@ -808,12 +667,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 1001907, "SpellLearnSpell.db2" },
     { 1140079, "SpellLevels.db2" },
     { 1014438, "SpellMechanic.db2" },
-    { 3549053, "SpellMemorizeCost.db2" },
     { 1003144, "SpellMisc.db2" },
     { 897956, "SpellMissile.db2" },
     { 897955, "SpellMissileMotion.db2" },
     { 1990283, "SpellName.db2" },
-    { 2618823, "SpellOverrideName.db2" },
     { 982806, "SpellPower.db2" },
     { 982804, "SpellPowerDifficulty.db2" },
     { 1140477, "SpellProceduralEffect.db2" },
@@ -823,10 +680,7 @@ DB2FileInfo const DBFilesClientList[] =
     { 1146820, "SpellRange.db2" },
     { 841946, "SpellReagents.db2" },
     { 1135239, "SpellReagentsCurrency.db2" },
-    { 4674394, "SpellReplacement.db2" },
     { 1139940, "SpellScaling.db2" },
-    { 3055899, "SpellScript.db2" },
-    { 3055901, "SpellScriptText.db2" },
     { 1139929, "SpellShapeshift.db2" },
     { 1280618, "SpellShapeshiftForm.db2" },
     { 1268903, "SpellSpecialUnitEffect.db2" },
@@ -841,12 +695,10 @@ DB2FileInfo const DBFilesClientList[] =
     { 897951, "SpellVisualKitAreaModel.db2" },
     { 1140480, "SpellVisualKitEffect.db2" },
     { 897953, "SpellVisualKitModelAttach.db2" },
-    { 3989478, "SpellVisualKitPicker.db2" },
-    { 3989479, "SpellVisualKitPickerEntry.db2" },
     { 897954, "SpellVisualMissile.db2" },
-    { 3607312, "SpellVisualScreenEffect.db2" },
     { 1724949, "SpellXDescriptionVariables.db2" },
     { 1101657, "SpellXSpellVisual.db2" },
+    { 2179613, "StableSlotPrices.db2" },
     { 1604265, "StartupFiles.db2" },
     { 1375805, "Startup_Strings.db2" },
     { 1140758, "Stationery.db2" },
@@ -854,10 +706,11 @@ DB2FileInfo const DBFilesClientList[] =
     { 1302850, "TactKey.db2" },
     { 1302851, "TactKeyLookup.db2" },
     { 1369062, "Talent.db2" },
+    { 2178102, "TalentTab.db2" },
+    { 5581887, "TalentTreePrimarySpells.db2" },
     { 1068100, "TaxiNodes.db2" },
     { 1067802, "TaxiPath.db2" },
     { 1000437, "TaxiPathNode.db2" },
-    { 3501705, "TerrainColorGradingRamp.db2" },
     { 1307290, "TerrainMaterial.db2" },
     { 1310249, "TerrainType.db2" },
     { 1284822, "TerrainTypeSounds.db2" },
@@ -893,9 +746,7 @@ DB2FileInfo const DBFilesClientList[] =
     { 4420306, "TraitTreeXTraitCost.db2" },
     { 4524218, "TraitTreeXTraitCurrency.db2" },
     { 1338702, "TransformMatrix.db2" },
-    { 2399695, "TransmogDefaultLevel.db2" },
     { 1589454, "TransmogHoliday.db2" },
-    { 3580450, "TransmogIllusion.db2" },
     { 1376213, "TransmogSet.db2" },
     { 1576116, "TransmogSetGroup.db2" },
     { 1376212, "TransmogSetItem.db2" },
@@ -904,25 +755,15 @@ DB2FileInfo const DBFilesClientList[] =
     { 1140687, "TransportRotation.db2" },
     { 975024, "Trophy.db2" },
     { 5011999, "UIArrowCallout.db2" },
-    { 3488582, "UIChromieTimeExpansionInfo.db2" },
-    { 3502042, "UICovenantAbility.db2" },
-    { 3502043, "UICovenantPreview.db2" },
-    { 4579858, "UIDeadlyDebuff.db2" },
-    { 4065278, "UIDungeonScoreRarity.db2" },
-    { 3946498, "UIEventToast.db2" },
     { 1729547, "UIExpansionDisplayInfo.db2" },
     { 1729546, "UIExpansionDisplayInfoIcon.db2" },
     { 4861207, "UIGenericWidgetDisplay.db2" },
-    { 4530951, "UIModifiedInstance.db2" },
     { 3556601, "UIScriptedAnimationEffect.db2" },
-    { 2960122, "UISplashScreen.db2" },
     { 1261406, "UiCamFbackTransmogChrRace.db2" },
     { 1261407, "UiCamFbackTransmogWeapon.db2" },
     { 1120287, "UiCamera.db2" },
     { 1120288, "UiCameraType.db2" },
     { 1989363, "UiCanvas.db2" },
-    { 3509132, "UiCovenantDisplayInfo.db2" },
-    { 3182424, "UiItemInteraction.db2" },
     { 1957206, "UiMap.db2" },
     { 1957202, "UiMapArt.db2" },
     { 1957208, "UiMapArtStyleLayer.db2" },
@@ -938,22 +779,16 @@ DB2FileInfo const DBFilesClientList[] =
     { 1548216, "UiModelSceneActorDisplay.db2" },
     { 1548213, "UiModelSceneCamera.db2" },
     { 1993323, "UiPartyPose.db2" },
-    { 3448518, "UiQuestDetailsTheme.db2" },
     { 897470, "UiTextureAtlas.db2" },
     { 1989276, "UiTextureAtlasElement.db2" },
     { 5319042, "UiTextureAtlasElementSliceData.db2" },
     { 897532, "UiTextureAtlasMember.db2" },
     { 939159, "UiTextureKit.db2" },
-    { 4737221, "UiWeeklyReward.db2" },
     { 1983278, "UiWidget.db2" },
     { 1983639, "UiWidgetConstantSource.db2" },
     { 1983640, "UiWidgetDataSource.db2" },
-    { 2322531, "UiWidgetMap.db2" },
-    { 3055925, "UiWidgetSet.db2" },
     { 1983641, "UiWidgetStringSource.db2" },
-    { 2740907, "UiWidgetVisTypeDataReq.db2" },
     { 1983276, "UiWidgetVisualization.db2" },
-    { 3386363, "UiWidgetXWidgetSet.db2" },
     { 1284821, "UnitBlood.db2" },
     { 1268904, "UnitBloodLevels.db2" },
     { 1120959, "UnitCondition.db2" },
@@ -971,10 +806,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 3587230, "VolumeFogCondition.db2" },
     { 1355528, "WMOAreaTable.db2" },
     { 1323241, "WMOMinimapTexture.db2" },
-    { 2565222, "WaterfallData.db2" },
-    { 2565258, "WaypointEdge.db2" },
-    { 2565265, "WaypointNode.db2" },
-    { 2820850, "WaypointSafeLocs.db2" },
     { 879634, "WbAccessControlList.db2" },
     { 1267648, "WeaponImpactSounds.db2" },
     { 1267068, "WeaponSwingSounds2.db2" },
@@ -983,8 +814,6 @@ DB2FileInfo const DBFilesClientList[] =
     { 1239842, "WeaponTrailParam.db2" },
     { 1343311, "Weather.db2" },
     { 1965591, "WeatherXParticulate.db2" },
-    { 5390446, "WeeklyRewardChestActivityTier.db2" },
-    { 3580962, "WeeklyRewardChestThreshold.db2" },
     { 943871, "WindSettings.db2" },
     { 975279, "WorldBossLockout.db2" },
     { 1267069, "WorldChunkSounds.db2" },
@@ -993,8 +822,8 @@ DB2FileInfo const DBFilesClientList[] =
     { 4550228, "WorldLayerMapSet.db2" },
     { 1134579, "WorldMapOverlay.db2" },
     { 1957212, "WorldMapOverlayTile.db2" },
-    { 4680120, "WorldShadow.db2" },
     { 1332558, "WorldStateExpression.db2" },
+    { 1343596, "WorldStateUI.db2" },
     { 1266941, "WorldStateZoneSounds.db2" },
     { 1310255, "World_PVP_Area.db2" },
     { 1310251, "ZoneIntroMusicTable.db2" },
diff --git a/src/tools/vmap4_extractor/vmapexport.cpp b/src/tools/vmap4_extractor/vmapexport.cpp
index d8444bc6b84..1f9945029d9 100644
--- a/src/tools/vmap4_extractor/vmapexport.cpp
+++ b/src/tools/vmap4_extractor/vmapexport.cpp
@@ -53,7 +53,6 @@ std::shared_ptr<CASC::Storage> CascStorage;
 struct MapEntry
 {
     uint32 Id = 0;
-    int32 WdtFileDataId = 0;
     int16 ParentMapID = 0;
     std::string Name;
     std::string Directory;
@@ -63,7 +62,7 @@ std::vector<MapEntry> map_ids; // partitioned by parent maps first
 std::unordered_set<uint32> maps_that_are_parents;
 boost::filesystem::path input_path;
 bool preciseVectorData = false;
-char const* CascProduct = "wow";
+char const* CascProduct = "wow_classic_beta";
 char const* CascRegion = "eu";
 bool UseRemoteCasc = false;
 uint32 DbcLocale = 0;
@@ -280,13 +279,9 @@ void ParsMapFiles()
             if (mapEntryItr == map_ids.end())
                 return nullptr;
 
-            uint32 fileDataId = mapEntryItr->WdtFileDataId;
-            if (!fileDataId)
-                return nullptr;
-
-            std::string description = Trinity::StringFormat("WDT for map {} - {} (FileDataID {})", mapId, mapEntryItr->Name, fileDataId);
+            std::string fileName = Trinity::StringFormat("World\\Maps\\{}\\{}.wdt", mapEntryItr->Directory.c_str(), mapEntryItr->Directory.c_str());
             std::string directory = mapEntryItr->Directory;
-            itr = wdts.emplace(std::piecewise_construct, std::forward_as_tuple(mapId), std::forward_as_tuple(fileDataId, description, std::move(directory), maps_that_are_parents.count(mapId) > 0)).first;
+            itr = wdts.emplace(std::piecewise_construct, std::forward_as_tuple(mapId), std::forward_as_tuple(std::move(fileName), std::move(directory), maps_that_are_parents.count(mapId) > 0)).first;
             if (!itr->second.init(mapId))
             {
                 wdts.erase(itr);
@@ -554,7 +549,6 @@ int main(int argc, char ** argv)
 
             MapEntry map;
             map.Id = record.GetId();
-            map.WdtFileDataId = record.GetInt32("WdtFileDataID");
             map.ParentMapID = int16(record.GetUInt16("ParentMapID"));
             map.Name = record.GetString("MapName");
             map.Directory = record.GetString("Directory");
@@ -577,7 +571,6 @@ int main(int argc, char ** argv)
             {
                 MapEntry map;
                 map.Id = copy.NewRowId;
-                map.WdtFileDataId = map_ids[itr->second].WdtFileDataId;
                 map.ParentMapID = map_ids[itr->second].ParentMapID;
                 map.Name = map_ids[itr->second].Name;
                 map.Directory = map_ids[itr->second].Directory;
@@ -585,8 +578,6 @@ int main(int argc, char ** argv)
             }
         }
 
-        map_ids.erase(std::remove_if(map_ids.begin(), map_ids.end(), [](MapEntry const& map) { return !map.WdtFileDataId; }), map_ids.end());
-
         // force parent maps to be extracted first
         std::stable_partition(map_ids.begin(), map_ids.end(), [](MapEntry const& map) { return maps_that_are_parents.count(map.Id) > 0; });
 
diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
index cde22020a65..ec7a2168bec 100644
--- a/src/tools/vmap4_extractor/wdtfile.cpp
+++ b/src/tools/vmap4_extractor/wdtfile.cpp
@@ -25,8 +25,8 @@
 
 extern std::shared_ptr<CASC::Storage> CascStorage;
 
-WDTFile::WDTFile(uint32 fileDataId, std::string const& description, std::string mapName, bool cache)
-    : _file(CascStorage, fileDataId, description), _mapName(std::move(mapName))
+WDTFile::WDTFile(std::string fileName, std::string mapName, bool cache)
+    : _file(CascStorage, fileName.c_str()), _mapName(std::move(mapName))
 {
     memset(&_header, 0, sizeof(WDT::MPHD));
     memset(&_adtInfo, 0, sizeof(WDT::MAIN));
diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
index 47b111fd13e..1ddc3f94d6d 100644
--- a/src/tools/vmap4_extractor/wdtfile.h
+++ b/src/tools/vmap4_extractor/wdtfile.h
@@ -70,7 +70,7 @@ namespace WDT
 class WDTFile
 {
 public:
-    WDTFile(uint32 fileDataId, std::string const& description, std::string mapName, bool cache);
+    WDTFile(std::string fileName, std::string mapName, bool cache);
     ~WDTFile();
     bool init(uint32 mapId);