pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-18 10:42:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Quest API] Add Goto Player Teleport Methods. (#2379)

Browse Source 
* [Quest API] Add Player Teleport Methods.

These methods will allow server operators to teleport players directly to other players via the quest API using the #goto command's functionality.
- Add $client->TeleportToPlayerByCharID(character_id) to Perl.
- Add $client->TeleportToPlayerByName(player_name) to Perl.
- Add $client->TeleportGroupToPlayerByCharID(character_id) to Perl.
- Add $client->TeleportGroupToPlayerByName(player_name) to Perl.
- Add $client->TeleportRaidToPlayerByCharID(character_id) to Perl.
- Add $client->TeleportRaidToPlayerByName(player_name) to Perl.
- Add client:TeleportToPlayerByCharID(character_id) to Lua.
- Add client:TeleportToPlayerByName(player_name) to Lua.
- Add client:TeleportGroupToPlayerByCharID(character_id) to Lua.
- Add client:TeleportGroupToPlayerByName(player_name) to Lua.
- Add client:TeleportRaidToPlayerByCharID(character_id) to Lua.
- Add client:TeleportRaidToPlayerByName(player_name) to Lua.

* Simplify by using repositories

* Simplify

Co-authored-by: Akkadius <akkadius1@gmail.com>
This commit is contained in:
Kinglykrab 2022-08-20 10:23:41 -04:00 committed by GitHub
parent 59691f39d7
commit 3e8d34825a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 126 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
zone/client.cpp
View File

@ -65,6 +65,7 @@ extern volatile bool RunLoops;
#include "../common/repositories/character_spells_repository.h"
#include "../common/repositories/character_disciplines_repository.h"
#include "../common/repositories/character_data_repository.h"
extern QueryServ* QServ;
@ -9373,44 +9374,22 @@ void Client::SetSecondaryWeaponOrnamentation(uint32 model_id)
*/
bool Client::GotoPlayer(std::string player_name)
{
std::string query = StringFormat(
"SELECT"
" character_data.zone_id,"
" character_data.zone_instance,"
" character_data.x,"
" character_data.y,"
" character_data.z,"
" character_data.heading "
"FROM"
" character_data "
"WHERE"
" TRUE"
" AND character_data.name = '%s'"
" AND character_data.last_login > (UNIX_TIMESTAMP() - 600) LIMIT 1", player_name.c_str());
auto characters = CharacterDataRepository::GetWhere(
database,
fmt::format("name = '{}' AND last_login > (UNIX_TIMESTAMP() - 600) LIMIT 1", player_name)
);
auto results = database.QueryDatabase(query);
if (!results.Success()) {
return false;
}
for (auto row = results.begin(); row != results.end(); ++row) {
auto zone_id = static_cast<uint32>(atoi(row[0]));
auto instance_id = static_cast<uint16>(atoi(row[1]));
auto x = static_cast<float>(atof(row[2]));
auto y = static_cast<float>(atof(row[3]));
auto z = static_cast<float>(atof(row[4]));
auto heading = static_cast<float>(atof(row[5]));
if (instance_id > 0 && !database.CheckInstanceExists(instance_id)) {
for (auto &c: characters) {
if (c.zone_instance > 0 && !database.CheckInstanceExists(c.zone_instance)) {
Message(Chat::Yellow, "Instance no longer exists...");
return false;
}
if (instance_id > 0) {
database.AddClientToInstance(instance_id, CharacterID());
if (c.zone_instance > 0) {
database.AddClientToInstance(c.zone_instance, CharacterID());
}
MovePC(zone_id, instance_id, x, y, z, heading);
MovePC(c.zone_id, c.zone_instance, c.x, c.y, c.z, c.heading);
return true;
}
@ -9418,6 +9397,42 @@ bool Client::GotoPlayer(std::string player_name)
return false;
}
bool Client::GotoPlayerGroup(const std::string& player_name)
{
if (!GetGroup()) {
return GotoPlayer(player_name);
}
for (auto &m: GetGroup()->members) {
if (m && m->IsClient()) {
auto c = m->CastToClient();
if (!c->GotoPlayer(player_name)) {
return false;
}
}
}
return true;
}
bool Client::GotoPlayerRaid(const std::string& player_name)
{
if (!GetRaid()) {
return GotoPlayer(player_name);
}
for (auto &m: GetRaid()->members) {
if (m.member && m.member->IsClient()) {
auto c = m.member->CastToClient();
if (!c->GotoPlayer(player_name)) {
return false;
}
}
}
return true;
}
glm::vec4 &Client::GetLastPositionBeforeBulkUpdate()
{
return last_position_before_bulk_update;

2
zone/client.h
View File

@ -243,6 +243,8 @@ public:
void SendChatLineBreak(uint16 color = Chat::White);
bool GotoPlayer(std::string player_name);
bool GotoPlayerGroup(const std::string& player_name);
bool GotoPlayerRaid(const std::string& player_name);
//abstract virtual function implementations required by base abstract class
virtual bool Death(Mob* killerMob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill);

36
zone/lua_client.cpp
View File

@ -2575,6 +2575,36 @@ void Lua_Client::TaskSelector(luabind::adl::object table) {
self->TaskQuestSetSelector(self, task_count, tasks);
}
bool Lua_Client::TeleportToPlayerByCharID(uint32 character_id) {
Lua_Safe_Call_Bool();
return self->GotoPlayer(database.GetCharNameByID(character_id));
}
bool Lua_Client::TeleportToPlayerByName(std::string player_name) {
Lua_Safe_Call_Bool();
return self->GotoPlayer(player_name);
}
bool Lua_Client::TeleportGroupToPlayerByCharID(uint32 character_id) {
Lua_Safe_Call_Bool();
return self->GotoPlayerGroup(database.GetCharNameByID(character_id));
}
bool Lua_Client::TeleportGroupToPlayerByName(std::string player_name) {
Lua_Safe_Call_Bool();
return self->GotoPlayerGroup(player_name);
}
bool Lua_Client::TeleportRaidToPlayerByCharID(uint32 character_id) {
Lua_Safe_Call_Bool();
return self->GotoPlayerRaid(database.GetCharNameByID(character_id));
}
bool Lua_Client::TeleportRaidToPlayerByName(std::string player_name) {
Lua_Safe_Call_Bool();
return self->GotoPlayerRaid(player_name);
}
luabind::scope lua_register_client() {
return luabind::class_<Lua_Client, Lua_Mob>("Client")
.def(luabind::constructor<>())
@ -2975,6 +3005,12 @@ luabind::scope lua_register_client() {
.def("TakePlatinum", (bool(Lua_Client::*)(uint32))&Lua_Client::TakePlatinum)
.def("TakePlatinum", (bool(Lua_Client::*)(uint32,bool))&Lua_Client::TakePlatinum)
.def("TaskSelector", (void(Lua_Client::*)(luabind::adl::object))&Lua_Client::TaskSelector)
.def("TeleportToPlayerByCharID", (bool(Lua_Client::*)(uint32))&Lua_Client::TeleportToPlayerByCharID)
.def("TeleportToPlayerByName", (bool(Lua_Client::*)(std::string))&Lua_Client::TeleportToPlayerByName)
.def("TeleportGroupToPlayerByCharID", (bool(Lua_Client::*)(uint32))&Lua_Client::TeleportGroupToPlayerByCharID)
.def("TeleportGroupToPlayerByName", (bool(Lua_Client::*)(std::string))&Lua_Client::TeleportGroupToPlayerByName)
.def("TeleportRaidToPlayerByCharID", (bool(Lua_Client::*)(uint32))&Lua_Client::TeleportRaidToPlayerByCharID)
.def("TeleportRaidToPlayerByName", (bool(Lua_Client::*)(std::string))&Lua_Client::TeleportRaidToPlayerByName)
.def("Thirsty", (bool(Lua_Client::*)(void))&Lua_Client::Thirsty)
.def("TrainDisc", (void(Lua_Client::*)(int))&Lua_Client::TrainDisc)
.def("TrainDiscBySpellID", (void(Lua_Client::*)(int32))&Lua_Client::TrainDiscBySpellID)

6
zone/lua_client.h
View File

@ -122,6 +122,12 @@ public:
void MoveZoneInstance(uint16 instance_id);
void MoveZoneInstanceGroup(uint16 instance_id);
void MoveZoneInstanceRaid(uint16 instance_id);
bool TeleportToPlayerByCharID(uint32 character_id);
bool TeleportToPlayerByName(std::string player_name);
bool TeleportGroupToPlayerByCharID(uint32 character_id);
bool TeleportGroupToPlayerByName(std::string player_name);
bool TeleportRaidToPlayerByCharID(uint32 character_id);
bool TeleportRaidToPlayerByName(std::string player_name);
void ChangeLastName(std::string last_name);
int GetFactionLevel(uint32 char_id, uint32 npc_id, uint32 race, uint32 class_, uint32 deity, uint32 faction, Lua_NPC npc);
void SetFactionLevel(uint32 char_id, uint32 npc_id, int char_class, int char_race, int char_deity);

36
zone/perl_client.cpp
View File

@ -2419,6 +2419,36 @@ void Perl_Client_TaskSelector(Client* self, perl::array task_ids)
self->TaskQuestSetSelector(self, task_count, tasks);
}
bool Perl_Client_TeleportToPlayerByCharacterID(Client* self, uint32 character_id)
{
return self->GotoPlayer(database.GetCharNameByID(character_id));
}
bool Perl_Client_TeleportToPlayerByName(Client* self, std::string player_name)
{
return self->GotoPlayer(player_name);
}
bool Perl_Client_TeleportGroupToPlayerByCharacterID(Client* self, uint32 character_id)
{
return self->GotoPlayerGroup(database.GetCharNameByID(character_id));
}
bool Perl_Client_TeleportGroupToPlayerByName(Client* self, std::string player_name)
{
return self->GotoPlayerGroup(player_name);
}
bool Perl_Client_TeleportRaidToPlayerByCharacterID(Client* self, uint32 character_id)
{
return self->GotoPlayerRaid(database.GetCharNameByID(character_id));
}
bool Perl_Client_TeleportRaidToPlayerByName(Client* self, std::string player_name)
{
return self->GotoPlayerRaid(player_name);
}
void perl_register_client()
{
perl::interpreter perl(PERL_GET_THX);
@ -2823,6 +2853,12 @@ void perl_register_client()
package.add("TakeMoneyFromPP", (bool(*)(Client*, uint64_t, bool))&Perl_Client_TakeMoneyFromPP);
package.add("TakePlatinum", (bool(*)(Client*, uint32))&Perl_Client_TakePlatinum);
package.add("TakePlatinum", (bool(*)(Client*, uint32, bool))&Perl_Client_TakePlatinum);
package.add("TeleportToPlayerByCharID", &Perl_Client_TeleportToPlayerByCharacterID);
package.add("TeleportToPlayerByName", &Perl_Client_TeleportToPlayerByName);
package.add("TeleportGroupToPlayerByCharID", &Perl_Client_TeleportGroupToPlayerByCharacterID);
package.add("TeleportGroupToPlayerByName", &Perl_Client_TeleportGroupToPlayerByName);
package.add("TeleportRaidToPlayerByCharID", &Perl_Client_TeleportRaidToPlayerByCharacterID);
package.add("TeleportRaidToPlayerByName", &Perl_Client_TeleportRaidToPlayerByName);
package.add("TaskSelector", &Perl_Client_TaskSelector);
package.add("Thirsty", &Perl_Client_Thirsty);
package.add("TrainDiscBySpellID", &Perl_Client_TrainDiscBySpellID);