pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-09-02 04:16:46 +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/npccast.cpp
+77 -86
View File
@@ -2,93 +2,84 @@
void command_npccast(Client *c, const Seperator *sep)
{
if (c->GetTarget() && c->GetTarget()->IsNPC()) {
NPC *target = c->GetTarget()->CastToNPC();
if (!sep->IsNumber(1) && sep->arg[1] && sep->IsNumber(2)) {
const char *entity_name = sep->arg[1] ? sep->arg[1] : 0;
auto spell_id = sep->arg[2] ? std::stoul(sep->arg[2]) : 0;
Mob *spell_target = entity_list.GetMob(entity_name);
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
Chat::White,
fmt::format(
"{} ({}) casting {} ({}) on {} ({}).",
target->GetCleanName(),
target->GetID(),
GetSpellName(static_cast<uint16>(spell_id)),
spell_id,
spell_target->GetCleanName(),
spell_target->GetID()
).c_str()
);
target->CastSpell(spell_id, spell_target->GetID());
}
else {
if (!spell_target) {
c->Message(
Chat::White,
fmt::format(
"Entity {} was not found",
entity_name
).c_str()
);
}
else if (!spell_id || !IsValidSpell(spell_id)) {
c->Message(
Chat::White,
fmt::format(
"Spell ID {} was not found",
spell_id
).c_str()
);
}
}
}
else if (sep->IsNumber(1) && sep->IsNumber(2)) {
uint16 entity_id = sep->arg[1] ? std::stoul(sep->arg[1]) : 0;
auto spell_id = sep->arg[2] ? std::stoul(sep->arg[2]) : 0;
Mob *spell_target = entity_list.GetMob(entity_id);
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
Chat::White,
fmt::format(
"{} ({}) casting {} ({}) on {} ({}).",
target->GetCleanName(),
target->GetID(),
GetSpellName(static_cast<uint16>(spell_id)),
spell_id,
spell_target->GetCleanName(),
spell_target->GetID()
).c_str()
);
target->CastSpell(spell_id, spell_target->GetID());
}
else {
if (!spell_target) {
c->Message(
Chat::White,
fmt::format(
"Entity ID {} was not found",
entity_id
).c_str()
);
}
else if (!spell_id || !IsValidSpell(spell_id)) {
c->Message(
Chat::White,
fmt::format(
"Spell ID {} was not found",
spell_id
).c_str()
);
}
}
}
}
else {
if (!c->GetTarget() || !c->GetTarget()->IsNPC()) {
c->Message(Chat::White, "You must target an NPC to use this command.");
return;
}
auto target = c->GetTarget()->CastToNPC();
if (!sep->IsNumber(1) && sep->arg[1] && sep->IsNumber(2)) {
std::string entity_name = sep->arg[1] ? sep->arg[1] : 0;
auto spell_id = sep->arg[2] ? std::stoul(sep->arg[2]) : 0;
auto spell_target = entity_list.GetMob(entity_name.c_str());
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
Chat::White,
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()
);
target->CastSpell(spell_id, spell_target->GetID());
} else {
if (!spell_target) {
c->Message(
Chat::White,
fmt::format(
"Entity {} was not found",
entity_name
).c_str()
);
} else if (!spell_id || !IsValidSpell(spell_id)) {
c->Message(
Chat::White,
fmt::format(
"Spell ID {} was not found",
spell_id
).c_str()
);
}
}
} else if (sep->IsNumber(1) && sep->IsNumber(2)) {
uint16 entity_id = static_cast<uint16>(std::stoul(sep->arg[1]));
auto spell_id = std::stoul(sep->arg[2]);
auto spell_target = entity_list.GetMob(entity_id);
if (spell_target && IsValidSpell(spell_id) && spell_id < SPDAT_RECORDS) {
c->Message(
Chat::White,
fmt::format(
"{} casting {} ({}) on {}.",
c->GetTargetDescription(target),
GetSpellName(static_cast<uint16>(spell_id)),
spell_id,
c->GetTargetDescription(spell_target)
).c_str()
);
target->CastSpell(spell_id, spell_target->GetID());
} else {
if (!spell_target) {
c->Message(
Chat::White,
fmt::format(
"Entity ID {} was not found",
entity_id
).c_str()
);
} else if (!spell_id || !IsValidSpell(spell_id)) {
c->Message(
Chat::White,
fmt::format(
"Spell ID {} was not found",
spell_id
).c_str()
);
}
}
}
}