From 18416e6e6dcb19dc262bdfa2cb1537d406e823b9 Mon Sep 17 00:00:00 2001
From: Dorovon <50294688+Dorovon@users.noreply.github.com>
Date: Thu, 19 Dec 2024 18:13:05 -0700
Subject: [PATCH] partial 11.1.0.58221 updates

---
 definitions/Achievement.dbd         |  57 ++----
 definitions/AreaTable.dbd           |  69 +++-----
 definitions/ChrClasses.dbd          | 117 +++++--------
 definitions/ChrRaces.dbd            | 153 ++++++-----------
 definitions/ChrSpecialization.dbd   |  39 ++---
 definitions/Creature.dbd            |  33 ++--
 definitions/CreatureImmunities.dbd  |  27 +--
 definitions/CreatureType.dbd        |   6 +-
 definitions/Criteria.dbd            |  36 ++--
 definitions/CurrencyTypes.dbd       |  54 ++----
 definitions/FactionGroup.dbd        |  15 +-
 definitions/FactionTemplate.dbd     |  21 +--
 definitions/ItemSparse.dbd          | 192 +++++++--------------
 definitions/JournalInstance.dbd     |  27 +--
 definitions/PlayerCondition.dbd     | 258 ++++++++++------------------
 definitions/SpellShapeshiftForm.dbd |  30 ++--
 definitions/Talent.dbd              |  27 +--
 17 files changed, 387 insertions(+), 774 deletions(-)

diff --git a/definitions/Achievement.dbd b/definitions/Achievement.dbd
index 10bdd0fce21..76e12075609 100644
--- a/definitions/Achievement.dbd
+++ b/definitions/Achievement.dbd
@@ -21,25 +21,6 @@ int Field_3_0_1_8471_007? // possibly ui_order
 int Field_3_0_1_8303_002?
 int<DisplaySeason::ID> HiddenBeforeDisplaySeason? // hidden in UI before this DisplaySeason is active
 int LegacyAfterTimeEvent? // category changes clientside to Legacy (15234) after this TimeEvent is passed
-locstring Field_11_1_0_58221_000_lang?
-locstring Field_11_1_0_58221_001_lang?
-locstring Field_11_1_0_58221_002_lang?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
-int Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
-int Field_11_1_0_58221_012?
-int Field_11_1_0_58221_013?
-int Field_11_1_0_58221_014?
-int Field_11_1_0_58221_015?
-int Field_11_1_0_58221_016?
-int Field_11_1_0_58221_017?
-int Field_11_1_0_58221_018?
 
 LAYOUT 19FCE7B0
 BUILD 2.5.4.42581, 2.5.4.42695, 2.5.4.42757, 2.5.4.42800, 2.5.4.42869, 2.5.4.42870, 2.5.4.42873, 2.5.4.42917, 2.5.4.42940, 2.5.4.43400, 2.5.4.43638, 2.5.4.43861, 2.5.4.44036, 2.5.4.44171, 2.5.4.44400, 2.5.4.44833
@@ -491,22 +472,22 @@ LegacyAfterTimeEvent<32>
 
 LAYOUT 6FC5281B
 BUILD 11.1.0.58221
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002_lang
-$id$Field_11_1_0_58221_003<32>
-Field_11_1_0_58221_004<16>
-Field_11_1_0_58221_005<8>
-Field_11_1_0_58221_006<32>
-Field_11_1_0_58221_007<16>
-Field_11_1_0_58221_008<8>
-Field_11_1_0_58221_009<8>
-Field_11_1_0_58221_010<32>
-$relation$Field_11_1_0_58221_011<16>
-Field_11_1_0_58221_012<32>
-Field_11_1_0_58221_013<32>
-Field_11_1_0_58221_014<u32>
-Field_11_1_0_58221_015<16>
-Field_11_1_0_58221_016<32>
-Field_11_1_0_58221_017<32>
-Field_11_1_0_58221_018<32>
+Description_lang
+Title_lang
+Reward_lang
+$id$ID<32>
+Instance_ID<16>
+Faction<8>
+Supercedes<32>
+Category<16>
+Minimum_criteria<8>
+Points<8>
+Flags<32>
+$relation$Ui_order<16>
+IconFileID<32>
+RewardItemID<32>
+Criteria_tree<u32>
+Shares_criteria<16>
+CovenantID<32>
+HiddenBeforeDisplaySeason<32>
+LegacyAfterTimeEvent<32>
diff --git a/definitions/AreaTable.dbd b/definitions/AreaTable.dbd
index 3af014955ec..361d3f460ed 100644
--- a/definitions/AreaTable.dbd
+++ b/definitions/AreaTable.dbd
@@ -32,29 +32,6 @@ int MIDIAmbience
 int MIDIAmbienceUnderwater
 int IntroPriority
 int<ContentTuning::ID> ContentTuningID
-string Field_11_1_0_58221_000?
-locstring Field_11_1_0_58221_001_lang?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
-int Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
-int Field_11_1_0_58221_012?
-int Field_11_1_0_58221_013?
-float Field_11_1_0_58221_014?
-int Field_11_1_0_58221_015?
-int Field_11_1_0_58221_016?
-int Field_11_1_0_58221_017?
-int Field_11_1_0_58221_018?
-int Field_11_1_0_58221_019?
-int Field_11_1_0_58221_020?
-int Field_11_1_0_58221_021?
-int Field_11_1_0_58221_022?
 
 BUILD 0.5.3.3368
 $id$ID<32>
@@ -819,26 +796,26 @@ LiquidTypeID<u16>[4]
 LAYOUT 3F51DE1F
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002<u16>
-Field_11_1_0_58221_003<u16>
-Field_11_1_0_58221_004<16>
-Field_11_1_0_58221_005<u8>
-Field_11_1_0_58221_006<u8>
-Field_11_1_0_58221_007<u16>
-Field_11_1_0_58221_008<u16>
-Field_11_1_0_58221_009<u16>
-Field_11_1_0_58221_010<u16>
-Field_11_1_0_58221_011<u16>
-Field_11_1_0_58221_012<u32>
-Field_11_1_0_58221_013<u8>
-Field_11_1_0_58221_014
-Field_11_1_0_58221_015<32>
-Field_11_1_0_58221_016<16>
-Field_11_1_0_58221_017<u8>
-Field_11_1_0_58221_018<u8>
-Field_11_1_0_58221_019<u8>
-Field_11_1_0_58221_020<32>
-Field_11_1_0_58221_021<32>[2]
-Field_11_1_0_58221_022<u16>[4]
+ZoneName
+AreaName_lang
+ContinentID<u16>
+ParentAreaID<u16>
+AreaBit<16>
+SoundProviderPref<u8>
+SoundProviderPrefUnderwater<u8>
+AmbienceID<u16>
+UwAmbience<u16>
+ZoneMusic<u16>
+UwZoneMusic<u16>
+IntroSound<u16>
+UwIntroSound<u32>
+FactionGroupMask<u8>
+Ambient_multiplier
+MountFlags<32>
+PvpCombatWorldStateID<16>
+WildBattlePetLevelMin<u8>
+WildBattlePetLevelMax<u8>
+WindSettingsID<u8>
+ContentTuningID<32>
+Flags<32>[2]
+LiquidTypeID<u16>[4]
diff --git a/definitions/ChrClasses.dbd b/definitions/ChrClasses.dbd
index daff60699e3..fe307a93b76 100644
--- a/definitions/ChrClasses.dbd
+++ b/definitions/ChrClasses.dbd
@@ -46,45 +46,6 @@ int CharacterCreationAnimLoopWaitTimeMsFallback?
 int HasStrengthAttackBonus?
 locstring Hyphenated_name_male_lang? // same as Name_x_lang, but with dashes and newlines for very long words
 locstring Hyphenated_name_female_lang?
