Skip to content

Commit

Permalink
More WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
@killerwife
killerwife committed Sep 6, 2024
1 parent d1e0fe3 commit 070c352
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 30 deletions.
3 changes: 3 additions & 0 deletions src/game/Entities/Player.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#include "Server/SQLStorages.h"
#include "Loot/LootMgr.h"
#include "Cinematics/CinematicMgr.h"
#include "LFG/LFGDefines.h"

#include <functional>
#include <vector>
Expand Down Expand Up @@ -2132,6 +2133,8 @@ class Player : public Unit
void RemoveAtLoginFlag(AtLoginFlags f, bool in_db_also = false);
static bool ValidateAppearance(uint8 race, uint8 class_, uint8 gender, uint8 hairID, uint8 hairColor, uint8 faceID, uint8 facialHair, uint8 skinColor, bool create = false);

LfgPlayerInfo m_lfgInfo;

// Temporarily removed pet cache
uint32 GetTemporaryUnsummonedPetNumber() const { return m_temporaryUnsummonedPetNumber; }
void SetTemporaryUnsummonedPetNumber(uint32 petnumber) { m_temporaryUnsummonedPetNumber = petnumber; }
Expand Down
8 changes: 8 additions & 0 deletions src/game/LFG/LFGDefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,12 @@ enum class MeetingstoneFailedStatus : uint8
MEETINGSTONE_FAIL_RAID_GROUP = 3,
};

struct LfgPlayerInfo
{
std::string comment;
bool autojoin;
bool autofill;
bool queued; // cached async information
};

#endif
72 changes: 45 additions & 27 deletions src/game/LFG/LFGHandler.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,11 @@
#include "Log/Log.h"
#include "World/World.h"
#include "LFG/LFGDefines.h"
#include "LFG/LFGQueue.h"

static inline const Player* LookingForGroupGetCurrentLeader(Player* _this)
{
if (Group* group = _this->GetGroup())
{
if (!group->IsBattleGroup() && !group->IsFull() && !group->IsLeader(_this->GetObjectGuid()))
{
for (const GroupReference* itr = group->GetFirstMember(); itr; itr = itr->next())
{
if (Player* member = itr->getSource())
{
if (group->IsLeader(member->GetObjectGuid()))
return member;
}
}
}
}

return _this;
}

