pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 14:41:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve GM command interface UI

Browse Source
This commit is contained in:
Akkadius 2021-02-06 21:14:25 -06:00
parent 053bdb8646
commit 5fba138a5a
4 changed files with 140 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zone/client.h
View File

@ -1227,7 +1227,7 @@ public:
return (task_state ? task_state->EnabledTaskCount(task_set_id) : -1); return (task_state ? task_state->EnabledTaskCount(task_set_id) : -1);
} }
inline int IsTaskCompleted(int task_id) { return (task_state ? task_state->IsTaskCompleted(task_id) : -1); } inline int IsTaskCompleted(int task_id) { return (task_state ? task_state->IsTaskCompleted(task_id) : -1); }
inline void ShowClientTasks() { if (task_state) { task_state->ShowClientTasks(this); }} inline void ShowClientTasks(Client *client) { if (task_state) { task_state->ShowClientTasks(client); }}
inline void CancelAllTasks() { if (task_state) { task_state->CancelAllTasks(this); }} inline void CancelAllTasks() { if (task_state) { task_state->CancelAllTasks(this); }}
inline int GetActiveTaskCount() { return (task_state ? task_state->GetActiveTaskCount() : 0); } inline int GetActiveTaskCount() { return (task_state ? task_state->GetActiveTaskCount() : 0); }
inline int GetActiveTaskID(int index) { return (task_state ? task_state->GetActiveTaskID(index) : -1); } inline int GetActiveTaskID(int index) { return (task_state ? task_state->GetActiveTaskID(index) : -1); }

139
zone/command.cpp
View File