-locstring Field_11_1_0_58221_000_lang?
-string Field_11_1_0_58221_001?
-locstring Field_11_1_0_58221_002_lang?
-locstring Field_11_1_0_58221_003_lang?
-string Field_11_1_0_58221_004?
-locstring Field_11_1_0_58221_005_lang?
-locstring Field_11_1_0_58221_006_lang?
-locstring Field_11_1_0_58221_007_lang?
-locstring Field_11_1_0_58221_008_lang?
-locstring Field_11_1_0_58221_009_lang?
-int Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
-int Field_11_1_0_58221_012?
-int Field_11_1_0_58221_013?
-int Field_11_1_0_58221_014?
-int Field_11_1_0_58221_015?
-int Field_11_1_0_58221_016?
-int Field_11_1_0_58221_017?
-int Field_11_1_0_58221_018?
-int Field_11_1_0_58221_019?
-int Field_11_1_0_58221_020?
-int Field_11_1_0_58221_021?
-int Field_11_1_0_58221_022?
-int Field_11_1_0_58221_023?
-int Field_11_1_0_58221_024?
-int Field_11_1_0_58221_025?
-int Field_11_1_0_58221_026?
-int Field_11_1_0_58221_027?
-int Field_11_1_0_58221_028?
-int Field_11_1_0_58221_029?
-int Field_11_1_0_58221_030?
-int Field_11_1_0_58221_031?
-int Field_11_1_0_58221_032?
-int Field_11_1_0_58221_033?
-int Field_11_1_0_58221_034?
-int Field_11_1_0_58221_035?
-int Field_11_1_0_58221_036?
-int Field_11_1_0_58221_037?
-int Field_11_1_0_58221_038?
 
 BUILD 0.5.3.3368
 $id$ID<32>
@@ -1237,42 +1198,42 @@ RolesMask<u8>
 
 LAYOUT 6D301B0D
 BUILD 11.1.0.58221
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001
-Field_11_1_0_58221_002_lang
-Field_11_1_0_58221_003_lang
-Field_11_1_0_58221_004
-Field_11_1_0_58221_005_lang
-Field_11_1_0_58221_006_lang
-Field_11_1_0_58221_007_lang
-Field_11_1_0_58221_008_lang
-Field_11_1_0_58221_009_lang
-Field_11_1_0_58221_010<u32>
-Field_11_1_0_58221_011<u32>
-Field_11_1_0_58221_012<u32>
-Field_11_1_0_58221_013<u32>
-Field_11_1_0_58221_014<32>
-Field_11_1_0_58221_015<u32>
-Field_11_1_0_58221_016<u32>
-Field_11_1_0_58221_017<32>
-Field_11_1_0_58221_018<32>
-Field_11_1_0_58221_019<32>
-Field_11_1_0_58221_020<32>
-Field_11_1_0_58221_021<32>
-Field_11_1_0_58221_022<32>
-Field_11_1_0_58221_023<32>
-Field_11_1_0_58221_024<32>
-Field_11_1_0_58221_025<32>
-Field_11_1_0_58221_026<u16>
-Field_11_1_0_58221_027<u16>
-$id$Field_11_1_0_58221_028<8>
-Field_11_1_0_58221_029<u8>
-Field_11_1_0_58221_030<8>
-Field_11_1_0_58221_031<u8>
-Field_11_1_0_58221_032<u8>
-Field_11_1_0_58221_033<u8>
-Field_11_1_0_58221_034<u8>
-Field_11_1_0_58221_035<u8>
-Field_11_1_0_58221_036<u8>
-Field_11_1_0_58221_037<u8>
-Field_11_1_0_58221_038<u8>
+Name_lang
+Filename
+Name_male_lang
+Name_female_lang
+PetNameToken
+Description_lang
+RoleInfoString_lang
+DisabledString_lang
+Hyphenated_name_male_lang
+Hyphenated_name_female_lang
+CreateScreenFileDataID<u32>
+SelectScreenFileDataID<u32>
+IconFileDataID<u32>
+LowResScreenFileDataID<u32>
+Flags<32>
+SpellTextureBlobFileDataID<u32>
+ArmorTypeMask<u32>
+Field_9_0_1_34490_018<32>
+MaleCharacterCreationVisualFallback<32>
+MaleCharacterCreationIdleVisualFallback<32>
+FemaleCharacterCreationVisualFallback<32>
+FemaleCharacterCreationIdleVisualFallback<32>
+CharacterCreationIdleGroundVisualFallback<32>
+CharacterCreationGroundVisualFallback<32>
+AlteredFormCharacterCreationIdleVisualFallback<32>
+CharacterCreationAnimLoopWaitTimeMsFallback<32>
+CinematicSequenceID<u16>
+DefaultSpec<u16>
+$id$ID<8>
+PrimaryStatPriority<u8>
+DisplayPower<8>
+RangedAttackPowerPerAgility<u8>
+AttackPowerPerAgility<u8>
+AttackPowerPerStrength<u8>
+SpellClassSet<u8>
+ClassColorR<u8>
+ClassColorG<u8>
+ClassColorB<u8>
+RolesMask<u8>
diff --git a/definitions/ChrRaces.dbd b/definitions/ChrRaces.dbd
index 96fc1fcf2b1..f4afd3b5701 100644
--- a/definitions/ChrRaces.dbd
+++ b/definitions/ChrRaces.dbd
@@ -79,57 +79,6 @@ int<ChrRaces::ID> HelmetAnimScalingRaceID?
 float Field_9_1_0_38312_030?
 float Field_9_1_0_38312_031?
 int Field_10_0_0_44649_045? // 1 for dragonriding races
