pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-22 12:18:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Cleanup #reloadzps Command. (#2129)

Browse Source 
* [Commands] Cleanup #reloadzps Command.
- Cleanup messages and logic.
- Make reloading of zone points global instead of zone specific.

* Further cleanup.
- Add zone->GetZoneDescription().
- Add mob->GetTargetDescription(mob).

* Final cleanup.

* Typo.
This commit is contained in:
Kinglykrab
2022-05-07 03:23:15 -04:00
committed by GitHub
parent 0b3065d7a9
commit 7df9b2974b
111 changed files with 2035 additions and 2864 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/gm_commands/npcspawn.cpp
+49 -41
View File
@@ -2,26 +2,31 @@
void command_npcspawn(Client *c, const Seperator *sep)
{
if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
c->Message(Chat::White, "You must target an NPC to use this command.");
return;
}
int arguments = sep->argnum;
if (!arguments) {
c->Message(Chat::White, "Command Syntax: #npcspawn [Add|Create|Delete|Remove|Update]");
return;
}
if (!(c->GetTarget() && c->GetTarget()->IsNPC())) {
c->Message(Chat::White, "You must target an NPC to use this command.");
return;
}
NPC *target = c->GetTarget()->CastToNPC();
std::string spawn_type = str_tolower(sep->arg[1]);
uint32 extra = 0;
bool is_add = spawn_type.find("add") != std::string::npos;
bool is_create = spawn_type.find("create") != std::string::npos;
bool is_delete = spawn_type.find("delete") != std::string::npos;
bool is_remove = spawn_type.find("remove") != std::string::npos;
bool is_update = spawn_type.find("update") != std::string::npos;
if (!is_add && !is_create && !is_delete && !is_remove && !is_update) {
auto target = c->GetTarget()->CastToNPC();
uint32 extra = 0;
bool is_add = !strcasecmp(sep->arg[1], "add");
bool is_create = !strcasecmp(sep->arg[1], "create");
bool is_delete = !strcasecmp(sep->arg[1], "delete");
bool is_remove = !strcasecmp(sep->arg[1], "remove");
bool is_update = !strcasecmp(sep->arg[1], "update");
if (
!is_add &&
!is_create &&
!is_delete &&
!is_remove &&
!is_update
) {
c->Message(Chat::White, "Command Syntax: #npcspawn [Add|Create|Delete|Remove|Update]");
return;
}
@@ -29,16 +34,17 @@ void command_npcspawn(Client *c, const Seperator *sep)
if (is_add || is_create) {
extra = (
sep->IsNumber(2) ?
(
is_add ?
std::stoi(sep->arg[2]) :
1
) : (
(
is_add ?
1200 :
0
std::stoi(sep->arg[2]) :
1
) : (
is_add ?
1200 :
0
)
); // Default to 1200 for Add, 0 for Create if not set
content_db.NPCSpawnDB(
is_add ? NPCSpawnTypes::AddNewSpawngroup : NPCSpawnTypes::CreateNewSpawn,
zone->GetShortName(),
@@ -47,35 +53,37 @@ void command_npcspawn(Client *c, const Seperator *sep)
target,
extra
);
c->Message(
Chat::White,
fmt::format(
"Spawn {} | Name: {} ({})",
"Spawn {} | Name: {}",
is_add ? "Added" : "Created",
target->GetCleanName(),
target->GetID()
c->GetTargetDescription(target)
).c_str()
);
}
else if (is_delete || is_remove || is_update) {
uint8 spawn_update_type = (
uint8 spawn_update_type = (
is_delete ?
NPCSpawnTypes::DeleteSpawn :
(
is_remove ?
NPCSpawnTypes::RemoveSpawn :
NPCSpawnTypes::UpdateAppearance
)
NPCSpawnTypes::DeleteSpawn :
(
is_remove ?
NPCSpawnTypes::RemoveSpawn :
NPCSpawnTypes::UpdateAppearance
)
);
std::string spawn_message = (
std::string spawn_message = (
is_delete ?
"Deleted" :
(
is_remove ?
"Removed" :
"Updated"
)
"Deleted" :
(
is_remove ?
"Removed" :
"Updated"
)
);
content_db.NPCSpawnDB(
spawn_update_type,
zone->GetShortName(),
@@ -83,13 +91,13 @@ void command_npcspawn(Client *c, const Seperator *sep)
c,
target
);
c->Message(
Chat::White,
fmt::format(
"Spawn {} | Name: {} ({})",
"Spawn {} | Name: {}",
spawn_message,
target->GetCleanName(),
target->GetID()
c->GetTargetDescription(target)
).c_str()
);
}