From 46eaff5a74338eed55958f772c35795d2522c009 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Wed, 4 Sep 2019 03:52:48 +0200 Subject: [PATCH] Core/Guilds: implement SMSG_GUILD_KNOWN_RECIPES and CMSG_GUILD_QUERY_RECIPES * updated CMSG_GUILD_GET_ROSTER and SMSG_GUILD_ROSTER_UPDATE to packet class * optimized caching process and updating for guild member profession data --- .../Implementation/CharacterDatabase.cpp | 2 +- src/server/game/DataStores/DBCStructure.h | 27 ++-- src/server/game/Entities/Player/Player.cpp | 59 +------ src/server/game/Entities/Player/Player.h | 11 +- src/server/game/Guilds/Guild.cpp | 148 +++++++++++++++--- src/server/game/Guilds/Guild.h | 21 ++- src/server/game/Guilds/GuildMgr.cpp | 15 ++ src/server/game/Guilds/GuildMgr.h | 11 +- src/server/game/Handlers/GuildHandler.cpp | 13 +- .../game/Server/Packets/GuildPackets.cpp | 63 ++++++++ src/server/game/Server/Packets/GuildPackets.h | 44 ++++++ src/server/game/Server/Protocol/Opcodes.cpp | 8 +- src/server/game/Server/Protocol/Opcodes.h | 9 +- src/server/game/Server/WorldSession.h | 5 +- src/server/game/World/World.cpp | 3 + 15 files changed, 318 insertions(+), 121 deletions(-) diff --git a/src/server/database/Database/Implementation/CharacterDatabase.cpp b/src/server/database/Database/Implementation/CharacterDatabase.cpp index fd54a522cb..5e617efe6b 100644 --- a/src/server/database/Database/Implementation/CharacterDatabase.cpp +++ b/src/server/database/Database/Implementation/CharacterDatabase.cpp @@ -72,7 +72,7 @@ void CharacterDatabaseConnection::DoPrepareStatements() PrepareStatement(CHAR_SEL_CHARACTER_INSTANCE, "SELECT id, permanent, map, difficulty, extendState, resettime FROM character_instance LEFT JOIN instance ON instance = id WHERE guid = ?", CONNECTION_ASYNC); PrepareStatement(CHAR_SEL_CHARACTER_AURAS, "SELECT casterGuid, spell, effectMask, recalculateMask, stackCount, amount0, amount1, amount2, " "base_amount0, base_amount1, base_amount2, maxduration, remaintime, remaincharges FROM character_aura WHERE guid = ?", CONNECTION_ASYNC); - PrepareStatement(CHAR_SEL_CHARACTER_SPELL, "SELECT spell, active, disabled FROM character_spell WHERE guid = ?", CONNECTION_ASYNC); + PrepareStatement(CHAR_SEL_CHARACTER_SPELL, "SELECT spell, active, disabled FROM character_spell WHERE guid = ?", CONNECTION_BOTH); PrepareStatement(CHAR_SEL_CHARACTER_QUESTSTATUS, "SELECT quest, status, explored, timer, mobcount1, mobcount2, mobcount3, mobcount4, " "itemcount1, itemcount2, itemcount3, itemcount4, itemcount5, itemcount6, playercount FROM character_queststatus WHERE guid = ? AND status <> 0", CONNECTION_ASYNC); diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h index fb35ab83f1..df2eaae1ac 100644 --- a/src/server/game/DataStores/DBCStructure.h +++ b/src/server/game/DataStores/DBCStructure.h @@ -1939,19 +1939,20 @@ struct SkillLineEntry struct SkillLineAbilityEntry { - uint32 id; // 0 m_ID - uint32 skillId; // 1 m_skillLine - uint32 spellId; // 2 m_spell - uint32 racemask; // 3 m_raceMask - uint32 classmask; // 4 m_classMask - //uint32 racemaskNot; // 5 m_excludeRace - //uint32 classmaskNot; // 6 m_excludeClass - uint32 req_skill_value; // 7 m_minSkillLineRank - uint32 forward_spellid; // 8 m_supercededBySpell - uint32 AutolearnType; // 9 m_acquireMethod - uint32 max_value; // 10 m_trivialSkillLineRankHigh - uint32 min_value; // 11 m_trivialSkillLineRankLow - uint32 character_points[2]; // 12-13 m_characterPoints + uint32 id; // 0 m_ID + uint32 skillId; // 1 m_skillLine + uint32 spellId; // 2 m_spell + uint32 racemask; // 3 m_raceMask + uint32 classmask; // 4 m_classMask + //uint32 racemaskNot; // 5 m_excludeRace + //uint32 classmaskNot; // 6 m_excludeClass + uint32 req_skill_value; // 7 m_minSkillLineRank + uint32 forward_spellid; // 8 m_supercededBySpell + uint32 AutolearnType; // 9 m_acquireMethod + uint32 max_value; // 10 m_trivialSkillLineRankHigh + uint32 min_value; // 11 m_trivialSkillLineRankLow + uint32 character_points; // 12 m_characterPoints + uint32 UniqueBits; // 13 }; struct SkillRaceClassInfoEntry diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index fd5fedaf25..29fb558e5a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -3665,6 +3665,9 @@ void Player::LearnSpell(uint32 spell_id, bool dependent, uint32 fromSkill /*= 0* if (CanControlPet(spell_id) && GetPet()) PetSpellInitialize(); + + if (Guild* guild = GetGuild()) + guild->UpdateMemberData(this, GUILD_MEMBER_DATA_PROFESSIONS, 0); } void Player::RemoveSpell(uint32 spell_id, bool disabled, bool learn_low_rank) @@ -3854,6 +3857,9 @@ void Player::RemoveSpell(uint32 spell_id, bool disabled, bool learn_low_rank) data << uint32(spell_id); SendDirectMessage(&data); } + + if (Guild* guild = GetGuild()) + guild->UpdateMemberData(this, GUILD_MEMBER_DATA_PROFESSIONS, 0); } void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns) @@ -5677,7 +5683,7 @@ bool Player::UpdateCraftSkill(uint32 spellid) } uint32 craft_skill_gain = sWorld->getIntConfig(CONFIG_SKILL_GAIN_CRAFTING); - uint32 craft_skill_points = _spell_idx->second->character_points[0]; + uint32 craft_skill_points = _spell_idx->second->character_points; if (craft_skill_points) { @@ -17337,34 +17343,6 @@ bool Player::LoadPositionFromDB(uint32& mapid, float& x, float& y, float& z, flo return true; } -void Player::LoadPrimaryProfessionsFromDB(ObjectGuid guid, std::vector& data) -{ - PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SKILLS); - stmt->setUInt32(0, guid.GetCounter()); - PreparedQueryResult result = CharacterDatabase.Query(stmt); - if (result) - { - do - { - Field* fields = result->Fetch(); - uint16 skill = fields[0].GetUInt16(); - uint16 value = fields[1].GetUInt16(); - uint16 max = fields[2].GetUInt16(); - - SkillLineEntry const* skillLine = sSkillLineStore.LookupEntry(skill); - if (!skillLine || skillLine->categoryId != SKILL_CATEGORY_PROFESSION) - continue; - - PrimaryProfessionData profession; - profession.SkillId = skill; - profession.Step = max / 75; - profession.Rank = value; - data.push_back(profession); - - } while (result->NextRow()); - } -} - void Player::SetHomebind(WorldLocation const& loc, uint32 areaId) { loc.GetPosition(m_homebindX, m_homebindY, m_homebindZ); @@ -28619,26 +28597,3 @@ void Player::SendTamePetFailure(PetTameFailureReason reason) data << uint8(reason); SendDirectMessage(&data); } - -void Player::GetPrimaryProfessionData(PrimaryProfessionData* data) -{ - for (uint8 i = 0; i < 2; i++) - { - uint32 skillId = GetUInt32Value(PLAYER_PROFESSION_SKILL_LINE_1 + i); - SkillStatusMap::iterator itr = mSkillStatus.find(skillId); - if (itr != mSkillStatus.end() && itr->second.uState != SKILL_DELETED) - { - uint16 field = itr->second.pos / 2; - uint8 offset = itr->second.pos & 1; // itr->second.pos % 2 - data[i].SkillId = skillId; - data[i].Step = GetUInt16Value(PLAYER_SKILL_STEP_0 + field, offset); - data[i].Rank = GetUInt16Value(PLAYER_SKILL_RANK_0 + field, offset); - } - else - { - data[i].SkillId = 0; - data[i].Step = 0; - data[i].Rank = 0; - } - } -} diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 3c274e85f9..a1e010d0be 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -53,6 +53,7 @@ struct Mail; struct ScalingStatValuesEntry; struct TrainerSpell; struct VendorItem; +struct GuildMemberProfessionData; template class AchievementMgr; @@ -376,13 +377,6 @@ struct EnchantDuration typedef std::list EnchantDurationList; typedef std::list ItemDurationList; -struct PrimaryProfessionData -{ - uint32 SkillId = 0; - uint32 Step = 0; - uint32 Rank = 0; -}; - enum DrunkenState { DRUNKEN_SOBER = 0, @@ -1096,8 +1090,6 @@ class TC_GAME_API Player : public Unit, public GridObject void SendTamePetFailure(PetTameFailureReason reason); - void GetPrimaryProfessionData(PrimaryProfessionData* professions); - PlayerTaxi m_taxi; void InitTaxiNodesForLevel() { m_taxi.InitTaxiNodesForLevel(getRace(), getClass(), getLevel()); } bool ActivateTaxiPathTo(std::vector const& nodes, Creature* npc = nullptr, uint32 spellid = 0); @@ -1502,7 +1494,6 @@ class TC_GAME_API Player : public Unit, public GridObject static float GetFloatValueFromArray(Tokenizer const& data, uint16 index); static uint32 GetZoneIdFromDB(ObjectGuid guid); static bool LoadPositionFromDB(uint32& mapid, float& x, float& y, float& z, float& o, bool& in_flight, ObjectGuid guid); - static void LoadPrimaryProfessionsFromDB(ObjectGuid guid, std::vector& data); static bool IsValidGender(uint8 Gender) { return Gender <= GENDER_FEMALE; } static bool ValidateAppearance(uint8 race, uint8 class_, uint8 gender, uint8 hairID, uint8 hairColor, uint8 faceID, uint8 facialHair, uint8 skinColor, bool create = false); diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index d7fea36cc1..bf2b228163 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -43,6 +43,7 @@ #include "Group.h" #include "Battleground.h" #include "ReputationMgr.h" +#include #define MAX_GUILD_BANK_TAB_TEXT_LEN 500 #define EMBLEM_PRICE 10 * GOLD @@ -676,7 +677,7 @@ Guild::Member::Member(ObjectGuid::LowType guildId, ObjectGuid guid, uint8 rankId m_weekReputation(0) { memset(m_bankWithdraw, 0, (GUILD_BANK_MAX_TABS + 1) * sizeof(int32)); - memset(m_professions, 0, GUILD_PROFESSION_COUNT * sizeof(PrimaryProfessionData)); + memset(m_professions, 0, GUILD_PROFESSION_COUNT * sizeof(GuildMemberProfessionData)); } void Guild::Member::SetStats(Player* player) @@ -800,26 +801,64 @@ bool Guild::Member::LoadFromDB(Field* fields) m_zoneId = Player::GetZoneIdFromDB(m_guid); } - std::vector professions; - Player::LoadPrimaryProfessionsFromDB(m_guid, professions); - if (professions.size() > GUILD_PROFESSION_COUNT) - TC_LOG_ERROR("guild", "Guild::Member::LoadFromDB: Character %s has too many primary professions. Skipped loading profession data.", m_guid.ToString().c_str()); - else - { - uint8 index = 0; - for (PrimaryProfessionData profession : professions) - { - m_professions[index].SkillId = profession.SkillId; - m_professions[index].Rank = profession.Rank; - m_professions[index].Step = profession.Step; - index++; - } - } + LoadProfessionDataFromDB(m_guid); ResetFlags(); return true; } +void Guild::Member::LoadProfessionDataFromDB(ObjectGuid guid) +{ + PreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SKILLS); + stmt->setUInt32(0, guid.GetCounter()); + PreparedQueryResult result = CharacterDatabase.Query(stmt); + uint8 index = 0; + if (result) + { + do + { + Field* fields = result->Fetch(); + uint16 skill = fields[0].GetUInt16(); + uint16 value = fields[1].GetUInt16(); + uint16 max = fields[2].GetUInt16(); + + SkillLineEntry const* skillLine = sSkillLineStore.LookupEntry(skill); + if (!skillLine || skillLine->categoryId != SKILL_CATEGORY_PROFESSION) + continue; + + GuildMemberProfessionData profession; + profession.SkillId = skill; + profession.Step = max / 75; + profession.Rank = value; + + PreparedStatement* stmt2 = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_SPELL); + stmt2->setUInt32(0, guid.GetCounter()); + PreparedQueryResult result2 = CharacterDatabase.Query(stmt2); + + if (result2) + { + do + { + Field* fields2 = result2->Fetch(); + uint32 spellId = fields2[0].GetUInt32(); + bool disabled = fields2[2].GetBool(); + if (disabled) + continue; + + for (GuildProfession prof : sGuildMgr->GetGuildProfessionData(skill)) + if (prof.SpellId == spellId) + profession.RecipeUniqueBits.push_back(prof.UniqueBits); + + } while (result2->NextRow()); + } + + m_professions[index] = profession; + index++; + + } while (result->NextRow()); + } +} + // Validate player fields. Returns false if corrupted fields are found. bool Guild::Member::CheckStats() const { @@ -914,13 +953,34 @@ void Guild::Member::ResetWeekActivityAndReputation() CharacterDatabase.CommitTransaction(trans); } -void Guild::Member::UpdatePrimaryProfessionData() +void Guild::Member::UpdateProfessionData() { - if (!IsOnline()) + Player* player = FindConnectedPlayer(); + if (!player) return; - Player* player = FindConnectedPlayer(); - player->GetPrimaryProfessionData(m_professions); + for (uint8 i = 0; i < GUILD_PROFESSION_COUNT; i++) + { + uint32 skillId = player->GetUInt32Value(PLAYER_PROFESSION_SKILL_LINE_1 + i); + if (player->HasSkill(skillId)) + { + m_professions[i].SkillId = skillId; + m_professions[i].Rank = player->GetSkillValue(skillId); + m_professions[i].Step = player->GetSkillStep(skillId); + m_professions->RecipeUniqueBits.clear(); + + for (GuildProfession prof : sGuildMgr->GetGuildProfessionData(skillId)) + if (player->HasSpell(prof.SpellId)) + m_professions->RecipeUniqueBits.push_back(prof.UniqueBits); + } + else + { + m_professions[i].SkillId = 0; + m_professions[i].Step = 0; + m_professions[i].Rank = 0; + m_professions[i].RecipeUniqueBits.clear(); + } + } } // Get amount of money/slots left for today. @@ -1502,7 +1562,7 @@ void Guild::UpdateMemberData(Player* player, uint8 dataid, uint32 value) member->SetLevel(value); break; case GUILD_MEMBER_DATA_PROFESSIONS: - member->UpdatePrimaryProfessionData(); + member->UpdateProfessionData(); break; default: TC_LOG_ERROR("guild", "Guild::UpdateMemberData: Called with incorrect DATAID %u (value %u)", dataid, value); @@ -1585,9 +1645,9 @@ void Guild::HandleRoster(WorldSession* session) for (uint8 i = 0; i < GUILD_PROFESSION_COUNT; i++) { - memberData.Profession[i].DbID = member->GetPrimaryProfessionData(i).SkillId; - memberData.Profession[i].Step = member->GetPrimaryProfessionData(i).Step; - memberData.Profession[i].Rank = member->GetPrimaryProfessionData(i).Rank; + memberData.Profession[i].DbID = member->GetProfessionData(i).SkillId; + memberData.Profession[i].Step = member->GetProfessionData(i).Step; + memberData.Profession[i].Rank = member->GetProfessionData(i).Rank; } memberData.VirtualRealmAddress = 0; @@ -2959,7 +3019,7 @@ bool Guild::AddMember(SQLTransaction& trans, ObjectGuid guid, uint8 rankId) player->SetGuildIdInvited(0); player->SetRank(rankId); player->SetGuildLevel(GetLevel()); - member->UpdatePrimaryProfessionData(); + member->UpdateProfessionData(); SendLoginInfo(player->GetSession()); name = player->GetName(); } @@ -4077,3 +4137,41 @@ void Guild::HandleNewsSetSticky(WorldSession* session, uint32 newsId, bool stick news->WritePacket(data, buffer); session->SendPacket(&data); } + +void Guild::SendKnownRecipes(Player const* player) +{ + WorldPackets::Guild::KnownRecipes packet; + + std::set uniqueProfessions; + std::unordered_map> uniqueBitsMap; + for (auto itr : m_members) + { + Member* member = itr.second; + for (uint8 i = 0; i < GUILD_PROFESSION_COUNT; i++) + { + if (uint32 skillId = member->GetProfessionData(i).SkillId) + { + uniqueProfessions.insert(skillId); + for (uint32 bits : member->GetProfessionData(i).RecipeUniqueBits) + uniqueBitsMap[skillId].insert(bits); + } + } + } + + for (uint32 skill : uniqueProfessions) + { + WorldPackets::Guild::GuildRecipesData data; + memset(data.UniqueBits, 0, GUILD_RECIPES_COUNT * sizeof(uint8)); + data.SkillID = skill; + for (uint32 bits : uniqueBitsMap[skill]) + { + uint16 index = std::floor(bits / 8); + uint8 offset = bits % 8; + uint8 bit = 1 << offset; + data.UniqueBits[index] |= bit; + } + packet.Recipes.push_back(data); + } + + player->SendDirectMessage(packet.Write()); +} diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index d0ced922ca..1792d0d395 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -33,7 +33,6 @@ class Unit; class WorldPacket; class WorldSession; struct ItemPosCount; -struct PrimaryProfessionData; enum AchievementCriteriaTypes : uint8; enum InventoryResult : uint8; enum LocaleConstant : uint8; @@ -51,6 +50,7 @@ enum GuildMisc GUILD_EVENT_LOG_GUID_UNDEFINED = 0xFFFFFFFF, GUILD_EXPERIENCE_UNCAPPED_LEVEL = 20, ///> Hardcoded in client, starting from this level, guild daily experience gain is unlimited. GUILD_PROFESSION_COUNT = 2, + GUILD_RECIPES_COUNT = 300, TAB_UNDEFINED = 0xFF, }; @@ -333,9 +333,16 @@ private: }; typedef std::vector GuildBankRightsAndSlotsVec; - typedef std::set SlotIds; +struct GuildMemberProfessionData +{ + uint32 SkillId; + uint32 Rank; + uint32 Step; + std::vector RecipeUniqueBits; +}; + class TC_GAME_API Guild { private: @@ -357,13 +364,14 @@ private: void AddActivity(uint64 activity); void SetWeekReputation(uint32 reputation) { m_weekReputation = reputation; } void AddReputation(uint32 rep, Player *player); - void UpdatePrimaryProfessionData(); + void UpdateProfessionData(); void AddFlag(uint8 var) { m_flags |= var; } void RemFlag(uint8 var) { m_flags &= ~var; } void ResetFlags() { m_flags = GUILDMEMBER_STATUS_NONE; } bool LoadFromDB(Field* fields); + void LoadProfessionDataFromDB(ObjectGuid guid); void SaveToDB(SQLTransaction& trans) const; ObjectGuid GetGUID() const { return m_guid; } @@ -385,7 +393,7 @@ private: uint64 GetWeekActivity() const { return m_weekActivity; } uint32 GetTotalReputation() const { return m_totalReputation; } uint32 GetWeekReputation() const { return m_weekReputation; } - PrimaryProfessionData GetPrimaryProfessionData(uint8 index) const { return m_professions[index]; } + GuildMemberProfessionData GetProfessionData(uint8 index) const { return m_professions[index]; } std::set GetTrackedCriteriaIds() const { return m_trackedCriteriaIds; } void SetTrackedCriteriaIds(std::set criteriaIds) { m_trackedCriteriaIds.swap(criteriaIds); } @@ -432,7 +440,7 @@ private: uint64 m_weekActivity; uint32 m_totalReputation; uint32 m_weekReputation; - PrimaryProfessionData m_professions[GUILD_PROFESSION_COUNT]; + GuildMemberProfessionData m_professions[GUILD_PROFESSION_COUNT]; }; // Base class for event entries @@ -887,6 +895,8 @@ public: member->SetAchievementPoints(achievementPoint); } + void SendKnownRecipes(Player const* player); + protected: ObjectGuid::LowType m_id; std::string m_name; @@ -915,6 +925,7 @@ protected: uint8 _currChallengeCount[MAX_GUILD_CHALLENGE_TYPE]; + private: inline uint8 _GetRanksSize() const { return uint8(m_ranks.size()); } inline const RankInfo* GetRankInfo(uint8 rankId) const { return rankId < _GetRanksSize() ? &m_ranks[rankId] : nullptr; } diff --git a/src/server/game/Guilds/GuildMgr.cpp b/src/server/game/Guilds/GuildMgr.cpp index 48296a3081..eb9b443ed2 100644 --- a/src/server/game/Guilds/GuildMgr.cpp +++ b/src/server/game/Guilds/GuildMgr.cpp @@ -580,6 +580,21 @@ void GuildMgr::LoadGuildRewards() TC_LOG_INFO("server.loading", ">> Loaded %u guild reward definitions in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); } +void GuildMgr::LoadGuildProfessionData() +{ + for (SkillLineAbilityEntry const* entry : sSkillLineAbilityStore) + { + SkillLineEntry const* skill = sSkillLineStore.LookupEntry(entry->skillId); + if (!skill || skill->categoryId != SKILL_CATEGORY_PROFESSION) + continue; + + GuildProfession prof; + prof.SpellId = entry->spellId; + prof.UniqueBits = entry->UniqueBits; + GuildProfessionStore[skill->id].push_back(prof); + } +} + void GuildMgr::ResetTimes(bool week) { CharacterDatabase.Execute(CharacterDatabase.GetPreparedStatement(CHAR_UPD_GUILD_RESET_TODAY_EXPERIENCE)); diff --git a/src/server/game/Guilds/GuildMgr.h b/src/server/game/Guilds/GuildMgr.h index b28cae694f..d0ef1ffd30 100644 --- a/src/server/game/Guilds/GuildMgr.h +++ b/src/server/game/Guilds/GuildMgr.h @@ -34,6 +34,12 @@ struct GuildReward uint8 Standing; }; +struct GuildProfession +{ + uint32 SpellId; + uint32 UniqueBits; +}; + class TC_GAME_API GuildMgr { private: @@ -53,11 +59,11 @@ public: void LoadGuildXpForLevel(); void LoadGuildRewards(); + void LoadGuildProfessionData(); void LoadGuilds(); void AddGuild(Guild* guild); void RemoveGuild(ObjectGuid::LowType guildId); - void SaveGuilds(); ObjectGuid::LowType GenerateGuildId(); @@ -65,12 +71,15 @@ public: uint32 GetXPForGuildLevel(uint8 level) const; std::vector const& GetGuildRewards() const { return GuildRewards; } + std::vector const& GetGuildProfessionData(uint32 skillId) { return GuildProfessionStore[skillId]; } void ResetTimes(bool week); protected: typedef std::unordered_map GuildContainer; + typedef std::unordered_map> GuildProfessionMap; ObjectGuid::LowType NextGuildId; GuildContainer GuildStore; + GuildProfessionMap GuildProfessionStore; std::vector GuildXPperLevel; std::vector GuildRewards; }; diff --git a/src/server/game/Handlers/GuildHandler.cpp b/src/server/game/Handlers/GuildHandler.cpp index 8618b9b8d4..02d20b1da6 100644 --- a/src/server/game/Handlers/GuildHandler.cpp +++ b/src/server/game/Handlers/GuildHandler.cpp @@ -100,11 +100,8 @@ void WorldSession::HandleGuildDeclineOpcode(WorldPacket& /*recvPacket*/) GetPlayer()->SetInGuild(0); } -void WorldSession::HandleGuildRosterOpcode(WorldPacket& recvPacket) +void WorldSession::HandleGuildGetRosterOpcode(WorldPackets::Guild::GuildGetRoster& /*packet*/) { - TC_LOG_DEBUG("guild", "CMSG_GUILD_ROSTER [%s]", GetPlayerInfo().c_str()); - recvPacket.rfinish(); - if (Guild* guild = GetPlayer()->GetGuild()) guild->HandleRoster(this); else @@ -909,6 +906,14 @@ void WorldSession::HandleGuildRenameCallback(std::string newName, PreparedQueryR if(pGuild && hasRenamed) pGuild->SetName(newName); } + +void WorldSession::HandleGuildQueryRecipesOpcode(WorldPackets::Guild::GuildQueryRecipes& packet) +{ + if (Guild * guild = sGuildMgr->GetGuildByGuid(packet.GuildGUID)) + if (guild->IsMember(_player->GetGUID())) + guild->SendKnownRecipes(_player); +} + /* void WorldSession::HandleGuildChallengeRequest(WorldPacket& recvPacket) { diff --git a/src/server/game/Server/Packets/GuildPackets.cpp b/src/server/game/Server/Packets/GuildPackets.cpp index 9d205e3ea8..f04f218935 100644 --- a/src/server/game/Server/Packets/GuildPackets.cpp +++ b/src/server/game/Server/Packets/GuildPackets.cpp @@ -132,6 +132,27 @@ void WorldPackets::Guild::GuildXPQuery::Read() _worldPacket.ReadByteSeq(GuildGUID[4]); } +void WorldPackets::Guild::GuildQueryRecipes::Read() +{ + GuildGUID[5] = _worldPacket.ReadBit(); + GuildGUID[6] = _worldPacket.ReadBit(); + GuildGUID[1] = _worldPacket.ReadBit(); + GuildGUID[4] = _worldPacket.ReadBit(); + GuildGUID[2] = _worldPacket.ReadBit(); + GuildGUID[7] = _worldPacket.ReadBit(); + GuildGUID[0] = _worldPacket.ReadBit(); + GuildGUID[3] = _worldPacket.ReadBit(); + + _worldPacket.ReadByteSeq(GuildGUID[3]); + _worldPacket.ReadByteSeq(GuildGUID[1]); + _worldPacket.ReadByteSeq(GuildGUID[0]); + _worldPacket.ReadByteSeq(GuildGUID[5]); + _worldPacket.ReadByteSeq(GuildGUID[4]); + _worldPacket.ReadByteSeq(GuildGUID[2]); + _worldPacket.ReadByteSeq(GuildGUID[6]); + _worldPacket.ReadByteSeq(GuildGUID[7]); +} + WorldPacket const* WorldPackets::Guild::GuildBankQueryResults::Write() { _worldPacket.WriteBit(FullUpdate); @@ -254,6 +275,35 @@ WorldPacket const* WorldPackets::Guild::GuildRoster::Write() return &_worldPacket; } +WorldPacket const* WorldPackets::Guild::GuildRosterUpdate::Write() +{ + _worldPacket.WriteBits(MemberData.size(), 18); + + for (GuildRosterMemberData const& member : MemberData) + { + _worldPacket.WriteBit(member.Guid[3]); + _worldPacket.WriteBit(member.Guid[4]); + _worldPacket.WriteBit(member.Authenticated); + _worldPacket.WriteBit(member.SorEligible); + _worldPacket.WriteBits(member.Note.length(), 8); + _worldPacket.WriteBits(member.OfficerNote.length(), 8); + _worldPacket.WriteBit(member.Guid[0]); + _worldPacket.WriteBits(member.Name.length(), 7); + _worldPacket.WriteBit(member.Guid[1]); + _worldPacket.WriteBit(member.Guid[2]); + _worldPacket.WriteBit(member.Guid[6]); + _worldPacket.WriteBit(member.Guid[5]); + _worldPacket.WriteBit(member.Guid[7]); + } + + _worldPacket.FlushBits(); + + for (GuildRosterMemberData const& member : MemberData) + _worldPacket << member; + + return &_worldPacket; +} + ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Guild::GuildRosterProfessionData const& rosterProfessionData) { data << uint32(rosterProfessionData.Step); @@ -297,3 +347,16 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Guild::GuildRosterMemberD return data; } +WorldPacket const* WorldPackets::Guild::KnownRecipes::Write() +{ + _worldPacket.WriteBits(Recipes.size(), 16); + + for (GuildRecipesData recipe : Recipes) + { + _worldPacket << int32(recipe.SkillID); + for (uint16 i = 0; i < 300; i++) + _worldPacket << uint8(recipe.UniqueBits[i]); + } + + return &_worldPacket; +} diff --git a/src/server/game/Server/Packets/GuildPackets.h b/src/server/game/Server/Packets/GuildPackets.h index dc3c548288..4d777166c7 100644 --- a/src/server/game/Server/Packets/GuildPackets.h +++ b/src/server/game/Server/Packets/GuildPackets.h @@ -196,6 +196,16 @@ namespace WorldPackets std::vector SocketEnchant; }; + class GuildQueryRecipes final : public ClientPacket + { + public: + GuildQueryRecipes(WorldPacket&& packet) : ClientPacket(CMSG_GUILD_QUERY_RECIPES, std::move(packet)) { } + + void Read() override; + + ObjectGuid GuildGUID; + }; + struct GuildBankTabInfo { int32 TabIndex = 0; @@ -308,6 +318,40 @@ namespace WorldPackets int32 GuildFlags = 0; int32 WeeklyRepCap = 0; }; + + class GuildRosterUpdate final : public ServerPacket + { + public: + GuildRosterUpdate() : ServerPacket(SMSG_GUILD_ROSTER_UPDATE, 4) { } + + WorldPacket const* Write() override; + + std::vector MemberData; + }; + + class GuildGetRoster final : public ClientPacket + { + public: + GuildGetRoster(WorldPacket&& packet) : ClientPacket(CMSG_GUILD_GET_ROSTER, std::move(packet)) { } + + void Read() override { } + }; + + struct GuildRecipesData + { + uint32 SkillID; + uint8 UniqueBits[GUILD_RECIPES_COUNT]; + }; + + class KnownRecipes final : public ServerPacket + { + public: + KnownRecipes() : ServerPacket(SMSG_GUILD_KNOWN_RECIPES, 4) { } + + WorldPacket const* Write() override; + + std::vector Recipes; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 8403dabd21..70bddeafcd 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -347,12 +347,13 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_GUILD_QUERY, STATUS_AUTHED, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryOpcode ); DEFINE_HANDLER(CMSG_GUILD_QUERY_NEWS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryNewsOpcode ); DEFINE_HANDLER(CMSG_GUILD_QUERY_RANKS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryRanksOpcode ); + DEFINE_HANDLER(CMSG_GUILD_QUERY_RECIPES, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildQueryRecipesOpcode ); DEFINE_HANDLER(CMSG_GUILD_REMOVE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRemoveOpcode ); DEFINE_HANDLER(CMSG_GUILD_REPLACE_GUILD_MASTER, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_GUILD_REQUEST_CHALLENGE_UPDATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRequestChallengeUpdate); DEFINE_HANDLER(CMSG_GUILD_REQUEST_MAX_DAILY_XP, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRequestMaxDailyXP ); DEFINE_HANDLER(CMSG_GUILD_REQUEST_PARTY_STATE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRequestPartyState ); - DEFINE_HANDLER(CMSG_GUILD_ROSTER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildRosterOpcode ); + DEFINE_HANDLER(CMSG_GUILD_GET_ROSTER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildGetRosterOpcode ); DEFINE_HANDLER(CMSG_GUILD_SET_ACHIEVEMENT_TRACKING, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildSetAchievementTracking); DEFINE_HANDLER(CMSG_GUILD_SET_GUILD_MASTER, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildSetGuildMaster ); DEFINE_HANDLER(CMSG_GUILD_SET_NOTE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleGuildSetNoteOpcode ); @@ -493,7 +494,6 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_QUERY_BATTLEFIELD_STATE, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleBattlegroundStateQuery ); DEFINE_HANDLER(CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_QUERY_GUILD_MEMBER_RECIPES, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); - DEFINE_HANDLER(CMSG_QUERY_GUILD_RECIPES, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); DEFINE_HANDLER(CMSG_QUERY_GUILD_REWARDS, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleGuildRewardsQueryOpcode ); DEFINE_HANDLER(CMSG_QUERY_INSPECT_ACHIEVEMENTS, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleQueryInspectAchievements ); DEFINE_HANDLER(CMSG_QUERY_QUESTS_COMPLETED, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleQueryQuestsCompleted ); @@ -953,14 +953,14 @@ void OpcodeTable::Initialize() DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_QUERY_RESPONSE, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RANK, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RANKS_UPDATE, STATUS_NEVER); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RECIPES, STATUS_NEVER); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_KNOWN_RECIPES, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RENAMED, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_REPUTATION_REACTION_CHANGED, STATUS_UNHANDLED); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_REPUTATION_WEEKLY_CAP, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_RESET, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_REWARDS_LIST, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_ROSTER, STATUS_NEVER); - DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_UPDATE_ROSTER, STATUS_NEVER); + DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_ROSTER_UPDATE, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_XP, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_GUILD_XP_GAIN, STATUS_NEVER); DEFINE_SERVER_OPCODE_HANDLER(SMSG_HEALTH_UPDATE, STATUS_NEVER); diff --git a/src/server/game/Server/Protocol/Opcodes.h b/src/server/game/Server/Protocol/Opcodes.h index 7839841982..f0945d3520 100644 --- a/src/server/game/Server/Protocol/Opcodes.h +++ b/src/server/game/Server/Protocol/Opcodes.h @@ -269,7 +269,7 @@ enum Opcodes : uint16 CMSG_GUILD_REQUEST_CHALLENGE_UPDATE = 0x1224, CMSG_GUILD_REQUEST_MAX_DAILY_XP = 0x3232, CMSG_GUILD_REQUEST_PARTY_STATE = 0x3900, - CMSG_GUILD_ROSTER = 0x1226, + CMSG_GUILD_GET_ROSTER = 0x1226, CMSG_GUILD_SET_ACHIEVEMENT_TRACKING = 0x1027, CMSG_GUILD_SET_GUILD_MASTER = 0x3034, CMSG_GUILD_SET_NOTE = 0x1233, @@ -420,7 +420,7 @@ enum Opcodes : uint16 CMSG_QUERY_BATTLEFIELD_STATE = 0x7202, CMSG_QUERY_GUILD_MEMBERS_FOR_RECIPE = 0x1036, CMSG_QUERY_GUILD_MEMBER_RECIPES = 0x1037, - CMSG_QUERY_GUILD_RECIPES = 0x3033, + CMSG_GUILD_QUERY_RECIPES = 0x3033, CMSG_QUERY_GUILD_REWARDS = 0x3012, CMSG_QUERY_INSPECT_ACHIEVEMENTS = 0x4D27, CMSG_QUERY_QUESTS_COMPLETED = 0x2317, @@ -911,7 +911,7 @@ enum Opcodes : uint16 SMSG_GUILD_FLAGGED_FOR_RENAME = 0x30B6, SMSG_GUILD_INVITE = 0x14A2, SMSG_GUILD_INVITE_CANCEL = 0x0606, - SMSG_GUILD_KNOWN_RECIPES = 0x0000, + SMSG_GUILD_KNOWN_RECIPES = 0x10B3, SMSG_GUILD_MAX_DAILY_XP = 0x79B5, SMSG_GUILD_MEMBERS_FOR_RECIPE = 0x1CB7, SMSG_GUILD_MEMBER_DAILY_RESET = 0x10A5, @@ -926,7 +926,6 @@ enum Opcodes : uint16 SMSG_GUILD_QUERY_RESPONSE = 0x0E06, SMSG_GUILD_RANK = 0x30B4, SMSG_GUILD_RANKS_UPDATE = 0x5DA0, - SMSG_GUILD_RECIPES = 0x10B3, SMSG_GUILD_RENAMED = 0x74A6, SMSG_GUILD_REPUTATION_REACTION_CHANGED = 0x74B0, SMSG_GUILD_REPUTATION_WEEKLY_CAP = 0x30B7, @@ -935,7 +934,7 @@ enum Opcodes : uint16 SMSG_GUILD_ROSTER = 0x3DA3, SMSG_GUILD_SET_NOTE = 0x0000, SMSG_GUILD_TRADESKILL_UPDATE = 0x0000, - SMSG_GUILD_UPDATE_ROSTER = 0x18B0, + SMSG_GUILD_ROSTER_UPDATE = 0x18B0, SMSG_GUILD_XP = 0x3DB0, SMSG_GUILD_XP_GAIN = 0x14A1, SMSG_GUILD_XP_UPDATE = 0x0000, diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index cfc8ce6140..2efc9955ba 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -113,6 +113,8 @@ namespace WorldPackets class GuildBankTextQuery; class GuildBankSetTabText; class GuildXPQuery; + class GuildGetRoster; + class GuildQueryRecipes; } } @@ -704,7 +706,7 @@ class TC_GAME_API WorldSession void HandleGuildAcceptOpcode(WorldPacket& recvPacket); void HandleGuildDeclineOpcode(WorldPacket& recvPacket); void HandleGuildEventLogQueryOpcode(WorldPacket& recvPacket); - void HandleGuildRosterOpcode(WorldPacket& recvPacket); + void HandleGuildGetRosterOpcode(WorldPackets::Guild::GuildGetRoster& /*packet*/); void HandleGuildRewardsQueryOpcode(WorldPacket& recvPacket); void HandleGuildPromoteOpcode(WorldPacket& recvPacket); void HandleGuildDemoteOpcode(WorldPacket& recvPacket); @@ -718,6 +720,7 @@ class TC_GAME_API WorldSession void HandleGuildSetNoteOpcode(WorldPacket& recvPacket); void HandleGuildQueryRanksOpcode(WorldPacket& recvPacket); void HandleGuildQueryNewsOpcode(WorldPacket& recvPacket); + void HandleGuildQueryRecipesOpcode(WorldPackets::Guild::GuildQueryRecipes& packet); void HandleGuildSetRankPermissionsOpcode(WorldPacket& recvPacket); void HandleGuildAddRankOpcode(WorldPacket& recvPacket); void HandleGuildDelRankOpcode(WorldPacket& recvPacket); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index 19aa5925c3..0cc2b65b6b 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2000,6 +2000,9 @@ void World::SetInitialWorldSettings() TC_LOG_INFO("server.loading", "Loading Guild rewards..."); sGuildMgr->LoadGuildRewards(); + TC_LOG_INFO("server.loading", "Initializing Guild Profession Data Store..."); + sGuildMgr->LoadGuildProfessionData(); + TC_LOG_INFO("server.loading", "Loading Guilds..."); sGuildMgr->LoadGuilds();