-string Field_11_1_0_58221_000?
-string Field_11_1_0_58221_001?
-locstring Field_11_1_0_58221_002_lang?
-locstring Field_11_1_0_58221_003_lang?
-locstring Field_11_1_0_58221_004_lang?
-locstring Field_11_1_0_58221_005_lang?
-locstring Field_11_1_0_58221_006_lang?
-locstring Field_11_1_0_58221_007_lang?
-locstring Field_11_1_0_58221_008_lang?
-locstring Field_11_1_0_58221_009_lang?
-locstring Field_11_1_0_58221_010_lang?
-locstring Field_11_1_0_58221_011_lang?
-locstring Field_11_1_0_58221_012_lang?
-locstring Field_11_1_0_58221_013_lang?
-locstring Field_11_1_0_58221_014_lang?
-int Field_11_1_0_58221_015?
-int Field_11_1_0_58221_016?
-int Field_11_1_0_58221_017?
-int Field_11_1_0_58221_018?
-int Field_11_1_0_58221_019?
-int Field_11_1_0_58221_020?
-int Field_11_1_0_58221_021?
-int Field_11_1_0_58221_022?
-int Field_11_1_0_58221_023?
-int Field_11_1_0_58221_024?
-int Field_11_1_0_58221_025?
-int Field_11_1_0_58221_026?
-int Field_11_1_0_58221_027?
-int Field_11_1_0_58221_028?
-int Field_11_1_0_58221_029?
-float Field_11_1_0_58221_030?
-float Field_11_1_0_58221_031?
-float Field_11_1_0_58221_032?
-float Field_11_1_0_58221_033?
-int Field_11_1_0_58221_034?
-int Field_11_1_0_58221_035?
-int Field_11_1_0_58221_036?
-int Field_11_1_0_58221_037?
-int Field_11_1_0_58221_038?
-int Field_11_1_0_58221_039?
-int Field_11_1_0_58221_040?
-int Field_11_1_0_58221_041?
-int Field_11_1_0_58221_042?
-int Field_11_1_0_58221_043?
-int Field_11_1_0_58221_044?
-int Field_11_1_0_58221_045?
-int Field_11_1_0_58221_046?
-int Field_11_1_0_58221_047?
-int Field_11_1_0_58221_048?
-int Field_11_1_0_58221_049?
-int Field_11_1_0_58221_050?
 
 BUILD 0.5.3.3368
 BUILD 0.5.3.3368-0.6.0.3592
@@ -1937,54 +1886,54 @@ FemaleTextureFallbackSex<8>
 LAYOUT 4F44C796
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000
-Field_11_1_0_58221_001
-Field_11_1_0_58221_002_lang
-Field_11_1_0_58221_003_lang
-Field_11_1_0_58221_004_lang
-Field_11_1_0_58221_005_lang
-Field_11_1_0_58221_006_lang
-Field_11_1_0_58221_007_lang
-Field_11_1_0_58221_008_lang
-Field_11_1_0_58221_009_lang
-Field_11_1_0_58221_010_lang
-Field_11_1_0_58221_011_lang
-Field_11_1_0_58221_012_lang
-Field_11_1_0_58221_013_lang
-Field_11_1_0_58221_014_lang
-Field_11_1_0_58221_015<32>
-Field_11_1_0_58221_016<32>
-Field_11_1_0_58221_017<32>
-Field_11_1_0_58221_018<32>
-Field_11_1_0_58221_019<32>
-Field_11_1_0_58221_020<32>
-Field_11_1_0_58221_021<32>
-Field_11_1_0_58221_022<32>
-Field_11_1_0_58221_023<32>[3]
-Field_11_1_0_58221_024<32>[3]
-Field_11_1_0_58221_025<32>
-Field_11_1_0_58221_026<32>
-Field_11_1_0_58221_027<32>
-Field_11_1_0_58221_028<32>
-Field_11_1_0_58221_029<32>
-Field_11_1_0_58221_030[3]
-Field_11_1_0_58221_031
-Field_11_1_0_58221_032[3]
-Field_11_1_0_58221_033[3]
-Field_11_1_0_58221_034<8>
-Field_11_1_0_58221_035<u8>
-Field_11_1_0_58221_036<8>
-Field_11_1_0_58221_037<8>
-Field_11_1_0_58221_038<8>
-Field_11_1_0_58221_039<8>
-Field_11_1_0_58221_040<8>
-Field_11_1_0_58221_041<8>
-Field_11_1_0_58221_042<8>
-Field_11_1_0_58221_043<8>
-Field_11_1_0_58221_044<8>
-Field_11_1_0_58221_045<8>
-Field_11_1_0_58221_046<8>
-Field_11_1_0_58221_047<8>
-Field_11_1_0_58221_048<8>
-Field_11_1_0_58221_049<8>
-Field_11_1_0_58221_050<8>
+ClientPrefix
+ClientFileString
+Name_lang
+Name_female_lang
+Name_lowercase_lang
+Name_female_lowercase_lang
+Lore_name_lang
+Lore_name_female_lang
+Lore_name_lower_lang
+Lore_name_lower_female_lang
+LoreDescription_lang
+Short_name_lang
+Short_name_female_lang
+Short_name_lower_lang
+Short_name_lower_female_lang
+Flags<32>
+FactionID<32>
+CinematicSequenceID<32>
+ResSicknessSpellID<32>
+SplashSoundID<32>
+CreateScreenFileDataID<32>
+SelectScreenFileDataID<32>
+LowResScreenFileDataID<32>
+AlteredFormStartVisualKitID<32>[3]
+AlteredFormFinishVisualKitID<32>[3]
+HeritageArmorAchievementID<32>
+StartingLevel<32>
+UiDisplayOrder<32>
+PlayableRaceBit<32>
+TransmogrifyDisabledSlotMask<32>
+AlteredFormCustomizeOffsetFallback[3]
+AlteredFormCustomizeRotationFallback
+Field_9_1_0_38312_030[3]
+Field_9_1_0_38312_031[3]
+BaseLanguage<8>
+CreatureType<u8>
+Alliance<8>
+Race_related<8>
+UnalteredVisualRaceID<8>
+DefaultClassID<8>
+NeutralRaceID<8>
+MaleModelFallbackRaceID<8>
+MaleModelFallbackSex<8>
+FemaleModelFallbackRaceID<8>
+FemaleModelFallbackSex<8>
+MaleTextureFallbackRaceID<8>
+MaleTextureFallbackSex<8>
+FemaleTextureFallbackRaceID<8>
+FemaleTextureFallbackSex<8>
+HelmetAnimScalingRaceID<8>
+UnalteredVisualCustomizationRaceID<8>
diff --git a/definitions/ChrSpecialization.dbd b/definitions/ChrSpecialization.dbd
index 63a689a9664..26e03c10688 100644
--- a/definitions/ChrSpecialization.dbd
+++ b/definitions/ChrSpecialization.dbd
@@ -17,19 +17,6 @@ int<AnimReplacementSet::ID> AnimReplacements
 locstring FemaleName_lang
 int PrimaryStatPriority
 int<FileData::ID> SpellIconFileID
-locstring Field_11_1_0_58221_000_lang?
-locstring Field_11_1_0_58221_001_lang?
-locstring Field_11_1_0_58221_002_lang?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
-int Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
-int Field_11_1_0_58221_012?
 
 BUILD 5.0.1.15464-5.0.1.15640
 $id$ID<32>
