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

[Tasks] Send active elements in task select packet (#4051)

Browse Source 
Only the first element was being serialized to show the start zone of
tasks. This was resulting in a blank description for tasks that only
have element descriptions.

Live sends all initial active elements for the task when sending this
packet. Any bracket text with these elements as a requirement will be
appended to the description.
This commit is contained in:
hg 2024-02-10 04:23:24 -05:00 committed by GitHub
parent b280f50c99
commit 804b798068
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/tasks.h
View File

@ -216,6 +216,8 @@ struct TaskInformation {
uint32_t request_timer_group; uint32_t request_timer_group;
uint32_t request_timer_seconds; uint32_t request_timer_seconds;
ActivityInformation activity_information[MAXACTIVITIESPERTASK]; ActivityInformation activity_information[MAXACTIVITIESPERTASK];
std::vector<int> selector_ids; // initial active elements for task select window
int selector_step = std::numeric_limits<int>::max();
void SerializeSelector(SerializeBuffer& out, EQ::versions::ClientVersion client_version) const void SerializeSelector(SerializeBuffer& out, EQ::versions::ClientVersion client_version) const
{ {
@ -232,12 +234,14 @@ struct TaskInformation {
out.WriteUInt8(0); // 0: no rewards 1: enables "Reward Preview" button out.WriteUInt8(0); // 0: no rewards 1: enables "Reward Preview" button
} }
// selector only needs to send the first objective to fill description starting zone // live only sends the initial active elements to the select window
out.WriteUInt32(std::min(activity_count, 1)); // number of task objectives // element index 0 fills the description starting zone
if (activity_count > 0) // bracket descriptions are appended if all their elements are sent
out.WriteUInt32(static_cast<uint32_t>(selector_ids.size())); // element count
for (int id : selector_ids)
{ {
out.WriteUInt32(0); // objective index out.WriteInt32(id); // element index
activity_information[0].SerializeSelector(out, client_version); activity_information[id].SerializeSelector(out, client_version);
} }
} }
}; };

11
zone/task_manager.cpp
View File

@ -238,6 +238,17 @@ bool TaskManager::LoadTasks(int single_task)
} }
} }
// store initial active element ids for select window
if (ad->req_activity_id < 0 && ad->step <= task_data->selector_step)
{
if (ad->step < task_data->selector_step)
{
task_data->selector_step = ad->step;
task_data->selector_ids.clear();
}
task_data->selector_ids.push_back(activity_id);
}
LogTasksDetail( LogTasksDetail(
"(Activity) task_id [{}] activity_id [{}] slot [{}] activity_type [{}] goal_method [{}] goal_count [{}] zones [{}]" "(Activity) task_id [{}] activity_id [{}] slot [{}] activity_type [{}] goal_method [{}] goal_count [{}] zones [{}]"
" target_name [{}] item_list [{}] skill_list [{}] spell_list [{}] description_override [{}]", " target_name [{}] item_list [{}] skill_list [{}] spell_list [{}] description_override [{}]",