pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +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/task.cpp
+43 -85
View File
@@ -80,9 +80,9 @@ void command_task(Client *c, const Seperator *sep)
return;
}
Client *client_target = c;
Client *target = c;
if (c->GetTarget() && c->GetTarget()->IsClient()) {
client_target = c->GetTarget()->CastToClient();
target = c->GetTarget()->CastToClient();
}
bool is_assign = !strcasecmp(sep->arg[1], "assign");
@@ -177,21 +177,13 @@ void command_task(Client *c, const Seperator *sep)
if (is_assign) {
auto task_id = std::stoul(sep->arg[2]);
if (task_id && task_id < MAXTASKS) {
client_target->AssignTask(task_id, 0, false);
target->AssignTask(task_id, 0, false);
c->Message(
Chat::Yellow,
fmt::format(
"Assigned task ID {} to {}.",
task_id,
(
client_target == c ?
"yourself" :
fmt::format(
"{} ({})",
client_target->GetCleanName(),
client_target->GetID()
)
)
c->GetTargetDescription(target)
).c_str()
);
}
@@ -201,23 +193,15 @@ void command_task(Client *c, const Seperator *sep)
Chat::Yellow,
fmt::format(
"Task timers have been purged for {}.",
(
client_target == c ?
"yourself" :
fmt::format(
"{} ({})",
client_target->GetCleanName(),
client_target->GetID()
)
)
c->GetTargetDescription(target)
).c_str()
);
if (client_target != c) {
client_target->Message(Chat::Yellow, "Your task timers have been purged by a GM.");
if (c != target) {
target->Message(Chat::Yellow, "Your task timers have been purged by a GM.");
}
client_target->PurgeTaskTimers();
target->PurgeTaskTimers();
return;
} else if (is_reload) {
if (arguments >= 2) {
@@ -282,62 +266,45 @@ void command_task(Client *c, const Seperator *sep)
return;
} else if (is_show) {
c->ShowClientTasks(client_target);
target->ShowClientTasks(c);
return;
} else if (is_uncomplete) {
if (sep->IsNumber(2)) {
auto task_id = std::stoul(sep->arg[2]);
if (task_id && task_id < MAXTASKS) {
if (
CompletedTasksRepository::DeleteWhere(
database,
fmt::format(
"charid = {} AND taskid = {}",
client_target->CharacterID(),
task_id
)
)
) {
c->Message(
Chat::Yellow,
fmt::format(
"Successfully uncompleted task ID {} for {}.",
task_id,
(
client_target == c ?
"yourself" :
fmt::format(
"{} ({})",
client_target->GetCleanName(),
client_target->GetID()
)
)
).c_str()
);
return;
} else {
c->Message(
Chat::Yellow,
fmt::format(
"{} not completed task ID {}.",
(
client_target == c ?
"You have" :
fmt::format(
"{} ({}) has",
client_target->GetCleanName(),
client_target->GetID()
)
),
task_id
).c_str()
);
return;
}
} else {
if (!task_id || task_id > MAXTASKS) {
c->Message(Chat::White, "Invalid task ID specified.");
return;
}
if (
CompletedTasksRepository::DeleteWhere(
database,
fmt::format(
"charid = {} AND taskid = {}",
target->CharacterID(),
task_id
)
)
) {
c->Message(
Chat::Yellow,
fmt::format(
"Successfully uncompleted task ID {} for {}.",
task_id,
c->GetTargetDescription(target)
).c_str()
);
} else {
c->Message(
Chat::Yellow,
fmt::format(
"{} {} not completed task ID {}.",
c->GetTargetDescription(target, TargetDescriptionType::UCYou),
c == target ? "have" : "has",
task_id
).c_str()
);
}
}
} else if (is_update) {
if (arguments >= 3) {
@@ -359,21 +326,12 @@ void command_task(Client *c, const Seperator *sep)
task_id,
activity_id,
count,
(
client_target == c ?
"yourself" :
fmt::format(
"{} ({})",
client_target->GetCleanName(),
client_target->GetID()
)
)
c->GetTargetDescription(target)
).c_str()
);
client_target->UpdateTaskActivity(task_id, activity_id, count);
c->ShowClientTasks(client_target);
target->UpdateTaskActivity(task_id, activity_id, count);
target->ShowClientTasks(c);
}
return;
}
}