@@ -260,16 +247,16 @@ MasterySpellID<32>[2]
 
 LAYOUT BF17DE0B
 BUILD 11.1.0.58221
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002_lang
-$id$Field_11_1_0_58221_003<32>
-$relation$Field_11_1_0_58221_004<8>
-Field_11_1_0_58221_005<8>
-Field_11_1_0_58221_006<8>
-Field_11_1_0_58221_007<8>
-Field_11_1_0_58221_008<u32>
-Field_11_1_0_58221_009<32>
-Field_11_1_0_58221_010<8>
-Field_11_1_0_58221_011<32>
-Field_11_1_0_58221_012<32>[2]
+Name_lang
+FemaleName_lang
+Description_lang
+$id$ID<32>
+$relation$ClassID<8>
+OrderIndex<8>
+PetTalentType<8>
+Role<8>
+Flags<u32>
+SpellIconFileID<32>
+PrimaryStatPriority<8>
+AnimReplacements<32>
+MasterySpellID<32>[2]
diff --git a/definitions/Creature.dbd b/definitions/Creature.dbd
index b0795782b9a..6db061eb645 100644
--- a/definitions/Creature.dbd
+++ b/definitions/Creature.dbd
@@ -24,17 +24,6 @@ int Field_5_0_1_15589_003?
 int Field_5_0_1_15589_004?
 int Field_5_0_1_15650_002?
 int Field_5_0_1_15650_003?
-locstring Field_11_1_0_58221_000_lang?
-locstring Field_11_1_0_58221_001_lang?
-locstring Field_11_1_0_58221_002_lang?
-locstring Field_11_1_0_58221_003_lang?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-float Field_11_1_0_58221_009?
-int Field_11_1_0_58221_010?
 
 BUILD 5.0.1.15589
 $id$ID<32>
@@ -272,14 +261,14 @@ AlwaysItem<32>[3]
 LAYOUT AEA084C0
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002_lang
-Field_11_1_0_58221_003_lang
-Field_11_1_0_58221_004<8>
-Field_11_1_0_58221_005<u8>
-Field_11_1_0_58221_006<u16>
-Field_11_1_0_58221_007<u8>
-Field_11_1_0_58221_008<32>[4]
-Field_11_1_0_58221_009[4]
-Field_11_1_0_58221_010<32>[3]
+Name_lang
+NameAlt_lang
+Title_lang
+TitleAlt_lang
+Classification<8>
+CreatureType<u8>
+CreatureFamily<u16>
+StartAnimState<u8>
+DisplayID<32>[4]
+DisplayProbability[4]
+AlwaysItem<32>[3]
diff --git a/definitions/CreatureImmunities.dbd b/definitions/CreatureImmunities.dbd
index 510e2be01b7..073e9df8967 100644
--- a/definitions/CreatureImmunities.dbd
+++ b/definitions/CreatureImmunities.dbd
@@ -9,15 +9,6 @@ int Effect
 int StatesAllowed
 int State
 int Flags
-int Field_11_1_0_58221_000?
-int Field_11_1_0_58221_001?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
 
 BUILD 4.1.0.13914-4.3.4.15595
 $id$ID<32>
@@ -247,12 +238,12 @@ State<u32>[20]
 LAYOUT A1D7B067
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000<u8>
-Field_11_1_0_58221_001<u32>
-Field_11_1_0_58221_002<u8>
-Field_11_1_0_58221_003<u8>
-Field_11_1_0_58221_004<u8>
-Field_11_1_0_58221_005<32>
-Field_11_1_0_58221_006<32>[2]
-Field_11_1_0_58221_007<u32>[11]
-Field_11_1_0_58221_008<u32>[20]
+School<u8>
+DispelType<u32>
+MechanicsAllowed<u8>
+EffectsAllowed<u8>
+StatesAllowed<u8>
+Flags<32>
+Mechanic<32>[2]
+Effect<u32>[11]
+State<u32>[20]
diff --git a/definitions/CreatureType.dbd b/definitions/CreatureType.dbd
index 93a4f2a9458..e5bd67b09b5 100644
--- a/definitions/CreatureType.dbd
+++ b/definitions/CreatureType.dbd
@@ -2,8 +2,6 @@ COLUMNS
 int ID
 locstring Name_lang
 int Flags
-locstring Field_11_1_0_58221_000_lang?
-int Field_11_1_0_58221_001?
 
 BUILD 0.5.3.3368
 $id$ID<32>
@@ -105,5 +103,5 @@ Flags<u8>
 LAYOUT 6FF4CA42
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001<32>
+Name_lang
+Flags<32>
diff --git a/definitions/Criteria.dbd b/definitions/Criteria.dbd
index e07b2ed5efd..054046c6eef 100644
--- a/definitions/Criteria.dbd
+++ b/definitions/Criteria.dbd
@@ -11,18 +11,6 @@ int<ModifierTree::ID> Modifier_tree_ID
 int Flags
 int<WorldState::ID> Eligibility_world_state_ID
 int Eligibility_world_state_value
-int Field_11_1_0_58221_000?
-int Field_11_1_0_58221_001?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
-int Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
 
 BUILD 6.0.1.18179
 BUILD 6.0.1.18125-6.2.4.21742
@@ -193,15 +181,15 @@ Eligibility_world_state_value<8>
 
 LAYOUT B06E4073
 BUILD 11.1.0.58221
-$id$Field_11_1_0_58221_000<32>
-Field_11_1_0_58221_001<16>
-Field_11_1_0_58221_002<32>
-Field_11_1_0_58221_003<u32>
-Field_11_1_0_58221_004<32>
-Field_11_1_0_58221_005<32>
-Field_11_1_0_58221_006<u16>
-Field_11_1_0_58221_007<32>
-Field_11_1_0_58221_008<32>
-Field_11_1_0_58221_009<32>
-Field_11_1_0_58221_010<16>
-Field_11_1_0_58221_011<8>
+$id$ID<32>
+Type<16>
+Asset<32>
+Modifier_tree_ID<u32>
+Start_event<32>
+Start_asset<32>
+Start_timer<u16>
+Fail_event<32>
+Fail_asset<32>
+Flags<32>
+Eligibility_world_state_ID<16>
+Eligibility_world_state_value<8>
diff --git a/definitions/CurrencyTypes.dbd b/definitions/CurrencyTypes.dbd
index 61d7b0b1ca4..82ee3ad1ee3 100644
--- a/definitions/CurrencyTypes.dbd
+++ b/definitions/CurrencyTypes.dbd
@@ -26,25 +26,7 @@ float WarbondTransferPercentage?
 int Field_1_15_3_55112_010?
 int Field_1_15_3_55112_011?
 float Field_1_15_4_56400_012?
-locstring Field_11_1_0_58221_000_lang?
-locstring Field_11_1_0_58221_001_lang?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
-int Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
-int Field_11_1_0_58221_012?
-int Field_11_1_0_58221_013?
-int Field_11_1_0_58221_014?
-int Field_11_1_0_58221_015?
-float Field_11_1_0_58221_016?
 int Field_11_1_0_58221_017?
-int Field_11_1_0_58221_018?
 
 LAYOUT EFA2B68B
 BUILD 1.15.3.55112, 1.15.3.55244, 1.15.3.55348, 1.15.3.55391, 1.15.3.55515, 1.15.3.55563, 1.15.3.55646, 1.15.3.55917, 1.15.3.56488, 1.15.3.56626
