pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 04:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Cleanup #summon Command. (#2145)

Browse Source 
* [Commands] Cleanup #summon Command.
- Cleanup messages and logic.
- Add glm::vec4 overload for GMMove.
- Remove unused parameter from GMMove.
- Remove unnecessary Lua GMMove now that parameter is gone.

* Update summon.cpp

* Cleanup.
This commit is contained in:
Kinglykrab
2022-05-06 19:45:12 -04:00
committed by GitHub
parent fc484d0b1c
commit 0aeab11408
8 changed files with 119 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/summon.cpp
+72 -68
View File
@@ -7,82 +7,79 @@ extern WorldServer worldserver;
void command_summon(Client *c, const Seperator *sep)
{
Mob *t;
int arguments = sep->argnum;
if (!arguments && !c->GetTarget()) {
c->Message(Chat::White, "Usage: #summon - Summon your target, if you have one, to your position");
c->Message(Chat::White, "Usage: #summon [Character Name] - Summon a character by name to your position");
c->Message(Chat::White, "Note: You may also summon your target if you have one.");
return;
}
if (sep->arg[1][0] != 0) // arg specified
{
Client *client = entity_list.GetClientByName(sep->arg[1]);
if (client != 0) { // found player in zone
t = client->CastToMob();
}
else {
if (!worldserver.Connected()) {
c->Message(Chat::White, "Error: World server disconnected.");
}
else { // player is in another zone
//Taking this command out until we test the factor of 8 in ServerOP_ZonePlayer
//c->Message(Chat::White, "Summoning player from another zone not yet implemented.");
//return;
Mob* target;
auto pack = new ServerPacket(ServerOP_ZonePlayer, sizeof(ServerZonePlayer_Struct));
ServerZonePlayer_Struct *szp = (ServerZonePlayer_Struct *) pack->pBuffer;
strcpy(szp->adminname, c->GetName());
szp->adminrank = c->Admin();
szp->ignorerestrictions = 2;
strcpy(szp->name, sep->arg[1]);
strcpy(szp->zone, zone->GetShortName());
szp->x_pos = c->GetX(); // May need to add a factor of 8 in here..
szp->y_pos = c->GetY();
szp->z_pos = c->GetZ();
szp->instance_id = zone->GetInstanceID();
worldserver.SendPacket(pack);
safe_delete(pack);
}
if (arguments == 1) {
std::string character_name = sep->arg[1];
auto character_id = database.GetCharacterID(character_name.c_str());
if (!character_id) {
c->Message(
Chat::White,
fmt::format(
"Character '{}' does not exist.",
character_name
).c_str()
);
return;
}
auto search_client = entity_list.GetClientByName(character_name.c_str());
if (search_client) {
target = search_client->CastToMob();
} else {
if (!worldserver.Connected()) {
c->Message(Chat::White, "World server is currently disconnected.");
return;
}
auto pack = new ServerPacket(ServerOP_ZonePlayer, sizeof(ServerZonePlayer_Struct));
auto szp = (ServerZonePlayer_Struct *) pack->pBuffer;
strn0cpy(szp->adminname, c->GetName(), sizeof(szp->adminname));
szp->adminrank = c->Admin();
szp->ignorerestrictions = 2;
strn0cpy(szp->name, character_name.c_str(), sizeof(szp->name));
strn0cpy(szp->zone, zone->GetShortName(), sizeof(szp->zone));
szp->x_pos = c->GetX();
szp->y_pos = c->GetY();
szp->z_pos = c->GetZ();
szp->instance_id = zone->GetInstanceID();
worldserver.SendPacket(pack);
safe_delete(pack);
return;
}
} else if (c->GetTarget()) {
target = c->GetTarget();
}
else if (c->GetTarget()) { // have target
t = c->GetTarget();
}
else {
c->Message(Chat::White, "Usage: #summon [charname] Either target or charname is required");
if (c == target) {
c->Message(Chat::White, "You cannot summon yourself.");
return;
}
c->Message(
Chat::White,
fmt::format(
"Summoning {} ({}) to {:.2f}, {:.2f}, {:.2f} in {} ({}).",
target->GetCleanName(),
target->GetID(),
c->GetX(),
c->GetY(),
c->GetZ(),
zone->GetLongName(),
zone->GetZoneID()
).c_str()
);
if (!t) {
return;
}
if (t->IsNPC()) { // npc target
c->Message(
Chat::White,
"Summoning NPC %s to %1.1f, %1.1f, %1.1f",
t->GetName(),
c->GetX(),
c->GetY(),
c->GetZ());
t->CastToNPC()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
t->CastToNPC()->SaveGuardSpot(glm::vec4(0.0f));
}
else if (t->IsCorpse()) { // corpse target
c->Message(
Chat::White,
"Summoning corpse %s to %1.1f, %1.1f, %1.1f",
t->GetName(),
c->GetX(),
c->GetY(),
c->GetZ());
t->CastToCorpse()->GMMove(c->GetX(), c->GetY(), c->GetZ(), c->GetHeading());
}
else if (t->IsClient()) {
c->Message(
Chat::White,
"Summoning player %s to %1.1f, %1.1f, %1.1f",
t->GetName(),
c->GetX(),
c->GetY(),
c->GetZ());
t->CastToClient()->MovePC(
if (target->IsClient()) {
target->CastToClient()->MovePC(
zone->GetZoneID(),
zone->GetInstanceID(),
c->GetX(),
@@ -92,6 +89,13 @@ void command_summon(Client *c, const Seperator *sep)
2,
GMSummon
);
return;
}
target->GMMove(c->GetPosition());
if (target->IsNPC()) {
target->CastToNPC()->SaveGuardSpot(glm::vec4(0.0f));
}
}