nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-15 10:00:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat (core/cs): Make .go xyz ignore non-numeric data to improve copy-paste usability (#17772)

Browse Source 
* Flexible `.go xyz` working well with existing syntax order.

* Make `.go xyz` ignore non-numeric characters

* Support values separated by something other than a space.

* Use current player orientation instead of `0.0f`

* Rename `inputCoords` to `args` per request.
This commit is contained in:
KJack
2023-11-19 16:43:48 -05:00
committed by GitHub
parent e4b90f5579
commit 48271945d0
2 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/server/scripts/Commands/cs_go.cpp
View File

@@ -31,6 +31,9 @@ EndScriptData */
#include "ScriptMgr.h"
#include "TicketMgr.h"
#include <regex>
#include "boost/algorithm/string.hpp"
using namespace Acore::ChatCommands;
class go_commandscript : public CommandScript
@@ -288,34 +291,68 @@ public:
return true;
}
//teleport at coordinates, including Z and orientation
static bool HandleGoXYZCommand(ChatHandler* handler, float x, float y, Optional<float> z, Optional<uint32> id, Optional<float> o)
/**
* @brief Teleports the GM to the specified world coordinates, optionally specifying map ID and orientation.
*
* @param handler The ChatHandler that is handling the command.
* @param args The coordinates to teleport to in format "x y z [mapId [orientation]]".
* @return true The command was successful.
* @return false The command was unsuccessful (show error or syntax)
*/
static bool HandleGoXYZCommand(ChatHandler* handler, Tail args)
{
std::wstring wInputCoords;
if (!Utf8toWStr(args, wInputCoords))
{
return false;
}
// extract float and integer values from the input
std::vector<float> locationValues;
std::wregex floatRegex(L"(-?\\d+(?:\\.\\d+)?)");
std::wsregex_iterator floatRegexIterator(wInputCoords.begin(), wInputCoords.end(), floatRegex);
std::wsregex_iterator end;
while (floatRegexIterator != end)
{
std::wsmatch match = *floatRegexIterator;
std::wstring matchStr = match.str();
// try to convert the match to a float
try
{
locationValues.push_back(std::stof(matchStr));
}
// if the match is not a float, do not add it to the vector
catch (std::invalid_argument const&){}
++floatRegexIterator;
}
// X and Y are required
if (locationValues.size() < 2)
{
return false;
}
Player* player = handler->GetSession()->GetPlayer();
uint32 mapId = id.value_or(player->GetMapId());
if (z)
uint32 mapId = locationValues.size() >= 4 ? uint32(locationValues[3]) : player->GetMapId();
Map const* map = sMapMgr->CreateBaseMap(mapId);
float x = locationValues[0];
float y = locationValues[1];
float z = locationValues.size() >= 3 ? locationValues[2] : std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
// map ID (locationValues[3]) already handled above
float o = locationValues.size() >= 5 ? locationValues[4] : player->GetOrientation();
if (!MapMgr::IsValidMapCoord(mapId, x, y, z, o))
{
if (!MapMgr::IsValidMapCoord(mapId, x, y, *z))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
return false;
}
}
else
{
if (!MapMgr::IsValidMapCoord(mapId, x, y))
{
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
return false;
}
Map const* map = sMapMgr->CreateBaseMap(mapId);
z = std::max(map->GetHeight(x, y, MAX_HEIGHT), map->GetWaterLevel(x, y));
handler->PSendSysMessage(LANG_INVALID_TARGET_COORD, x, y, mapId);
handler->SetSentErrorMessage(true);
return false;
}
return DoTeleport(handler, { x, y, *z, o.value_or(0.0f) }, mapId);
return DoTeleport(handler, { x, y, z, o }, mapId);
}
static bool HandleGoTicketCommand(ChatHandler* handler, uint32 ticketId)