Initial 10.2.6 merge

wowdev · Mar 19, 2024 · 781b982 · 781b982
1 parent 01979e0
commit 781b982
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 90 deletions.
diff --git a/definitions/Achievement.dbd b/definitions/Achievement.dbd
@@ -19,23 +19,6 @@ int<Item::ID> RewardItemID
 int<Covenant::ID> CovenantID
 int Field_3_0_1_8471_007? // possibly ui_order
 int Field_3_0_1_8303_002?
-locstring Field_10_2_6_53840_000_lang?
-locstring Field_10_2_6_53840_001_lang?
-locstring Field_10_2_6_53840_002_lang?
-int Field_10_2_6_53840_003?
-int Field_10_2_6_53840_004?
-int Field_10_2_6_53840_005?
-int Field_10_2_6_53840_006?
-int Field_10_2_6_53840_007?
-int Field_10_2_6_53840_008?
-int Field_10_2_6_53840_009?
-int Field_10_2_6_53840_010?
-int Field_10_2_6_53840_011?
-int Field_10_2_6_53840_012?
-int Field_10_2_6_53840_013?
-int Field_10_2_6_53840_014?
-int Field_10_2_6_53840_015?
-int Field_10_2_6_53840_016?
 int Field_10_2_6_53840_017?
 int Field_10_2_6_53840_018?
 
@@ -373,22 +356,22 @@ CovenantID<32>
 
 LAYOUT 920E09CB
 BUILD 10.2.6.53840
-Field_10_2_6_53840_000_lang
-Field_10_2_6_53840_001_lang
-Field_10_2_6_53840_002_lang
-$id$Field_10_2_6_53840_003<32>
-Field_10_2_6_53840_004<16>
-Field_10_2_6_53840_005<8>
-Field_10_2_6_53840_006<16>
-Field_10_2_6_53840_007<16>
-Field_10_2_6_53840_008<8>
-Field_10_2_6_53840_009<8>
-Field_10_2_6_53840_010<32>
-$relation$Field_10_2_6_53840_011<16>
-Field_10_2_6_53840_012<32>
-Field_10_2_6_53840_013<32>
-Field_10_2_6_53840_014<u32>
-Field_10_2_6_53840_015<16>
-Field_10_2_6_53840_016<32>
+Description_lang
+Title_lang
+Reward_lang
+$id$ID<32>
+Instance_ID<16>
+Faction<8>
+Supercedes<16>
+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>
 Field_10_2_6_53840_017<32>
 Field_10_2_6_53840_018<32>
diff --git a/definitions/AdventureJournal.dbd b/definitions/AdventureJournal.dbd
@@ -23,26 +23,6 @@ int<FileData::ID> TextureFileDataID
 int Type
 int<WorldMapArea::ID> WorldMapAreaID
 int<UiMap::ID> UIMapID
-locstring Field_10_2_6_53840_000_lang?
-locstring Field_10_2_6_53840_001_lang?
-locstring Field_10_2_6_53840_002_lang?
-locstring Field_10_2_6_53840_003_lang?
-locstring Field_10_2_6_53840_004_lang?
-int Field_10_2_6_53840_005?
-int Field_10_2_6_53840_006?
-int Field_10_2_6_53840_007?
-int Field_10_2_6_53840_008?
-int Field_10_2_6_53840_009?
-int Field_10_2_6_53840_010?
-int Field_10_2_6_53840_011?
-int Field_10_2_6_53840_012?
-int Field_10_2_6_53840_013?
-int Field_10_2_6_53840_014?
-int Field_10_2_6_53840_015?
-int Field_10_2_6_53840_016?
-int Field_10_2_6_53840_017?
-int Field_10_2_6_53840_018?
-int Field_10_2_6_53840_019?
 
 LAYOUT AF456C4F
 BUILD 2.5.3.41402, 2.5.3.41531, 2.5.3.41750, 2.5.3.41812, 2.5.3.42083, 2.5.3.42328, 2.5.3.42598