Expand Down Expand Up @@ -364,7 +352,7 @@ void WorldSession::HandleLfgSetAutoJoinOpcode(WorldPacket& /*recv_data*/)
{
DEBUG_LOG("CMSG_LFG_SET_AUTOJOIN");

LookingForGroup_auto_join = true;
_player->m_lfgInfo.autojoin = true;

if (!_player) // needed because STATUS_AUTHED
return;
Expand All @@ -376,7 +364,7 @@ void WorldSession::HandleLfgClearAutoJoinOpcode(WorldPacket& /*recv_data*/)
{
DEBUG_LOG("CMSG_LFG_CLEAR_AUTOJOIN");

LookingForGroup_auto_join = false;
_player->m_lfgInfo.autojoin = false;

LookingForGroupSetAutoJoin(_player, _player->GetSession(), false);
}
Expand All @@ -385,7 +373,7 @@ void WorldSession::HandleLfmSetAutoFillOpcode(WorldPacket& /*recv_data*/)
{
DEBUG_LOG("CMSG_LFM_SET_AUTOFILL");

LookingForGroup_auto_add = true;
_player->m_lfgInfo.autofill = true;

if (!_player) // needed because STATUS_AUTHED
return;
Expand All @@ -397,7 +385,7 @@ void WorldSession::HandleLfmClearAutoFillOpcode(WorldPacket& /*recv_data*/)
{
DEBUG_LOG("CMSG_LFM_CLEAR_AUTOFILL");

LookingForGroup_auto_add = false;
_player->m_lfgInfo.autofill = false;

LookingForGroupSetAutoFill(_player, _player->GetSession(), false);
}
Expand All @@ -406,6 +394,15 @@ void WorldSession::HandleLfgClearOpcode(WorldPacket& /*recv_data */)
{
DEBUG_LOG("CMSG_CLEAR_LOOKING_FOR_GROUP");

ObjectGuid leaderGuid = _player->GetObjectGuid();
if (Group* group = _player->GetGroup())
leaderGuid = group->GetLeaderGuid();

sWorld.GetLFGQueue().GetMessager().AddMessage([leaderGuid, playerGuid = _player->GetObjectGuid()](LFGQueue* queue)
{
queue->StopLookingForGroup(leaderGuid, playerGuid);
});

LookingForGroupClearLFG(_player, this);
}

Expand All @@ -420,26 +417,47 @@ void WorldSession::HandleSetLfgOpcode(WorldPacket& recv_data)
if (slot >= MAX_LOOKING_FOR_GROUP_SLOT)
return;

LFGPlayerQueueInfo info;

const Player* pov = _player;
if (Group* _group = _player->GetGroup())
{
const Player* pov = LookingForGroupGetCurrentLeader(_player);

if (pov != _player && pov->m_lookingForGroup.isLFM())
if (Group* group = _player->GetGroup())
{
WorldPacket data(SMSG_LFG_LEADER_IS_LFM);
SendPacket(data);
return;
if (!group->IsBattleGroup() && !group->IsFull() && !group->IsLeader(_player->GetObjectGuid()))
{
for (const GroupReference* itr = group->GetFirstMember(); itr; itr = itr->next())
{
if (Player* member = itr->getSource())
{
if (group->IsLeader(member->GetObjectGuid()))
{
pov = member;
}
else
{
info.members.push_back(LFGGroupQueueInfo(member->GetObjectGuid(), member->GetLevel()));
}
}
}
}
}

SendLFGUpdate();
return;
pov = LookingForGroupGetCurrentLeader(_player);
}

uint16 entry = (data & 0xFFFF);
uint16 type = ((data >> 24) & 0xFFFF);

info.leaderGuid = pov->GetObjectGuid();
info.group[slot].set(entry, type);

DEBUG_LOG("LFG set: looknumber %u, temp %X, type %u, entry %u", slot, data, type, entry);
_player->m_lookingForGroup.group[slot].set(entry, type);
sWorld.GetLFGQueue().GetMessager().AddMessage([playerGuid = _player->GetObjectGuid(), info](LFGQueue* queue)
{
queue->StartLookingForGroup(info, playerGuid);
});

LookingForGroupClearLFM(_player, this);

LookingForGroupUpdateQueueStatus(_player, this);
Expand Down
42 changes: 42 additions & 0 deletions src/game/LFG/LFGQueue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,48 @@ void LFGQueue::SetMore(ObjectGuid playerGuid, uint16 entry, uint16 type)
m_queuedPlayers[playerGuid].more.set(entry, type);
}

void LFGQueue::StartLookingForGroup(LFGPlayerQueueInfo info, ObjectGuid invokerPlayer)
{
auto itr = m_queuedPlayers.find(info.leaderGuid);
if (itr != m_queuedPlayers.end())
{
sWorld.GetMessager().AddMessage([leaderGuid = info.leaderGuid, invokerPlayer](World* world)
{
Player* player = sObjectMgr.GetPlayer(invokerPlayer);

if (leaderGuid != invokerPlayer)
{
WorldPacket data(SMSG_LFG_LEADER_IS_LFM);
player->GetSession()->SendPacket(data);
}
});

SendLFGUpdate(info.leaderGuid, invokerPlayer);
return;
}

m_queuedPlayers[info.leaderGuid] = info;

LookingForGroupClearLFM(_player, this);

LookingForGroupUpdateQueueStatus(_player, this);

if (LookingForGroup_auto_join)
LookingForGroupTryJoin(_player);
}

void LFGQueue::StopLookingForGroup(ObjectGuid leaderGuid, ObjectGuid playerGuid)
{
auto itr = m_queuedPlayers.find(leaderGuid);
bool success = false;
if (itr != m_queuedPlayers.end())
{
m_queuedPlayers.erase(itr);
}

// TODO: Send out packets
}

void LFGQueue::SendLFGUpdate(ObjectGuid leaderGuid, ObjectGuid playerGuid) const
{
auto itr = m_queuedPlayers.find(leaderGuid);
Expand Down
5 changes: 5 additions & 0 deletions src/game/LFG/LFGQueue.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ struct LFGGroupQueueInfo
{
ObjectGuid partyMember;
uint32 level;

LFGGroupQueueInfo(ObjectGuid partyMember, uint32 level) : partyMember(partyMember), level(level) {}
};

struct LFGPlayerQueueInfo
Expand Down Expand Up @@ -98,6 +100,9 @@ class LFGQueue
void SetComment(ObjectGuid playerGuid, std::string const& comment);
void SetMore(ObjectGuid playerGuid, uint16 entry, uint16 type);

void StartLookingForGroup(LFGPlayerQueueInfo info, ObjectGuid invokerPlayer);
void StopLookingForGroup(ObjectGuid leaderGuid, ObjectGuid playerGuid);

void SendLFGUpdate(ObjectGuid leaderGuid, ObjectGuid playerGuid) const;
void SendLFGUpdateLFG(ObjectGuid playerGuid) const;
void SendLFGUpdateLFM(ObjectGuid playerGuid) const;
Expand Down
3 changes: 0 additions & 3 deletions src/game/Server/WorldSession.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,6 @@ class WorldSession

// Looking For Group
// TRUE values set by client sending CMSG_LFG_SET_AUTOJOIN and CMSG_LFM_CLEAR_AUTOFILL before player login
bool LookingForGroup_auto_join = false;
bool LookingForGroup_auto_add = false;
bool LookingForGroup_queue = false;
void SendMeetingStoneInProgress();
void SendMeetingStoneComplete();
void SendLFGListQueryResponse(LfgType type, uint32 entry);
Expand Down

0 comments on commit 070c352

Please sign in to comment.