pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-11 21:01:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Commands] Cleanup #npcsay and #npcshout Commands. (#2107)

Browse Source 
* [Commands] Cleanup #npcsay and #npcshout Commands.
- Cleanup messages and logic.

* Update npcsay.cpp

* Update npcshout.cpp
This commit is contained in:
Kinglykrab 2022-05-06 20:57:53 -04:00 committed by GitHub
parent 26b26af8d7
commit 37fefad58e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/command.cpp
View File

@ -253,8 +253,8 @@ int command_init(void)
command_add("npceditmass", "[name-search] [column] [value] - Mass (Zone wide) NPC data editing command", AccountStatus::GMAdmin, command_npceditmass) ||
command_add("npcemote", "[message] - Make your NPC target emote a message.", AccountStatus::GMLeadAdmin, command_npcemote) ||
command_add("npcloot", "- Manipulate the loot an NPC is carrying. Use #npcloot help for more information.", AccountStatus::QuestTroupe, command_npcloot) ||
command_add("npcsay", "[message] - Make your NPC target say a message.", AccountStatus::GMLeadAdmin, command_npcsay) ||
command_add("npcshout", "[message] - Make your NPC target shout a message.", AccountStatus::GMLeadAdmin, command_npcshout) ||
command_add("npcsay", "[Message] - Make your NPC target say a message.", AccountStatus::GMLeadAdmin, command_npcsay) ||
command_add("npcshout", "[Message] - Make your NPC target shout a message.", AccountStatus::GMLeadAdmin, command_npcshout) ||
command_add("npcspawn", "[create/add/update/remove/delete] - Manipulate spawn DB", AccountStatus::GMAreas, command_npcspawn) ||
command_add("npcspecialattk", "[flagchar] [perm] - Set NPC special attack flags. Flags are E(nrage) F(lurry) R(ampage) S(ummon).", AccountStatus::QuestTroupe, command_npcspecialattk) ||
command_add("npcstats", "- Show stats about target NPC", AccountStatus::QuestTroupe, command_npcstats) ||

15
zone/gm_commands/npcsay.cpp
View File

@ -2,11 +2,18 @@
void command_npcsay(Client *c, const Seperator *sep)
{
if (c->GetTarget() && c->GetTarget()->IsNPC() && sep->arg[1][0]) {
c->GetTarget()->Say(sep->argplus[1]);
if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
c->Message(Chat::White, "You must target an NPC to use this command.");
return;
}
else {
c->Message(Chat::White, "Usage: #npcsay message (requires NPC target");
int arguments = sep->argnum;
if (!arguments) {
c->Message(Chat::White, "Usage: #npcsay [Message]");
return;
}
std::string message = sep->argplus[1];
c->GetTarget()->Say(message.c_str());
}

15
zone/gm_commands/npcshout.cpp
View File

@ -2,11 +2,18 @@
void command_npcshout(Client *c, const Seperator *sep)
{
if (c->GetTarget() && c->GetTarget()->IsNPC() && sep->arg[1][0]) {
c->GetTarget()->Shout(sep->argplus[1]);
if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
c->Message(Chat::White, "You must target an NPC to use this command.");
return;
}
else {
c->Message(Chat::White, "Usage: #npcshout message (requires NPC target");
int arguments = sep->argnum;
if (!arguments) {
c->Message(Chat::White, "Usage: #npcshout [Message]");
return;
}
std::string message = sep->argplus[1];
c->GetTarget()->Shout(message.c_str());
}