@ -10169,76 +10169,135 @@ void command_rules(Client *c, const Seperator *sep) {
void command_task(Client *c, const Seperator *sep) { void command_task(Client *c, const Seperator *sep) {
//super-command for managing tasks //super-command for managing tasks
if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) { if(sep->arg[1][0] == '\0' || !strcasecmp(sep->arg[1], "help")) {
c->Message(Chat::White, "Syntax: #task [subcommand]."); c->Message(Chat::White, "Syntax: #task [subcommand]");
c->Message(Chat::White, "-- Task System Commands --"); c->Message(Chat::White, "------------------------------------------------");
c->Message(Chat::White, "...show - List active tasks for a client"); c->Message(Chat::White, "# Task System Commands");
c->Message(Chat::White, "...update <TaskID> <ActivityID> [Count]"); c->Message(Chat::White, "------------------------------------------------");
c->Message(Chat::White, "...reloadall - Reload all Task information from the database"); c->Message(
c->Message(Chat::White, "...reload task <TaskID> - Reload Task and Activity informnation for a single task"); Chat::White,
c->Message(Chat::White, "...reload lists - Reload goal/reward list information"); fmt::format(
c->Message(Chat::White, "...reload prox - Reload proximity information"); "--- [{}] List active tasks for a client",
c->Message(Chat::White, "...reload sets - Reload task set information"); EQ::SayLinkEngine::GenerateQuestSaylink("#task show", false, "show")
).c_str()
);
c->Message(Chat::White, "--- update <task_id> <activity_id> [count] | Updates task");
c->Message(Chat::White, "--- assign <task_id> | Assigns task to client");
c->Message(
Chat::White,
fmt::format(
"--- [{}] Reload all Task information from the database",
EQ::SayLinkEngine::GenerateQuestSaylink("#task reloadall", false, "reloadall")
).c_str()
);
c->Message(
Chat::White,
fmt::format(
"--- [{}] <task_id> Reload Task and Activity informnation for a single task",
EQ::SayLinkEngine::GenerateQuestSaylink("#task reload task", false, "reload task")
).c_str()
);
c->Message(
Chat::White,
fmt::format(
"--- [{}] Reload goal/reward list information",
EQ::SayLinkEngine::GenerateQuestSaylink("#task reload lists", false, "reload lists")
).c_str()
);
c->Message(
Chat::White,
fmt::format(
"--- [{}] Reload proximity information",
EQ::SayLinkEngine::GenerateQuestSaylink("#task reload prox", false, "reload prox")
).c_str()
);
c->Message(
Chat::White,
fmt::format(
"--- [{}] Reload task set information",
EQ::SayLinkEngine::GenerateQuestSaylink("#task reload sets", false, "reload sets")
).c_str()
);
return; return;
} }
if(!strcasecmp(sep->arg[1], "show")) { Client *client_target = c;
if(c->GetTarget() && c->GetTarget()->IsClient()) if (c->GetTarget() && c->GetTarget()->IsClient()) {
c->GetTarget()->CastToClient()->ShowClientTasks(); client_target = c->GetTarget()->CastToClient();
else }
c->ShowClientTasks();
if (!strcasecmp(sep->arg[1], "show")) {
c->ShowClientTasks(client_target);
return; return;
} }
if(!strcasecmp(sep->arg[1], "update")) { if (!strcasecmp(sep->arg[1], "update")) {
if(sep->argnum>=3) { if (sep->argnum >= 3) {
int TaskID = atoi(sep->arg[2]); int task_id = atoi(sep->arg[2]);
int ActivityID = atoi(sep->arg[3]); int activity_id = atoi(sep->arg[3]);
int Count=1; int count = 1;
if(sep->argnum>=4) { if (sep->argnum >= 4) {
Count = atoi(sep->arg[4]); count = atoi(sep->arg[4]);
if(Count <= 0) if (count <= 0) {
Count = 1; count = 1;
}
} }
c->Message(Chat::Yellow, "Updating Task %i, Activity %i, Count %i", TaskID, ActivityID, Count); c->Message(
c->UpdateTaskActivity(TaskID, ActivityID, Count); Chat::Yellow,
"Updating Task [%i] Activity [%i] Count [%i] for client [%s]",
task_id,
activity_id,
count,
client_target->GetCleanName()
);
client_target->UpdateTaskActivity(task_id, activity_id, count);
c->ShowClientTasks(client_target);
} }
return; return;
} }
if(!strcasecmp(sep->arg[1], "reloadall")) {
if (!strcasecmp(sep->arg[1], "assign")) {
int task_id = atoi(sep->arg[2]);
if ((task_id > 0) && (task_id < MAXTASKS)) {
client_target->AssignTask(task_id, 0, false);
c->Message(Chat::Yellow, "Assigned task [%i] to [%s]", task_id, client_target->GetCleanName());
}
return;
}
if (!strcasecmp(sep->arg[1], "reloadall")) {
c->Message(Chat::Yellow, "Sending reloadtasks to world"); c->Message(Chat::Yellow, "Sending reloadtasks to world");
worldserver.SendReloadTasks(RELOADTASKS); worldserver.SendReloadTasks(RELOADTASKS);
c->Message(Chat::Yellow, "Back again"); c->Message(Chat::Yellow, "Back again");
return; return;
} }
if(!strcasecmp(sep->arg[1], "reload")) { if (!strcasecmp(sep->arg[1], "reload")) {
if(sep->arg[2][0] != '\0') { if (sep->arg[2][0] != '\0') {
if(!strcasecmp(sep->arg[2], "lists")) { if (!strcasecmp(sep->arg[2], "lists")) {
c->Message(Chat::Yellow, "Sending reload lists to world"); c->Message(Chat::Yellow, "Sending reload lists to world");
worldserver.SendReloadTasks(RELOADTASKGOALLISTS); worldserver.SendReloadTasks(RELOADTASKGOALLISTS);
c->Message(Chat::Yellow, "Back again"); c->Message(Chat::Yellow, "Reloaded");
return; return;
} }
if(!strcasecmp(sep->arg[2], "prox")) { if (!strcasecmp(sep->arg[2], "prox")) {
c->Message(Chat::Yellow, "Sending reload proximities to world"); c->Message(Chat::Yellow, "Sending reload proximities to world");
worldserver.SendReloadTasks(RELOADTASKPROXIMITIES); worldserver.SendReloadTasks(RELOADTASKPROXIMITIES);
c->Message(Chat::Yellow, "Back again"); c->Message(Chat::Yellow, "Reloaded");
return; return;
} }
if(!strcasecmp(sep->arg[2], "sets")) { if (!strcasecmp(sep->arg[2], "sets")) {
c->Message(Chat::Yellow, "Sending reload task sets to world"); c->Message(Chat::Yellow, "Sending reload task sets to world");
worldserver.SendReloadTasks(RELOADTASKSETS); worldserver.SendReloadTasks(RELOADTASKSETS);
c->Message(Chat::Yellow, "Back again"); c->Message(Chat::Yellow, "Reloaded");
return; return;
} }
if(!strcasecmp(sep->arg[2], "task") && (sep->arg[3][0] != '\0')) { if (!strcasecmp(sep->arg[2], "task") && (sep->arg[3][0] != '\0')) {
int TaskID = atoi(sep->arg[3]); int task_id = atoi(sep->arg[3]);
if((TaskID > 0) && (TaskID < MAXTASKS)) { if ((task_id > 0) && (task_id < MAXTASKS)) {
c->Message(Chat::Yellow, "Sending reload task %i to world", TaskID); c->Message(Chat::Yellow, "Sending reload task %i to world", task_id);
worldserver.SendReloadTasks(RELOADTASKS, TaskID); worldserver.SendReloadTasks(RELOADTASKS, task_id);
c->Message(Chat::Yellow, "Back again"); c->Message(Chat::Yellow, "Reloaded");
return; return;
} }
} }

37
zone/task_client_state.cpp
View File

@ -1052,7 +1052,6 @@ void ClientTaskState::IncrementDoneCount(
Log(Logs::General, Logs::Tasks, "[UPDATE] IncrementDoneCount"); Log(Logs::General, Logs::Tasks, "[UPDATE] IncrementDoneCount");
auto info = GetClientTaskInfo(task_information->type, task_index); auto info = GetClientTaskInfo(task_information->type, task_index);
if (info == nullptr) { if (info == nullptr) {
return; return;
} }
@ -1557,7 +1556,9 @@ void ClientTaskState::ResetTaskActivity(Client *client, int task_id, int activit
void ClientTaskState::ShowClientTasks(Client *client) void ClientTaskState::ShowClientTasks(Client *client)
{ {
client->Message(Chat::White, "Task Information:"); client->Message(Chat::White, "------------------------------------------------");
client->Message(Chat::White, "# Task Information | Client [%s]", client->GetCleanName());
// client->Message(Chat::White, "------------------------------------------------");
if (active_task.task_id != TASKSLOTEMPTY) { if (active_task.task_id != TASKSLOTEMPTY) {
client->Message( client->Message(
Chat::White, Chat::White,
@ -1586,27 +1587,51 @@ void ClientTaskState::ShowClientTasks(Client *client)
continue; continue;
} }
client->Message(Chat::White, "------------------------------------------------");
client->Message( client->Message(
Chat::White, "Quest: %i %s", active_quest.task_id, Chat::White, "# Quest | task_id [%i] title [%s]",
active_quest.task_id,
p_task_manager->p_task_data[active_quest.task_id]->title.c_str() p_task_manager->p_task_data[active_quest.task_id]->title.c_str()
); );
client->Message(Chat::White, "------------------------------------------------");
client->Message( client->Message(
Chat::White, Chat::White,
" description: [%s]\n", " -- Description [%s]\n",
p_task_manager->p_task_data[active_quest.task_id]->description.c_str() p_task_manager->p_task_data[active_quest.task_id]->description.c_str()
); );
for (int activity_id = 0; activity_id < p_task_manager->GetActivityCount(active_quest.task_id); activity_id++) { for (int activity_id = 0; activity_id < p_task_manager->GetActivityCount(active_quest.task_id); activity_id++) {
std::vector<std::string> update_increments = {"1", "5", "50"};
std::string update_saylinks;
for (auto &increment: update_increments) {
auto task_update_saylink = EQ::SayLinkEngine::GenerateQuestSaylink(
fmt::format(
"#task update {} {} {}",
active_quest.task_id,
active_quest.activity[activity_id].activity_id,
increment
),
false,
increment
);
update_saylinks += "[" + task_update_saylink + "] ";
}
client->Message( client->Message(
Chat::White, Chat::White,
" activity_information: %2d, done_count: %2d, Status: %d (0=Hidden, 1=Active, 2=Complete)", " --- activity_id [%i] done_count [%i] state [%d] (0=hidden 1=active 2=complete) | Update %s",
active_quest.activity[activity_id].activity_id, active_quest.activity[activity_id].activity_id,
active_quest.activity[activity_id].done_count, active_quest.activity[activity_id].done_count,
active_quest.activity[activity_id].activity_state active_quest.activity[activity_id].activity_state,
update_saylinks.c_str()
); );
} }
} }
client->Message(Chat::White, "------------------------------------------------");
} }
// TODO: Shared Task // TODO: Shared Task

14
zone/task_manager.cpp
View File

@ -1392,16 +1392,20 @@ bool TaskManager::LoadClientState(Client *client, ClientTaskState *client_task_s
auto type = static_cast<TaskType>(character_task.type); auto type = static_cast<TaskType>(character_task.type);
if ((task_id < 0) || (task_id >= MAXTASKS)) { if ((task_id < 0) || (task_id >= MAXTASKS)) {
LogTasks("[LoadClientState] Error: task_id [{}] out of range while loading character tasks from database", LogTasks(
task_id); "[LoadClientState] Error: task_id [{}] out of range while loading character tasks from database",
task_id
);
continue; continue;
} }
// client data bucket pointer
auto task_info = client_task_state->GetClientTaskInfo(type, slot); auto task_info = client_task_state->GetClientTaskInfo(type, slot);
if (task_info == nullptr) { if (task_info == nullptr) {
LogTasks("[LoadClientState] Error: slot [{}] out of range while loading character tasks from database", LogTasks(
slot); "[LoadClientState] Error: slot [{}] out of range while loading character tasks from database",
slot
);
continue; continue;
} }