pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Tasks] Add Task Reward Points Field (#2317)

Browse Source 
* Add task reward points field

This replaces the separate DoN crystal reward fields with points and
point_type fields. This will make it easier to import data from
packet/client captures and possibly better support any future clients
or tasks that don't reward through the newer reward window.

* Fix manifest column check
This commit is contained in:
hg
2022-07-30 14:31:34 -04:00
committed by GitHub
parent c68ff9bc5a
commit eaeb583048
7 changed files with 149 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/task_manager.cpp
+5 -8
View File
@@ -105,8 +105,8 @@ bool TaskManager::LoadTasks(int single_task)
m_task_data[task_id]->cash_reward = task.cashreward;
m_task_data[task_id]->experience_reward = task.xpreward;
m_task_data[task_id]->reward_method = (TaskMethodType) task.rewardmethod;
m_task_data[task_id]->reward_radiant_crystals = task.reward_radiant_crystals;
m_task_data[task_id]->reward_ebon_crystals = task.reward_ebon_crystals;
m_task_data[task_id]->reward_points = task.reward_points;
m_task_data[task_id]->reward_point_type = static_cast<AltCurrencyType>(task.reward_point_type);
m_task_data[task_id]->faction_reward = task.faction_reward;
m_task_data[task_id]->min_level = task.minlevel;
m_task_data[task_id]->max_level = task.maxlevel;
@@ -1213,8 +1213,7 @@ void TaskManager::SendActiveTaskDescription(
task_description_header->open_window = bring_up_task_journal;
task_description_header->task_type = static_cast<uint32>(m_task_data[task_id]->type);
constexpr uint32_t reward_radiant_type = 4; // Radiant Crystals, anything else is Ebon for shared tasks
task_description_header->reward_type = m_task_data[task_id]->reward_radiant_crystals > 0 ? reward_radiant_type : 0;
task_description_header->reward_type = static_cast<int>(m_task_data[task_id]->reward_point_type);
Ptr = (char *) task_description_header + sizeof(TaskDescriptionHeader_Struct);
@@ -1257,10 +1256,8 @@ void TaskManager::SendActiveTaskDescription(
tdt = (TaskDescriptionTrailer_Struct *) Ptr;
// shared tasks show radiant/ebon crystal reward, non-shared tasks show generic points
tdt->Points = m_task_data[task_id]->reward_ebon_crystals;
if (m_task_data[task_id]->reward_radiant_crystals > 0) {
tdt->Points = m_task_data[task_id]->reward_radiant_crystals;
}
tdt->Points = m_task_data[task_id]->reward_points;
tdt->has_reward_selection = 0; // TODO: new rewards window
client->QueuePacket(outapp);