@@ -430,23 +410,23 @@ BonusValue<u8>[2]
 LAYOUT 872F8E30
 BUILD 10.2.6.53840
 $noninline,id$ID<32>
-Field_10_2_6_53840_000_lang
-Field_10_2_6_53840_001_lang
-Field_10_2_6_53840_002_lang
-Field_10_2_6_53840_003_lang
-Field_10_2_6_53840_004_lang
-Field_10_2_6_53840_005<u8>
-Field_10_2_6_53840_006<u32>
-Field_10_2_6_53840_007<32>
-Field_10_2_6_53840_008<u8>
-Field_10_2_6_53840_009<32>
-Field_10_2_6_53840_010<u16>
-Field_10_2_6_53840_011<32>
-Field_10_2_6_53840_012<u16>
-Field_10_2_6_53840_013<u8>
-Field_10_2_6_53840_014<u8>
-Field_10_2_6_53840_015<u16>
-Field_10_2_6_53840_016<u32>
-Field_10_2_6_53840_017<u16>
-Field_10_2_6_53840_018<u32>[2]
-Field_10_2_6_53840_019<u8>[2]
+Name_lang
+Description_lang
+ButtonText_lang
+RewardDescription_lang
+ContinueDescription_lang
+Type<u8>
+PlayerConditionID<u32>
+Flags<32>
+ButtonActionType<u8>
+TextureFileDataID<32>
+LfgDungeonID<u16>
+QuestID<32>
+BattleMasterListID<u16>
+PriorityMin<u8>
+PriorityMax<u8>
+CurrencyType<u16>
+CurrencyQuantity<u32>
+UIMapID<u16>
+BonusPlayerConditionID<u32>[2]
+BonusValue<u8>[2]
diff --git a/definitions/JournalEncounterItem.dbd b/definitions/JournalEncounterItem.dbd
@@ -5,12 +5,6 @@ int<Item::ID> ItemID
 int DifficultyMask
 int FactionMask
 int Flags
-int Field_10_2_6_53840_000?
-int Field_10_2_6_53840_001?
-int Field_10_2_6_53840_002?
-int Field_10_2_6_53840_003?
-int Field_10_2_6_53840_004?
-int Field_10_2_6_53840_005?
 int Field_10_2_6_53840_006?
 
 LAYOUT D3499B0A
@@ -151,10 +145,10 @@ DifficultyMask<8>
 
 LAYOUT 2F00E0F6
 BUILD 10.2.6.53840
-$id$Field_10_2_6_53840_000<32>
-$relation$Field_10_2_6_53840_001<u16>
-Field_10_2_6_53840_002<u32>
-Field_10_2_6_53840_003<8>
-Field_10_2_6_53840_004<32>
-Field_10_2_6_53840_005<8>
+$id$ID<32>
+$relation$JournalEncounterID<u16>
+ItemID<u32>
+FactionMask<8>
+Flags<32>
+DifficultyMask<8>
 Field_10_2_6_53840_006<32>
diff --git a/definitions/QuestXUiWidgetSet.dbd b/definitions/QuestXUiWidgetSet.dbd
@@ -2,8 +2,6 @@ COLUMNS
 int ID
 int<QuestV2::ID> QuestID
 int<UiWidgetSet::ID> UiWidgetSetID
-int Field_10_2_6_53840_000?
-int Field_10_2_6_53840_001?
 int Field_10_2_6_53840_002?
 
 LAYOUT 9D15AFB1
@@ -37,6 +35,6 @@ UiWidgetSetID<32>
 LAYOUT 5FABCD9E
 BUILD 10.2.6.53840
 $noninline,id$ID<32>
-Field_10_2_6_53840_000<32>
-Field_10_2_6_53840_001<32>
+QuestID<32>
+UiWidgetSetID<32>
 Field_10_2_6_53840_002<u8>