From c89eee43cec72872b9ae0116e69d672c727cbb36 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 18 Apr 2021 14:47:46 +0200 Subject: [PATCH] Core/Groups: implemented and enabled CMSG_SET_EVERYONE_IS_ASSISTANT and updated naming for group flags --- src/server/game/Groups/Group.cpp | 51 ++++++++++++------- src/server/game/Groups/Group.h | 26 +++++----- src/server/game/Handlers/GroupHandler.cpp | 14 ++++- .../game/Server/Packets/PartyPackets.cpp | 5 ++ src/server/game/Server/Packets/PartyPackets.h | 10 ++++ src/server/game/Server/Protocol/Opcodes.cpp | 2 +- src/server/game/Server/WorldSession.h | 6 +++ 7 files changed, 81 insertions(+), 33 deletions(-) diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index cb24b48f28..6f68a69a34 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -63,7 +63,7 @@ Loot* Roll::getLoot() return getTarget(); } -Group::Group() : m_leaderGuid(), m_leaderName(""), m_groupType(GROUPTYPE_NORMAL), +Group::Group() : m_leaderGuid(), m_leaderName(""), m_groupFlags(GROUP_FLAG_NONE), m_dungeonDifficulty(DUNGEON_DIFFICULTY_NORMAL), m_raidDifficulty(RAID_DIFFICULTY_10MAN_NORMAL), m_bgGroup(nullptr), m_bfGroup(nullptr), m_lootMethod(FREE_FOR_ALL), m_lootThreshold(ITEM_QUALITY_UNCOMMON), m_looterGuid(), m_masterLooterGuid(), m_subGroupsCounts(nullptr), m_guid(), m_counter(0), m_dbStoreId(0) @@ -112,9 +112,9 @@ bool Group::Create(Player* leader) leader->SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_GROUP_LEADER); if (isBGGroup() || isBFGroup()) - m_groupType = GROUPTYPE_BGRAID; + m_groupFlags = GROUP_MASK_BGRAID; - if (m_groupType & GROUPTYPE_RAID) + if (m_groupFlags & GROUP_FLAG_RAID) _initRaidSubGroupsCounter(); if (!isLFGGroup()) @@ -154,7 +154,7 @@ bool Group::Create(Player* leader) stmt->setUInt64(index++, m_targetIcons[5].GetRawValue()); stmt->setUInt64(index++, m_targetIcons[6].GetRawValue()); stmt->setUInt64(index++, m_targetIcons[7].GetRawValue()); - stmt->setUInt8(index++, uint8(m_groupType)); + stmt->setUInt8(index++, uint8(m_groupFlags)); stmt->setUInt32(index++, uint8(m_dungeonDifficulty)); stmt->setUInt32(index++, uint8(m_raidDifficulty)); stmt->setUInt32(index++, m_masterLooterGuid.GetCounter()); @@ -189,8 +189,8 @@ void Group::LoadGroupFromDB(Field* fields) for (uint8 i = 0; i < TARGETICONCOUNT; ++i) m_targetIcons[i].Set(fields[4 + i].GetUInt64()); - m_groupType = GroupType(fields[12].GetUInt8()); - if (m_groupType & GROUPTYPE_RAID) + m_groupFlags = GroupFlags(fields[12].GetUInt8()); + if (m_groupFlags & GROUP_FLAG_RAID) _initRaidSubGroupsCounter(); uint32 diff = fields[13].GetUInt8(); @@ -207,7 +207,7 @@ void Group::LoadGroupFromDB(Field* fields) m_masterLooterGuid = ObjectGuid(HighGuid::Player, fields[15].GetUInt32()); - if (m_groupType & GROUPTYPE_LFG) + if (m_groupFlags & GROUP_FLAG_LFG) sLFGMgr->_LoadFromDB(fields, GetGUID()); } @@ -239,13 +239,13 @@ void Group::LoadMemberFromDB(ObjectGuid::LowType guidLow, uint8 memberFlags, uin void Group::ConvertToLFG() { - m_groupType = GroupType(m_groupType | GROUPTYPE_LFG | GROUPTYPE_LFG_RESTRICTED); + m_groupFlags = GroupFlags(m_groupFlags | GROUP_FLAG_LFG | GROUP_FLAG_LFG_RESTRICTED); m_lootMethod = NEED_BEFORE_GREED; if (!isBGGroup() && !isBFGroup()) { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_TYPE); - stmt->setUInt8(0, uint8(m_groupType)); + stmt->setUInt8(0, uint8(m_groupFlags)); stmt->setUInt32(1, m_dbStoreId); CharacterDatabase.Execute(stmt); @@ -256,7 +256,7 @@ void Group::ConvertToLFG() void Group::ConvertToLFR() { - m_groupType = GroupType(m_groupType | GROUPTYPE_LFG | GROUPTYPE_LFG_RESTRICTED | GROUPTYPE_RAID); + m_groupFlags = GroupFlags(m_groupFlags | GROUP_FLAG_LFG | GROUP_FLAG_LFG_RESTRICTED | GROUP_FLAG_RAID); m_lootMethod = NEED_BEFORE_GREED; _initRaidSubGroupsCounter(); @@ -265,7 +265,7 @@ void Group::ConvertToLFR() { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_TYPE); - stmt->setUInt8(0, uint8(m_groupType)); + stmt->setUInt8(0, uint8(m_groupFlags)); stmt->setUInt32(1, m_dbStoreId); CharacterDatabase.Execute(stmt); @@ -276,7 +276,7 @@ void Group::ConvertToLFR() void Group::ConvertToRaid() { - m_groupType = GroupType(m_groupType | GROUPTYPE_RAID); + m_groupFlags = GroupFlags(m_groupFlags | GROUP_FLAG_RAID); _initRaidSubGroupsCounter(); @@ -284,7 +284,7 @@ void Group::ConvertToRaid() { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_TYPE); - stmt->setUInt8(0, uint8(m_groupType)); + stmt->setUInt8(0, uint8(m_groupFlags)); stmt->setUInt32(1, m_dbStoreId); CharacterDatabase.Execute(stmt); @@ -303,7 +303,7 @@ void Group::ConvertToGroup() if (m_memberSlots.size() > 5) return; // What message error should we send? - m_groupType = GroupType(GROUPTYPE_NORMAL); + m_groupFlags = GroupFlags(GROUP_FLAG_NONE); if (m_subGroupsCounts) { @@ -315,7 +315,7 @@ void Group::ConvertToGroup() { CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_GROUP_TYPE); - stmt->setUInt8(0, uint8(m_groupType)); + stmt->setUInt8(0, uint8(m_groupFlags)); stmt->setUInt32(1, m_dbStoreId); CharacterDatabase.Execute(stmt); @@ -1757,7 +1757,7 @@ void Group::SendUpdateToPlayer(ObjectGuid playerGUID, MemberSlot* slot) } WorldPacket data(SMSG_GROUP_LIST, (1+1+1+1+1+4+8+4+4+(GetMembersCount()-1)*(13+8+1+1+1+1)+8+1+8+1+1+1+1)); - data << uint8(m_groupType); // group type (flags in 3.3) + data << uint8(m_groupFlags); data << uint8(slot->group); data << uint8(slot->flags); data << uint8(slot->roles); @@ -2596,17 +2596,17 @@ bool Group::IsFull() const bool Group::isLFGGroup() const { - return (m_groupType & GROUPTYPE_LFG) != 0; + return (m_groupFlags & GROUP_FLAG_LFG) != 0; } bool Group::isLFRGroup() const { - return (m_groupType & GROUPTYPE_LFG) && (m_groupType & GROUPTYPE_RAID); + return (m_groupFlags & GROUP_FLAG_LFG) != 0 && (m_groupFlags & GROUP_FLAG_RAID) != 0; } bool Group::isRaidGroup() const { - return (m_groupType & GROUPTYPE_RAID) != 0; + return (m_groupFlags & GROUP_FLAG_RAID) != 0; } bool Group::isBGGroup() const @@ -2881,3 +2881,16 @@ void Group::ToggleGroupMemberFlag(member_witerator slot, uint8 flag, bool apply) else slot->flags &= ~flag; } + +void Group::SetEveryoneIsAssistant(bool apply) +{ + if (apply) + m_groupFlags = GroupFlags(m_groupFlags | GROUP_FLAG_EVERYONE_ASSISTANT); + else + m_groupFlags = GroupFlags(m_groupFlags & ~GROUP_FLAG_EVERYONE_ASSISTANT); + + for (member_witerator itr = m_memberSlots.begin(); itr != m_memberSlots.end(); ++itr) + ToggleGroupMemberFlag(itr, MEMBER_FLAG_ASSISTANT, apply); + + SendUpdate(); +} diff --git a/src/server/game/Groups/Group.h b/src/server/game/Groups/Group.h index 2cbc999f02..0ac40698ae 100644 --- a/src/server/game/Groups/Group.h +++ b/src/server/game/Groups/Group.h @@ -81,17 +81,18 @@ enum GroupMemberAssignment GROUP_ASSIGN_MAINASSIST = 1 }; -enum GroupType +enum GroupFlags { - GROUPTYPE_NORMAL = 0x00, - GROUPTYPE_BG = 0x01, - GROUPTYPE_RAID = 0x02, - GROUPTYPE_BGRAID = GROUPTYPE_BG | GROUPTYPE_RAID, // mask - GROUPTYPE_LFG_RESTRICTED = 0x04, // Script_HasLFGRestrictions() - GROUPTYPE_LFG = 0x08, - // 0x10, leave/change group?, I saw this flag when leaving group and after leaving BG while in group - // GROUPTYPE_ONE_PERSON_PARTY = 0x20, 4.x Script_IsOnePersonParty() - // GROUPTYPE_EVERYONE_ASSISTANT = 0x40 4.x Script_IsEveryoneAssistant() + GROUP_FLAG_NONE = 0x000, + GROUP_FLAG_FAKE_RAID = 0x001, + GROUP_FLAG_RAID = 0x002, + GROUP_FLAG_LFG_RESTRICTED = 0x004, // Script_HasLFGRestrictions() + GROUP_FLAG_LFG = 0x008, + GROUP_FLAG_DESTROYED = 0x010, + GROUP_FLAG_ONE_PERSON_PARTY = 0x020, // Script_IsOnePersonParty() + GROUP_FLAG_EVERYONE_ASSISTANT = 0x040, // Script_IsEveryoneAssistant() + + GROUP_MASK_BGRAID = GROUP_FLAG_FAKE_RAID | GROUP_FLAG_RAID, }; enum GroupUpdateFlags @@ -243,6 +244,7 @@ class TC_GAME_API Group void Disband(bool hideDestroy = false); void SetLfgRoles(ObjectGuid guid, uint8 roles); uint8 GetLfgRoles(ObjectGuid guid); + void SetEveryoneIsAssistant(bool apply); void SetGroupMarkerMask(uint32 mask) { m_markerMask = mask; } void AddGroupMarkerMask(uint32 mask) { m_markerMask |= mask; } @@ -298,7 +300,7 @@ class TC_GAME_API Group GroupReference const* GetFirstMember() const { return m_memberMgr.getFirst(); } uint32 GetMembersCount() const { return m_memberSlots.size(); } uint32 GetInviteeCount() const { return m_invitees.size(); } - GroupType GetGroupType() const { return m_groupType; } + GroupFlags GetGroupFlags() const { return m_groupFlags; } uint8 GetMemberGroup(ObjectGuid guid) const; @@ -412,7 +414,7 @@ class TC_GAME_API Group InvitesList m_invitees; ObjectGuid m_leaderGuid; std::string m_leaderName; - GroupType m_groupType; + GroupFlags m_groupFlags; uint32 m_markerMask; Difficulty m_dungeonDifficulty; Difficulty m_raidDifficulty; diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 19297ff4a3..e63e6b7e37 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -827,7 +827,7 @@ void WorldSession::HandleGroupRequestJoinUpdates(WorldPacket& /*recvData*/) return; WorldPacket data(SMSG_REAL_GROUP_UPDATE, 1 + 4 + 8); - data << uint8(group->GetGroupType()); + data << uint8(group->GetGroupFlags()); data << uint32(group->GetMembersCount() - 1); data << uint64(group->GetLeaderGUID()); SendPacket(&data); @@ -1066,3 +1066,15 @@ void WorldSession::HandleRolePollBeginOpcode(WorldPacket& recvData) GetPlayer()->GetGroup()->BroadcastPacket(&data, true); } } + +void WorldSession::HandleSetEveryoneIsAssistant(WorldPackets::Party::SetEveryoneIsAssistant& packet) +{ + Group* group = GetPlayer()->GetGroup(); + if (!group) + return; + + if (!group->IsLeader(GetPlayer()->GetGUID())) + return; + + group->SetEveryoneIsAssistant(packet.EveryoneIsAssistant); +} diff --git a/src/server/game/Server/Packets/PartyPackets.cpp b/src/server/game/Server/Packets/PartyPackets.cpp index 6c6ca9510d..39428f8660 100644 --- a/src/server/game/Server/Packets/PartyPackets.cpp +++ b/src/server/game/Server/Packets/PartyPackets.cpp @@ -309,3 +309,8 @@ WorldPacket const* WorldPackets::Party::PartyMemberState::Write() return &_worldPacket; } + +void WorldPackets::Party::SetEveryoneIsAssistant::Read() +{ + EveryoneIsAssistant = _worldPacket.ReadBit(); +} diff --git a/src/server/game/Server/Packets/PartyPackets.h b/src/server/game/Server/Packets/PartyPackets.h index b0b428d8a9..620f0b2e5a 100644 --- a/src/server/game/Server/Packets/PartyPackets.h +++ b/src/server/game/Server/Packets/PartyPackets.h @@ -91,6 +91,16 @@ namespace WorldPackets uint32 ChangeMask = 0; PartyMemberStats MemberStats; }; + + class SetEveryoneIsAssistant final : public ClientPacket + { + public: + SetEveryoneIsAssistant(WorldPacket&& packet) : ClientPacket(CMSG_SET_EVERYONE_IS_ASSISTANT, std::move(packet)) { } + + void Read() override; + + bool EveryoneIsAssistant = false; + }; } } diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 16a788a288..ba1a9af765 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -574,7 +574,7 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_SET_CHANNEL_WATCH, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetChannelWatch ); DEFINE_HANDLER(CMSG_SET_CONTACT_NOTES, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetContactNotesOpcode ); DEFINE_HANDLER(CMSG_SET_CURRENCY_FLAGS, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleSetCurrencyFlags ); - DEFINE_HANDLER(CMSG_SET_EVERYONE_IS_ASSISTANT, STATUS_UNHANDLED, PROCESS_INPLACE, &WorldSession::Handle_NULL ); + DEFINE_HANDLER(CMSG_SET_EVERYONE_IS_ASSISTANT, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleSetEveryoneIsAssistant ); DEFINE_HANDLER(CMSG_SET_FACTION_ATWAR, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetFactionAtWar ); DEFINE_HANDLER(CMSG_SET_FACTION_INACTIVE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleSetFactionInactiveOpcode ); DEFINE_HANDLER(CMSG_SET_PET_SLOT, STATUS_LOGGEDIN , PROCESS_THREADUNSAFE, &WorldSession::HandleSetPetSlot ); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index 768122afce..15a9c55d4d 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -165,6 +165,11 @@ namespace WorldPackets class TrainerBuySpell; } + namespace Party + { + class SetEveryoneIsAssistant; + } + namespace Quest { class QuestGiverAcceptQuest; @@ -768,6 +773,7 @@ class TC_GAME_API WorldSession void HandleGroupAssistantLeaderOpcode(WorldPacket& recvData); void HandlePartyAssignmentOpcode(WorldPacket& recvData); void HandleRolePollBeginOpcode(WorldPacket& recvData); + void HandleSetEveryoneIsAssistant(WorldPackets::Party::SetEveryoneIsAssistant& packet); void HandlePetitionBuyOpcode(WorldPacket& recvData); void HandlePetitionShowSignOpcode(WorldPacket& recvData);