Core: Updated to 7.1.5.23360

5 files changed, 20 insertions, 30 deletions

diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h
index 949a6409d54..aa1e507da16 100644
--- a/src/server/game/DataStores/DB2LoadInfo.h
+++ b/src/server/game/DataStores/DB2LoadInfo.h
@@ -713,7 +713,6 @@ struct ChrSpecializationLoadInfo
             { false, FT_STRING, "Name" },
             { false, FT_STRING, "Name2" },
             { false, FT_STRING, "Description" },
-            { false, FT_STRING_NOT_LOCALIZED, "BackgroundFile" },
             { false, FT_SHORT, "SpellIconID" },
             { false, FT_BYTE, "ClassID" },
             { false, FT_BYTE, "OrderIndex" },
diff --git a/src/server/game/DataStores/DB2Metadata.h b/src/server/game/DataStores/DB2Metadata.h
index 94bf1e92f85..f7c24ec315b 100644
--- a/src/server/game/DataStores/DB2Metadata.h
+++ b/src/server/game/DataStores/DB2Metadata.h
@@ -981,9 +981,9 @@ struct ChrSpecializationMeta
 {
     static DB2Meta const* Instance()
     {
-        static char const* types = "isssshbbbbbiii";
-        static uint8 const arraySizes[14] = { 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
-        static DB2Meta instance(11, 14, 0x1A96EDE4, types, arraySizes);
+        static char const* types = "issshbbbbbiii";
+        static uint8 const arraySizes[13] = { 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 };
+        static DB2Meta instance(10, 13, 0x6F1BA4F3, types, arraySizes);
         return &instance;
     }
 };
@@ -1434,7 +1434,7 @@ struct DungeonEncounterMeta
     {
         static char const* types = "isihhbbbi";
         static uint8 const arraySizes[9] = { 1, 1, 1, 1, 1, 1, 1, 1, 1 };
-        static DB2Meta instance(0, 9, 0x8E0853BB, types, arraySizes);
+        static DB2Meta instance(0, 9, 0x164CF266, types, arraySizes);
         return &instance;
     }
 };
@@ -4200,6 +4200,17 @@ struct QuestV2CliTaskMeta
     }
 };
 
+struct QuestXGroupActivityMeta
+{
+    static DB2Meta const* Instance()
+    {
+        static char const* types = "ii";
+        static uint8 const arraySizes[2] = { 1, 1 };
+        static DB2Meta instance(-1, 2, 0xD40C68F3, types, arraySizes);
+        return &instance;
+    }
+};
+
 struct QuestXPMeta
 {
     static DB2Meta const* Instance()
@@ -5960,17 +5971,6 @@ struct WbAccessControlListMeta
     }
 };
 
-struct WbCertBlacklistMeta
-{
-    static DB2Meta const* Instance()
-    {
-        static char const* types = "sb";
-        static uint8 const arraySizes[2] = { 1, 20 };
-        static DB2Meta instance(-1, 2, 0x23D156DE, types, arraySizes);
-        return &instance;
-    }
-};
-
 struct WbCertWhitelistMeta
 {
     static DB2Meta const* Instance()
@@ -5982,17 +5982,6 @@ struct WbCertWhitelistMeta
     }
 };
 
-struct WbPermissionsMeta
-{
-    static DB2Meta const* Instance()
-    {
-        static char const* types = "sb";
-        static uint8 const arraySizes[2] = { 1, 1 };
-        static DB2Meta instance(-1, 2, 0x7A15E8CA, types, arraySizes);
-        return &instance;
-    }
-};
-
 struct WeaponImpactSoundsMeta
 {
     static DB2Meta const* Instance()
diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h
index 6b96b95d5ba..36acf283ef9 100644
--- a/src/server/game/DataStores/DB2Structure.h
+++ b/src/server/game/DataStores/DB2Structure.h
@@ -433,7 +433,6 @@ struct ChrSpecializationEntry
     LocalizedString* Name;
     LocalizedString* Name2;
     LocalizedString* Description;
-    char* BackgroundFile;
     uint16 SpellIconID;
     uint8 ClassID;
     uint8 OrderIndex;
diff --git a/src/server/game/DataStores/DBCEnums.h b/src/server/game/DataStores/DBCEnums.h
index 1a64524be54..f47282c5bd9 100644
--- a/src/server/game/DataStores/DBCEnums.h
+++ b/src/server/game/DataStores/DBCEnums.h
@@ -147,7 +147,7 @@ enum ArtifactPowerFlag : uint8
     ARTIFACT_POWER_FLAG_DONT_COUNT_FIRST_BONUS_RANK = 0x10,
 };
 
-#define BATTLE_PET_SPECIES_MAX_ID 1986
+#define BATTLE_PET_SPECIES_MAX_ID 2023
 
 enum ChrSpecializationFlag
 {
diff --git a/src/server/game/DataStores/GameTables.h b/src/server/game/DataStores/GameTables.h
index 19b342b8ec2..3da05662116 100644
--- a/src/server/game/DataStores/GameTables.h
+++ b/src/server/game/DataStores/GameTables.h
@@ -90,7 +90,10 @@ struct GtCombatRatingsEntry
 
 struct GtCombatRatingsMultByILvl
 {
-    float RatingMultiplier = 0.0f;
+    float ArmorMultiplier = 0.0f;
+    float WeaponMultiplier = 0.0f;
+    float TrinketMultiplier = 0.0f;
+    float JewelryMultiplier = 0.0f;
 };
 
 struct GtHpPerStaEntry