Core: Update to 10.2.7

TrinityCore · May 8, 2024 · 468a06b · 468a06b
1 parent 83f4763
commit 468a06b
Show file tree

Hide file tree

Showing 43 changed files with 3,172 additions and 2,753 deletions.
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
@@ -774,7 +774,10 @@ INSERT INTO `build_info` VALUES
 (54070,10,2,6,NULL,NULL,'FDA08264B7587250CF78F9B960218169',NULL,NULL,NULL),
 (54205,10,2,6,NULL,NULL,'589D59EB3F0D6D77C2175D9302F78FDD',NULL,NULL,NULL),
 (54358,10,2,6,NULL,NULL,'89C733D366E845FB9264404CD48CCA89',NULL,NULL,NULL),
-(54499,10,2,6,NULL,NULL,'6AC1F6180FC4C390F782DB933BD83326',NULL,NULL,NULL);
+(54499,10,2,6,NULL,NULL,'6AC1F6180FC4C390F782DB933BD83326',NULL,NULL,NULL),
+(54577,10,2,7,NULL,NULL,'CBBBBBFFB2C652F0F4A7848D86E1B063',NULL,NULL,NULL),
+(54601,10,2,7,NULL,NULL,'F8B866CF7DB9A12273F35B3929627375',NULL,NULL,NULL),
+(54604,10,2,7,NULL,NULL,'A5FF4CE535F69D4D7F638CB2C11F2243',NULL,NULL,NULL);
 /*!40000 ALTER TABLE `build_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2384,7 +2387,7 @@ CREATE TABLE `realmlist` (
   `timezone` tinyint unsigned NOT NULL DEFAULT '0',
   `allowedSecurityLevel` tinyint unsigned NOT NULL DEFAULT '0',
   `population` float unsigned NOT NULL DEFAULT '0',
-  `gamebuild` int unsigned NOT NULL DEFAULT '54499',
+  `gamebuild` int unsigned NOT NULL DEFAULT '54604',
   `Region` tinyint unsigned NOT NULL DEFAULT '1',
   `Battlegroup` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
@@ -2399,7 +2402,7 @@ CREATE TABLE `realmlist` (
 LOCK TABLES `realmlist` WRITE;
 /*!40000 ALTER TABLE `realmlist` DISABLE KEYS */;
 INSERT INTO `realmlist` VALUES