@@ -535,22 +517,22 @@ Flags<32>[2]
 LAYOUT B4FEFA1A
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002<32>
-Field_11_1_0_58221_003<32>
-Field_11_1_0_58221_004<u32>
-Field_11_1_0_58221_005<u8>
-Field_11_1_0_58221_006<u32>
-Field_11_1_0_58221_007<u32>
-Field_11_1_0_58221_008<8>
-Field_11_1_0_58221_009<32>
-Field_11_1_0_58221_010<32>
-Field_11_1_0_58221_011<32>
-Field_11_1_0_58221_012<32>
-Field_11_1_0_58221_013<32>
-Field_11_1_0_58221_014<u32>
-Field_11_1_0_58221_015<u32>
-Field_11_1_0_58221_016
+Name_lang
+Description_lang
+CategoryID<32>
+InventoryIconFileID<32>
+SpellWeight<u32>
+SpellCategory<u8>
+MaxQty<u32>
+MaxEarnablePerWeek<u32>
+Quality<8>
+FactionID<32>
+ItemGroupSoundsID<32>
+XpQuestDifficulty<32>
+AwardConditionID<32>
+MaxQtyWorldStateID<32>
+RechargingAmountPerCycle<u32>
+RechargingCycleDurationMS<u32>
+WarbondTransferPercentage
 Field_11_1_0_58221_017<u8>
-Field_11_1_0_58221_018<32>[2]
+Flags<32>[2]
diff --git a/definitions/FactionGroup.dbd b/definitions/FactionGroup.dbd
index 63cd1613d1f..02328571b44 100644
--- a/definitions/FactionGroup.dbd
+++ b/definitions/FactionGroup.dbd
@@ -5,11 +5,6 @@ string InternalName
 locstring Name_lang
 int<FileData::ID> ConquestCurrencyTextureFileID
 int<FileData::ID> HonorCurrencyTextureFileID
-string Field_11_1_0_58221_000?
-locstring Field_11_1_0_58221_001_lang?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
 
 LAYOUT 059DA8DE
 BUILD 2.5.4.42581, 2.5.4.42695, 2.5.4.42757, 2.5.4.42800, 2.5.4.42869, 2.5.4.42870, 2.5.4.42873, 2.5.4.42917, 2.5.4.42940, 2.5.4.43400, 2.5.4.43638, 2.5.4.43861, 2.5.4.44036, 2.5.4.44171, 2.5.4.44400, 2.5.4.44833
@@ -167,8 +162,8 @@ ConquestCurrencyTextureFileID<32>
 LAYOUT 81589733
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002<u8>
-Field_11_1_0_58221_003<32>
-Field_11_1_0_58221_004<32>
+InternalName
+Name_lang
+MaskID<u8>
+HonorCurrencyTextureFileID<32>
+ConquestCurrencyTextureFileID<32>
diff --git a/definitions/FactionTemplate.dbd b/definitions/FactionTemplate.dbd
index 09c6644c4ee..8618bf08cf7 100644
--- a/definitions/FactionTemplate.dbd
+++ b/definitions/FactionTemplate.dbd
@@ -7,13 +7,6 @@ int FriendGroup
 int EnemyGroup
 int<Faction::ID> Enemies
 int<Faction::ID> Friend
-int Field_11_1_0_58221_000?
-int Field_11_1_0_58221_001?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
 
 BUILD 0.5.3.3368
 BUILD 0.5.3.3368-0.11.0.3925
@@ -186,10 +179,10 @@ Friend<u16>[8]
 LAYOUT 22B6DC22
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000<u16>
-Field_11_1_0_58221_001<32>
-Field_11_1_0_58221_002<u8>
-Field_11_1_0_58221_003<u8>
-Field_11_1_0_58221_004<u8>
-Field_11_1_0_58221_005<u16>[8]
-Field_11_1_0_58221_006<u16>[8]
+Faction<u16>
+Flags<32>
+FactionGroup<u8>
+FriendGroup<u8>
+EnemyGroup<u8>
+Enemies<u16>[8]
+Friend<u16>[8]
diff --git a/definitions/ItemSparse.dbd b/definitions/ItemSparse.dbd
index e8bd825af15..2637c2b370e 100644
--- a/definitions/ItemSparse.dbd
+++ b/definitions/ItemSparse.dbd
@@ -78,70 +78,6 @@ int Field_7_3_2_25549_048? // probably RequiredPVPRank
 int Field_7_3_2_25549_049? // probably RequiredPVPMedal
 int Field_4_4_0_53750_013?
 int Field_1_15_3_55112_014?
-int Field_11_1_0_58221_000?
-locstring Field_11_1_0_58221_001_lang?
-locstring Field_11_1_0_58221_002_lang?
-locstring Field_11_1_0_58221_003_lang?
-locstring Field_11_1_0_58221_004_lang?
-locstring Field_11_1_0_58221_005_lang?
-int Field_11_1_0_58221_006?
-float Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
-float Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
-int Field_11_1_0_58221_012?
-int Field_11_1_0_58221_013?
-float Field_11_1_0_58221_014?
-float Field_11_1_0_58221_015?
-int Field_11_1_0_58221_016?
-int Field_11_1_0_58221_017?
-int Field_11_1_0_58221_018?
-int Field_11_1_0_58221_019?
-int Field_11_1_0_58221_020?
-int Field_11_1_0_58221_021?
-int Field_11_1_0_58221_022?
-int Field_11_1_0_58221_023?
-int Field_11_1_0_58221_024?
-float Field_11_1_0_58221_025?
-float Field_11_1_0_58221_026?
-int Field_11_1_0_58221_027?
-int Field_11_1_0_58221_028?
-int Field_11_1_0_58221_029?
-int Field_11_1_0_58221_030?
-int Field_11_1_0_58221_031?
-int Field_11_1_0_58221_032?
-int Field_11_1_0_58221_033?
-int Field_11_1_0_58221_034?
-int Field_11_1_0_58221_035?
-int Field_11_1_0_58221_036?
-int Field_11_1_0_58221_037?
-int Field_11_1_0_58221_038?
-int Field_11_1_0_58221_039?
-int Field_11_1_0_58221_040?
-int Field_11_1_0_58221_041?
-int Field_11_1_0_58221_042?
-int Field_11_1_0_58221_043?
-int Field_11_1_0_58221_044?
-int Field_11_1_0_58221_045?
-int Field_11_1_0_58221_046?
-int Field_11_1_0_58221_047?
-int Field_11_1_0_58221_048?
-int Field_11_1_0_58221_049?
-int Field_11_1_0_58221_050?
-int Field_11_1_0_58221_051?
-int Field_11_1_0_58221_052?
-int Field_11_1_0_58221_053?
-int Field_11_1_0_58221_054?
-int Field_11_1_0_58221_055?
-int Field_11_1_0_58221_056?
-int Field_11_1_0_58221_057?
-int Field_11_1_0_58221_058?
-int Field_11_1_0_58221_059?
-int Field_11_1_0_58221_060?
-int Field_11_1_0_58221_061?
-int Field_11_1_0_58221_062?
-int Field_11_1_0_58221_063?
 
 LAYOUT 5272360F
 BUILD 1.13.0.28211
