From f76f20c7fc73260e609120d38b72e03ce94e9264 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 18 Aug 2024 18:45:18 +0200 Subject: Core/DataStores: named and assigned missing combat rating fields in CombatRatings game table --- src/server/game/DataStores/GameTables.h | 6 +++--- src/server/game/Entities/Player/Player.cpp | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/server/game/DataStores/GameTables.h b/src/server/game/DataStores/GameTables.h index 43c893ec13b..faf8d815c6b 100644 --- a/src/server/game/DataStores/GameTables.h +++ b/src/server/game/DataStores/GameTables.h @@ -114,9 +114,9 @@ struct GtCombatRatingsEntry float Unknown1 = 0.0f; float Unknown2 = 0.0f; float Unknown3 = 0.0f; - float Unknown4 = 0.0f; - float Unknown5 = 0.0f; - float Unknown6 = 0.0f; + float Expertise = 0.0f; + float Mastery = 0.0f; + float ArmorPenetration = 0.0f; float Unknown7 = 0.0f; float Unknown8 = 0.0f; float Unknown9 = 0.0f; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 183be944b31..7449359de28 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4874,6 +4874,12 @@ inline float GetGameTableColumnForCombatRating(GtCombatRatingsEntry const* row, return row->HasteRanged; case CR_HASTE_SPELL: return row->HasteSpell; + case CR_EXPERTISE: + return row->Expertise; + case CR_MASTERY: + return row->Mastery; + case CR_ARMOR_PENETRATION: + return row->ArmorPenetration; default: break; } -- cgit v1.2.3