From ad683a356a173f47fd9cd1f9860d5ea5d6da868c Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 3 Jun 2021 21:42:12 +0200 Subject: Core/DataStores: Load Achievement_Category.db2 --- .../database/Database/Implementation/HotfixDatabase.cpp | 6 ++++++ .../database/Database/Implementation/HotfixDatabase.h | 4 ++++ src/server/game/DataStores/DB2LoadInfo.h | 16 ++++++++++++++++ src/server/game/DataStores/DB2Stores.cpp | 2 ++ src/server/game/DataStores/DB2Stores.h | 1 + src/server/game/DataStores/DB2Structure.h | 8 ++++++++ 6 files changed, 37 insertions(+) (limited to 'src') diff --git a/src/server/database/Database/Implementation/HotfixDatabase.cpp b/src/server/database/Database/Implementation/HotfixDatabase.cpp index f21bd71baa4..1eba397e46e 100644 --- a/src/server/database/Database/Implementation/HotfixDatabase.cpp +++ b/src/server/database/Database/Implementation/HotfixDatabase.cpp @@ -43,6 +43,12 @@ void HotfixDatabaseConnection::DoPrepareStatements() PREPARE_LOCALE_STMT(HOTFIX_SEL_ACHIEVEMENT, "SELECT ID, Description_lang, Title_lang, Reward_lang FROM achievement_locale" " WHERE (`VerifiedBuild` > 0) = ? AND locale = ?", CONNECTION_SYNCH); + // AchievementCategory.db2 + PrepareStatement(HOTFIX_SEL_ACHIEVEMENT_CATEGORY, "SELECT Name, ID, Parent, UiOrder FROM achievement_category WHERE (`VerifiedBuild` > 0) = ?", CONNECTION_SYNCH); + PREPARE_MAX_ID_STMT(HOTFIX_SEL_ACHIEVEMENT_CATEGORY, "SELECT MAX(ID) + 1 FROM achievement_category", CONNECTION_SYNCH); + PREPARE_LOCALE_STMT(HOTFIX_SEL_ACHIEVEMENT_CATEGORY, "SELECT ID, Name_lang FROM achievement_category_locale WHERE (`VerifiedBuild` > 0) = ?" + " AND locale = ?", CONNECTION_SYNCH); + // AdventureJournal.db2 PrepareStatement(HOTFIX_SEL_ADVENTURE_JOURNAL, "SELECT ID, Name, Description, ButtonText, RewardDescription, ContinueDescription, Type, " "PlayerConditionID, Flags, ButtonActionType, TextureFileDataID, LfgDungeonID, QuestID, BattleMasterListID, PriorityMin, PriorityMax, ItemID, " diff --git a/src/server/database/Database/Implementation/HotfixDatabase.h b/src/server/database/Database/Implementation/HotfixDatabase.h index 443ad2ae744..4acb89a35bf 100644 --- a/src/server/database/Database/Implementation/HotfixDatabase.h +++ b/src/server/database/Database/Implementation/HotfixDatabase.h @@ -35,6 +35,10 @@ enum HotfixDatabaseStatements : uint32 HOTFIX_SEL_ACHIEVEMENT_MAX_ID, HOTFIX_SEL_ACHIEVEMENT_LOCALE, + HOTFIX_SEL_ACHIEVEMENT_CATEGORY, + HOTFIX_SEL_ACHIEVEMENT_CATEGORY_MAX_ID, + HOTFIX_SEL_ACHIEVEMENT_CATEGORY_LOCALE, + HOTFIX_SEL_ADVENTURE_JOURNAL, HOTFIX_SEL_ADVENTURE_JOURNAL_MAX_ID, HOTFIX_SEL_ADVENTURE_JOURNAL_LOCALE, diff --git a/src/server/game/DataStores/DB2LoadInfo.h b/src/server/game/DataStores/DB2LoadInfo.h index ee9ccc26255..9f55b36f2fe 100644 --- a/src/server/game/DataStores/DB2LoadInfo.h +++ b/src/server/game/DataStores/DB2LoadInfo.h @@ -53,6 +53,22 @@ struct AchievementLoadInfo } }; +struct AchievementCategoryLoadInfo +{ + static DB2LoadInfo const* Instance() + { + static DB2FieldMeta const fields[] = + { + { false, FT_STRING, "Name" }, + { false, FT_INT, "ID" }, + { true, FT_SHORT, "Parent" }, + { true, FT_BYTE, "UiOrder" }, + }; + static DB2LoadInfo const loadInfo(&fields[0], std::extent::value, Achievement_CategoryMeta::Instance(), HOTFIX_SEL_ACHIEVEMENT_CATEGORY); + return &loadInfo; + } +}; + struct AdventureJournalLoadInfo { static DB2LoadInfo const* Instance() diff --git a/src/server/game/DataStores/DB2Stores.cpp b/src/server/game/DataStores/DB2Stores.cpp index 81e848bb87d..865afd679d4 100644 --- a/src/server/game/DataStores/DB2Stores.cpp +++ b/src/server/game/DataStores/DB2Stores.cpp @@ -42,6 +42,7 @@ #endif DB2Storage sAchievementStore("Achievement.db2", AchievementLoadInfo::Instance()); +DB2Storage sAchievementCategoryStore("Achievement_Category.db2", AchievementCategoryLoadInfo::Instance()); DB2Storage sAdventureJournalStore("AdventureJournal.db2", AdventureJournalLoadInfo::Instance()); DB2Storage sAdventureMapPOIStore("AdventureMapPOI.db2", AdventureMapPoiLoadInfo::Instance()); DB2Storage sAnimationDataStore("AnimationData.db2", AnimationDataLoadInfo::Instance()); @@ -581,6 +582,7 @@ uint32 DB2Manager::LoadStores(std::string const& dataPath, LocaleConstant defaul #define LOAD_DB2(store) LoadDB2(availableDb2Locales, loadErrors, _stores, &store, db2Path, defaultLocale, GetCppRecordSize(store)) LOAD_DB2(sAchievementStore); + LOAD_DB2(sAchievementCategoryStore); LOAD_DB2(sAdventureJournalStore); LOAD_DB2(sAdventureMapPOIStore); LOAD_DB2(sAnimationDataStore); diff --git a/src/server/game/DataStores/DB2Stores.h b/src/server/game/DataStores/DB2Stores.h index 47ff813c03d..c39479ee847 100644 --- a/src/server/game/DataStores/DB2Stores.h +++ b/src/server/game/DataStores/DB2Stores.h @@ -36,6 +36,7 @@ class DB2HotfixGeneratorBase; TC_GAME_API extern DB2Storage sAchievementStore; +TC_GAME_API extern DB2Storage sAchievementCategoryStore; TC_GAME_API extern DB2Storage sAdventureJournalStore; TC_GAME_API extern DB2Storage sAdventureMapPOIStore; TC_GAME_API extern DB2Storage sAnimationDataStore; diff --git a/src/server/game/DataStores/DB2Structure.h b/src/server/game/DataStores/DB2Structure.h index 47017fc2ed2..dcc563884b2 100644 --- a/src/server/game/DataStores/DB2Structure.h +++ b/src/server/game/DataStores/DB2Structure.h @@ -46,6 +46,14 @@ struct AchievementEntry int32 CovenantID; }; +struct Achievement_CategoryEntry +{ + LocalizedString Name; + uint32 ID; + int16 Parent; + int8 UiOrder; +}; + struct AdventureJournalEntry { uint32 ID; -- cgit v1.2.3