@@ -2286,67 +2222,67 @@ LAYOUT 93DE68EC
 BUILD 11.1.0.58221
 COMMENT table is sparse
 $noninline,id$ID<32>
-Field_11_1_0_58221_000<64>
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002_lang
-Field_11_1_0_58221_003_lang
-Field_11_1_0_58221_004_lang
-Field_11_1_0_58221_005_lang
-Field_11_1_0_58221_006<32>
-Field_11_1_0_58221_007
-Field_11_1_0_58221_008<32>
-Field_11_1_0_58221_009<u32>
-Field_11_1_0_58221_010
-Field_11_1_0_58221_011<u32>
-Field_11_1_0_58221_012<32>
-Field_11_1_0_58221_013<32>
-Field_11_1_0_58221_014
-Field_11_1_0_58221_015[10]
-Field_11_1_0_58221_016<32>[10]
-Field_11_1_0_58221_017<32>[10]
-Field_11_1_0_58221_018<32>
-Field_11_1_0_58221_019<32>
-Field_11_1_0_58221_020<32>
-Field_11_1_0_58221_021<u32>
-Field_11_1_0_58221_022<u32>
-Field_11_1_0_58221_023<u32>
-Field_11_1_0_58221_024<u32>
-Field_11_1_0_58221_025
-Field_11_1_0_58221_026
-Field_11_1_0_58221_027<32>[5]
-Field_11_1_0_58221_028<32>
-Field_11_1_0_58221_029<32>
-Field_11_1_0_58221_030<32>
-Field_11_1_0_58221_031<32>
-Field_11_1_0_58221_032<u16>
-Field_11_1_0_58221_033<u16>
-Field_11_1_0_58221_034<u16>
-Field_11_1_0_58221_035<u16>
-Field_11_1_0_58221_036<u16>
-Field_11_1_0_58221_037<u16>
-Field_11_1_0_58221_038<u16>
-Field_11_1_0_58221_039<u16>[2]
-Field_11_1_0_58221_040<u16>
-Field_11_1_0_58221_041<u16>
-Field_11_1_0_58221_042<u16>
-Field_11_1_0_58221_043<u16>
-Field_11_1_0_58221_044<u16>
-Field_11_1_0_58221_045<u16>
-Field_11_1_0_58221_046<u16>
-Field_11_1_0_58221_047<u16>
-Field_11_1_0_58221_048<16>
-Field_11_1_0_58221_049<u8>
-Field_11_1_0_58221_050<u8>
-Field_11_1_0_58221_051<u8>
-Field_11_1_0_58221_052<u8>[3]
-Field_11_1_0_58221_053<u8>
-Field_11_1_0_58221_054<u8>
-Field_11_1_0_58221_055<u8>
-Field_11_1_0_58221_056<u8>
-Field_11_1_0_58221_057<u8>
-Field_11_1_0_58221_058<u8>
-Field_11_1_0_58221_059<u8>
-Field_11_1_0_58221_060<8>
-Field_11_1_0_58221_061<8>
-Field_11_1_0_58221_062<8>
-Field_11_1_0_58221_063<8>
+AllowableRace<64>
+Description_lang
+Display3_lang
+Display2_lang
+Display1_lang
+Display_lang
+ExpansionID<32>
+DmgVariance
+LimitCategory<32>
+DurationInInventory<u32>
+QualityModifier
+BagFamily<u32>
+StartQuestID<32>
+LanguageID<32>
+ItemRange
+StatPercentageOfSocket[10]
+StatPercentEditor<32>[10]
+StatModifier_bonusStat<32>[10]
+Stackable<32>
+MaxCount<32>
+MinReputation<32>
+RequiredAbility<u32>
+SellPrice<u32>
+BuyPrice<u32>
+VendorStackCount<u32>
+PriceVariance
+PriceRandomValue
+Flags<32>[5]
+OppositeFactionItemID<32>
+ModifiedCraftingReagentItemID<32>
+ContentTuningID<32>
+PlayerLevelToItemLevelCurveID<32>
+ItemNameDescriptionID<u16>
+RequiredTransmogHoliday<u16>
+RequiredHoliday<u16>
+Gem_properties<u16>
+Socket_match_enchantment_ID<u16>
+TotemCategoryID<u16>
+InstanceBound<u16>
+ZoneBound<u16>[2]
+ItemSet<u16>
+LockID<u16>
+PageID<u16>
+ItemDelay<u16>
+MinFactionID<u16>
+RequiredSkillRank<u16>
+RequiredSkill<u16>
+ItemLevel<u16>
+AllowableClass<16>
+ArtifactID<u8>
+SpellWeight<u8>
+SpellWeightCategory<u8>
+SocketType<u8>[3]
+SheatheType<u8>
+Material<u8>
+PageMaterialID<u8>
+Bonding<u8>
+DamageType<u8>
+ContainerSlots<u8>
+RequiredPVPMedal<u8>
+RequiredPVPRank<8>
+RequiredLevel<8>
+InventoryType<8>
+OverallQualityID<8>
diff --git a/definitions/JournalInstance.dbd b/definitions/JournalInstance.dbd
index b5df3881b2c..b9f902a6778 100644
--- a/definitions/JournalInstance.dbd
+++ b/definitions/JournalInstance.dbd
@@ -16,15 +16,6 @@ int Field_3_4_1_46722_005?
 int Field_3_4_1_46722_006?
 int Field_3_4_1_46722_007?
 int Field_3_4_1_46722_008?
-locstring Field_11_1_0_58221_000_lang?
-locstring Field_11_1_0_58221_001_lang?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
 int Field_11_1_0_58221_009?
 
 LAYOUT 71413EF7
@@ -300,13 +291,13 @@ AreaID<u16>
 LAYOUT 6C5ED7F2
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002<u16>
-Field_11_1_0_58221_003<32>
-Field_11_1_0_58221_004<32>
-Field_11_1_0_58221_005<32>
-Field_11_1_0_58221_006<32>
-Field_11_1_0_58221_007<32>
-Field_11_1_0_58221_008<u16>
+Name_lang
+Description_lang
+MapID<u16>
+BackgroundFileDataID<32>
+ButtonFileDataID<32>
+ButtonSmallFileDataID<32>
+LoreFileDataID<32>
+Flags<32>
+AreaID<u16>
 Field_11_1_0_58221_009<u16>
diff --git a/definitions/PlayerCondition.dbd b/definitions/PlayerCondition.dbd
index 8f74ddd46a9..f3d680e09f9 100644
--- a/definitions/PlayerCondition.dbd
+++ b/definitions/PlayerCondition.dbd
@@ -168,92 +168,6 @@ int Field_4_4_0_54377_077?
 int Field_4_4_0_54377_078?
 int Field_4_4_0_54377_079?
 int Field_4_4_0_54377_080?
