pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-17 03:08:26 +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
common/repositories/base/base_tasks_repository.h
+104 -104
View File
@@ -30,8 +30,8 @@ public:
int cashreward;
int xpreward;
int rewardmethod;
int reward_radiant_crystals;
int reward_ebon_crystals;
int reward_points;
int reward_point_type;
int minlevel;
int maxlevel;
int level_spread;
@@ -63,8 +63,8 @@ public:
"cashreward",
"xpreward",
"rewardmethod",
"reward_radiant_crystals",
"reward_ebon_crystals",
"reward_points",
"reward_point_type",
"minlevel",
"maxlevel",
"level_spread",
@@ -92,8 +92,8 @@ public:
"cashreward",
"xpreward",
"rewardmethod",
"reward_radiant_crystals",
"reward_ebon_crystals",
"reward_points",
"reward_point_type",
"minlevel",
"maxlevel",
"level_spread",
@@ -144,29 +144,29 @@ public:
{
Tasks entry{};
entry.id = 0;
entry.type = 0;
entry.duration = 0;
entry.duration_code = 0;
entry.title = "";
entry.description = "";
entry.reward = "";
entry.rewardid = 0;
entry.cashreward = 0;
entry.xpreward = 0;
entry.rewardmethod = 2;
entry.reward_radiant_crystals = 0;
entry.reward_ebon_crystals = 0;
entry.minlevel = 0;
entry.maxlevel = 0;
entry.level_spread = 0;
entry.min_players = 0;
entry.max_players = 0;
entry.repeatable = 1;
entry.faction_reward = 0;
entry.completion_emote = "";
entry.replay_timer_seconds = 0;
entry.request_timer_seconds = 0;
entry.id = 0;
entry.type = 0;
entry.duration = 0;
entry.duration_code = 0;
entry.title = "";
entry.description = "";
entry.reward = "";
entry.rewardid = 0;
entry.cashreward = 0;
entry.xpreward = 0;
entry.rewardmethod = 2;
entry.reward_points = 0;
entry.reward_point_type = 0;
entry.minlevel = 0;
entry.maxlevel = 0;
entry.level_spread = 0;
entry.min_players = 0;
entry.max_players = 0;
entry.repeatable = 1;
entry.faction_reward = 0;
entry.completion_emote = "";
entry.replay_timer_seconds = 0;
entry.request_timer_seconds = 0;
return entry;
}
@@ -202,29 +202,29 @@ public:
if (results.RowCount() == 1) {
Tasks entry{};
entry.id = atoi(row[0]);
entry.type = atoi(row[1]);
entry.duration = atoi(row[2]);
entry.duration_code = atoi(row[3]);
entry.title = row[4] ? row[4] : "";
entry.description = row[5] ? row[5] : "";
entry.reward = row[6] ? row[6] : "";
entry.rewardid = atoi(row[7]);
entry.cashreward = atoi(row[8]);
entry.xpreward = atoi(row[9]);
entry.rewardmethod = atoi(row[10]);
entry.reward_radiant_crystals = atoi(row[11]);
entry.reward_ebon_crystals = atoi(row[12]);
entry.minlevel = atoi(row[13]);
entry.maxlevel = atoi(row[14]);
entry.level_spread = atoi(row[15]);
entry.min_players = atoi(row[16]);
entry.max_players = atoi(row[17]);
entry.repeatable = atoi(row[18]);
entry.faction_reward = atoi(row[19]);
entry.completion_emote = row[20] ? row[20] : "";
entry.replay_timer_seconds = atoi(row[21]);
entry.request_timer_seconds = atoi(row[22]);
entry.id = atoi(row[0]);
entry.type = atoi(row[1]);
entry.duration = atoi(row[2]);
entry.duration_code = atoi(row[3]);
entry.title = row[4] ? row[4] : "";
entry.description = row[5] ? row[5] : "";
entry.reward = row[6] ? row[6] : "";
entry.rewardid = atoi(row[7]);
entry.cashreward = atoi(row[8]);
entry.xpreward = atoi(row[9]);
entry.rewardmethod = atoi(row[10]);
entry.reward_points = atoi(row[11]);
entry.reward_point_type = atoi(row[12]);
entry.minlevel = atoi(row[13]);
entry.maxlevel = atoi(row[14]);
entry.level_spread = atoi(row[15]);
entry.min_players = atoi(row[16]);
entry.max_players = atoi(row[17]);
entry.repeatable = atoi(row[18]);
entry.faction_reward = atoi(row[19]);
entry.completion_emote = row[20] ? row[20] : "";
entry.replay_timer_seconds = atoi(row[21]);
entry.request_timer_seconds = atoi(row[22]);
return entry;
}
@@ -269,8 +269,8 @@ public:
update_values.push_back(columns[8] + " = " + std::to_string(tasks_entry.cashreward));
update_values.push_back(columns[9] + " = " + std::to_string(tasks_entry.xpreward));
update_values.push_back(columns[10] + " = " + std::to_string(tasks_entry.rewardmethod));
update_values.push_back(columns[11] + " = " + std::to_string(tasks_entry.reward_radiant_crystals));
update_values.push_back(columns[12] + " = " + std::to_string(tasks_entry.reward_ebon_crystals));
update_values.push_back(columns[11] + " = " + std::to_string(tasks_entry.reward_points));
update_values.push_back(columns[12] + " = " + std::to_string(tasks_entry.reward_point_type));
update_values.push_back(columns[13] + " = " + std::to_string(tasks_entry.minlevel));
update_values.push_back(columns[14] + " = " + std::to_string(tasks_entry.maxlevel));
update_values.push_back(columns[15] + " = " + std::to_string(tasks_entry.level_spread));
@@ -313,8 +313,8 @@ public:
insert_values.push_back(std::to_string(tasks_entry.cashreward));
insert_values.push_back(std::to_string(tasks_entry.xpreward));
insert_values.push_back(std::to_string(tasks_entry.rewardmethod));
insert_values.push_back(std::to_string(tasks_entry.reward_radiant_crystals));
insert_values.push_back(std::to_string(tasks_entry.reward_ebon_crystals));
insert_values.push_back(std::to_string(tasks_entry.reward_points));
insert_values.push_back(std::to_string(tasks_entry.reward_point_type));
insert_values.push_back(std::to_string(tasks_entry.minlevel));
insert_values.push_back(std::to_string(tasks_entry.maxlevel));
insert_values.push_back(std::to_string(tasks_entry.level_spread));
@@ -365,8 +365,8 @@ public:
insert_values.push_back(std::to_string(tasks_entry.cashreward));
insert_values.push_back(std::to_string(tasks_entry.xpreward));
insert_values.push_back(std::to_string(tasks_entry.rewardmethod));
insert_values.push_back(std::to_string(tasks_entry.reward_radiant_crystals));
insert_values.push_back(std::to_string(tasks_entry.reward_ebon_crystals));
insert_values.push_back(std::to_string(tasks_entry.reward_points));
insert_values.push_back(std::to_string(tasks_entry.reward_point_type));
insert_values.push_back(std::to_string(tasks_entry.minlevel));
insert_values.push_back(std::to_string(tasks_entry.maxlevel));
insert_values.push_back(std::to_string(tasks_entry.level_spread));
@@ -410,29 +410,29 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Tasks entry{};
entry.id = atoi(row[0]);
entry.type = atoi(row[1]);
entry.duration = atoi(row[2]);
entry.duration_code = atoi(row[3]);
entry.title = row[4] ? row[4] : "";
entry.description = row[5] ? row[5] : "";
entry.reward = row[6] ? row[6] : "";
entry.rewardid = atoi(row[7]);
entry.cashreward = atoi(row[8]);
entry.xpreward = atoi(row[9]);
entry.rewardmethod = atoi(row[10]);
entry.reward_radiant_crystals = atoi(row[11]);
entry.reward_ebon_crystals = atoi(row[12]);
entry.minlevel = atoi(row[13]);
entry.maxlevel = atoi(row[14]);
entry.level_spread = atoi(row[15]);
entry.min_players = atoi(row[16]);
entry.max_players = atoi(row[17]);
entry.repeatable = atoi(row[18]);
entry.faction_reward = atoi(row[19]);
entry.completion_emote = row[20] ? row[20] : "";
entry.replay_timer_seconds = atoi(row[21]);
entry.request_timer_seconds = atoi(row[22]);
entry.id = atoi(row[0]);
entry.type = atoi(row[1]);
entry.duration = atoi(row[2]);
entry.duration_code = atoi(row[3]);
entry.title = row[4] ? row[4] : "";
entry.description = row[5] ? row[5] : "";
entry.reward = row[6] ? row[6] : "";
entry.rewardid = atoi(row[7]);
entry.cashreward = atoi(row[8]);
entry.xpreward = atoi(row[9]);
entry.rewardmethod = atoi(row[10]);
entry.reward_points = atoi(row[11]);
entry.reward_point_type = atoi(row[12]);
entry.minlevel = atoi(row[13]);
entry.maxlevel = atoi(row[14]);
entry.level_spread = atoi(row[15]);
entry.min_players = atoi(row[16]);
entry.max_players = atoi(row[17]);
entry.repeatable = atoi(row[18]);
entry.faction_reward = atoi(row[19]);
entry.completion_emote = row[20] ? row[20] : "";
entry.replay_timer_seconds = atoi(row[21]);
entry.request_timer_seconds = atoi(row[22]);
all_entries.push_back(entry);
}
@@ -457,29 +457,29 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) {
Tasks entry{};
entry.id = atoi(row[0]);
entry.type = atoi(row[1]);
entry.duration = atoi(row[2]);
entry.duration_code = atoi(row[3]);
entry.title = row[4] ? row[4] : "";
entry.description = row[5] ? row[5] : "";
entry.reward = row[6] ? row[6] : "";
entry.rewardid = atoi(row[7]);
entry.cashreward = atoi(row[8]);
entry.xpreward = atoi(row[9]);
entry.rewardmethod = atoi(row[10]);
entry.reward_radiant_crystals = atoi(row[11]);
entry.reward_ebon_crystals = atoi(row[12]);
entry.minlevel = atoi(row[13]);
entry.maxlevel = atoi(row[14]);
entry.level_spread = atoi(row[15]);
entry.min_players = atoi(row[16]);
entry.max_players = atoi(row[17]);
entry.repeatable = atoi(row[18]);
entry.faction_reward = atoi(row[19]);
entry.completion_emote = row[20] ? row[20] : "";
entry.replay_timer_seconds = atoi(row[21]);
entry.request_timer_seconds = atoi(row[22]);
entry.id = atoi(row[0]);
entry.type = atoi(row[1]);
entry.duration = atoi(row[2]);
entry.duration_code = atoi(row[3]);
entry.title = row[4] ? row[4] : "";
entry.description = row[5] ? row[5] : "";
entry.reward = row[6] ? row[6] : "";
entry.rewardid = atoi(row[7]);
entry.cashreward = atoi(row[8]);
entry.xpreward = atoi(row[9]);
entry.rewardmethod = atoi(row[10]);
entry.reward_points = atoi(row[11]);
entry.reward_point_type = atoi(row[12]);
entry.minlevel = atoi(row[13]);
entry.maxlevel = atoi(row[14]);
entry.level_spread = atoi(row[15]);
entry.min_players = atoi(row[16]);
entry.max_players = atoi(row[17]);
entry.repeatable = atoi(row[18]);
entry.faction_reward = atoi(row[19]);
entry.completion_emote = row[20] ? row[20] : "";
entry.replay_timer_seconds = atoi(row[21]);
entry.request_timer_seconds = atoi(row[22]);
all_entries.push_back(entry);
}
common/tasks.h
+16 -2
View File
@@ -50,6 +50,20 @@ enum class TaskTimerType
Request
};
// live alt currency types, may not match current server alternate currency ids
enum class AltCurrencyType
{
RadiantCrystal = 4,
EbonCrystal = 5,
MarkOfValor = 31,
CommemorativeCoin = 33,
PieceOfEight = 37,
RemnantOfTranquility = 38,
SathirTradeGem = 41,
BathezidTradeGem = 43,
FroststoneDucat = 48,
};
struct ActivityInformation {
int step_number;
TaskActivityType activity_type;
@@ -198,8 +212,8 @@ struct TaskInformation {
int experience_reward{};
int faction_reward{}; // just a npc_faction_id
TaskMethodType reward_method;
int reward_radiant_crystals;
int reward_ebon_crystals;
int reward_points;
AltCurrencyType reward_point_type;
int activity_count{};
SequenceType sequence_mode;
int last_step{};
common/version.h
+1 -1
View File
@@ -34,7 +34,7 @@
* Manifest: https://github.com/EQEmu/Server/blob/master/utils/sql/db_update_manifest.txt
*/
#define CURRENT_BINARY_DATABASE_VERSION 9189
#define CURRENT_BINARY_DATABASE_VERSION 9190
#ifdef BOTS
#define CURRENT_BINARY_BOTS_DATABASE_VERSION 9029