featScripts/Commands): convert cs_lfg to new system (#8919)

This commit is contained in:
IntelligentQuantum
2021-11-06 02:29:03 +03:30
committed by GitHub
parent 7057ecdb8b
commit f342535b69
+41 -45
View File
@@ -15,12 +15,13 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "ScriptMgr.h"
#include "Chat.h" #include "Chat.h"
#include "DatabaseEnv.h"
#include "Group.h" #include "Group.h"
#include "Language.h" #include "Language.h"
#include "LFGMgr.h" #include "LFGMgr.h"
#include "Player.h" #include "Player.h"
#include "ScriptMgr.h"
void GetPlayerInfo(ChatHandler* handler, Player* player) void GetPlayerInfo(ChatHandler* handler, Player* player)
{ {
@@ -36,10 +37,6 @@ void GetPlayerInfo(ChatHandler* handler, Player* player)
lfg::GetRolesString(sLFGMgr->GetRoles(guid)).c_str(), sLFGMgr->GetComment(guid).c_str()); lfg::GetRolesString(sLFGMgr->GetRoles(guid)).c_str(), sLFGMgr->GetComment(guid).c_str());
} }
#if AC_COMPILER == AC_COMPILER_GNU
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
using namespace Acore::ChatCommands; using namespace Acore::ChatCommands;
class lfg_commandscript : public CommandScript class lfg_commandscript : public CommandScript
@@ -51,81 +48,80 @@ public:
{ {
static ChatCommandTable lfgCommandTable = static ChatCommandTable lfgCommandTable =
{ {
{ "player", SEC_MODERATOR, false, &HandleLfgPlayerInfoCommand, "" }, { "player", HandleLfgPlayerInfoCommand, SEC_MODERATOR, Console::No },
{ "group", SEC_MODERATOR, false, &HandleLfgGroupInfoCommand, "" }, { "group", HandleLfgGroupInfoCommand, SEC_MODERATOR, Console::No },
{ "queue", SEC_MODERATOR, false, &HandleLfgQueueInfoCommand, "" }, { "queue", HandleLfgQueueInfoCommand, SEC_MODERATOR, Console::Yes },
{ "clean", SEC_ADMINISTRATOR, false, &HandleLfgCleanCommand, "" }, { "clean", HandleLfgCleanCommand, SEC_ADMINISTRATOR, Console::Yes },
{ "options", SEC_GAMEMASTER, false, &HandleLfgOptionsCommand, "" }, { "options", HandleLfgOptionsCommand, SEC_GAMEMASTER, Console::Yes },
}; };
static ChatCommandTable commandTable = static ChatCommandTable commandTable =
{ {
{ "lfg", SEC_GAMEMASTER, false, nullptr, "", lfgCommandTable }, { "lfg", lfgCommandTable },
}; };
return commandTable; return commandTable;
} }
static bool HandleLfgPlayerInfoCommand(ChatHandler* handler, char const* args) static bool HandleLfgPlayerInfoCommand(ChatHandler* handler, Optional<PlayerIdentifier> player)
{ {
Player* target = nullptr; if (!player)
std::string playerName; player = PlayerIdentifier::FromTargetOrSelf(handler);
if (!handler->extractPlayerTarget((char*)args, &target, nullptr, &playerName)) if (!player)
return false; return false;
GetPlayerInfo(handler, target); if (Player* target = player->GetConnectedPlayer())
return true;
}
static bool HandleLfgGroupInfoCommand(ChatHandler* handler, char const* args)
{
Player* target = nullptr;
std::string playerName;
if (!handler->extractPlayerTarget((char*)args, &target, nullptr, &playerName))
return false;
Group* grp = target->GetGroup();
if (!grp)
{ {
handler->PSendSysMessage(LANG_LFG_NOT_IN_GROUP, playerName.c_str()); GetPlayerInfo(handler, target);
return true; return true;
} }
ObjectGuid guid = grp->GetGUID(); return false;
}
static bool HandleLfgGroupInfoCommand(ChatHandler* handler, Optional<PlayerIdentifier> player)
{
if (!player)
player = PlayerIdentifier::FromTargetOrSelf(handler);
if (!player)
return false;
Group* groupTarget = nullptr;
if (Player* target = player->GetConnectedPlayer())
groupTarget = target->GetGroup();
if (!groupTarget)
{
handler->PSendSysMessage(LANG_LFG_NOT_IN_GROUP, player->GetName().c_str());
return true;
}
ObjectGuid guid = groupTarget->GetGUID();
std::string const& state = lfg::GetStateString(sLFGMgr->GetState(guid)); std::string const& state = lfg::GetStateString(sLFGMgr->GetState(guid));
handler->PSendSysMessage(LANG_LFG_GROUP_INFO, grp->isLFGGroup(), handler->PSendSysMessage(LANG_LFG_GROUP_INFO, groupTarget->isLFGGroup(),
state.c_str(), sLFGMgr->GetDungeon(guid)); state.c_str(), sLFGMgr->GetDungeon(guid));
for (GroupReference* itr = grp->GetFirstMember(); itr != nullptr; itr = itr->next()) for (GroupReference* itr = groupTarget->GetFirstMember(); itr != nullptr; itr = itr->next())
GetPlayerInfo(handler, itr->GetSource()); GetPlayerInfo(handler, itr->GetSource());
return true; return true;
} }
static bool HandleLfgOptionsCommand(ChatHandler* handler, char const* args) static bool HandleLfgOptionsCommand(ChatHandler* handler, Optional<uint32> optionsArg)
{ {
int32 options = -1; if (optionsArg)
if (char* str = strtok((char*)args, " "))
{ {
int32 tmp = atoi(str); sLFGMgr->SetOptions(*optionsArg);
if (tmp > -1)
options = tmp;
}
if (options != -1)
{
sLFGMgr->SetOptions(options);
handler->PSendSysMessage(LANG_LFG_OPTIONS_CHANGED); handler->PSendSysMessage(LANG_LFG_OPTIONS_CHANGED);
} }
handler->PSendSysMessage(LANG_LFG_OPTIONS, sLFGMgr->GetOptions()); handler->PSendSysMessage(LANG_LFG_OPTIONS, sLFGMgr->GetOptions());
return true; return true;
} }
static bool HandleLfgQueueInfoCommand(ChatHandler* /*handler*/, char const* /*args*/) static bool HandleLfgQueueInfoCommand(ChatHandler* /*handler*/)
{ {
return true; return true;
} }
static bool HandleLfgCleanCommand(ChatHandler* handler, char const* /*args*/) static bool HandleLfgCleanCommand(ChatHandler* handler)
{ {
handler->PSendSysMessage(LANG_LFG_CLEAN); handler->PSendSysMessage(LANG_LFG_CLEAN);
sLFGMgr->Clean(); sLFGMgr->Clean();