-int Field_11_1_0_58221_000?
-locstring Field_11_1_0_58221_001_lang?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
-int Field_11_1_0_58221_010?
-int Field_11_1_0_58221_011?
-int Field_11_1_0_58221_012?
-int Field_11_1_0_58221_013?
-int Field_11_1_0_58221_014?
-int Field_11_1_0_58221_015?
-int Field_11_1_0_58221_016?
-int Field_11_1_0_58221_017?
-int Field_11_1_0_58221_018?
-int Field_11_1_0_58221_019?
-int Field_11_1_0_58221_020?
-int Field_11_1_0_58221_021?
-int Field_11_1_0_58221_022?
-int Field_11_1_0_58221_023?
-int Field_11_1_0_58221_024?
-int Field_11_1_0_58221_025?
-int Field_11_1_0_58221_026?
-int Field_11_1_0_58221_027?
-int Field_11_1_0_58221_028?
-int Field_11_1_0_58221_029?
-int Field_11_1_0_58221_030?
-int Field_11_1_0_58221_031?
-int Field_11_1_0_58221_032?
-int Field_11_1_0_58221_033?
-int Field_11_1_0_58221_034?
-int Field_11_1_0_58221_035?
-int Field_11_1_0_58221_036?
-int Field_11_1_0_58221_037?
-int Field_11_1_0_58221_038?
-int Field_11_1_0_58221_039?
-int Field_11_1_0_58221_040?
-int Field_11_1_0_58221_041?
-int Field_11_1_0_58221_042?
-int Field_11_1_0_58221_043?
-int Field_11_1_0_58221_044?
-int Field_11_1_0_58221_045?
-int Field_11_1_0_58221_046?
-int Field_11_1_0_58221_047?
-int Field_11_1_0_58221_048?
-int Field_11_1_0_58221_049?
-int Field_11_1_0_58221_050?
-int Field_11_1_0_58221_051?
-int Field_11_1_0_58221_052?
-int Field_11_1_0_58221_053?
-int Field_11_1_0_58221_054?
-int Field_11_1_0_58221_055?
-int Field_11_1_0_58221_056?
-int Field_11_1_0_58221_057?
-int Field_11_1_0_58221_058?
-int Field_11_1_0_58221_059?
-int Field_11_1_0_58221_060?
-int Field_11_1_0_58221_061?
-int Field_11_1_0_58221_062?
-int Field_11_1_0_58221_063?
-int Field_11_1_0_58221_064?
-int Field_11_1_0_58221_065?
-int Field_11_1_0_58221_066?
-int Field_11_1_0_58221_067?
-int Field_11_1_0_58221_068?
-int Field_11_1_0_58221_069?
-int Field_11_1_0_58221_070?
-int Field_11_1_0_58221_071?
-int Field_11_1_0_58221_072?
-int Field_11_1_0_58221_073?
-int Field_11_1_0_58221_074?
-int Field_11_1_0_58221_075?
-int Field_11_1_0_58221_076?
-int Field_11_1_0_58221_077?
-int Field_11_1_0_58221_078?
-int Field_11_1_0_58221_079?
-int Field_11_1_0_58221_080?
-int Field_11_1_0_58221_081?
-int Field_11_1_0_58221_082?
-int Field_11_1_0_58221_083?
-int Field_11_1_0_58221_084?
-int Field_11_1_0_58221_085?
 
 LAYOUT 8FEB04E0
 BUILD 1.15.3.55112, 1.15.3.55244, 1.15.3.55348, 1.15.3.55391, 1.15.3.55515, 1.15.3.55563, 1.15.3.55646, 1.15.3.55917, 1.15.3.56488, 1.15.3.56626