-(1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,54499,1,1);
+(1,'Trinity','127.0.0.1','127.0.0.1','255.255.255.0',8085,0,0,1,0,0,54604,1,1);
 /*!40000 ALTER TABLE `realmlist` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2820,7 +2823,8 @@ INSERT INTO `updates` VALUES
 ('2024_04_08_00_auth.sql','B05516DB306A06982206180A2A18407D9E0012DE','RELEASED','2024-04-08 21:56:33',0),
 ('2024_04_12_00_auth.sql','3D2DCEA21AE5104EF192CACAAFBB5131AD355791','RELEASED','2024-04-12 12:07:49',0),
 ('2024_04_22_00_auth.sql','83566EA54235D588697D747D8130CD6D37445CC5','RELEASED','2024-04-22 23:05:46',0),
-('2024_05_01_00_auth.sql','2A1C2B4E54706BDD1FDD57AFB943058BEE8D8852','RELEASED','2024-05-01 21:32:43',0);
+('2024_05_01_00_auth.sql','2A1C2B4E54706BDD1FDD57AFB943058BEE8D8852','RELEASED','2024-05-01 21:32:43',0),
+('2024_05_08_00_auth.sql','F2EEE0D225CB82DBB3A478E0BF6A0116C9265355','RELEASED','2024-05-08 20:35:53',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 

diff --git a/sql/updates/auth/master/2024_05_08_00_auth.sql b/sql/updates/auth/master/2024_05_08_00_auth.sql
@@ -0,0 +1,9 @@
+DELETE FROM `build_info` WHERE `build` IN (54577,54601,54604);
+INSERT INTO `build_info` (`build`,`majorVersion`,`minorVersion`,`bugfixVersion`,`hotfixVersion`,`winAuthSeed`,`win64AuthSeed`,`mac64AuthSeed`,`winChecksumSeed`,`macChecksumSeed`) VALUES
+(54577,10,2,7,NULL,NULL,'CBBBBBFFB2C652F0F4A7848D86E1B063',NULL,NULL,NULL),
+(54601,10,2,7,NULL,NULL,'F8B866CF7DB9A12273F35B3929627375',NULL,NULL,NULL),
+(54604,10,2,7,NULL,NULL,'A5FF4CE535F69D4D7F638CB2C11F2243',NULL,NULL,NULL);
+
+UPDATE `realmlist` SET `gamebuild`=54604 WHERE `gamebuild`=54499;
+
+ALTER TABLE `realmlist` CHANGE `gamebuild` `gamebuild` int unsigned NOT NULL DEFAULT '54604';
diff --git a/sql/updates/hotfixes/master/2024_05_08_00_hotfixes.sql b/sql/updates/hotfixes/master/2024_05_08_00_hotfixes.sql
@@ -0,0 +1,6 @@
+ALTER TABLE `achievement` MODIFY COLUMN `Supercedes` int NOT NULL DEFAULT 0 AFTER `Faction`;
+
+ALTER TABLE `content_tuning` ADD COLUMN `HealthItemLevelCurveID` int NOT NULL DEFAULT 0 AFTER `ExpansionID`;
+ALTER TABLE `content_tuning` ADD COLUMN `DamageItemLevelCurveID` int NOT NULL DEFAULT 0 AFTER `HealthItemLevelCurveID`;
+
+ALTER TABLE `item_modified_appearance` ADD COLUMN `Flags` int NOT NULL DEFAULT 0 AFTER `TransmogSourceTypeEnum`;
diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp
@@ -454,8 +454,9 @@ void HotfixDatabaseConnection::DoPrepareStatements()
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_CONDITIONAL_CONTENT_TUNING, "SELECT MAX(ID) + 1 FROM conditional_content_tuning", CONNECTION_SYNCH);
 
     // ContentTuning.db2
-    PrepareStatement(HOTFIX_SEL_CONTENT_TUNING, "SELECT ID, Flags, ExpansionID, MinLevel, MaxLevel, MinLevelType, MaxLevelType, TargetLevelDelta, "
-        "TargetLevelMaxDelta, TargetLevelMin, TargetLevelMax, MinItemLevel, QuestXpMultiplier FROM content_tuning WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+    PrepareStatement(HOTFIX_SEL_CONTENT_TUNING, "SELECT ID, Flags, ExpansionID, HealthItemLevelCurveID, DamageItemLevelCurveID, MinLevel, MaxLevel, "
+        "MinLevelType, MaxLevelType, TargetLevelDelta, TargetLevelMaxDelta, TargetLevelMin, TargetLevelMax, MinItemLevel, QuestXpMultiplier"
+        " FROM content_tuning WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_CONTENT_TUNING, "SELECT MAX(ID) + 1 FROM content_tuning", CONNECTION_SYNCH);
 
     // ContentTuningXExpected.db2
@@ -962,7 +963,7 @@ void HotfixDatabaseConnection::DoPrepareStatements()
 
     // ItemModifiedAppearance.db2
     PrepareStatement(HOTFIX_SEL_ITEM_MODIFIED_APPEARANCE, "SELECT ID, ItemID, ItemAppearanceModifierID, ItemAppearanceID, OrderIndex, "
-        "TransmogSourceTypeEnum FROM item_modified_appearance WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
+        "TransmogSourceTypeEnum, Flags FROM item_modified_appearance WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH);
     PREPARE_MAX_ID_STMT(HOTFIX_SEL_ITEM_MODIFIED_APPEARANCE, "SELECT MAX(ID) + 1 FROM item_modified_appearance", CONNECTION_SYNCH);
 
     // ItemModifiedAppearanceExtra.db2

diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
@@ -34,7 +34,7 @@ struct AchievementLoadInfo
         { false, FT_INT, "ID" },
         { true, FT_SHORT, "InstanceID" },
         { true, FT_BYTE, "Faction" },
-        { true, FT_SHORT, "Supercedes" },
+        { true, FT_INT, "Supercedes" },
         { true, FT_SHORT, "Category" },
         { true, FT_BYTE, "MinimumCriteria" },
         { true, FT_BYTE, "Points" },
@@ -1299,11 +1299,13 @@ struct ConditionalContentTuningLoadInfo
 
 struct ContentTuningLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[13] =
+    static constexpr DB2FieldMeta Fields[15] =
     {
         { false, FT_INT, "ID" },
         { true, FT_INT, "Flags" },
         { true, FT_INT, "ExpansionID" },
+        { true, FT_INT, "HealthItemLevelCurveID" },
+        { true, FT_INT, "DamageItemLevelCurveID" },
         { true, FT_INT, "MinLevel" },
         { true, FT_INT, "MaxLevel" },
         { true, FT_INT, "MinLevelType" },
@@ -1316,7 +1318,7 @@ struct ContentTuningLoadInfo
         { false, FT_FLOAT, "QuestXpMultiplier" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 13, &ContentTuningMeta::Instance, HOTFIX_SEL_CONTENT_TUNING };
+    static constexpr DB2LoadInfo Instance{ Fields, 15, &ContentTuningMeta::Instance, HOTFIX_SEL_CONTENT_TUNING };
 };
 
 struct ContentTuningXExpectedLoadInfo
@@ -3026,17 +3028,18 @@ struct ItemLimitCategoryConditionLoadInfo
 
 struct ItemModifiedAppearanceLoadInfo
 {
-    static constexpr DB2FieldMeta Fields[6] =
+    static constexpr DB2FieldMeta Fields[7] =
     {
         { false, FT_INT, "ID" },
         { true, FT_INT, "ItemID" },
         { true, FT_INT, "ItemAppearanceModifierID" },
         { true, FT_INT, "ItemAppearanceID" },
         { true, FT_INT, "OrderIndex" },
         { false, FT_BYTE, "TransmogSourceTypeEnum" },
+        { true, FT_INT, "Flags" },
     };
 
-    static constexpr DB2LoadInfo Instance{ Fields, 6, &ItemModifiedAppearanceMeta::Instance, HOTFIX_SEL_ITEM_MODIFIED_APPEARANCE };
+    static constexpr DB2LoadInfo Instance{ Fields, 7, &ItemModifiedAppearanceMeta::Instance, HOTFIX_SEL_ITEM_MODIFIED_APPEARANCE };
 };
 
 struct ItemModifiedAppearanceExtraLoadInfo

diff --git a/src/server/game/DataStores/DB2Metadata.h b/src/server/game/DataStores/DB2Metadata.h
@@ -30,7 +30,7 @@ struct AchievementMeta
         { FT_INT, 1, false },
         { FT_SHORT, 1, true },
         { FT_BYTE, 1, true },
-        { FT_SHORT, 1, true },
+        { FT_INT, 1, true },
         { FT_SHORT, 1, true },
         { FT_BYTE, 1, true },
         { FT_BYTE, 1, true },
@@ -45,7 +45,7 @@ struct AchievementMeta
         { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 1260179, 3, 19, 19, 0x920E09CB, Fields, 11 };
+    static constexpr DB2Meta Instance{ 1260179, 3, 19, 19, 0x145BE391, Fields, 11 };
 };
 
 struct Achievement_CategoryMeta
@@ -2971,6 +2971,24 @@ struct ConfigurationWarningMeta
     static constexpr DB2Meta Instance{ 1709409, -1, 2, 2, 0x6E7F031C, Fields, -1 };
 };
 
+struct ContentPushMeta
+{
+    static constexpr DB2MetaField Fields[9] =
+    {
+        { FT_INT, 1, true },
+        { 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, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 5742435, -1, 9, 9, 0xA22779BB, Fields, -1 };
+};
+
 struct ContentRestrictionRuleMeta
 {
     static constexpr DB2MetaField Fields[8] =
@@ -3002,7 +3020,7 @@ struct ContentRestrictionRuleSetMeta
 
 struct ContentTuningMeta
 {
-    static constexpr DB2MetaField Fields[12] =
+    static constexpr DB2MetaField Fields[14] =
     {
         { FT_INT, 1, true },
         { FT_INT, 1, true },
@@ -3015,10 +3033,12 @@ struct ContentTuningMeta
         { 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{ 1962930, -1, 12, 12, 0x3E5D4B74, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1962930, -1, 14, 14, 0x7364682E, Fields, -1 };
 };
 
 struct ContentTuningXExpectedMeta
@@ -3473,6 +3493,17 @@ struct CreatureDisplayInfoTrnMeta
     static constexpr DB2Meta Instance{ 1146698, -1, 6, 5, 0x7B61A667, Fields, 5 };
 };
 
+struct CreatureDisplayXUIModelSceneMeta
+{
+    static constexpr DB2MetaField Fields[2] =
+    {
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 5551196, -1, 2, 2, 0xF6F7B883, Fields, -1 };
+};
+
 struct CreatureFamilyMeta
 {
     static constexpr DB2MetaField Fields[9] =
@@ -3491,6 +3522,17 @@ struct CreatureFamilyMeta
     static constexpr DB2Meta Instance{ 1351351, -1, 9, 9, 0x78019FD1, Fields, -1 };
 };
 
+struct CreatureFamilyXUIModelSceneMeta
+{
+    static constexpr DB2MetaField Fields[2] =
+    {
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 5551197, -1, 2, 2, 0x67A62BDD, Fields, -1 };
+};
+
 struct CreatureImmunitiesMeta
 {
     static constexpr DB2MetaField Fields[9] =
@@ -3502,11 +3544,11 @@ struct CreatureImmunitiesMeta
         { FT_BYTE, 1, false },
         { FT_BYTE, 1, false },
         { FT_INT, 2, true },
-        { FT_INT, 10, false },
+        { FT_INT, 11, false },
         { FT_INT, 20, false },
     };
 
-    static constexpr DB2Meta Instance{ 1131322, -1, 9, 9, 0x1B605529, Fields, -1 };
+    static constexpr DB2Meta Instance{ 1131322, -1, 9, 9, 0x6103DDDA, Fields, -1 };
 };
 
 struct CreatureLabelMeta
@@ -4496,6 +4538,21 @@ struct GameObjectDiffAnimMapMeta
     static constexpr DB2Meta Instance{ 1302847, -1, 4, 3, 0x7403DFA2, Fields, 3 };
 };
 
+struct GameObjectDisplayConditionMeta
+{
+    static constexpr DB2MetaField Fields[6] =
+    {
+        { FT_INT, 1, false },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_INT, 1, true },
+        { FT_FLOAT, 1, true },
+        { FT_INT, 1, true },
+    };
+
+    static constexpr DB2Meta Instance{ 5634246, 0, 6, 5, 0x676E8326, Fields, 5 };
+};
+
 struct GameObjectDisplayInfoMeta
 {
     static constexpr DB2MetaField Fields[8] =
@@ -6751,17 +6808,18 @@ struct ItemLogicalCostGroupMeta
 
 struct ItemModifiedAppearanceMeta
 {
-    static constexpr DB2MetaField Fields[6] =
+    static constexpr DB2MetaField Fields[7] =
     {
         { FT_INT, 1, false },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, true },
         { FT_BYTE, 1, false },
+        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 982457, 0, 6, 6, 0x0120090C, Fields, 1 };
+    static constexpr DB2Meta Instance{ 982457, 0, 7, 7, 0xF881E7D5, Fields, 1 };
 };
 
 struct ItemModifiedAppearanceExtraMeta
@@ -6850,6 +6908,20 @@ struct ItemRecraftMeta
     static constexpr DB2Meta Instance{ 5150118, 0, 5, 4, 0xE00E7F34, Fields, 4 };
 };
 
+struct ItemReforgeMeta
+{
+    static constexpr DB2MetaField Fields[5] =
+    {
+        { FT_SHORT, 1, false },
+        { FT_FLOAT, 1, true },
+        { FT_SHORT, 1, false },
+        { FT_FLOAT, 1, true },
+        { FT_SHORT, 1, false },
+    };
+
+    static constexpr DB2Meta Instance{ 5633983, -1, 5, 5, 0xE91C7760, Fields, -1 };
+};
+
 struct ItemSalvageMeta
 {
     static constexpr DB2MetaField Fields[3] =
@@ -9821,16 +9893,17 @@ struct QuestLabelMeta
 
 struct QuestLineMeta
 {
-    static constexpr DB2MetaField Fields[5] =
+    static constexpr DB2MetaField Fields[6] =
     {
         { FT_STRING, 1, true },
         { FT_STRING, 1, true },
         { FT_INT, 1, true },
         { FT_INT, 1, false },
         { FT_INT, 1, true },
+        { FT_INT, 1, true },
     };
 
-    static constexpr DB2Meta Instance{ 973430, -1, 5, 5, 0xA360A782, Fields, -1 };
+    static constexpr DB2Meta Instance{ 973430, -1, 6, 6, 0x148A5F52, Fields, -1 };
 };
 
 struct QuestLineXQuestMeta
@@ -13435,6 +13508,19 @@ struct UISplashScreenMeta
     static constexpr DB2Meta Instance{ 2960122, -1, 15, 15, 0x5C67BB80, Fields, -1 };
 };
 
+struct UiCamFbackTalkingHeadChrRaceMeta
+{
+    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{ 3055924, -1, 4, 3, 0xAABE2521, Fields, 3 };
+};
+
 struct UiCamFbackTransmogChrRaceMeta
 {
     static constexpr DB2MetaField Fields[5] =

diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
@@ -33,7 +33,7 @@ struct AchievementEntry
     uint32 ID;
     int16 InstanceID;                                               // -1 = none
     int8 Faction;                                                   // -1 = all, 0 = horde, 1 = alliance
-    int16 Supercedes;                                               // its Achievement parent (can`t start while parent uncomplete, use its Criteria if don`t have own, use its progress on begin)
+    int32 Supercedes;                                               // its Achievement parent (can`t start while parent uncomplete, use its Criteria if don`t have own, use its progress on begin)
     int16 Category;
     int8 MinimumCriteria;                                           // need this count of completed criterias (own or referenced achievement criterias)
     int8 Points;
@@ -927,6 +927,8 @@ struct ContentTuningEntry
     uint32 ID;
     int32 Flags;
     int32 ExpansionID;
+    int32 HealthItemLevelCurveID;
+    int32 DamageItemLevelCurveID;
     int32 MinLevel;
     int32 MaxLevel;
     int32 MinLevelType;
@@ -2346,6 +2348,7 @@ struct ItemModifiedAppearanceEntry
     int32 ItemAppearanceID;
     int32 OrderIndex;
     uint8 TransmogSourceTypeEnum;
+    int32 Flags;
 };
 
 struct ItemModifiedAppearanceExtraEntry