@@ -2195,89 +2109,89 @@ TraitNodeEntryMaxRank<u16>[4]
 LAYOUT 91789B48
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000<64>
-Field_11_1_0_58221_001_lang
-Field_11_1_0_58221_002<u16>
-Field_11_1_0_58221_003<u16>
-Field_11_1_0_58221_004<32>
-Field_11_1_0_58221_005<u32>
-Field_11_1_0_58221_006<32>
-Field_11_1_0_58221_007<u8>
-Field_11_1_0_58221_008<32>
-Field_11_1_0_58221_009<u16>
-Field_11_1_0_58221_010<u8>
-Field_11_1_0_58221_011<u32>
-Field_11_1_0_58221_012<8>
-Field_11_1_0_58221_013<u8>
-Field_11_1_0_58221_014<u32>
-Field_11_1_0_58221_015<u32>
-Field_11_1_0_58221_016<u32>
-Field_11_1_0_58221_017<u32>
-Field_11_1_0_58221_018<u32>
-Field_11_1_0_58221_019<u8>
-Field_11_1_0_58221_020<u32>
-Field_11_1_0_58221_021<u16>
-Field_11_1_0_58221_022<32>
-Field_11_1_0_58221_023<u8>
-Field_11_1_0_58221_024<8>
-Field_11_1_0_58221_025<u32>
-Field_11_1_0_58221_026<8>
-Field_11_1_0_58221_027<8>
-Field_11_1_0_58221_028<u32>
-Field_11_1_0_58221_029<u32>
-Field_11_1_0_58221_030<u32>
-Field_11_1_0_58221_031<32>
-Field_11_1_0_58221_032<u32>
-Field_11_1_0_58221_033<8>
-Field_11_1_0_58221_034<8>
-Field_11_1_0_58221_035<32>
-Field_11_1_0_58221_036<32>
-Field_11_1_0_58221_037<u16>
-Field_11_1_0_58221_038<u16>
-Field_11_1_0_58221_039<32>
-Field_11_1_0_58221_040<u16>
-Field_11_1_0_58221_041<u32>
-Field_11_1_0_58221_042<32>
-Field_11_1_0_58221_043<8>
-Field_11_1_0_58221_044<8>
-Field_11_1_0_58221_045<u32>
-Field_11_1_0_58221_046<8>
-Field_11_1_0_58221_047<u8>
-Field_11_1_0_58221_048<u8>
-Field_11_1_0_58221_049<32>
-Field_11_1_0_58221_050<u8>
-Field_11_1_0_58221_051<u8>
-Field_11_1_0_58221_052<8>
-Field_11_1_0_58221_053<8>
-Field_11_1_0_58221_054<8>
-Field_11_1_0_58221_055<8>
-Field_11_1_0_58221_056<32>
-Field_11_1_0_58221_057<32>
-Field_11_1_0_58221_058<u32>
-Field_11_1_0_58221_059<u16>[4]
-Field_11_1_0_58221_060<u16>[4]
-Field_11_1_0_58221_061<u16>[4]
-Field_11_1_0_58221_062<u32>[3]
-Field_11_1_0_58221_063<u8>[3]
-Field_11_1_0_58221_064<32>[4]
-Field_11_1_0_58221_065<32>[4]
-Field_11_1_0_58221_066<32>[4]
-Field_11_1_0_58221_067<32>[4]
-Field_11_1_0_58221_068<32>[4]
-Field_11_1_0_58221_069<u32>[4]
-Field_11_1_0_58221_070<u16>[2]
-Field_11_1_0_58221_071<u32>[2]
-Field_11_1_0_58221_072<32>[4]
-Field_11_1_0_58221_073<u8>[4]
-Field_11_1_0_58221_074<u16>[4]
-Field_11_1_0_58221_075<u16>[4]
-Field_11_1_0_58221_076<u8>[4]
-Field_11_1_0_58221_077<u8>[4]
-Field_11_1_0_58221_078<u32>[4]
-Field_11_1_0_58221_079<u32>[4]
-Field_11_1_0_58221_080<u32>[4]
-Field_11_1_0_58221_081<u32>[6]
-Field_11_1_0_58221_082<32>[2]
-Field_11_1_0_58221_083<32>[4]
-Field_11_1_0_58221_084<u16>[4]
-Field_11_1_0_58221_085<u16>[4]
+RaceMask<64>
+Failure_description_lang
+MinLevel<u16>
+MaxLevel<u16>
+ClassMask<32>
+SkillLogic<u32>
+LanguageID<32>
+MinLanguage<u8>
+MaxLanguage<32>
+MaxFactionID<u16>
+MaxReputation<u8>
+ReputationLogic<u32>
+CurrentPvpFaction<8>
+PvpMedal<u8>
+PrevQuestLogic<u32>
+CurrQuestLogic<u32>
+CurrentCompletedQuestLogic<u32>
+SpellLogic<u32>
+ItemLogic<u32>
+ItemFlags<u8>
+AuraSpellLogic<u32>
+WorldStateExpressionID<u16>
+WeatherID<32>
+PartyStatus<u8>
+LifetimeMaxPVPRank<8>
+AchievementLogic<u32>
+Gender<8>
+NativeGender<8>
+AreaLogic<u32>
+LfgLogic<u32>
+CurrencyLogic<u32>
+QuestKillID<32>
+QuestKillLogic<u32>
+MinExpansionLevel<8>
+MaxExpansionLevel<8>
+MinAvgItemLevel<32>
+MaxAvgItemLevel<32>
+MinAvgEquippedItemLevel<u16>
+MaxAvgEquippedItemLevel<u16>
+PhaseUseFlags<32>
+PhaseID<u16>
+PhaseGroupID<u32>
+Flags<32>
+ChrSpecializationIndex<8>
+ChrSpecializationRole<8>
+ModifierTreeID<u32>
+PowerType<8>
+PowerTypeComp<u8>
+PowerTypeValue<u8>
+WeaponSubclassMask<32>
+MaxGuildLevel<u8>
+MinGuildLevel<u8>
+MaxExpansionTier<8>
+MinExpansionTier<8>
+MinPVPRank<8>
+MaxPVPRank<8>
+ContentTuningID<32>
+CovenantID<32>
+TraitNodeEntryLogic<u32>
+SkillID<u16>[4]
+MinSkill<u16>[4]
+MaxSkill<u16>[4]
+MinFactionID<u32>[3]
+MinReputation<u8>[3]
+PrevQuestID<32>[4]
+CurrQuestID<32>[4]
+CurrentCompletedQuestID<32>[4]
+SpellID<32>[4]
+ItemID<32>[4]
+ItemCount<u32>[4]
+Explored<u16>[2]
+Time<u32>[2]
+AuraSpellID<32>[4]
+AuraStacks<u8>[4]
+Achievement<u16>[4]
+AreaID<u16>[4]
+LfgStatus<u8>[4]
+LfgCompare<u8>[4]
+LfgValue<u32>[4]
+CurrencyID<u32>[4]
+CurrencyCount<u32>[4]
+QuestKillMonster<u32>[6]
+MovementFlags<32>[2]
+TraitNodeEntryID<32>[4]
+TraitNodeEntryMinRank<u16>[4]
+TraitNodeEntryMaxRank<u16>[4]
diff --git a/definitions/SpellShapeshiftForm.dbd b/definitions/SpellShapeshiftForm.dbd
index 4da971e18d1..f78e330fe0e 100644
--- a/definitions/SpellShapeshiftForm.dbd
+++ b/definitions/SpellShapeshiftForm.dbd
@@ -13,16 +13,6 @@ int ExitSoundEntriesID
 int<FileData::ID> AttackIconFileID
 float DamageVariance
 int Field_1_15_0_52124_002? // Duplicate of CreatureDisplayID
-locstring Field_11_1_0_58221_000_lang?
-int Field_11_1_0_58221_001?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-float Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
-int Field_11_1_0_58221_009?
 
 BUILD 0.5.3.3368
 BUILD 0.5.3.3368-0.5.5.3494
@@ -278,13 +268,13 @@ PresetSpellID<u32>[8]
 LAYOUT 385A8162
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001<u32>
-Field_11_1_0_58221_002<u8>
-Field_11_1_0_58221_003<32>
-Field_11_1_0_58221_004<32>
-Field_11_1_0_58221_005<8>
-Field_11_1_0_58221_006<16>
-Field_11_1_0_58221_007
-Field_11_1_0_58221_008<u16>
-Field_11_1_0_58221_009<u32>[8]
+Name_lang
+CreatureDisplayID<u32>
+CreatureType<u8>
+Flags<32>
+AttackIconFileID<32>
+BonusActionBar<8>
+CombatRoundTime<16>
+DamageVariance
+MountTypeID<u16>
+PresetSpellID<u32>[8]
diff --git a/definitions/Talent.dbd b/definitions/Talent.dbd
index 4e1f97aed86..deb44b860bd 100644
--- a/definitions/Talent.dbd
+++ b/definitions/Talent.dbd
@@ -14,15 +14,6 @@ int SpellRank
 int<Talent::ID> PrereqTalent
 int PrereqRank
 int<Spell::ID> RequiredSpellID
-locstring Field_11_1_0_58221_000_lang?
-int Field_11_1_0_58221_001?
-int Field_11_1_0_58221_002?
-int Field_11_1_0_58221_003?
-int Field_11_1_0_58221_004?
-int Field_11_1_0_58221_005?
-int Field_11_1_0_58221_006?
-int Field_11_1_0_58221_007?
-int Field_11_1_0_58221_008?
 
 BUILD 0.7.0.3694-0.9.1.3810
 $id$ID<32>
@@ -350,12 +341,12 @@ CategoryMask<u8>[2]
 LAYOUT FD0E9E24
 BUILD 11.1.0.58221
 $noninline,id$ID<32>
-Field_11_1_0_58221_000_lang
-Field_11_1_0_58221_001<u8>
-Field_11_1_0_58221_002<u8>
-Field_11_1_0_58221_003<u8>
-Field_11_1_0_58221_004<8>
-Field_11_1_0_58221_005<u16>
-Field_11_1_0_58221_006<u32>
-Field_11_1_0_58221_007<u32>
-Field_11_1_0_58221_008<u8>[2]
+Description_lang
+TierID<u8>
+Flags<u8>
+ColumnIndex<u8>
+ClassID<8>
+SpecID<u16>
+SpellID<u32>
+OverridesSpellID<u32>
+CategoryMask<u8>[2]