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

[Repositories] Regenerate repositories with int64 support, reserved word support (#1440)

Browse Source
This commit is contained in:
Chris Miles 2021-06-25 15:05:47 -05:00 committed by GitHub
parent 1c75236508
commit 82d6e0138d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
157 changed files with 1003 additions and 647 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/repositories/base/base_account_ip_repository.h
View File

@ -74,7 +74,7 @@ public:
entry.accid = 0; entry.accid = 0;
entry.ip = ""; entry.ip = "";
entry.count = 1; entry.count = 1;
entry.lastused = current_timestamp(); entry.lastused = "";
return entry; return entry;
} }

18
common/repositories/base/base_base_data_repository.h
View File

@ -19,7 +19,7 @@ class BaseBaseDataRepository {
public: public:
struct BaseData { struct BaseData {
int level; int level;
int class; int class_;
float hp; float hp;
float mana; float mana;
float end; float end;
@ -39,7 +39,7 @@ public:
{ {
return { return {
"level", "level",
"class", "`class`",
"hp", "hp",
"mana", "mana",
"end", "end",
@ -84,7 +84,7 @@ public:
BaseData entry{}; BaseData entry{};
entry.level = 0; entry.level = 0;
entry.class = 0; entry.class_ = 0;
entry.hp = 0; entry.hp = 0;
entry.mana = 0; entry.mana = 0;
entry.end = 0; entry.end = 0;
@ -129,7 +129,7 @@ public:
BaseData entry{}; BaseData entry{};
entry.level = atoi(row[0]); entry.level = atoi(row[0]);
entry.class = atoi(row[1]); entry.class_ = atoi(row[1]);
entry.hp = static_cast<float>(atof(row[2])); entry.hp = static_cast<float>(atof(row[2]));
entry.mana = static_cast<float>(atof(row[3])); entry.mana = static_cast<float>(atof(row[3]));
entry.end = static_cast<float>(atof(row[4])); entry.end = static_cast<float>(atof(row[4]));
@ -172,7 +172,7 @@ public:
auto columns = Columns(); auto columns = Columns();
update_values.push_back(columns[0] + " = " + std::to_string(base_data_entry.level)); update_values.push_back(columns[0] + " = " + std::to_string(base_data_entry.level));
update_values.push_back(columns[1] + " = " + std::to_string(base_data_entry.class)); update_values.push_back(columns[1] + " = " + std::to_string(base_data_entry.class_));
update_values.push_back(columns[2] + " = " + std::to_string(base_data_entry.hp)); update_values.push_back(columns[2] + " = " + std::to_string(base_data_entry.hp));
update_values.push_back(columns[3] + " = " + std::to_string(base_data_entry.mana)); update_values.push_back(columns[3] + " = " + std::to_string(base_data_entry.mana));
update_values.push_back(columns[4] + " = " + std::to_string(base_data_entry.end)); update_values.push_back(columns[4] + " = " + std::to_string(base_data_entry.end));
@ -203,7 +203,7 @@ public:
std::vector<std::string> insert_values; std::vector<std::string> insert_values;
insert_values.push_back(std::to_string(base_data_entry.level)); insert_values.push_back(std::to_string(base_data_entry.level));
insert_values.push_back(std::to_string(base_data_entry.class)); insert_values.push_back(std::to_string(base_data_entry.class_));
insert_values.push_back(std::to_string(base_data_entry.hp)); insert_values.push_back(std::to_string(base_data_entry.hp));
insert_values.push_back(std::to_string(base_data_entry.mana)); insert_values.push_back(std::to_string(base_data_entry.mana));
insert_values.push_back(std::to_string(base_data_entry.end)); insert_values.push_back(std::to_string(base_data_entry.end));
@ -242,7 +242,7 @@ public:
std::vector<std::string> insert_values; std::vector<std::string> insert_values;
insert_values.push_back(std::to_string(base_data_entry.level)); insert_values.push_back(std::to_string(base_data_entry.level));
insert_values.push_back(std::to_string(base_data_entry.class)); insert_values.push_back(std::to_string(base_data_entry.class_));
insert_values.push_back(std::to_string(base_data_entry.hp)); insert_values.push_back(std::to_string(base_data_entry.hp));
insert_values.push_back(std::to_string(base_data_entry.mana)); insert_values.push_back(std::to_string(base_data_entry.mana));
insert_values.push_back(std::to_string(base_data_entry.end)); insert_values.push_back(std::to_string(base_data_entry.end));
@ -285,7 +285,7 @@ public:
BaseData entry{}; BaseData entry{};
entry.level = atoi(row[0]); entry.level = atoi(row[0]);
entry.class = atoi(row[1]); entry.class_ = atoi(row[1]);
entry.hp = static_cast<float>(atof(row[2])); entry.hp = static_cast<float>(atof(row[2]));
entry.mana = static_cast<float>(atof(row[3])); entry.mana = static_cast<float>(atof(row[3]));
entry.end = static_cast<float>(atof(row[4])); entry.end = static_cast<float>(atof(row[4]));
@ -319,7 +319,7 @@ public:
BaseData entry{}; BaseData entry{};
entry.level = atoi(row[0]); entry.level = atoi(row[0]);
entry.class = atoi(row[1]); entry.class_ = atoi(row[1]);
entry.hp = static_cast<float>(atof(row[2])); entry.hp = static_cast<float>(atof(row[2]));
entry.mana = static_cast<float>(atof(row[3])); entry.mana = static_cast<float>(atof(row[3]));
entry.end = static_cast<float>(atof(row[4])); entry.end = static_cast<float>(atof(row[4]));

4
common/repositories/base/base_bug_reports_repository.h
View File

@ -154,9 +154,9 @@ public:
entry._unknown_value = 0; entry._unknown_value = 0;
entry.bug_report = ""; entry.bug_report = "";
entry.system_info = ""; entry.system_info = "";
entry.report_datetime = current_timestamp(); entry.report_datetime = "";
entry.bug_status = 0; entry.bug_status = 0;
entry.last_review = current_timestamp(); entry.last_review = "";
entry.last_reviewer = "None"; entry.last_reviewer = "None";
entry.reviewer_notes = ""; entry.reviewer_notes = "";

18
common/repositories/base/base_char_create_combinations_repository.h
View File

@ -20,7 +20,7 @@ public:
struct CharCreateCombinations { struct CharCreateCombinations {
int allocation_id; int allocation_id;
int race; int race;
int class; int class_;
int deity; int deity;
int start_zone; int start_zone;
int expansions_req; int expansions_req;
@ -36,7 +36,7 @@ public:
return { return {
"allocation_id", "allocation_id",
"race", "race",
"class", "`class`",
"deity", "deity",
"start_zone", "start_zone",
"expansions_req", "expansions_req",
@ -77,7 +77,7 @@ public:
entry.allocation_id = 0; entry.allocation_id = 0;
entry.race = 0; entry.race = 0;
entry.class = 0; entry.class_ = 0;
entry.deity = 0; entry.deity = 0;
entry.start_zone = 0; entry.start_zone = 0;
entry.expansions_req = 0; entry.expansions_req = 0;
@ -118,7 +118,7 @@ public:
entry.allocation_id = atoi(row[0]); entry.allocation_id = atoi(row[0]);
entry.race = atoi(row[1]); entry.race = atoi(row[1]);
entry.class = atoi(row[2]); entry.class_ = atoi(row[2]);
entry.deity = atoi(row[3]); entry.deity = atoi(row[3]);
entry.start_zone = atoi(row[4]); entry.start_zone = atoi(row[4]);
entry.expansions_req = atoi(row[5]); entry.expansions_req = atoi(row[5]);
@ -157,7 +157,7 @@ public:
update_values.push_back(columns[0] + " = " + std::to_string(char_create_combinations_entry.allocation_id)); update_values.push_back(columns[0] + " = " + std::to_string(char_create_combinations_entry.allocation_id));
update_values.push_back(columns[1] + " = " + std::to_string(char_create_combinations_entry.race)); update_values.push_back(columns[1] + " = " + std::to_string(char_create_combinations_entry.race));
update_values.push_back(columns[2] + " = " + std::to_string(char_create_combinations_entry.class)); update_values.push_back(columns[2] + " = " + std::to_string(char_create_combinations_entry.class_));
update_values.push_back(columns[3] + " = " + std::to_string(char_create_combinations_entry.deity)); update_values.push_back(columns[3] + " = " + std::to_string(char_create_combinations_entry.deity));
update_values.push_back(columns[4] + " = " + std::to_string(char_create_combinations_entry.start_zone)); update_values.push_back(columns[4] + " = " + std::to_string(char_create_combinations_entry.start_zone));
update_values.push_back(columns[5] + " = " + std::to_string(char_create_combinations_entry.expansions_req)); update_values.push_back(columns[5] + " = " + std::to_string(char_create_combinations_entry.expansions_req));
@ -184,7 +184,7 @@ public:
insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id)); insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id));
insert_values.push_back(std::to_string(char_create_combinations_entry.race)); insert_values.push_back(std::to_string(char_create_combinations_entry.race));
insert_values.push_back(std::to_string(char_create_combinations_entry.class)); insert_values.push_back(std::to_string(char_create_combinations_entry.class_));
insert_values.push_back(std::to_string(char_create_combinations_entry.deity)); insert_values.push_back(std::to_string(char_create_combinations_entry.deity));
insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone)); insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone));
insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req)); insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req));
@ -219,7 +219,7 @@ public:
insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id)); insert_values.push_back(std::to_string(char_create_combinations_entry.allocation_id));
insert_values.push_back(std::to_string(char_create_combinations_entry.race)); insert_values.push_back(std::to_string(char_create_combinations_entry.race));
insert_values.push_back(std::to_string(char_create_combinations_entry.class)); insert_values.push_back(std::to_string(char_create_combinations_entry.class_));
insert_values.push_back(std::to_string(char_create_combinations_entry.deity)); insert_values.push_back(std::to_string(char_create_combinations_entry.deity));
insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone)); insert_values.push_back(std::to_string(char_create_combinations_entry.start_zone));
insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req)); insert_values.push_back(std::to_string(char_create_combinations_entry.expansions_req));
@ -258,7 +258,7 @@ public:
entry.allocation_id = atoi(row[0]); entry.allocation_id = atoi(row[0]);
entry.race = atoi(row[1]); entry.race = atoi(row[1]);
entry.class = atoi(row[2]); entry.class_ = atoi(row[2]);
entry.deity = atoi(row[3]); entry.deity = atoi(row[3]);
entry.start_zone = atoi(row[4]); entry.start_zone = atoi(row[4]);
entry.expansions_req = atoi(row[5]); entry.expansions_req = atoi(row[5]);
@ -288,7 +288,7 @@ public:
entry.allocation_id = atoi(row[0]); entry.allocation_id = atoi(row[0]);
entry.race = atoi(row[1]); entry.race = atoi(row[1]);
entry.class = atoi(row[2]); entry.class_ = atoi(row[2]);
entry.deity = atoi(row[3]); entry.deity = atoi(row[3]);
entry.start_zone = atoi(row[4]); entry.start_zone = atoi(row[4]);
entry.expansions_req = atoi(row[5]); entry.expansions_req = atoi(row[5]);

18
common/repositories/base/base_character_corpses_repository.h
View File

@ -38,7 +38,7 @@ public:
int level; int level;
int race; int race;
int gender; int gender;
int class; int class_;
int deity; int deity;
int texture; int texture;
int helm_texture; int helm_texture;
@ -95,7 +95,7 @@ public:
"level", "level",
"race", "race",
"gender", "gender",
"class", "`class`",
"deity", "deity",
"texture", "texture",
"helm_texture", "helm_texture",
@ -177,7 +177,7 @@ public:
entry.level = 0; entry.level = 0;
entry.race = 0; entry.race = 0;
entry.gender = 0; entry.gender = 0;
entry.class = 0; entry.class_ = 0;
entry.deity = 0; entry.deity = 0;
entry.texture = 0; entry.texture = 0;
entry.helm_texture = 0; entry.helm_texture = 0;
@ -259,7 +259,7 @@ public:
entry.level = atoi(row[17]); entry.level = atoi(row[17]);
entry.race = atoi(row[18]); entry.race = atoi(row[18]);
entry.gender = atoi(row[19]); entry.gender = atoi(row[19]);
entry.class = atoi(row[20]); entry.class_ = atoi(row[20]);
entry.deity = atoi(row[21]); entry.deity = atoi(row[21]);
entry.texture = atoi(row[22]); entry.texture = atoi(row[22]);
entry.helm_texture = atoi(row[23]); entry.helm_texture = atoi(row[23]);
@ -338,7 +338,7 @@ public:
update_values.push_back(columns[17] + " = " + std::to_string(character_corpses_entry.level)); update_values.push_back(columns[17] + " = " + std::to_string(character_corpses_entry.level));
update_values.push_back(columns[18] + " = " + std::to_string(character_corpses_entry.race)); update_values.push_back(columns[18] + " = " + std::to_string(character_corpses_entry.race));
update_values.push_back(columns[19] + " = " + std::to_string(character_corpses_entry.gender)); update_values.push_back(columns[19] + " = " + std::to_string(character_corpses_entry.gender));
update_values.push_back(columns[20] + " = " + std::to_string(character_corpses_entry.class)); update_values.push_back(columns[20] + " = " + std::to_string(character_corpses_entry.class_));
update_values.push_back(columns[21] + " = " + std::to_string(character_corpses_entry.deity)); update_values.push_back(columns[21] + " = " + std::to_string(character_corpses_entry.deity));
update_values.push_back(columns[22] + " = " + std::to_string(character_corpses_entry.texture)); update_values.push_back(columns[22] + " = " + std::to_string(character_corpses_entry.texture));
update_values.push_back(columns[23] + " = " + std::to_string(character_corpses_entry.helm_texture)); update_values.push_back(columns[23] + " = " + std::to_string(character_corpses_entry.helm_texture));
@ -406,7 +406,7 @@ public:
insert_values.push_back(std::to_string(character_corpses_entry.level)); insert_values.push_back(std::to_string(character_corpses_entry.level));
insert_values.push_back(std::to_string(character_corpses_entry.race)); insert_values.push_back(std::to_string(character_corpses_entry.race));
insert_values.push_back(std::to_string(character_corpses_entry.gender)); insert_values.push_back(std::to_string(character_corpses_entry.gender));
insert_values.push_back(std::to_string(character_corpses_entry.class)); insert_values.push_back(std::to_string(character_corpses_entry.class_));
insert_values.push_back(std::to_string(character_corpses_entry.deity)); insert_values.push_back(std::to_string(character_corpses_entry.deity));
insert_values.push_back(std::to_string(character_corpses_entry.texture)); insert_values.push_back(std::to_string(character_corpses_entry.texture));
insert_values.push_back(std::to_string(character_corpses_entry.helm_texture)); insert_values.push_back(std::to_string(character_corpses_entry.helm_texture));
@ -482,7 +482,7 @@ public:
insert_values.push_back(std::to_string(character_corpses_entry.level)); insert_values.push_back(std::to_string(character_corpses_entry.level));
insert_values.push_back(std::to_string(character_corpses_entry.race)); insert_values.push_back(std::to_string(character_corpses_entry.race));
insert_values.push_back(std::to_string(character_corpses_entry.gender)); insert_values.push_back(std::to_string(character_corpses_entry.gender));
insert_values.push_back(std::to_string(character_corpses_entry.class)); insert_values.push_back(std::to_string(character_corpses_entry.class_));
insert_values.push_back(std::to_string(character_corpses_entry.deity)); insert_values.push_back(std::to_string(character_corpses_entry.deity));
insert_values.push_back(std::to_string(character_corpses_entry.texture)); insert_values.push_back(std::to_string(character_corpses_entry.texture));
insert_values.push_back(std::to_string(character_corpses_entry.helm_texture)); insert_values.push_back(std::to_string(character_corpses_entry.helm_texture));
@ -562,7 +562,7 @@ public:
entry.level = atoi(row[17]); entry.level = atoi(row[17]);
entry.race = atoi(row[18]); entry.race = atoi(row[18]);
entry.gender = atoi(row[19]); entry.gender = atoi(row[19]);
entry.class = atoi(row[20]); entry.class_ = atoi(row[20]);
entry.deity = atoi(row[21]); entry.deity = atoi(row[21]);
entry.texture = atoi(row[22]); entry.texture = atoi(row[22]);
entry.helm_texture = atoi(row[23]); entry.helm_texture = atoi(row[23]);
@ -633,7 +633,7 @@ public:
entry.level = atoi(row[17]); entry.level = atoi(row[17]);
entry.race = atoi(row[18]); entry.race = atoi(row[18]);
entry.gender = atoi(row[19]); entry.gender = atoi(row[19]);
entry.class = atoi(row[20]); entry.class_ = atoi(row[20]);
entry.deity = atoi(row[21]); entry.deity = atoi(row[21]);
entry.texture = atoi(row[22]); entry.texture = atoi(row[22]);
entry.helm_texture = atoi(row[23]); entry.helm_texture = atoi(row[23]);

38
common/repositories/base/base_character_data_repository.h
View File

@ -32,7 +32,7 @@ public:
float heading; float heading;
int gender; int gender;
int race; int race;
int class; int class_;
int level; int level;
int deity; int deity;
int birthday; int birthday;
@ -72,7 +72,7 @@ public:
int sta; int sta;
int cha; int cha;
int dex; int dex;
int int; int int_;
int agi; int agi;
int wis; int wis;
int zone_change_count; int zone_change_count;
@ -144,7 +144,7 @@ public:
"heading", "heading",
"gender", "gender",
"race", "race",
"class", "`class`",
"level", "level",
"deity", "deity",
"birthday", "birthday",
@ -184,7 +184,7 @@ public:
"sta", "sta",
"cha", "cha",
"dex", "dex",
"int", "`int`",
"agi", "agi",
"wis", "wis",
"zone_change_count", "zone_change_count",
@ -281,7 +281,7 @@ public:
entry.heading = 0; entry.heading = 0;
entry.gender = 0; entry.gender = 0;
entry.race = 0; entry.race = 0;
entry.class = 0; entry.class_ = 0;
entry.level = 0; entry.level = 0;
entry.deity = 0; entry.deity = 0;
entry.birthday = 0; entry.birthday = 0;
@ -321,7 +321,7 @@ public:
entry.sta = 0; entry.sta = 0;
entry.cha = 0; entry.cha = 0;
entry.dex = 0; entry.dex = 0;
entry.int = 0; entry.int_ = 0;
entry.agi = 0; entry.agi = 0;
entry.wis = 0; entry.wis = 0;
entry.zone_change_count = 0; entry.zone_change_count = 0;
@ -368,7 +368,7 @@ public:
entry.aa_points_spent_old = 0; entry.aa_points_spent_old = 0;
entry.aa_points_old = 0; entry.aa_points_old = 0;
entry.e_last_invsnapshot = 0; entry.e_last_invsnapshot = 0;
entry.deleted_at = 0; entry.deleted_at = "";
return entry; return entry;
} }
@ -418,7 +418,7 @@ public:
entry.heading = static_cast<float>(atof(row[11])); entry.heading = static_cast<float>(atof(row[11]));
entry.gender = atoi(row[12]); entry.gender = atoi(row[12]);
entry.race = atoi(row[13]); entry.race = atoi(row[13]);
entry.class = atoi(row[14]); entry.class_ = atoi(row[14]);
entry.level = atoi(row[15]); entry.level = atoi(row[15]);
entry.deity = atoi(row[16]); entry.deity = atoi(row[16]);
entry.birthday = atoi(row[17]); entry.birthday = atoi(row[17]);
@ -458,7 +458,7 @@ public:
entry.sta = atoi(row[51]); entry.sta = atoi(row[51]);
entry.cha = atoi(row[52]); entry.cha = atoi(row[52]);
entry.dex = atoi(row[53]); entry.dex = atoi(row[53]);
entry.int = atoi(row[54]); entry.int_ = atoi(row[54]);
entry.agi = atoi(row[55]); entry.agi = atoi(row[55]);
entry.wis = atoi(row[56]); entry.wis = atoi(row[56]);
entry.zone_change_count = atoi(row[57]); entry.zone_change_count = atoi(row[57]);
@ -552,7 +552,7 @@ public:
update_values.push_back(columns[11] + " = " + std::to_string(character_data_entry.heading)); update_values.push_back(columns[11] + " = " + std::to_string(character_data_entry.heading));
update_values.push_back(columns[12] + " = " + std::to_string(character_data_entry.gender)); update_values.push_back(columns[12] + " = " + std::to_string(character_data_entry.gender));
update_values.push_back(columns[13] + " = " + std::to_string(character_data_entry.race)); update_values.push_back(columns[13] + " = " + std::to_string(character_data_entry.race));
update_values.push_back(columns[14] + " = " + std::to_string(character_data_entry.class)); update_values.push_back(columns[14] + " = " + std::to_string(character_data_entry.class_));
update_values.push_back(columns[15] + " = " + std::to_string(character_data_entry.level)); update_values.push_back(columns[15] + " = " + std::to_string(character_data_entry.level));
update_values.push_back(columns[16] + " = " + std::to_string(character_data_entry.deity)); update_values.push_back(columns[16] + " = " + std::to_string(character_data_entry.deity));
update_values.push_back(columns[17] + " = " + std::to_string(character_data_entry.birthday)); update_values.push_back(columns[17] + " = " + std::to_string(character_data_entry.birthday));
@ -592,7 +592,7 @@ public:
update_values.push_back(columns[51] + " = " + std::to_string(character_data_entry.sta)); update_values.push_back(columns[51] + " = " + std::to_string(character_data_entry.sta));
update_values.push_back(columns[52] + " = " + std::to_string(character_data_entry.cha)); update_values.push_back(columns[52] + " = " + std::to_string(character_data_entry.cha));
update_values.push_back(columns[53] + " = " + std::to_string(character_data_entry.dex)); update_values.push_back(columns[53] + " = " + std::to_string(character_data_entry.dex));
update_values.push_back(columns[54] + " = " + std::to_string(character_data_entry.int)); update_values.push_back(columns[54] + " = " + std::to_string(character_data_entry.int_));
update_values.push_back(columns[55] + " = " + std::to_string(character_data_entry.agi)); update_values.push_back(columns[55] + " = " + std::to_string(character_data_entry.agi));
update_values.push_back(columns[56] + " = " + std::to_string(character_data_entry.wis)); update_values.push_back(columns[56] + " = " + std::to_string(character_data_entry.wis));
update_values.push_back(columns[57] + " = " + std::to_string(character_data_entry.zone_change_count)); update_values.push_back(columns[57] + " = " + std::to_string(character_data_entry.zone_change_count));
@ -675,7 +675,7 @@ public:
insert_values.push_back(std::to_string(character_data_entry.heading)); insert_values.push_back(std::to_string(character_data_entry.heading));
insert_values.push_back(std::to_string(character_data_entry.gender)); insert_values.push_back(std::to_string(character_data_entry.gender));
insert_values.push_back(std::to_string(character_data_entry.race)); insert_values.push_back(std::to_string(character_data_entry.race));
insert_values.push_back(std::to_string(character_data_entry.class)); insert_values.push_back(std::to_string(character_data_entry.class_));
insert_values.push_back(std::to_string(character_data_entry.level)); insert_values.push_back(std::to_string(character_data_entry.level));
insert_values.push_back(std::to_string(character_data_entry.deity)); insert_values.push_back(std::to_string(character_data_entry.deity));
insert_values.push_back(std::to_string(character_data_entry.birthday)); insert_values.push_back(std::to_string(character_data_entry.birthday));
@ -715,7 +715,7 @@ public:
insert_values.push_back(std::to_string(character_data_entry.sta)); insert_values.push_back(std::to_string(character_data_entry.sta));
insert_values.push_back(std::to_string(character_data_entry.cha)); insert_values.push_back(std::to_string(character_data_entry.cha));
insert_values.push_back(std::to_string(character_data_entry.dex)); insert_values.push_back(std::to_string(character_data_entry.dex));
insert_values.push_back(std::to_string(character_data_entry.int)); insert_values.push_back(std::to_string(character_data_entry.int_));
insert_values.push_back(std::to_string(character_data_entry.agi)); insert_values.push_back(std::to_string(character_data_entry.agi));
insert_values.push_back(std::to_string(character_data_entry.wis)); insert_values.push_back(std::to_string(character_data_entry.wis));
insert_values.push_back(std::to_string(character_data_entry.zone_change_count)); insert_values.push_back(std::to_string(character_data_entry.zone_change_count));
@ -806,7 +806,7 @@ public:
insert_values.push_back(std::to_string(character_data_entry.heading)); insert_values.push_back(std::to_string(character_data_entry.heading));
insert_values.push_back(std::to_string(character_data_entry.gender)); insert_values.push_back(std::to_string(character_data_entry.gender));
insert_values.push_back(std::to_string(character_data_entry.race)); insert_values.push_back(std::to_string(character_data_entry.race));
insert_values.push_back(std::to_string(character_data_entry.class)); insert_values.push_back(std::to_string(character_data_entry.class_));
insert_values.push_back(std::to_string(character_data_entry.level)); insert_values.push_back(std::to_string(character_data_entry.level));
insert_values.push_back(std::to_string(character_data_entry.deity)); insert_values.push_back(std::to_string(character_data_entry.deity));
insert_values.push_back(std::to_string(character_data_entry.birthday)); insert_values.push_back(std::to_string(character_data_entry.birthday));
@ -846,7 +846,7 @@ public:
insert_values.push_back(std::to_string(character_data_entry.sta)); insert_values.push_back(std::to_string(character_data_entry.sta));
insert_values.push_back(std::to_string(character_data_entry.cha)); insert_values.push_back(std::to_string(character_data_entry.cha));
insert_values.push_back(std::to_string(character_data_entry.dex)); insert_values.push_back(std::to_string(character_data_entry.dex));
insert_values.push_back(std::to_string(character_data_entry.int)); insert_values.push_back(std::to_string(character_data_entry.int_));
insert_values.push_back(std::to_string(character_data_entry.agi)); insert_values.push_back(std::to_string(character_data_entry.agi));
insert_values.push_back(std::to_string(character_data_entry.wis)); insert_values.push_back(std::to_string(character_data_entry.wis));
insert_values.push_back(std::to_string(character_data_entry.zone_change_count)); insert_values.push_back(std::to_string(character_data_entry.zone_change_count));
@ -941,7 +941,7 @@ public:
entry.heading = static_cast<float>(atof(row[11])); entry.heading = static_cast<float>(atof(row[11]));
entry.gender = atoi(row[12]); entry.gender = atoi(row[12]);
entry.race = atoi(row[13]); entry.race = atoi(row[13]);
entry.class = atoi(row[14]); entry.class_ = atoi(row[14]);
entry.level = atoi(row[15]); entry.level = atoi(row[15]);
entry.deity = atoi(row[16]); entry.deity = atoi(row[16]);
entry.birthday = atoi(row[17]); entry.birthday = atoi(row[17]);
@ -981,7 +981,7 @@ public:
entry.sta = atoi(row[51]); entry.sta = atoi(row[51]);
entry.cha = atoi(row[52]); entry.cha = atoi(row[52]);
entry.dex = atoi(row[53]); entry.dex = atoi(row[53]);
entry.int = atoi(row[54]); entry.int_ = atoi(row[54]);
entry.agi = atoi(row[55]); entry.agi = atoi(row[55]);
entry.wis = atoi(row[56]); entry.wis = atoi(row[56]);
entry.zone_change_count = atoi(row[57]); entry.zone_change_count = atoi(row[57]);
@ -1067,7 +1067,7 @@ public:
entry.heading = static_cast<float>(atof(row[11])); entry.heading = static_cast<float>(atof(row[11]));
entry.gender = atoi(row[12]); entry.gender = atoi(row[12]);
entry.race = atoi(row[13]); entry.race = atoi(row[13]);
entry.class = atoi(row[14]); entry.class_ = atoi(row[14]);
entry.level = atoi(row[15]); entry.level = atoi(row[15]);
entry.deity = atoi(row[16]); entry.deity = atoi(row[16]);
entry.birthday = atoi(row[17]); entry.birthday = atoi(row[17]);
@ -1107,7 +1107,7 @@ public:
entry.sta = atoi(row[51]); entry.sta = atoi(row[51]);
entry.cha = atoi(row[52]); entry.cha = atoi(row[52]);
entry.dex = atoi(row[53]); entry.dex = atoi(row[53]);
entry.int = atoi(row[54]); entry.int_ = atoi(row[54]);
entry.agi = atoi(row[55]); entry.agi = atoi(row[55]);
entry.wis = atoi(row[56]); entry.wis = atoi(row[56]);
entry.zone_change_count = atoi(row[57]); entry.zone_change_count = atoi(row[57]);

8
common/repositories/base/base_data_buckets_repository.h
View File

@ -18,7 +18,7 @@
class BaseDataBucketsRepository { class BaseDataBucketsRepository {
public: public:
struct DataBuckets { struct DataBuckets {
int id; int64 id;
std::string key; std::string key;
std::string value; std::string value;
int expires; int expires;
@ -110,7 +110,7 @@ public:
if (results.RowCount() == 1) { if (results.RowCount() == 1) {
DataBuckets entry{}; DataBuckets entry{};
entry.id = atoi(row[0]); entry.id = strtoll(row[0], NULL, 10);
entry.key = row[1] ? row[1] : ""; entry.key = row[1] ? row[1] : "";
entry.value = row[2] ? row[2] : ""; entry.value = row[2] ? row[2] : "";
entry.expires = atoi(row[3]); entry.expires = atoi(row[3]);
@ -241,7 +241,7 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
DataBuckets entry{}; DataBuckets entry{};
entry.id = atoi(row[0]); entry.id = strtoll(row[0], NULL, 10);
entry.key = row[1] ? row[1] : ""; entry.key = row[1] ? row[1] : "";
entry.value = row[2] ? row[2] : ""; entry.value = row[2] ? row[2] : "";
entry.expires = atoi(row[3]); entry.expires = atoi(row[3]);
@ -269,7 +269,7 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
DataBuckets entry{}; DataBuckets entry{};
entry.id = atoi(row[0]); entry.id = strtoll(row[0], NULL, 10);
entry.key = row[1] ? row[1] : ""; entry.key = row[1] ? row[1] : "";
entry.value = row[2] ? row[2] : ""; entry.value = row[2] ? row[2] : "";
entry.expires = atoi(row[3]); entry.expires = atoi(row[3]);

9
common/repositories/base/base_doors_repository.h
View File

@ -53,7 +53,6 @@ public:
int max_expansion; int max_expansion;
std::string content_flags; std::string content_flags;
std::string content_flags_disabled; std::string content_flags_disabled;
int is_instance_door;
}; };
static std::string PrimaryKey() static std::string PrimaryKey()
@ -99,7 +98,6 @@ public:
"max_expansion", "max_expansion",
"content_flags", "content_flags",
"content_flags_disabled", "content_flags_disabled",
"is_instance_door",
}; };
} }
@ -170,7 +168,6 @@ public:
entry.max_expansion = 0; entry.max_expansion = 0;
entry.content_flags = ""; entry.content_flags = "";
entry.content_flags_disabled = ""; entry.content_flags_disabled = "";
entry.is_instance_door = 0;
return entry; return entry;
} }
@ -241,7 +238,6 @@ public:
entry.max_expansion = atoi(row[32]); entry.max_expansion = atoi(row[32]);
entry.content_flags = row[33] ? row[33] : ""; entry.content_flags = row[33] ? row[33] : "";
entry.content_flags_disabled = row[34] ? row[34] : ""; entry.content_flags_disabled = row[34] ? row[34] : "";
entry.is_instance_door = atoi(row[35]);
return entry; return entry;
} }
@ -309,7 +305,6 @@ public:
update_values.push_back(columns[32] + " = " + std::to_string(doors_entry.max_expansion)); update_values.push_back(columns[32] + " = " + std::to_string(doors_entry.max_expansion));
update_values.push_back(columns[33] + " = '" + EscapeString(doors_entry.content_flags) + "'"); update_values.push_back(columns[33] + " = '" + EscapeString(doors_entry.content_flags) + "'");
update_values.push_back(columns[34] + " = '" + EscapeString(doors_entry.content_flags_disabled) + "'"); update_values.push_back(columns[34] + " = '" + EscapeString(doors_entry.content_flags_disabled) + "'");
update_values.push_back(columns[35] + " = " + std::to_string(doors_entry.is_instance_door));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -366,7 +361,6 @@ public:
insert_values.push_back(std::to_string(doors_entry.max_expansion)); insert_values.push_back(std::to_string(doors_entry.max_expansion));
insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'"); insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'");
insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'"); insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'");
insert_values.push_back(std::to_string(doors_entry.is_instance_door));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -431,7 +425,6 @@ public:
insert_values.push_back(std::to_string(doors_entry.max_expansion)); insert_values.push_back(std::to_string(doors_entry.max_expansion));
insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'"); insert_values.push_back("'" + EscapeString(doors_entry.content_flags) + "'");
insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'"); insert_values.push_back("'" + EscapeString(doors_entry.content_flags_disabled) + "'");
insert_values.push_back(std::to_string(doors_entry.is_instance_door));
insert_chunks.push_back("(" + implode(",", insert_values) + ")"); insert_chunks.push_back("(" + implode(",", insert_values) + ")");
} }
@ -500,7 +493,6 @@ public:
entry.max_expansion = atoi(row[32]); entry.max_expansion = atoi(row[32]);
entry.content_flags = row[33] ? row[33] : ""; entry.content_flags = row[33] ? row[33] : "";
entry.content_flags_disabled = row[34] ? row[34] : ""; entry.content_flags_disabled = row[34] ? row[34] : "";
entry.is_instance_door = atoi(row[35]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -560,7 +552,6 @@ public:
entry.max_expansion = atoi(row[32]); entry.max_expansion = atoi(row[32]);
entry.content_flags = row[33] ? row[33] : ""; entry.content_flags = row[33] ? row[33] : "";
entry.content_flags_disabled = row[34] ? row[34] : ""; entry.content_flags_disabled = row[34] ? row[34] : "";
entry.is_instance_door = atoi(row[35]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }

2
common/repositories/base/base_eventlog_repository.h
View File

@ -89,7 +89,7 @@ public:
entry.status = 0; entry.status = 0;
entry.charname = ""; entry.charname = "";
entry.target = "None"; entry.target = "None";
entry.time = current_timestamp(); entry.time = "";
entry.descriptiontype = ""; entry.descriptiontype = "";
entry.description = ""; entry.description = "";
entry.event_nid = 0; entry.event_nid = 0;

18
common/repositories/base/base_global_loot_repository.h
View File

@ -27,7 +27,7 @@ public:
int rare; int rare;
int raid; int raid;
std::string race; std::string race;
std::string class; std::string class_;
std::string bodytype; std::string bodytype;
std::string zone; std::string zone;
int hot_zone; int hot_zone;
@ -54,7 +54,7 @@ public:
"rare", "rare",
"raid", "raid",
"race", "race",
"class", "`class`",
"bodytype", "bodytype",
"zone", "zone",
"hot_zone", "hot_zone",
@ -106,7 +106,7 @@ public:
entry.rare = 0; entry.rare = 0;
entry.raid = 0; entry.raid = 0;
entry.race = ""; entry.race = "";
entry.class = ""; entry.class_ = "";
entry.bodytype = ""; entry.bodytype = "";
entry.zone = ""; entry.zone = "";
entry.hot_zone = 0; entry.hot_zone = 0;
@ -158,7 +158,7 @@ public:
entry.rare = atoi(row[6]); entry.rare = atoi(row[6]);
entry.raid = atoi(row[7]); entry.raid = atoi(row[7]);
entry.race = row[8] ? row[8] : ""; entry.race = row[8] ? row[8] : "";
entry.class = row[9] ? row[9] : ""; entry.class_ = row[9] ? row[9] : "";
entry.bodytype = row[10] ? row[10] : ""; entry.bodytype = row[10] ? row[10] : "";
entry.zone = row[11] ? row[11] : ""; entry.zone = row[11] ? row[11] : "";
entry.hot_zone = atoi(row[12]); entry.hot_zone = atoi(row[12]);
@ -207,7 +207,7 @@ public:
update_values.push_back(columns[6] + " = " + std::to_string(global_loot_entry.rare)); update_values.push_back(columns[6] + " = " + std::to_string(global_loot_entry.rare));
update_values.push_back(columns[7] + " = " + std::to_string(global_loot_entry.raid)); update_values.push_back(columns[7] + " = " + std::to_string(global_loot_entry.raid));
update_values.push_back(columns[8] + " = '" + EscapeString(global_loot_entry.race) + "'"); update_values.push_back(columns[8] + " = '" + EscapeString(global_loot_entry.race) + "'");
update_values.push_back(columns[9] + " = '" + EscapeString(global_loot_entry.class) + "'"); update_values.push_back(columns[9] + " = '" + EscapeString(global_loot_entry.class_) + "'");
update_values.push_back(columns[10] + " = '" + EscapeString(global_loot_entry.bodytype) + "'"); update_values.push_back(columns[10] + " = '" + EscapeString(global_loot_entry.bodytype) + "'");
update_values.push_back(columns[11] + " = '" + EscapeString(global_loot_entry.zone) + "'"); update_values.push_back(columns[11] + " = '" + EscapeString(global_loot_entry.zone) + "'");
update_values.push_back(columns[12] + " = " + std::to_string(global_loot_entry.hot_zone)); update_values.push_back(columns[12] + " = " + std::to_string(global_loot_entry.hot_zone));
@ -245,7 +245,7 @@ public:
insert_values.push_back(std::to_string(global_loot_entry.rare)); insert_values.push_back(std::to_string(global_loot_entry.rare));
insert_values.push_back(std::to_string(global_loot_entry.raid)); insert_values.push_back(std::to_string(global_loot_entry.raid));
insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'");
insert_values.push_back("'" + EscapeString(global_loot_entry.class) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.class_) + "'");
insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'");
insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'");
insert_values.push_back(std::to_string(global_loot_entry.hot_zone)); insert_values.push_back(std::to_string(global_loot_entry.hot_zone));
@ -291,7 +291,7 @@ public:
insert_values.push_back(std::to_string(global_loot_entry.rare)); insert_values.push_back(std::to_string(global_loot_entry.rare));
insert_values.push_back(std::to_string(global_loot_entry.raid)); insert_values.push_back(std::to_string(global_loot_entry.raid));
insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.race) + "'");
insert_values.push_back("'" + EscapeString(global_loot_entry.class) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.class_) + "'");
insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.bodytype) + "'");
insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'"); insert_values.push_back("'" + EscapeString(global_loot_entry.zone) + "'");
insert_values.push_back(std::to_string(global_loot_entry.hot_zone)); insert_values.push_back(std::to_string(global_loot_entry.hot_zone));
@ -341,7 +341,7 @@ public:
entry.rare = atoi(row[6]); entry.rare = atoi(row[6]);
entry.raid = atoi(row[7]); entry.raid = atoi(row[7]);
entry.race = row[8] ? row[8] : ""; entry.race = row[8] ? row[8] : "";
entry.class = row[9] ? row[9] : ""; entry.class_ = row[9] ? row[9] : "";
entry.bodytype = row[10] ? row[10] : ""; entry.bodytype = row[10] ? row[10] : "";
entry.zone = row[11] ? row[11] : ""; entry.zone = row[11] ? row[11] : "";
entry.hot_zone = atoi(row[12]); entry.hot_zone = atoi(row[12]);
@ -382,7 +382,7 @@ public:
entry.rare = atoi(row[6]); entry.rare = atoi(row[6]);
entry.raid = atoi(row[7]); entry.raid = atoi(row[7]);
entry.race = row[8] ? row[8] : ""; entry.race = row[8] ? row[8] : "";
entry.class = row[9] ? row[9] : ""; entry.class_ = row[9] ? row[9] : "";
entry.bodytype = row[10] ? row[10] : ""; entry.bodytype = row[10] ? row[10] : "";
entry.zone = row[11] ? row[11] : ""; entry.zone = row[11] ? row[11] : "";
entry.hot_zone = atoi(row[12]); entry.hot_zone = atoi(row[12]);

2
common/repositories/base/base_hackers_repository.h
View File

@ -80,7 +80,7 @@ public:
entry.name = ""; entry.name = "";
entry.hacked = ""; entry.hacked = "";
entry.zone = ""; entry.zone = "";
entry.date = current_timestamp(); entry.date = "";
return entry; return entry;
} }

4
common/repositories/base/base_items_repository.h
View File

@ -797,8 +797,8 @@ public:
entry.scrolllevel2 = 0; entry.scrolllevel2 = 0;
entry.scrolllevel = 0; entry.scrolllevel = 0;
entry.UNK157 = 0; entry.UNK157 = 0;
entry.serialized = 0; entry.serialized = "";
entry.verified = 0; entry.verified = "";
entry.serialization = ""; entry.serialization = "";
entry.source = ""; entry.source = "";
entry.UNK033 = 0; entry.UNK033 = 0;

6
common/repositories/base/base_login_accounts_repository.h
View File

@ -87,9 +87,9 @@ public:
entry.account_email = ""; entry.account_email = "";
entry.source_loginserver = ""; entry.source_loginserver = "";
entry.last_ip_address = ""; entry.last_ip_address = "";
entry.last_login_date = 0; entry.last_login_date = "";
entry.created_at = 0; entry.created_at = "";
entry.updated_at = current_timestamp(); entry.updated_at = "";
return entry; return entry;
} }

4
common/repositories/base/base_login_api_tokens_repository.h
View File

@ -79,8 +79,8 @@ public:
entry.token = ""; entry.token = "";
entry.can_write = 0; entry.can_write = 0;
entry.can_read = 0; entry.can_read = 0;
entry.created_at = 0; entry.created_at = "";
entry.updated_at = current_timestamp(); entry.updated_at = "";
return entry; return entry;
} }

2
common/repositories/base/base_login_server_admins_repository.h
View File

@ -85,7 +85,7 @@ public:
entry.first_name = ""; entry.first_name = "";
entry.last_name = ""; entry.last_name = "";
entry.email = ""; entry.email = "";
entry.registration_date = 0; entry.registration_date = "";
entry.registration_ip_address = ""; entry.registration_ip_address = "";
return entry; return entry;

2
common/repositories/base/base_login_world_servers_repository.h
View File

@ -88,7 +88,7 @@ public:
entry.short_name = ""; entry.short_name = "";
entry.tag_description = ""; entry.tag_description = "";
entry.login_server_list_type_id = 0; entry.login_server_list_type_id = 0;
entry.last_login_date = 0; entry.last_login_date = "";
entry.last_ip_address = ""; entry.last_ip_address = "";
entry.login_server_admin_id = 0; entry.login_server_admin_id = 0;
entry.is_server_trusted = 0; entry.is_server_trusted = 0;

27
common/repositories/base/base_npc_types_repository.h
View File

@ -23,7 +23,7 @@ public:
std::string lastname; std::string lastname;
int level; int level;
int race; int race;
int class; int class_;
int bodytype; int bodytype;
int hp; int hp;
int mana; int mana;
@ -140,6 +140,7 @@ public:
int model; int model;
int flymode; int flymode;
int always_aggro; int always_aggro;
int exp_mod;
}; };
static std::string PrimaryKey() static std::string PrimaryKey()
@ -155,7 +156,7 @@ public:
"lastname", "lastname",
"level", "level",
"race", "race",
"class", "`class`",
"bodytype", "bodytype",
"hp", "hp",
"mana", "mana",
@ -272,6 +273,7 @@ public:
"model", "model",
"flymode", "flymode",
"always_aggro", "always_aggro",
"exp_mod",
}; };
} }
@ -312,7 +314,7 @@ public:
entry.lastname = ""; entry.lastname = "";
entry.level = 0; entry.level = 0;
entry.race = 0; entry.race = 0;
entry.class = 0; entry.class_ = 0;
entry.bodytype = 1; entry.bodytype = 1;
entry.hp = 0; entry.hp = 0;
entry.mana = 0; entry.mana = 0;
@ -429,6 +431,7 @@ public:
entry.model = 0; entry.model = 0;
entry.flymode = -1; entry.flymode = -1;
entry.always_aggro = 0; entry.always_aggro = 0;
entry.exp_mod = 100;
return entry; return entry;
} }
@ -469,7 +472,7 @@ public:
entry.lastname = row[2] ? row[2] : ""; entry.lastname = row[2] ? row[2] : "";
entry.level = atoi(row[3]); entry.level = atoi(row[3]);
entry.race = atoi(row[4]); entry.race = atoi(row[4]);
entry.class = atoi(row[5]); entry.class_ = atoi(row[5]);
entry.bodytype = atoi(row[6]); entry.bodytype = atoi(row[6]);
entry.hp = atoi(row[7]); entry.hp = atoi(row[7]);
entry.mana = atoi(row[8]); entry.mana = atoi(row[8]);
@ -586,6 +589,7 @@ public:
entry.model = atoi(row[119]); entry.model = atoi(row[119]);
entry.flymode = atoi(row[120]); entry.flymode = atoi(row[120]);
entry.always_aggro = atoi(row[121]); entry.always_aggro = atoi(row[121]);
entry.exp_mod = atoi(row[122]);
return entry; return entry;
} }
@ -623,7 +627,7 @@ public:
update_values.push_back(columns[2] + " = '" + EscapeString(npc_types_entry.lastname) + "'"); update_values.push_back(columns[2] + " = '" + EscapeString(npc_types_entry.lastname) + "'");
update_values.push_back(columns[3] + " = " + std::to_string(npc_types_entry.level)); update_values.push_back(columns[3] + " = " + std::to_string(npc_types_entry.level));
update_values.push_back(columns[4] + " = " + std::to_string(npc_types_entry.race)); update_values.push_back(columns[4] + " = " + std::to_string(npc_types_entry.race));
update_values.push_back(columns[5] + " = " + std::to_string(npc_types_entry.class)); update_values.push_back(columns[5] + " = " + std::to_string(npc_types_entry.class_));
update_values.push_back(columns[6] + " = " + std::to_string(npc_types_entry.bodytype)); update_values.push_back(columns[6] + " = " + std::to_string(npc_types_entry.bodytype));
update_values.push_back(columns[7] + " = " + std::to_string(npc_types_entry.hp)); update_values.push_back(columns[7] + " = " + std::to_string(npc_types_entry.hp));
update_values.push_back(columns[8] + " = " + std::to_string(npc_types_entry.mana)); update_values.push_back(columns[8] + " = " + std::to_string(npc_types_entry.mana));
@ -740,6 +744,7 @@ public:
update_values.push_back(columns[119] + " = " + std::to_string(npc_types_entry.model)); update_values.push_back(columns[119] + " = " + std::to_string(npc_types_entry.model));
update_values.push_back(columns[120] + " = " + std::to_string(npc_types_entry.flymode)); update_values.push_back(columns[120] + " = " + std::to_string(npc_types_entry.flymode));
update_values.push_back(columns[121] + " = " + std::to_string(npc_types_entry.always_aggro)); update_values.push_back(columns[121] + " = " + std::to_string(npc_types_entry.always_aggro));
update_values.push_back(columns[122] + " = " + std::to_string(npc_types_entry.exp_mod));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -766,7 +771,7 @@ public:
insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'"); insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'");
insert_values.push_back(std::to_string(npc_types_entry.level)); insert_values.push_back(std::to_string(npc_types_entry.level));
insert_values.push_back(std::to_string(npc_types_entry.race)); insert_values.push_back(std::to_string(npc_types_entry.race));
insert_values.push_back(std::to_string(npc_types_entry.class)); insert_values.push_back(std::to_string(npc_types_entry.class_));
insert_values.push_back(std::to_string(npc_types_entry.bodytype)); insert_values.push_back(std::to_string(npc_types_entry.bodytype));
insert_values.push_back(std::to_string(npc_types_entry.hp)); insert_values.push_back(std::to_string(npc_types_entry.hp));
insert_values.push_back(std::to_string(npc_types_entry.mana)); insert_values.push_back(std::to_string(npc_types_entry.mana));
@ -883,6 +888,7 @@ public:
insert_values.push_back(std::to_string(npc_types_entry.model)); insert_values.push_back(std::to_string(npc_types_entry.model));
insert_values.push_back(std::to_string(npc_types_entry.flymode)); insert_values.push_back(std::to_string(npc_types_entry.flymode));
insert_values.push_back(std::to_string(npc_types_entry.always_aggro)); insert_values.push_back(std::to_string(npc_types_entry.always_aggro));
insert_values.push_back(std::to_string(npc_types_entry.exp_mod));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -917,7 +923,7 @@ public:
insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'"); insert_values.push_back("'" + EscapeString(npc_types_entry.lastname) + "'");
insert_values.push_back(std::to_string(npc_types_entry.level)); insert_values.push_back(std::to_string(npc_types_entry.level));
insert_values.push_back(std::to_string(npc_types_entry.race)); insert_values.push_back(std::to_string(npc_types_entry.race));
insert_values.push_back(std::to_string(npc_types_entry.class)); insert_values.push_back(std::to_string(npc_types_entry.class_));
insert_values.push_back(std::to_string(npc_types_entry.bodytype)); insert_values.push_back(std::to_string(npc_types_entry.bodytype));
insert_values.push_back(std::to_string(npc_types_entry.hp)); insert_values.push_back(std::to_string(npc_types_entry.hp));
insert_values.push_back(std::to_string(npc_types_entry.mana)); insert_values.push_back(std::to_string(npc_types_entry.mana));
@ -1034,6 +1040,7 @@ public:
insert_values.push_back(std::to_string(npc_types_entry.model)); insert_values.push_back(std::to_string(npc_types_entry.model));
insert_values.push_back(std::to_string(npc_types_entry.flymode)); insert_values.push_back(std::to_string(npc_types_entry.flymode));
insert_values.push_back(std::to_string(npc_types_entry.always_aggro)); insert_values.push_back(std::to_string(npc_types_entry.always_aggro));
insert_values.push_back(std::to_string(npc_types_entry.exp_mod));
insert_chunks.push_back("(" + implode(",", insert_values) + ")"); insert_chunks.push_back("(" + implode(",", insert_values) + ")");
} }
@ -1072,7 +1079,7 @@ public:
entry.lastname = row[2] ? row[2] : ""; entry.lastname = row[2] ? row[2] : "";
entry.level = atoi(row[3]); entry.level = atoi(row[3]);
entry.race = atoi(row[4]); entry.race = atoi(row[4]);
entry.class = atoi(row[5]); entry.class_ = atoi(row[5]);
entry.bodytype = atoi(row[6]); entry.bodytype = atoi(row[6]);
entry.hp = atoi(row[7]); entry.hp = atoi(row[7]);
entry.mana = atoi(row[8]); entry.mana = atoi(row[8]);
@ -1189,6 +1196,7 @@ public:
entry.model = atoi(row[119]); entry.model = atoi(row[119]);
entry.flymode = atoi(row[120]); entry.flymode = atoi(row[120]);
entry.always_aggro = atoi(row[121]); entry.always_aggro = atoi(row[121]);
entry.exp_mod = atoi(row[122]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -1218,7 +1226,7 @@ public:
entry.lastname = row[2] ? row[2] : ""; entry.lastname = row[2] ? row[2] : "";
entry.level = atoi(row[3]); entry.level = atoi(row[3]);
entry.race = atoi(row[4]); entry.race = atoi(row[4]);
entry.class = atoi(row[5]); entry.class_ = atoi(row[5]);
entry.bodytype = atoi(row[6]); entry.bodytype = atoi(row[6]);
entry.hp = atoi(row[7]); entry.hp = atoi(row[7]);
entry.mana = atoi(row[8]); entry.mana = atoi(row[8]);
@ -1335,6 +1343,7 @@ public:
entry.model = atoi(row[119]); entry.model = atoi(row[119]);
entry.flymode = atoi(row[120]); entry.flymode = atoi(row[120]);
entry.always_aggro = atoi(row[121]); entry.always_aggro = atoi(row[121]);
entry.exp_mod = atoi(row[122]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }

8
common/repositories/base/base_petitions_repository.h
View File

@ -33,7 +33,7 @@ public:
int checkouts; int checkouts;
int unavailables; int unavailables;
int ischeckedout; int ischeckedout;
int senttime; int64 senttime;
}; };
static std::string PrimaryKey() static std::string PrimaryKey()
@ -161,7 +161,7 @@ public:
entry.checkouts = atoi(row[12]); entry.checkouts = atoi(row[12]);
entry.unavailables = atoi(row[13]); entry.unavailables = atoi(row[13]);
entry.ischeckedout = atoi(row[14]); entry.ischeckedout = atoi(row[14]);
entry.senttime = atoi(row[15]); entry.senttime = strtoll(row[15], NULL, 10);
return entry; return entry;
} }
@ -340,7 +340,7 @@ public:
entry.checkouts = atoi(row[12]); entry.checkouts = atoi(row[12]);
entry.unavailables = atoi(row[13]); entry.unavailables = atoi(row[13]);
entry.ischeckedout = atoi(row[14]); entry.ischeckedout = atoi(row[14]);
entry.senttime = atoi(row[15]); entry.senttime = strtoll(row[15], NULL, 10);
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -380,7 +380,7 @@ public:
entry.checkouts = atoi(row[12]); entry.checkouts = atoi(row[12]);
entry.unavailables = atoi(row[13]); entry.unavailables = atoi(row[13]);
entry.ischeckedout = atoi(row[14]); entry.ischeckedout = atoi(row[14]);
entry.senttime = atoi(row[15]); entry.senttime = strtoll(row[15], NULL, 10);
all_entries.push_back(entry); all_entries.push_back(entry);
} }

338
common/repositories/base/base_pets_beastlord_data_repository.h Normal file
View File

@ -0,0 +1,338 @@
/**
* DO NOT MODIFY THIS FILE
*
* This repository was automatically generated and is NOT to be modified directly.
* Any repository modifications are meant to be made to the repository extending the base.
* Any modifications to base repositories are to be made by the generator only
*
* @generator ./utils/scripts/generators/repository-generator.pl
* @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
*/
#ifndef EQEMU_BASE_PETS_BEASTLORD_DATA_REPOSITORY_H
#define EQEMU_BASE_PETS_BEASTLORD_DATA_REPOSITORY_H
#include "../../database.h"
#include "../../string_util.h"
class BasePetsBeastlordDataRepository {
public:
struct PetsBeastlordData {
int player_race;
int pet_race;
int texture;
int helm_texture;
int gender;
float size_modifier;
int face;
};
static std::string PrimaryKey()
{
return std::string("player_race");
}
static std::vector<std::string> Columns()
{
return {
"player_race",
"pet_race",
"texture",
"helm_texture",
"gender",
"size_modifier",
"face",
};
}
static std::string ColumnsRaw()
{
return std::string(implode(", ", Columns()));
}
static std::string TableName()
{
return std::string("pets_beastlord_data");
}
static std::string BaseSelect()
{
return fmt::format(
"SELECT {} FROM {}",
ColumnsRaw(),
TableName()
);
}
static std::string BaseInsert()
{
return fmt::format(
"INSERT INTO {} ({}) ",
TableName(),
ColumnsRaw()
);
}
static PetsBeastlordData NewEntity()
{
PetsBeastlordData entry{};
entry.player_race = 1;
entry.pet_race = 42;
entry.texture = 0;
entry.helm_texture = 0;
entry.gender = 2;
entry.size_modifier = 1;
entry.face = 0;
return entry;
}
static PetsBeastlordData GetPetsBeastlordDataEntry(
const std::vector<PetsBeastlordData> &pets_beastlord_datas,
int pets_beastlord_data_id
)
{
for (auto &pets_beastlord_data : pets_beastlord_datas) {
if (pets_beastlord_data.player_race == pets_beastlord_data_id) {
return pets_beastlord_data;
}
}
return NewEntity();
}
static PetsBeastlordData FindOne(
Database& db,
int pets_beastlord_data_id
)
{
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE id = {} LIMIT 1",
BaseSelect(),
pets_beastlord_data_id
)
);
auto row = results.begin();
if (results.RowCount() == 1) {
PetsBeastlordData entry{};
entry.player_race = atoi(row[0]);
entry.pet_race = atoi(row[1]);
entry.texture = atoi(row[2]);
entry.helm_texture = atoi(row[3]);
entry.gender = atoi(row[4]);
entry.size_modifier = static_cast<float>(atof(row[5]));
entry.face = atoi(row[6]);
return entry;
}
return NewEntity();
}
static int DeleteOne(
Database& db,
int pets_beastlord_data_id
)
{
auto results = db.QueryDatabase(
fmt::format(
"DELETE FROM {} WHERE {} = {}",
TableName(),
PrimaryKey(),
pets_beastlord_data_id
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static int UpdateOne(
Database& db,
PetsBeastlordData pets_beastlord_data_entry
)
{
std::vector<std::string> update_values;
auto columns = Columns();
update_values.push_back(columns[0] + " = " + std::to_string(pets_beastlord_data_entry.player_race));
update_values.push_back(columns[1] + " = " + std::to_string(pets_beastlord_data_entry.pet_race));
update_values.push_back(columns[2] + " = " + std::to_string(pets_beastlord_data_entry.texture));
update_values.push_back(columns[3] + " = " + std::to_string(pets_beastlord_data_entry.helm_texture));
update_values.push_back(columns[4] + " = " + std::to_string(pets_beastlord_data_entry.gender));
update_values.push_back(columns[5] + " = " + std::to_string(pets_beastlord_data_entry.size_modifier));
update_values.push_back(columns[6] + " = " + std::to_string(pets_beastlord_data_entry.face));
auto results = db.QueryDatabase(
fmt::format(
"UPDATE {} SET {} WHERE {} = {}",
TableName(),
implode(", ", update_values),
PrimaryKey(),
pets_beastlord_data_entry.player_race
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static PetsBeastlordData InsertOne(
Database& db,
PetsBeastlordData pets_beastlord_data_entry
)
{
std::vector<std::string> insert_values;
insert_values.push_back(std::to_string(pets_beastlord_data_entry.player_race));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.pet_race));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.texture));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.helm_texture));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.gender));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.size_modifier));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.face));
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES ({})",
BaseInsert(),
implode(",", insert_values)
)
);
if (results.Success()) {
pets_beastlord_data_entry.player_race = results.LastInsertedID();
return pets_beastlord_data_entry;
}
pets_beastlord_data_entry = NewEntity();
return pets_beastlord_data_entry;
}
static int InsertMany(
Database& db,
std::vector<PetsBeastlordData> pets_beastlord_data_entries
)
{
std::vector<std::string> insert_chunks;
for (auto &pets_beastlord_data_entry: pets_beastlord_data_entries) {
std::vector<std::string> insert_values;
insert_values.push_back(std::to_string(pets_beastlord_data_entry.player_race));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.pet_race));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.texture));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.helm_texture));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.gender));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.size_modifier));
insert_values.push_back(std::to_string(pets_beastlord_data_entry.face));
insert_chunks.push_back("(" + implode(",", insert_values) + ")");
}
std::vector<std::string> insert_values;
auto results = db.QueryDatabase(
fmt::format(
"{} VALUES {}",
BaseInsert(),
implode(",", insert_chunks)
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static std::vector<PetsBeastlordData> All(Database& db)
{
std::vector<PetsBeastlordData> all_entries;
auto results = db.QueryDatabase(
fmt::format(
"{}",
BaseSelect()
)
);
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
PetsBeastlordData entry{};
entry.player_race = atoi(row[0]);
entry.pet_race = atoi(row[1]);
entry.texture = atoi(row[2]);
entry.helm_texture = atoi(row[3]);
entry.gender = atoi(row[4]);
entry.size_modifier = static_cast<float>(atof(row[5]));
entry.face = atoi(row[6]);
all_entries.push_back(entry);
}
return all_entries;
}
static std::vector<PetsBeastlordData> GetWhere(Database& db, std::string where_filter)
{
std::vector<PetsBeastlordData> all_entries;
auto results = db.QueryDatabase(
fmt::format(
"{} WHERE {}",
BaseSelect(),
where_filter
)
);
all_entries.reserve(results.RowCount());
for (auto row = results.begin(); row != results.end(); ++row) {
PetsBeastlordData entry{};
entry.player_race = atoi(row[0]);
entry.pet_race = atoi(row[1]);
entry.texture = atoi(row[2]);
entry.helm_texture = atoi(row[3]);
entry.gender = atoi(row[4]);
entry.size_modifier = static_cast<float>(atof(row[5]));
entry.face = atoi(row[6]);
all_entries.push_back(entry);
}
return all_entries;
}
static int DeleteWhere(Database& db, std::string where_filter)
{
auto results = db.QueryDatabase(
fmt::format(
"DELETE FROM {} WHERE {}",
TableName(),
where_filter
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
static int Truncate(Database& db)
{
auto results = db.QueryDatabase(
fmt::format(
"TRUNCATE TABLE {}",
TableName()
)
);
return (results.Success() ? results.RowsAffected() : 0);
}
};
#endif //EQEMU_BASE_PETS_BEASTLORD_DATA_REPOSITORY_H

18
common/repositories/base/base_skill_caps_repository.h
View File

@ -19,7 +19,7 @@ class BaseSkillCapsRepository {
public: public:
struct SkillCaps { struct SkillCaps {
int skillID; int skillID;
int class; int class_;
int level; int level;
int cap; int cap;
int class_; int class_;
@ -34,7 +34,7 @@ public:
{ {
return { return {
"skillID", "skillID",
"class", "`class`",
"level", "level",
"cap", "cap",
"class_", "class_",
@ -74,7 +74,7 @@ public:
SkillCaps entry{}; SkillCaps entry{};
entry.skillID = 0; entry.skillID = 0;
entry.class = 0; entry.class_ = 0;
entry.level = 0; entry.level = 0;
entry.cap = 0; entry.cap = 0;
entry.class_ = 0; entry.class_ = 0;
@ -114,7 +114,7 @@ public:
SkillCaps entry{}; SkillCaps entry{};
entry.skillID = atoi(row[0]); entry.skillID = atoi(row[0]);
entry.class = atoi(row[1]); entry.class_ = atoi(row[1]);
entry.level = atoi(row[2]); entry.level = atoi(row[2]);
entry.cap = atoi(row[3]); entry.cap = atoi(row[3]);
entry.class_ = atoi(row[4]); entry.class_ = atoi(row[4]);
@ -152,7 +152,7 @@ public:
auto columns = Columns(); auto columns = Columns();
update_values.push_back(columns[0] + " = " + std::to_string(skill_caps_entry.skillID)); update_values.push_back(columns[0] + " = " + std::to_string(skill_caps_entry.skillID));
update_values.push_back(columns[1] + " = " + std::to_string(skill_caps_entry.class)); update_values.push_back(columns[1] + " = " + std::to_string(skill_caps_entry.class_));
update_values.push_back(columns[2] + " = " + std::to_string(skill_caps_entry.level)); update_values.push_back(columns[2] + " = " + std::to_string(skill_caps_entry.level));
update_values.push_back(columns[3] + " = " + std::to_string(skill_caps_entry.cap)); update_values.push_back(columns[3] + " = " + std::to_string(skill_caps_entry.cap));
update_values.push_back(columns[4] + " = " + std::to_string(skill_caps_entry.class_)); update_values.push_back(columns[4] + " = " + std::to_string(skill_caps_entry.class_));
@ -178,7 +178,7 @@ public:
std::vector<std::string> insert_values; std::vector<std::string> insert_values;
insert_values.push_back(std::to_string(skill_caps_entry.skillID)); insert_values.push_back(std::to_string(skill_caps_entry.skillID));
insert_values.push_back(std::to_string(skill_caps_entry.class)); insert_values.push_back(std::to_string(skill_caps_entry.class_));
insert_values.push_back(std::to_string(skill_caps_entry.level)); insert_values.push_back(std::to_string(skill_caps_entry.level));
insert_values.push_back(std::to_string(skill_caps_entry.cap)); insert_values.push_back(std::to_string(skill_caps_entry.cap));
insert_values.push_back(std::to_string(skill_caps_entry.class_)); insert_values.push_back(std::to_string(skill_caps_entry.class_));
@ -212,7 +212,7 @@ public:
std::vector<std::string> insert_values; std::vector<std::string> insert_values;
insert_values.push_back(std::to_string(skill_caps_entry.skillID)); insert_values.push_back(std::to_string(skill_caps_entry.skillID));
insert_values.push_back(std::to_string(skill_caps_entry.class)); insert_values.push_back(std::to_string(skill_caps_entry.class_));
insert_values.push_back(std::to_string(skill_caps_entry.level)); insert_values.push_back(std::to_string(skill_caps_entry.level));
insert_values.push_back(std::to_string(skill_caps_entry.cap)); insert_values.push_back(std::to_string(skill_caps_entry.cap));
insert_values.push_back(std::to_string(skill_caps_entry.class_)); insert_values.push_back(std::to_string(skill_caps_entry.class_));
@ -250,7 +250,7 @@ public:
SkillCaps entry{}; SkillCaps entry{};
entry.skillID = atoi(row[0]); entry.skillID = atoi(row[0]);
entry.class = atoi(row[1]); entry.class_ = atoi(row[1]);
entry.level = atoi(row[2]); entry.level = atoi(row[2]);
entry.cap = atoi(row[3]); entry.cap = atoi(row[3]);
entry.class_ = atoi(row[4]); entry.class_ = atoi(row[4]);
@ -279,7 +279,7 @@ public:
SkillCaps entry{}; SkillCaps entry{};
entry.skillID = atoi(row[0]); entry.skillID = atoi(row[0]);
entry.class = atoi(row[1]); entry.class_ = atoi(row[1]);
entry.level = atoi(row[2]); entry.level = atoi(row[2]);
entry.cap = atoi(row[3]); entry.cap = atoi(row[3]);
entry.class_ = atoi(row[4]); entry.class_ = atoi(row[4]);

73
common/repositories/base/base_spawn2_repository.h
View File

@ -29,6 +29,7 @@ public:
int respawntime; int respawntime;
int variance; int variance;
int pathgrid; int pathgrid;
int path_when_zone_idle;
int _condition; int _condition;
int cond_value; int cond_value;
int enabled; int enabled;
@ -58,6 +59,7 @@ public:
"respawntime", "respawntime",
"variance", "variance",
"pathgrid", "pathgrid",
"path_when_zone_idle",
"_condition", "_condition",
"cond_value", "cond_value",
"enabled", "enabled",
@ -112,6 +114,7 @@ public:
entry.respawntime = 0; entry.respawntime = 0;
entry.variance = 0; entry.variance = 0;
entry.pathgrid = 0; entry.pathgrid = 0;
entry.path_when_zone_idle = 0;
entry._condition = 0; entry._condition = 0;
entry.cond_value = 1; entry.cond_value = 1;
entry.enabled = 1; entry.enabled = 1;
@ -166,14 +169,15 @@ public:
entry.respawntime = atoi(row[8]); entry.respawntime = atoi(row[8]);
entry.variance = atoi(row[9]); entry.variance = atoi(row[9]);
entry.pathgrid = atoi(row[10]); entry.pathgrid = atoi(row[10]);
entry._condition = atoi(row[11]); entry.path_when_zone_idle = atoi(row[11]);
entry.cond_value = atoi(row[12]); entry._condition = atoi(row[12]);
entry.enabled = atoi(row[13]); entry.cond_value = atoi(row[13]);
entry.animation = atoi(row[14]); entry.enabled = atoi(row[14]);
entry.min_expansion = atoi(row[15]); entry.animation = atoi(row[15]);
entry.max_expansion = atoi(row[16]); entry.min_expansion = atoi(row[16]);
entry.content_flags = row[17] ? row[17] : ""; entry.max_expansion = atoi(row[17]);
entry.content_flags_disabled = row[18] ? row[18] : ""; entry.content_flags = row[18] ? row[18] : "";
entry.content_flags_disabled = row[19] ? row[19] : "";
return entry; return entry;
} }
@ -217,14 +221,15 @@ public:
update_values.push_back(columns[8] + " = " + std::to_string(spawn2_entry.respawntime)); update_values.push_back(columns[8] + " = " + std::to_string(spawn2_entry.respawntime));
update_values.push_back(columns[9] + " = " + std::to_string(spawn2_entry.variance)); update_values.push_back(columns[9] + " = " + std::to_string(spawn2_entry.variance));
update_values.push_back(columns[10] + " = " + std::to_string(spawn2_entry.pathgrid)); update_values.push_back(columns[10] + " = " + std::to_string(spawn2_entry.pathgrid));
update_values.push_back(columns[11] + " = " + std::to_string(spawn2_entry._condition)); update_values.push_back(columns[11] + " = " + std::to_string(spawn2_entry.path_when_zone_idle));
update_values.push_back(columns[12] + " = " + std::to_string(spawn2_entry.cond_value)); update_values.push_back(columns[12] + " = " + std::to_string(spawn2_entry._condition));
update_values.push_back(columns[13] + " = " + std::to_string(spawn2_entry.enabled)); update_values.push_back(columns[13] + " = " + std::to_string(spawn2_entry.cond_value));
update_values.push_back(columns[14] + " = " + std::to_string(spawn2_entry.animation)); update_values.push_back(columns[14] + " = " + std::to_string(spawn2_entry.enabled));
update_values.push_back(columns[15] + " = " + std::to_string(spawn2_entry.min_expansion)); update_values.push_back(columns[15] + " = " + std::to_string(spawn2_entry.animation));
update_values.push_back(columns[16] + " = " + std::to_string(spawn2_entry.max_expansion)); update_values.push_back(columns[16] + " = " + std::to_string(spawn2_entry.min_expansion));
update_values.push_back(columns[17] + " = '" + EscapeString(spawn2_entry.content_flags) + "'"); update_values.push_back(columns[17] + " = " + std::to_string(spawn2_entry.max_expansion));
update_values.push_back(columns[18] + " = '" + EscapeString(spawn2_entry.content_flags_disabled) + "'"); update_values.push_back(columns[18] + " = '" + EscapeString(spawn2_entry.content_flags) + "'");
update_values.push_back(columns[19] + " = '" + EscapeString(spawn2_entry.content_flags_disabled) + "'");
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -257,6 +262,7 @@ public:
insert_values.push_back(std::to_string(spawn2_entry.respawntime)); insert_values.push_back(std::to_string(spawn2_entry.respawntime));
insert_values.push_back(std::to_string(spawn2_entry.variance)); insert_values.push_back(std::to_string(spawn2_entry.variance));
insert_values.push_back(std::to_string(spawn2_entry.pathgrid)); insert_values.push_back(std::to_string(spawn2_entry.pathgrid));
insert_values.push_back(std::to_string(spawn2_entry.path_when_zone_idle));
insert_values.push_back(std::to_string(spawn2_entry._condition)); insert_values.push_back(std::to_string(spawn2_entry._condition));
insert_values.push_back(std::to_string(spawn2_entry.cond_value)); insert_values.push_back(std::to_string(spawn2_entry.cond_value));
insert_values.push_back(std::to_string(spawn2_entry.enabled)); insert_values.push_back(std::to_string(spawn2_entry.enabled));
@ -305,6 +311,7 @@ public:
insert_values.push_back(std::to_string(spawn2_entry.respawntime)); insert_values.push_back(std::to_string(spawn2_entry.respawntime));
insert_values.push_back(std::to_string(spawn2_entry.variance)); insert_values.push_back(std::to_string(spawn2_entry.variance));
insert_values.push_back(std::to_string(spawn2_entry.pathgrid)); insert_values.push_back(std::to_string(spawn2_entry.pathgrid));
insert_values.push_back(std::to_string(spawn2_entry.path_when_zone_idle));
insert_values.push_back(std::to_string(spawn2_entry._condition)); insert_values.push_back(std::to_string(spawn2_entry._condition));
insert_values.push_back(std::to_string(spawn2_entry.cond_value)); insert_values.push_back(std::to_string(spawn2_entry.cond_value));
insert_values.push_back(std::to_string(spawn2_entry.enabled)); insert_values.push_back(std::to_string(spawn2_entry.enabled));
@ -357,14 +364,15 @@ public:
entry.respawntime = atoi(row[8]); entry.respawntime = atoi(row[8]);
entry.variance = atoi(row[9]); entry.variance = atoi(row[9]);
entry.pathgrid = atoi(row[10]); entry.pathgrid = atoi(row[10]);
entry._condition = atoi(row[11]); entry.path_when_zone_idle = atoi(row[11]);
entry.cond_value = atoi(row[12]); entry._condition = atoi(row[12]);
entry.enabled = atoi(row[13]); entry.cond_value = atoi(row[13]);
entry.animation = atoi(row[14]); entry.enabled = atoi(row[14]);
entry.min_expansion = atoi(row[15]); entry.animation = atoi(row[15]);
entry.max_expansion = atoi(row[16]); entry.min_expansion = atoi(row[16]);
entry.content_flags = row[17] ? row[17] : ""; entry.max_expansion = atoi(row[17]);
entry.content_flags_disabled = row[18] ? row[18] : ""; entry.content_flags = row[18] ? row[18] : "";
entry.content_flags_disabled = row[19] ? row[19] : "";
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -400,14 +408,15 @@ public:
entry.respawntime = atoi(row[8]); entry.respawntime = atoi(row[8]);
entry.variance = atoi(row[9]); entry.variance = atoi(row[9]);
entry.pathgrid = atoi(row[10]); entry.pathgrid = atoi(row[10]);
entry._condition = atoi(row[11]); entry.path_when_zone_idle = atoi(row[11]);
entry.cond_value = atoi(row[12]); entry._condition = atoi(row[12]);
entry.enabled = atoi(row[13]); entry.cond_value = atoi(row[13]);
entry.animation = atoi(row[14]); entry.enabled = atoi(row[14]);
entry.min_expansion = atoi(row[15]); entry.animation = atoi(row[15]);
entry.max_expansion = atoi(row[16]); entry.min_expansion = atoi(row[16]);
entry.content_flags = row[17] ? row[17] : ""; entry.max_expansion = atoi(row[17]);
entry.content_flags_disabled = row[18] ? row[18] : ""; entry.content_flags = row[18] ? row[18] : "";
entry.content_flags_disabled = row[19] ? row[19] : "";
all_entries.push_back(entry); all_entries.push_back(entry);
} }

8
common/repositories/base/base_spell_buckets_repository.h
View File

@ -18,7 +18,7 @@
class BaseSpellBucketsRepository { class BaseSpellBucketsRepository {
public: public:
struct SpellBuckets { struct SpellBuckets {
int spellid; int64 spellid;
std::string key; std::string key;
std::string value; std::string value;
}; };
@ -107,7 +107,7 @@ public:
if (results.RowCount() == 1) { if (results.RowCount() == 1) {
SpellBuckets entry{}; SpellBuckets entry{};
entry.spellid = atoi(row[0]); entry.spellid = strtoll(row[0], NULL, 10);
entry.key = row[1] ? row[1] : ""; entry.key = row[1] ? row[1] : "";
entry.value = row[2] ? row[2] : ""; entry.value = row[2] ? row[2] : "";
@ -235,7 +235,7 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
SpellBuckets entry{}; SpellBuckets entry{};
entry.spellid = atoi(row[0]); entry.spellid = strtoll(row[0], NULL, 10);
entry.key = row[1] ? row[1] : ""; entry.key = row[1] ? row[1] : "";
entry.value = row[2] ? row[2] : ""; entry.value = row[2] ? row[2] : "";
@ -262,7 +262,7 @@ public:
for (auto row = results.begin(); row != results.end(); ++row) { for (auto row = results.begin(); row != results.end(); ++row) {
SpellBuckets entry{}; SpellBuckets entry{};
entry.spellid = atoi(row[0]); entry.spellid = strtoll(row[0], NULL, 10);
entry.key = row[1] ? row[1] : ""; entry.key = row[1] ? row[1] : "";
entry.value = row[2] ? row[2] : ""; entry.value = row[2] ? row[2] : "";

18
common/repositories/base/base_starting_items_repository.h
View File

@ -20,7 +20,7 @@ public:
struct StartingItems { struct StartingItems {
int id; int id;
int race; int race;
int class; int class_;
int deityid; int deityid;
int zoneid; int zoneid;
int itemid; int itemid;
@ -43,7 +43,7 @@ public:
return { return {
"id", "id",
"race", "race",
"class", "`class`",
"deityid", "deityid",
"zoneid", "zoneid",
"itemid", "itemid",
@ -91,7 +91,7 @@ public:
entry.id = 0; entry.id = 0;
entry.race = 0; entry.race = 0;
entry.class = 0; entry.class_ = 0;
entry.deityid = 0; entry.deityid = 0;
entry.zoneid = 0; entry.zoneid = 0;
entry.itemid = 0; entry.itemid = 0;
@ -139,7 +139,7 @@ public:
entry.id = atoi(row[0]); entry.id = atoi(row[0]);
entry.race = atoi(row[1]); entry.race = atoi(row[1]);
entry.class = atoi(row[2]); entry.class_ = atoi(row[2]);
entry.deityid = atoi(row[3]); entry.deityid = atoi(row[3]);
entry.zoneid = atoi(row[4]); entry.zoneid = atoi(row[4]);
entry.itemid = atoi(row[5]); entry.itemid = atoi(row[5]);
@ -184,7 +184,7 @@ public:
auto columns = Columns(); auto columns = Columns();
update_values.push_back(columns[1] + " = " + std::to_string(starting_items_entry.race)); update_values.push_back(columns[1] + " = " + std::to_string(starting_items_entry.race));
update_values.push_back(columns[2] + " = " + std::to_string(starting_items_entry.class)); update_values.push_back(columns[2] + " = " + std::to_string(starting_items_entry.class_));
update_values.push_back(columns[3] + " = " + std::to_string(starting_items_entry.deityid)); update_values.push_back(columns[3] + " = " + std::to_string(starting_items_entry.deityid));
update_values.push_back(columns[4] + " = " + std::to_string(starting_items_entry.zoneid)); update_values.push_back(columns[4] + " = " + std::to_string(starting_items_entry.zoneid));
update_values.push_back(columns[5] + " = " + std::to_string(starting_items_entry.itemid)); update_values.push_back(columns[5] + " = " + std::to_string(starting_items_entry.itemid));
@ -218,7 +218,7 @@ public:
insert_values.push_back(std::to_string(starting_items_entry.id)); insert_values.push_back(std::to_string(starting_items_entry.id));
insert_values.push_back(std::to_string(starting_items_entry.race)); insert_values.push_back(std::to_string(starting_items_entry.race));
insert_values.push_back(std::to_string(starting_items_entry.class)); insert_values.push_back(std::to_string(starting_items_entry.class_));
insert_values.push_back(std::to_string(starting_items_entry.deityid)); insert_values.push_back(std::to_string(starting_items_entry.deityid));
insert_values.push_back(std::to_string(starting_items_entry.zoneid)); insert_values.push_back(std::to_string(starting_items_entry.zoneid));
insert_values.push_back(std::to_string(starting_items_entry.itemid)); insert_values.push_back(std::to_string(starting_items_entry.itemid));
@ -260,7 +260,7 @@ public:
insert_values.push_back(std::to_string(starting_items_entry.id)); insert_values.push_back(std::to_string(starting_items_entry.id));
insert_values.push_back(std::to_string(starting_items_entry.race)); insert_values.push_back(std::to_string(starting_items_entry.race));
insert_values.push_back(std::to_string(starting_items_entry.class)); insert_values.push_back(std::to_string(starting_items_entry.class_));
insert_values.push_back(std::to_string(starting_items_entry.deityid)); insert_values.push_back(std::to_string(starting_items_entry.deityid));
insert_values.push_back(std::to_string(starting_items_entry.zoneid)); insert_values.push_back(std::to_string(starting_items_entry.zoneid));
insert_values.push_back(std::to_string(starting_items_entry.itemid)); insert_values.push_back(std::to_string(starting_items_entry.itemid));
@ -306,7 +306,7 @@ public:
entry.id = atoi(row[0]); entry.id = atoi(row[0]);
entry.race = atoi(row[1]); entry.race = atoi(row[1]);
entry.class = atoi(row[2]); entry.class_ = atoi(row[2]);
entry.deityid = atoi(row[3]); entry.deityid = atoi(row[3]);
entry.zoneid = atoi(row[4]); entry.zoneid = atoi(row[4]);
entry.itemid = atoi(row[5]); entry.itemid = atoi(row[5]);
@ -343,7 +343,7 @@ public:
entry.id = atoi(row[0]); entry.id = atoi(row[0]);
entry.race = atoi(row[1]); entry.race = atoi(row[1]);
entry.class = atoi(row[2]); entry.class_ = atoi(row[2]);
entry.deityid = atoi(row[3]); entry.deityid = atoi(row[3]);
entry.zoneid = atoi(row[4]); entry.zoneid = atoi(row[4]);
entry.itemid = atoi(row[5]); entry.itemid = atoi(row[5]);

18
common/repositories/base/base_titles_repository.h
View File

@ -24,7 +24,7 @@ public:
int max_skill_value; int max_skill_value;
int min_aa_points; int min_aa_points;
int max_aa_points; int max_aa_points;
int class; int class_;
int gender; int gender;
int char_id; int char_id;
int status; int status;
@ -48,7 +48,7 @@ public:
"max_skill_value", "max_skill_value",
"min_aa_points", "min_aa_points",
"max_aa_points", "max_aa_points",
"class", "`class`",
"gender", "gender",
"char_id", "char_id",
"status", "status",
@ -97,7 +97,7 @@ public:
entry.max_skill_value = -1; entry.max_skill_value = -1;
entry.min_aa_points = -1; entry.min_aa_points = -1;
entry.max_aa_points = -1; entry.max_aa_points = -1;
entry.class = -1; entry.class_ = -1;
entry.gender = -1; entry.gender = -1;
entry.char_id = -1; entry.char_id = -1;
entry.status = -1; entry.status = -1;
@ -146,7 +146,7 @@ public:
entry.max_skill_value = atoi(row[3]); entry.max_skill_value = atoi(row[3]);
entry.min_aa_points = atoi(row[4]); entry.min_aa_points = atoi(row[4]);
entry.max_aa_points = atoi(row[5]); entry.max_aa_points = atoi(row[5]);
entry.class = atoi(row[6]); entry.class_ = atoi(row[6]);
entry.gender = atoi(row[7]); entry.gender = atoi(row[7]);
entry.char_id = atoi(row[8]); entry.char_id = atoi(row[8]);
entry.status = atoi(row[9]); entry.status = atoi(row[9]);
@ -192,7 +192,7 @@ public:
update_values.push_back(columns[3] + " = " + std::to_string(titles_entry.max_skill_value)); update_values.push_back(columns[3] + " = " + std::to_string(titles_entry.max_skill_value));
update_values.push_back(columns[4] + " = " + std::to_string(titles_entry.min_aa_points)); update_values.push_back(columns[4] + " = " + std::to_string(titles_entry.min_aa_points));
update_values.push_back(columns[5] + " = " + std::to_string(titles_entry.max_aa_points)); update_values.push_back(columns[5] + " = " + std::to_string(titles_entry.max_aa_points));
update_values.push_back(columns[6] + " = " + std::to_string(titles_entry.class)); update_values.push_back(columns[6] + " = " + std::to_string(titles_entry.class_));
update_values.push_back(columns[7] + " = " + std::to_string(titles_entry.gender)); update_values.push_back(columns[7] + " = " + std::to_string(titles_entry.gender));
update_values.push_back(columns[8] + " = " + std::to_string(titles_entry.char_id)); update_values.push_back(columns[8] + " = " + std::to_string(titles_entry.char_id));
update_values.push_back(columns[9] + " = " + std::to_string(titles_entry.status)); update_values.push_back(columns[9] + " = " + std::to_string(titles_entry.status));
@ -227,7 +227,7 @@ public:
insert_values.push_back(std::to_string(titles_entry.max_skill_value)); insert_values.push_back(std::to_string(titles_entry.max_skill_value));
insert_values.push_back(std::to_string(titles_entry.min_aa_points)); insert_values.push_back(std::to_string(titles_entry.min_aa_points));
insert_values.push_back(std::to_string(titles_entry.max_aa_points)); insert_values.push_back(std::to_string(titles_entry.max_aa_points));
insert_values.push_back(std::to_string(titles_entry.class)); insert_values.push_back(std::to_string(titles_entry.class_));
insert_values.push_back(std::to_string(titles_entry.gender)); insert_values.push_back(std::to_string(titles_entry.gender));
insert_values.push_back(std::to_string(titles_entry.char_id)); insert_values.push_back(std::to_string(titles_entry.char_id));
insert_values.push_back(std::to_string(titles_entry.status)); insert_values.push_back(std::to_string(titles_entry.status));
@ -270,7 +270,7 @@ public:
insert_values.push_back(std::to_string(titles_entry.max_skill_value)); insert_values.push_back(std::to_string(titles_entry.max_skill_value));
insert_values.push_back(std::to_string(titles_entry.min_aa_points)); insert_values.push_back(std::to_string(titles_entry.min_aa_points));
insert_values.push_back(std::to_string(titles_entry.max_aa_points)); insert_values.push_back(std::to_string(titles_entry.max_aa_points));
insert_values.push_back(std::to_string(titles_entry.class)); insert_values.push_back(std::to_string(titles_entry.class_));
insert_values.push_back(std::to_string(titles_entry.gender)); insert_values.push_back(std::to_string(titles_entry.gender));
insert_values.push_back(std::to_string(titles_entry.char_id)); insert_values.push_back(std::to_string(titles_entry.char_id));
insert_values.push_back(std::to_string(titles_entry.status)); insert_values.push_back(std::to_string(titles_entry.status));
@ -317,7 +317,7 @@ public:
entry.max_skill_value = atoi(row[3]); entry.max_skill_value = atoi(row[3]);
entry.min_aa_points = atoi(row[4]); entry.min_aa_points = atoi(row[4]);
entry.max_aa_points = atoi(row[5]); entry.max_aa_points = atoi(row[5]);
entry.class = atoi(row[6]); entry.class_ = atoi(row[6]);
entry.gender = atoi(row[7]); entry.gender = atoi(row[7]);
entry.char_id = atoi(row[8]); entry.char_id = atoi(row[8]);
entry.status = atoi(row[9]); entry.status = atoi(row[9]);
@ -355,7 +355,7 @@ public:
entry.max_skill_value = atoi(row[3]); entry.max_skill_value = atoi(row[3]);
entry.min_aa_points = atoi(row[4]); entry.min_aa_points = atoi(row[4]);
entry.max_aa_points = atoi(row[5]); entry.max_aa_points = atoi(row[5]);
entry.class = atoi(row[6]); entry.class_ = atoi(row[6]);
entry.gender = atoi(row[7]); entry.gender = atoi(row[7]);
entry.char_id = atoi(row[8]); entry.char_id = atoi(row[8]);
entry.status = atoi(row[9]); entry.status = atoi(row[9]);

675
common/repositories/base/base_zone_repository.h
View File

@ -26,6 +26,7 @@ public:
float safe_x; float safe_x;
float safe_y; float safe_y;
float safe_z; float safe_z;
float safe_heading;
float graveyard_id; float graveyard_id;
int min_level; int min_level;
int min_status; int min_status;
@ -76,7 +77,7 @@ public:
int castoutdoor; int castoutdoor;
int hotzone; int hotzone;
int insttype; int insttype;
int shutdowndelay; int64 shutdowndelay;
int peqzone; int peqzone;
int expansion; int expansion;
int suspendbuffs; int suspendbuffs;
@ -127,6 +128,7 @@ public:
"safe_x", "safe_x",
"safe_y", "safe_y",
"safe_z", "safe_z",
"safe_heading",
"graveyard_id", "graveyard_id",
"min_level", "min_level",
"min_status", "min_status",
@ -253,6 +255,7 @@ public:
entry.safe_x = 0; entry.safe_x = 0;
entry.safe_y = 0; entry.safe_y = 0;
entry.safe_z = 0; entry.safe_z = 0;
entry.safe_heading = 0;
entry.graveyard_id = 0; entry.graveyard_id = 0;
entry.min_level = 0; entry.min_level = 0;
entry.min_status = 0; entry.min_status = 0;
@ -379,89 +382,90 @@ public:
entry.safe_x = static_cast<float>(atof(row[5])); entry.safe_x = static_cast<float>(atof(row[5]));
entry.safe_y = static_cast<float>(atof(row[6])); entry.safe_y = static_cast<float>(atof(row[6]));
entry.safe_z = static_cast<float>(atof(row[7])); entry.safe_z = static_cast<float>(atof(row[7]));
entry.graveyard_id = static_cast<float>(atof(row[8])); entry.safe_heading = static_cast<float>(atof(row[8]));
entry.min_level = atoi(row[9]); entry.graveyard_id = static_cast<float>(atof(row[9]));
entry.min_status = atoi(row[10]); entry.min_level = atoi(row[10]);
entry.zoneidnumber = atoi(row[11]); entry.min_status = atoi(row[11]);
entry.version = atoi(row[12]); entry.zoneidnumber = atoi(row[12]);
entry.timezone = atoi(row[13]); entry.version = atoi(row[13]);
entry.maxclients = atoi(row[14]); entry.timezone = atoi(row[14]);
entry.ruleset = atoi(row[15]); entry.maxclients = atoi(row[15]);
entry.note = row[16] ? row[16] : ""; entry.ruleset = atoi(row[16]);
entry.underworld = static_cast<float>(atof(row[17])); entry.note = row[17] ? row[17] : "";
entry.minclip = static_cast<float>(atof(row[18])); entry.underworld = static_cast<float>(atof(row[18]));
entry.maxclip = static_cast<float>(atof(row[19])); entry.minclip = static_cast<float>(atof(row[19]));
entry.fog_minclip = static_cast<float>(atof(row[20])); entry.maxclip = static_cast<float>(atof(row[20]));
entry.fog_maxclip = static_cast<float>(atof(row[21])); entry.fog_minclip = static_cast<float>(atof(row[21]));
entry.fog_blue = atoi(row[22]); entry.fog_maxclip = static_cast<float>(atof(row[22]));
entry.fog_red = atoi(row[23]); entry.fog_blue = atoi(row[23]);
entry.fog_green = atoi(row[24]); entry.fog_red = atoi(row[24]);
entry.sky = atoi(row[25]); entry.fog_green = atoi(row[25]);
entry.ztype = atoi(row[26]); entry.sky = atoi(row[26]);
entry.zone_exp_multiplier = static_cast<float>(atof(row[27])); entry.ztype = atoi(row[27]);
entry.walkspeed = static_cast<float>(atof(row[28])); entry.zone_exp_multiplier = static_cast<float>(atof(row[28]));
entry.time_type = atoi(row[29]); entry.walkspeed = static_cast<float>(atof(row[29]));
entry.fog_red1 = atoi(row[30]); entry.time_type = atoi(row[30]);
entry.fog_green1 = atoi(row[31]); entry.fog_red1 = atoi(row[31]);
entry.fog_blue1 = atoi(row[32]); entry.fog_green1 = atoi(row[32]);
entry.fog_minclip1 = static_cast<float>(atof(row[33])); entry.fog_blue1 = atoi(row[33]);
entry.fog_maxclip1 = static_cast<float>(atof(row[34])); entry.fog_minclip1 = static_cast<float>(atof(row[34]));
entry.fog_red2 = atoi(row[35]); entry.fog_maxclip1 = static_cast<float>(atof(row[35]));
entry.fog_green2 = atoi(row[36]); entry.fog_red2 = atoi(row[36]);
entry.fog_blue2 = atoi(row[37]); entry.fog_green2 = atoi(row[37]);
entry.fog_minclip2 = static_cast<float>(atof(row[38])); entry.fog_blue2 = atoi(row[38]);
entry.fog_maxclip2 = static_cast<float>(atof(row[39])); entry.fog_minclip2 = static_cast<float>(atof(row[39]));
entry.fog_red3 = atoi(row[40]); entry.fog_maxclip2 = static_cast<float>(atof(row[40]));
entry.fog_green3 = atoi(row[41]); entry.fog_red3 = atoi(row[41]);
entry.fog_blue3 = atoi(row[42]); entry.fog_green3 = atoi(row[42]);
entry.fog_minclip3 = static_cast<float>(atof(row[43])); entry.fog_blue3 = atoi(row[43]);
entry.fog_maxclip3 = static_cast<float>(atof(row[44])); entry.fog_minclip3 = static_cast<float>(atof(row[44]));
entry.fog_red4 = atoi(row[45]); entry.fog_maxclip3 = static_cast<float>(atof(row[45]));
entry.fog_green4 = atoi(row[46]); entry.fog_red4 = atoi(row[46]);
entry.fog_blue4 = atoi(row[47]); entry.fog_green4 = atoi(row[47]);
entry.fog_minclip4 = static_cast<float>(atof(row[48])); entry.fog_blue4 = atoi(row[48]);
entry.fog_maxclip4 = static_cast<float>(atof(row[49])); entry.fog_minclip4 = static_cast<float>(atof(row[49]));
entry.fog_density = static_cast<float>(atof(row[50])); entry.fog_maxclip4 = static_cast<float>(atof(row[50]));
entry.flag_needed = row[51] ? row[51] : ""; entry.fog_density = static_cast<float>(atof(row[51]));
entry.canbind = atoi(row[52]); entry.flag_needed = row[52] ? row[52] : "";
entry.cancombat = atoi(row[53]); entry.canbind = atoi(row[53]);
entry.canlevitate = atoi(row[54]); entry.cancombat = atoi(row[54]);
entry.castoutdoor = atoi(row[55]); entry.canlevitate = atoi(row[55]);
entry.hotzone = atoi(row[56]); entry.castoutdoor = atoi(row[56]);
entry.insttype = atoi(row[57]); entry.hotzone = atoi(row[57]);
entry.shutdowndelay = atoi(row[58]); entry.insttype = atoi(row[58]);
entry.peqzone = atoi(row[59]); entry.shutdowndelay = strtoll(row[59], NULL, 10);
entry.expansion = atoi(row[60]); entry.peqzone = atoi(row[60]);
entry.suspendbuffs = atoi(row[61]); entry.expansion = atoi(row[61]);
entry.rain_chance1 = atoi(row[62]); entry.suspendbuffs = atoi(row[62]);
entry.rain_chance2 = atoi(row[63]); entry.rain_chance1 = atoi(row[63]);
entry.rain_chance3 = atoi(row[64]); entry.rain_chance2 = atoi(row[64]);
entry.rain_chance4 = atoi(row[65]); entry.rain_chance3 = atoi(row[65]);
entry.rain_duration1 = atoi(row[66]); entry.rain_chance4 = atoi(row[66]);
entry.rain_duration2 = atoi(row[67]); entry.rain_duration1 = atoi(row[67]);
entry.rain_duration3 = atoi(row[68]); entry.rain_duration2 = atoi(row[68]);
entry.rain_duration4 = atoi(row[69]); entry.rain_duration3 = atoi(row[69]);
entry.snow_chance1 = atoi(row[70]); entry.rain_duration4 = atoi(row[70]);
entry.snow_chance2 = atoi(row[71]); entry.snow_chance1 = atoi(row[71]);
entry.snow_chance3 = atoi(row[72]); entry.snow_chance2 = atoi(row[72]);
entry.snow_chance4 = atoi(row[73]); entry.snow_chance3 = atoi(row[73]);
entry.snow_duration1 = atoi(row[74]); entry.snow_chance4 = atoi(row[74]);
entry.snow_duration2 = atoi(row[75]); entry.snow_duration1 = atoi(row[75]);
entry.snow_duration3 = atoi(row[76]); entry.snow_duration2 = atoi(row[76]);
entry.snow_duration4 = atoi(row[77]); entry.snow_duration3 = atoi(row[77]);
entry.gravity = static_cast<float>(atof(row[78])); entry.snow_duration4 = atoi(row[78]);
entry.type = atoi(row[79]); entry.gravity = static_cast<float>(atof(row[79]));
entry.skylock = atoi(row[80]); entry.type = atoi(row[80]);
entry.fast_regen_hp = atoi(row[81]); entry.skylock = atoi(row[81]);
entry.fast_regen_mana = atoi(row[82]); entry.fast_regen_hp = atoi(row[82]);
entry.fast_regen_endurance = atoi(row[83]); entry.fast_regen_mana = atoi(row[83]);
entry.npc_max_aggro_dist = atoi(row[84]); entry.fast_regen_endurance = atoi(row[84]);
entry.max_movement_update_range = atoi(row[85]); entry.npc_max_aggro_dist = atoi(row[85]);
entry.min_expansion = atoi(row[86]); entry.max_movement_update_range = atoi(row[86]);
entry.max_expansion = atoi(row[87]); entry.min_expansion = atoi(row[87]);
entry.content_flags = row[88] ? row[88] : ""; entry.max_expansion = atoi(row[88]);
entry.content_flags_disabled = row[89] ? row[89] : ""; entry.content_flags = row[89] ? row[89] : "";
entry.underworld_teleport_index = atoi(row[90]); entry.content_flags_disabled = row[90] ? row[90] : "";
entry.underworld_teleport_index = atoi(row[91]);
return entry; return entry;
} }
@ -502,89 +506,90 @@ public:
update_values.push_back(columns[5] + " = " + std::to_string(zone_entry.safe_x)); update_values.push_back(columns[5] + " = " + std::to_string(zone_entry.safe_x));
update_values.push_back(columns[6] + " = " + std::to_string(zone_entry.safe_y)); update_values.push_back(columns[6] + " = " + std::to_string(zone_entry.safe_y));
update_values.push_back(columns[7] + " = " + std::to_string(zone_entry.safe_z)); update_values.push_back(columns[7] + " = " + std::to_string(zone_entry.safe_z));
update_values.push_back(columns[8] + " = " + std::to_string(zone_entry.graveyard_id)); update_values.push_back(columns[8] + " = " + std::to_string(zone_entry.safe_heading));
update_values.push_back(columns[9] + " = " + std::to_string(zone_entry.min_level)); update_values.push_back(columns[9] + " = " + std::to_string(zone_entry.graveyard_id));
update_values.push_back(columns[10] + " = " + std::to_string(zone_entry.min_status)); update_values.push_back(columns[10] + " = " + std::to_string(zone_entry.min_level));
update_values.push_back(columns[11] + " = " + std::to_string(zone_entry.zoneidnumber)); update_values.push_back(columns[11] + " = " + std::to_string(zone_entry.min_status));
update_values.push_back(columns[12] + " = " + std::to_string(zone_entry.version)); update_values.push_back(columns[12] + " = " + std::to_string(zone_entry.zoneidnumber));
update_values.push_back(columns[13] + " = " + std::to_string(zone_entry.timezone)); update_values.push_back(columns[13] + " = " + std::to_string(zone_entry.version));
update_values.push_back(columns[14] + " = " + std::to_string(zone_entry.maxclients)); update_values.push_back(columns[14] + " = " + std::to_string(zone_entry.timezone));
update_values.push_back(columns[15] + " = " + std::to_string(zone_entry.ruleset)); update_values.push_back(columns[15] + " = " + std::to_string(zone_entry.maxclients));
update_values.push_back(columns[16] + " = '" + EscapeString(zone_entry.note) + "'"); update_values.push_back(columns[16] + " = " + std::to_string(zone_entry.ruleset));
update_values.push_back(columns[17] + " = " + std::to_string(zone_entry.underworld)); update_values.push_back(columns[17] + " = '" + EscapeString(zone_entry.note) + "'");
update_values.push_back(columns[18] + " = " + std::to_string(zone_entry.minclip)); update_values.push_back(columns[18] + " = " + std::to_string(zone_entry.underworld));
update_values.push_back(columns[19] + " = " + std::to_string(zone_entry.maxclip)); update_values.push_back(columns[19] + " = " + std::to_string(zone_entry.minclip));
update_values.push_back(columns[20] + " = " + std::to_string(zone_entry.fog_minclip)); update_values.push_back(columns[20] + " = " + std::to_string(zone_entry.maxclip));
update_values.push_back(columns[21] + " = " + std::to_string(zone_entry.fog_maxclip)); update_values.push_back(columns[21] + " = " + std::to_string(zone_entry.fog_minclip));
update_values.push_back(columns[22] + " = " + std::to_string(zone_entry.fog_blue)); update_values.push_back(columns[22] + " = " + std::to_string(zone_entry.fog_maxclip));
update_values.push_back(columns[23] + " = " + std::to_string(zone_entry.fog_red)); update_values.push_back(columns[23] + " = " + std::to_string(zone_entry.fog_blue));
update_values.push_back(columns[24] + " = " + std::to_string(zone_entry.fog_green)); update_values.push_back(columns[24] + " = " + std::to_string(zone_entry.fog_red));
update_values.push_back(columns[25] + " = " + std::to_string(zone_entry.sky)); update_values.push_back(columns[25] + " = " + std::to_string(zone_entry.fog_green));
update_values.push_back(columns[26] + " = " + std::to_string(zone_entry.ztype)); update_values.push_back(columns[26] + " = " + std::to_string(zone_entry.sky));
update_values.push_back(columns[27] + " = " + std::to_string(zone_entry.zone_exp_multiplier)); update_values.push_back(columns[27] + " = " + std::to_string(zone_entry.ztype));
update_values.push_back(columns[28] + " = " + std::to_string(zone_entry.walkspeed)); update_values.push_back(columns[28] + " = " + std::to_string(zone_entry.zone_exp_multiplier));
update_values.push_back(columns[29] + " = " + std::to_string(zone_entry.time_type)); update_values.push_back(columns[29] + " = " + std::to_string(zone_entry.walkspeed));
update_values.push_back(columns[30] + " = " + std::to_string(zone_entry.fog_red1)); update_values.push_back(columns[30] + " = " + std::to_string(zone_entry.time_type));
update_values.push_back(columns[31] + " = " + std::to_string(zone_entry.fog_green1)); update_values.push_back(columns[31] + " = " + std::to_string(zone_entry.fog_red1));
update_values.push_back(columns[32] + " = " + std::to_string(zone_entry.fog_blue1)); update_values.push_back(columns[32] + " = " + std::to_string(zone_entry.fog_green1));
update_values.push_back(columns[33] + " = " + std::to_string(zone_entry.fog_minclip1)); update_values.push_back(columns[33] + " = " + std::to_string(zone_entry.fog_blue1));
update_values.push_back(columns[34] + " = " + std::to_string(zone_entry.fog_maxclip1)); update_values.push_back(columns[34] + " = " + std::to_string(zone_entry.fog_minclip1));
update_values.push_back(columns[35] + " = " + std::to_string(zone_entry.fog_red2)); update_values.push_back(columns[35] + " = " + std::to_string(zone_entry.fog_maxclip1));
update_values.push_back(columns[36] + " = " + std::to_string(zone_entry.fog_green2)); update_values.push_back(columns[36] + " = " + std::to_string(zone_entry.fog_red2));
update_values.push_back(columns[37] + " = " + std::to_string(zone_entry.fog_blue2)); update_values.push_back(columns[37] + " = " + std::to_string(zone_entry.fog_green2));
update_values.push_back(columns[38] + " = " + std::to_string(zone_entry.fog_minclip2)); update_values.push_back(columns[38] + " = " + std::to_string(zone_entry.fog_blue2));
update_values.push_back(columns[39] + " = " + std::to_string(zone_entry.fog_maxclip2)); update_values.push_back(columns[39] + " = " + std::to_string(zone_entry.fog_minclip2));
update_values.push_back(columns[40] + " = " + std::to_string(zone_entry.fog_red3)); update_values.push_back(columns[40] + " = " + std::to_string(zone_entry.fog_maxclip2));
update_values.push_back(columns[41] + " = " + std::to_string(zone_entry.fog_green3)); update_values.push_back(columns[41] + " = " + std::to_string(zone_entry.fog_red3));
update_values.push_back(columns[42] + " = " + std::to_string(zone_entry.fog_blue3)); update_values.push_back(columns[42] + " = " + std::to_string(zone_entry.fog_green3));
update_values.push_back(columns[43] + " = " + std::to_string(zone_entry.fog_minclip3)); update_values.push_back(columns[43] + " = " + std::to_string(zone_entry.fog_blue3));
update_values.push_back(columns[44] + " = " + std::to_string(zone_entry.fog_maxclip3)); update_values.push_back(columns[44] + " = " + std::to_string(zone_entry.fog_minclip3));
update_values.push_back(columns[45] + " = " + std::to_string(zone_entry.fog_red4)); update_values.push_back(columns[45] + " = " + std::to_string(zone_entry.fog_maxclip3));
update_values.push_back(columns[46] + " = " + std::to_string(zone_entry.fog_green4)); update_values.push_back(columns[46] + " = " + std::to_string(zone_entry.fog_red4));
update_values.push_back(columns[47] + " = " + std::to_string(zone_entry.fog_blue4)); update_values.push_back(columns[47] + " = " + std::to_string(zone_entry.fog_green4));
update_values.push_back(columns[48] + " = " + std::to_string(zone_entry.fog_minclip4)); update_values.push_back(columns[48] + " = " + std::to_string(zone_entry.fog_blue4));
update_values.push_back(columns[49] + " = " + std::to_string(zone_entry.fog_maxclip4)); update_values.push_back(columns[49] + " = " + std::to_string(zone_entry.fog_minclip4));
update_values.push_back(columns[50] + " = " + std::to_string(zone_entry.fog_density)); update_values.push_back(columns[50] + " = " + std::to_string(zone_entry.fog_maxclip4));
update_values.push_back(columns[51] + " = '" + EscapeString(zone_entry.flag_needed) + "'"); update_values.push_back(columns[51] + " = " + std::to_string(zone_entry.fog_density));
update_values.push_back(columns[52] + " = " + std::to_string(zone_entry.canbind)); update_values.push_back(columns[52] + " = '" + EscapeString(zone_entry.flag_needed) + "'");
update_values.push_back(columns[53] + " = " + std::to_string(zone_entry.cancombat)); update_values.push_back(columns[53] + " = " + std::to_string(zone_entry.canbind));
update_values.push_back(columns[54] + " = " + std::to_string(zone_entry.canlevitate)); update_values.push_back(columns[54] + " = " + std::to_string(zone_entry.cancombat));
update_values.push_back(columns[55] + " = " + std::to_string(zone_entry.castoutdoor)); update_values.push_back(columns[55] + " = " + std::to_string(zone_entry.canlevitate));
update_values.push_back(columns[56] + " = " + std::to_string(zone_entry.hotzone)); update_values.push_back(columns[56] + " = " + std::to_string(zone_entry.castoutdoor));
update_values.push_back(columns[57] + " = " + std::to_string(zone_entry.insttype)); update_values.push_back(columns[57] + " = " + std::to_string(zone_entry.hotzone));
update_values.push_back(columns[58] + " = " + std::to_string(zone_entry.shutdowndelay)); update_values.push_back(columns[58] + " = " + std::to_string(zone_entry.insttype));
update_values.push_back(columns[59] + " = " + std::to_string(zone_entry.peqzone)); update_values.push_back(columns[59] + " = " + std::to_string(zone_entry.shutdowndelay));
update_values.push_back(columns[60] + " = " + std::to_string(zone_entry.expansion)); update_values.push_back(columns[60] + " = " + std::to_string(zone_entry.peqzone));
update_values.push_back(columns[61] + " = " + std::to_string(zone_entry.suspendbuffs)); update_values.push_back(columns[61] + " = " + std::to_string(zone_entry.expansion));
update_values.push_back(columns[62] + " = " + std::to_string(zone_entry.rain_chance1)); update_values.push_back(columns[62] + " = " + std::to_string(zone_entry.suspendbuffs));
update_values.push_back(columns[63] + " = " + std::to_string(zone_entry.rain_chance2)); update_values.push_back(columns[63] + " = " + std::to_string(zone_entry.rain_chance1));
update_values.push_back(columns[64] + " = " + std::to_string(zone_entry.rain_chance3)); update_values.push_back(columns[64] + " = " + std::to_string(zone_entry.rain_chance2));
update_values.push_back(columns[65] + " = " + std::to_string(zone_entry.rain_chance4)); update_values.push_back(columns[65] + " = " + std::to_string(zone_entry.rain_chance3));
update_values.push_back(columns[66] + " = " + std::to_string(zone_entry.rain_duration1)); update_values.push_back(columns[66] + " = " + std::to_string(zone_entry.rain_chance4));
update_values.push_back(columns[67] + " = " + std::to_string(zone_entry.rain_duration2)); update_values.push_back(columns[67] + " = " + std::to_string(zone_entry.rain_duration1));
update_values.push_back(columns[68] + " = " + std::to_string(zone_entry.rain_duration3)); update_values.push_back(columns[68] + " = " + std::to_string(zone_entry.rain_duration2));
update_values.push_back(columns[69] + " = " + std::to_string(zone_entry.rain_duration4)); update_values.push_back(columns[69] + " = " + std::to_string(zone_entry.rain_duration3));
update_values.push_back(columns[70] + " = " + std::to_string(zone_entry.snow_chance1)); update_values.push_back(columns[70] + " = " + std::to_string(zone_entry.rain_duration4));
update_values.push_back(columns[71] + " = " + std::to_string(zone_entry.snow_chance2)); update_values.push_back(columns[71] + " = " + std::to_string(zone_entry.snow_chance1));
update_values.push_back(columns[72] + " = " + std::to_string(zone_entry.snow_chance3)); update_values.push_back(columns[72] + " = " + std::to_string(zone_entry.snow_chance2));
update_values.push_back(columns[73] + " = " + std::to_string(zone_entry.snow_chance4)); update_values.push_back(columns[73] + " = " + std::to_string(zone_entry.snow_chance3));
update_values.push_back(columns[74] + " = " + std::to_string(zone_entry.snow_duration1)); update_values.push_back(columns[74] + " = " + std::to_string(zone_entry.snow_chance4));
update_values.push_back(columns[75] + " = " + std::to_string(zone_entry.snow_duration2)); update_values.push_back(columns[75] + " = " + std::to_string(zone_entry.snow_duration1));
update_values.push_back(columns[76] + " = " + std::to_string(zone_entry.snow_duration3)); update_values.push_back(columns[76] + " = " + std::to_string(zone_entry.snow_duration2));
update_values.push_back(columns[77] + " = " + std::to_string(zone_entry.snow_duration4)); update_values.push_back(columns[77] + " = " + std::to_string(zone_entry.snow_duration3));
update_values.push_back(columns[78] + " = " + std::to_string(zone_entry.gravity)); update_values.push_back(columns[78] + " = " + std::to_string(zone_entry.snow_duration4));
update_values.push_back(columns[79] + " = " + std::to_string(zone_entry.type)); update_values.push_back(columns[79] + " = " + std::to_string(zone_entry.gravity));
update_values.push_back(columns[80] + " = " + std::to_string(zone_entry.skylock)); update_values.push_back(columns[80] + " = " + std::to_string(zone_entry.type));
update_values.push_back(columns[81] + " = " + std::to_string(zone_entry.fast_regen_hp)); update_values.push_back(columns[81] + " = " + std::to_string(zone_entry.skylock));
update_values.push_back(columns[82] + " = " + std::to_string(zone_entry.fast_regen_mana)); update_values.push_back(columns[82] + " = " + std::to_string(zone_entry.fast_regen_hp));
update_values.push_back(columns[83] + " = " + std::to_string(zone_entry.fast_regen_endurance)); update_values.push_back(columns[83] + " = " + std::to_string(zone_entry.fast_regen_mana));
update_values.push_back(columns[84] + " = " + std::to_string(zone_entry.npc_max_aggro_dist)); update_values.push_back(columns[84] + " = " + std::to_string(zone_entry.fast_regen_endurance));
update_values.push_back(columns[85] + " = " + std::to_string(zone_entry.max_movement_update_range)); update_values.push_back(columns[85] + " = " + std::to_string(zone_entry.npc_max_aggro_dist));
update_values.push_back(columns[86] + " = " + std::to_string(zone_entry.min_expansion)); update_values.push_back(columns[86] + " = " + std::to_string(zone_entry.max_movement_update_range));
update_values.push_back(columns[87] + " = " + std::to_string(zone_entry.max_expansion)); update_values.push_back(columns[87] + " = " + std::to_string(zone_entry.min_expansion));
update_values.push_back(columns[88] + " = '" + EscapeString(zone_entry.content_flags) + "'"); update_values.push_back(columns[88] + " = " + std::to_string(zone_entry.max_expansion));
update_values.push_back(columns[89] + " = '" + EscapeString(zone_entry.content_flags_disabled) + "'"); update_values.push_back(columns[89] + " = '" + EscapeString(zone_entry.content_flags) + "'");
update_values.push_back(columns[90] + " = " + std::to_string(zone_entry.underworld_teleport_index)); update_values.push_back(columns[90] + " = '" + EscapeString(zone_entry.content_flags_disabled) + "'");
update_values.push_back(columns[91] + " = " + std::to_string(zone_entry.underworld_teleport_index));
auto results = db.QueryDatabase( auto results = db.QueryDatabase(
fmt::format( fmt::format(
@ -614,6 +619,7 @@ public:
insert_values.push_back(std::to_string(zone_entry.safe_x)); insert_values.push_back(std::to_string(zone_entry.safe_x));
insert_values.push_back(std::to_string(zone_entry.safe_y)); insert_values.push_back(std::to_string(zone_entry.safe_y));
insert_values.push_back(std::to_string(zone_entry.safe_z)); insert_values.push_back(std::to_string(zone_entry.safe_z));
insert_values.push_back(std::to_string(zone_entry.safe_heading));
insert_values.push_back(std::to_string(zone_entry.graveyard_id)); insert_values.push_back(std::to_string(zone_entry.graveyard_id));
insert_values.push_back(std::to_string(zone_entry.min_level)); insert_values.push_back(std::to_string(zone_entry.min_level));
insert_values.push_back(std::to_string(zone_entry.min_status)); insert_values.push_back(std::to_string(zone_entry.min_status));
@ -734,6 +740,7 @@ public:
insert_values.push_back(std::to_string(zone_entry.safe_x)); insert_values.push_back(std::to_string(zone_entry.safe_x));
insert_values.push_back(std::to_string(zone_entry.safe_y)); insert_values.push_back(std::to_string(zone_entry.safe_y));
insert_values.push_back(std::to_string(zone_entry.safe_z)); insert_values.push_back(std::to_string(zone_entry.safe_z));
insert_values.push_back(std::to_string(zone_entry.safe_heading));
insert_values.push_back(std::to_string(zone_entry.graveyard_id)); insert_values.push_back(std::to_string(zone_entry.graveyard_id));
insert_values.push_back(std::to_string(zone_entry.min_level)); insert_values.push_back(std::to_string(zone_entry.min_level));
insert_values.push_back(std::to_string(zone_entry.min_status)); insert_values.push_back(std::to_string(zone_entry.min_status));
@ -858,89 +865,90 @@ public:
entry.safe_x = static_cast<float>(atof(row[5])); entry.safe_x = static_cast<float>(atof(row[5]));
entry.safe_y = static_cast<float>(atof(row[6])); entry.safe_y = static_cast<float>(atof(row[6]));
entry.safe_z = static_cast<float>(atof(row[7])); entry.safe_z = static_cast<float>(atof(row[7]));
entry.graveyard_id = static_cast<float>(atof(row[8])); entry.safe_heading = static_cast<float>(atof(row[8]));
entry.min_level = atoi(row[9]); entry.graveyard_id = static_cast<float>(atof(row[9]));
entry.min_status = atoi(row[10]); entry.min_level = atoi(row[10]);
entry.zoneidnumber = atoi(row[11]); entry.min_status = atoi(row[11]);
entry.version = atoi(row[12]); entry.zoneidnumber = atoi(row[12]);
entry.timezone = atoi(row[13]); entry.version = atoi(row[13]);
entry.maxclients = atoi(row[14]); entry.timezone = atoi(row[14]);
entry.ruleset = atoi(row[15]); entry.maxclients = atoi(row[15]);
entry.note = row[16] ? row[16] : ""; entry.ruleset = atoi(row[16]);
entry.underworld = static_cast<float>(atof(row[17])); entry.note = row[17] ? row[17] : "";
entry.minclip = static_cast<float>(atof(row[18])); entry.underworld = static_cast<float>(atof(row[18]));
entry.maxclip = static_cast<float>(atof(row[19])); entry.minclip = static_cast<float>(atof(row[19]));
entry.fog_minclip = static_cast<float>(atof(row[20])); entry.maxclip = static_cast<float>(atof(row[20]));
entry.fog_maxclip = static_cast<float>(atof(row[21])); entry.fog_minclip = static_cast<float>(atof(row[21]));
entry.fog_blue = atoi(row[22]); entry.fog_maxclip = static_cast<float>(atof(row[22]));
entry.fog_red = atoi(row[23]); entry.fog_blue = atoi(row[23]);
entry.fog_green = atoi(row[24]); entry.fog_red = atoi(row[24]);
entry.sky = atoi(row[25]); entry.fog_green = atoi(row[25]);
entry.ztype = atoi(row[26]); entry.sky = atoi(row[26]);
entry.zone_exp_multiplier = static_cast<float>(atof(row[27])); entry.ztype = atoi(row[27]);
entry.walkspeed = static_cast<float>(atof(row[28])); entry.zone_exp_multiplier = static_cast<float>(atof(row[28]));
entry.time_type = atoi(row[29]); entry.walkspeed = static_cast<float>(atof(row[29]));
entry.fog_red1 = atoi(row[30]); entry.time_type = atoi(row[30]);
entry.fog_green1 = atoi(row[31]); entry.fog_red1 = atoi(row[31]);
entry.fog_blue1 = atoi(row[32]); entry.fog_green1 = atoi(row[32]);
entry.fog_minclip1 = static_cast<float>(atof(row[33])); entry.fog_blue1 = atoi(row[33]);
entry.fog_maxclip1 = static_cast<float>(atof(row[34])); entry.fog_minclip1 = static_cast<float>(atof(row[34]));
entry.fog_red2 = atoi(row[35]); entry.fog_maxclip1 = static_cast<float>(atof(row[35]));
entry.fog_green2 = atoi(row[36]); entry.fog_red2 = atoi(row[36]);
entry.fog_blue2 = atoi(row[37]); entry.fog_green2 = atoi(row[37]);
entry.fog_minclip2 = static_cast<float>(atof(row[38])); entry.fog_blue2 = atoi(row[38]);
entry.fog_maxclip2 = static_cast<float>(atof(row[39])); entry.fog_minclip2 = static_cast<float>(atof(row[39]));
entry.fog_red3 = atoi(row[40]); entry.fog_maxclip2 = static_cast<float>(atof(row[40]));
entry.fog_green3 = atoi(row[41]); entry.fog_red3 = atoi(row[41]);
entry.fog_blue3 = atoi(row[42]); entry.fog_green3 = atoi(row[42]);
entry.fog_minclip3 = static_cast<float>(atof(row[43])); entry.fog_blue3 = atoi(row[43]);
entry.fog_maxclip3 = static_cast<float>(atof(row[44])); entry.fog_minclip3 = static_cast<float>(atof(row[44]));
entry.fog_red4 = atoi(row[45]); entry.fog_maxclip3 = static_cast<float>(atof(row[45]));
entry.fog_green4 = atoi(row[46]); entry.fog_red4 = atoi(row[46]);
entry.fog_blue4 = atoi(row[47]); entry.fog_green4 = atoi(row[47]);
entry.fog_minclip4 = static_cast<float>(atof(row[48])); entry.fog_blue4 = atoi(row[48]);
entry.fog_maxclip4 = static_cast<float>(atof(row[49])); entry.fog_minclip4 = static_cast<float>(atof(row[49]));
entry.fog_density = static_cast<float>(atof(row[50])); entry.fog_maxclip4 = static_cast<float>(atof(row[50]));
entry.flag_needed = row[51] ? row[51] : ""; entry.fog_density = static_cast<float>(atof(row[51]));
entry.canbind = atoi(row[52]); entry.flag_needed = row[52] ? row[52] : "";
entry.cancombat = atoi(row[53]); entry.canbind = atoi(row[53]);
entry.canlevitate = atoi(row[54]); entry.cancombat = atoi(row[54]);
entry.castoutdoor = atoi(row[55]); entry.canlevitate = atoi(row[55]);
entry.hotzone = atoi(row[56]); entry.castoutdoor = atoi(row[56]);
entry.insttype = atoi(row[57]); entry.hotzone = atoi(row[57]);
entry.shutdowndelay = atoi(row[58]); entry.insttype = atoi(row[58]);
entry.peqzone = atoi(row[59]); entry.shutdowndelay = strtoll(row[59], NULL, 10);
entry.expansion = atoi(row[60]); entry.peqzone = atoi(row[60]);
entry.suspendbuffs = atoi(row[61]); entry.expansion = atoi(row[61]);
entry.rain_chance1 = atoi(row[62]); entry.suspendbuffs = atoi(row[62]);
entry.rain_chance2 = atoi(row[63]); entry.rain_chance1 = atoi(row[63]);
entry.rain_chance3 = atoi(row[64]); entry.rain_chance2 = atoi(row[64]);
entry.rain_chance4 = atoi(row[65]); entry.rain_chance3 = atoi(row[65]);
entry.rain_duration1 = atoi(row[66]); entry.rain_chance4 = atoi(row[66]);
entry.rain_duration2 = atoi(row[67]); entry.rain_duration1 = atoi(row[67]);
entry.rain_duration3 = atoi(row[68]); entry.rain_duration2 = atoi(row[68]);
entry.rain_duration4 = atoi(row[69]); entry.rain_duration3 = atoi(row[69]);
entry.snow_chance1 = atoi(row[70]); entry.rain_duration4 = atoi(row[70]);
entry.snow_chance2 = atoi(row[71]); entry.snow_chance1 = atoi(row[71]);
entry.snow_chance3 = atoi(row[72]); entry.snow_chance2 = atoi(row[72]);
entry.snow_chance4 = atoi(row[73]); entry.snow_chance3 = atoi(row[73]);
entry.snow_duration1 = atoi(row[74]); entry.snow_chance4 = atoi(row[74]);
entry.snow_duration2 = atoi(row[75]); entry.snow_duration1 = atoi(row[75]);
entry.snow_duration3 = atoi(row[76]); entry.snow_duration2 = atoi(row[76]);
entry.snow_duration4 = atoi(row[77]); entry.snow_duration3 = atoi(row[77]);
entry.gravity = static_cast<float>(atof(row[78])); entry.snow_duration4 = atoi(row[78]);
entry.type = atoi(row[79]); entry.gravity = static_cast<float>(atof(row[79]));
entry.skylock = atoi(row[80]); entry.type = atoi(row[80]);
entry.fast_regen_hp = atoi(row[81]); entry.skylock = atoi(row[81]);
entry.fast_regen_mana = atoi(row[82]); entry.fast_regen_hp = atoi(row[82]);
entry.fast_regen_endurance = atoi(row[83]); entry.fast_regen_mana = atoi(row[83]);
entry.npc_max_aggro_dist = atoi(row[84]); entry.fast_regen_endurance = atoi(row[84]);
entry.max_movement_update_range = atoi(row[85]); entry.npc_max_aggro_dist = atoi(row[85]);
entry.min_expansion = atoi(row[86]); entry.max_movement_update_range = atoi(row[86]);
entry.max_expansion = atoi(row[87]); entry.min_expansion = atoi(row[87]);
entry.content_flags = row[88] ? row[88] : ""; entry.max_expansion = atoi(row[88]);
entry.content_flags_disabled = row[89] ? row[89] : ""; entry.content_flags = row[89] ? row[89] : "";
entry.underworld_teleport_index = atoi(row[90]); entry.content_flags_disabled = row[90] ? row[90] : "";
entry.underworld_teleport_index = atoi(row[91]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }
@ -973,89 +981,90 @@ public:
entry.safe_x = static_cast<float>(atof(row[5])); entry.safe_x = static_cast<float>(atof(row[5]));
entry.safe_y = static_cast<float>(atof(row[6])); entry.safe_y = static_cast<float>(atof(row[6]));
entry.safe_z = static_cast<float>(atof(row[7])); entry.safe_z = static_cast<float>(atof(row[7]));
entry.graveyard_id = static_cast<float>(atof(row[8])); entry.safe_heading = static_cast<float>(atof(row[8]));
entry.min_level = atoi(row[9]); entry.graveyard_id = static_cast<float>(atof(row[9]));
entry.min_status = atoi(row[10]); entry.min_level = atoi(row[10]);
entry.zoneidnumber = atoi(row[11]); entry.min_status = atoi(row[11]);
entry.version = atoi(row[12]); entry.zoneidnumber = atoi(row[12]);
entry.timezone = atoi(row[13]); entry.version = atoi(row[13]);
entry.maxclients = atoi(row[14]); entry.timezone = atoi(row[14]);
entry.ruleset = atoi(row[15]); entry.maxclients = atoi(row[15]);
entry.note = row[16] ? row[16] : ""; entry.ruleset = atoi(row[16]);
entry.underworld = static_cast<float>(atof(row[17])); entry.note = row[17] ? row[17] : "";
entry.minclip = static_cast<float>(atof(row[18])); entry.underworld = static_cast<float>(atof(row[18]));
entry.maxclip = static_cast<float>(atof(row[19])); entry.minclip = static_cast<float>(atof(row[19]));
entry.fog_minclip = static_cast<float>(atof(row[20])); entry.maxclip = static_cast<float>(atof(row[20]));
entry.fog_maxclip = static_cast<float>(atof(row[21])); entry.fog_minclip = static_cast<float>(atof(row[21]));
entry.fog_blue = atoi(row[22]); entry.fog_maxclip = static_cast<float>(atof(row[22]));
entry.fog_red = atoi(row[23]); entry.fog_blue = atoi(row[23]);
entry.fog_green = atoi(row[24]); entry.fog_red = atoi(row[24]);
entry.sky = atoi(row[25]); entry.fog_green = atoi(row[25]);
entry.ztype = atoi(row[26]); entry.sky = atoi(row[26]);
entry.zone_exp_multiplier = static_cast<float>(atof(row[27])); entry.ztype = atoi(row[27]);
entry.walkspeed = static_cast<float>(atof(row[28])); entry.zone_exp_multiplier = static_cast<float>(atof(row[28]));
entry.time_type = atoi(row[29]); entry.walkspeed = static_cast<float>(atof(row[29]));
entry.fog_red1 = atoi(row[30]); entry.time_type = atoi(row[30]);
entry.fog_green1 = atoi(row[31]); entry.fog_red1 = atoi(row[31]);
entry.fog_blue1 = atoi(row[32]); entry.fog_green1 = atoi(row[32]);
entry.fog_minclip1 = static_cast<float>(atof(row[33])); entry.fog_blue1 = atoi(row[33]);
entry.fog_maxclip1 = static_cast<float>(atof(row[34])); entry.fog_minclip1 = static_cast<float>(atof(row[34]));
entry.fog_red2 = atoi(row[35]); entry.fog_maxclip1 = static_cast<float>(atof(row[35]));
entry.fog_green2 = atoi(row[36]); entry.fog_red2 = atoi(row[36]);
entry.fog_blue2 = atoi(row[37]); entry.fog_green2 = atoi(row[37]);
entry.fog_minclip2 = static_cast<float>(atof(row[38])); entry.fog_blue2 = atoi(row[38]);
entry.fog_maxclip2 = static_cast<float>(atof(row[39])); entry.fog_minclip2 = static_cast<float>(atof(row[39]));
entry.fog_red3 = atoi(row[40]); entry.fog_maxclip2 = static_cast<float>(atof(row[40]));
entry.fog_green3 = atoi(row[41]); entry.fog_red3 = atoi(row[41]);
entry.fog_blue3 = atoi(row[42]); entry.fog_green3 = atoi(row[42]);
entry.fog_minclip3 = static_cast<float>(atof(row[43])); entry.fog_blue3 = atoi(row[43]);
entry.fog_maxclip3 = static_cast<float>(atof(row[44])); entry.fog_minclip3 = static_cast<float>(atof(row[44]));
entry.fog_red4 = atoi(row[45]); entry.fog_maxclip3 = static_cast<float>(atof(row[45]));
entry.fog_green4 = atoi(row[46]); entry.fog_red4 = atoi(row[46]);
entry.fog_blue4 = atoi(row[47]); entry.fog_green4 = atoi(row[47]);
entry.fog_minclip4 = static_cast<float>(atof(row[48])); entry.fog_blue4 = atoi(row[48]);
entry.fog_maxclip4 = static_cast<float>(atof(row[49])); entry.fog_minclip4 = static_cast<float>(atof(row[49]));
entry.fog_density = static_cast<float>(atof(row[50])); entry.fog_maxclip4 = static_cast<float>(atof(row[50]));
entry.flag_needed = row[51] ? row[51] : ""; entry.fog_density = static_cast<float>(atof(row[51]));
entry.canbind = atoi(row[52]); entry.flag_needed = row[52] ? row[52] : "";
entry.cancombat = atoi(row[53]); entry.canbind = atoi(row[53]);
entry.canlevitate = atoi(row[54]); entry.cancombat = atoi(row[54]);
entry.castoutdoor = atoi(row[55]); entry.canlevitate = atoi(row[55]);
entry.hotzone = atoi(row[56]); entry.castoutdoor = atoi(row[56]);
entry.insttype = atoi(row[57]); entry.hotzone = atoi(row[57]);
entry.shutdowndelay = atoi(row[58]); entry.insttype = atoi(row[58]);
entry.peqzone = atoi(row[59]); entry.shutdowndelay = strtoll(row[59], NULL, 10);
entry.expansion = atoi(row[60]); entry.peqzone = atoi(row[60]);
entry.suspendbuffs = atoi(row[61]); entry.expansion = atoi(row[61]);
entry.rain_chance1 = atoi(row[62]); entry.suspendbuffs = atoi(row[62]);
entry.rain_chance2 = atoi(row[63]); entry.rain_chance1 = atoi(row[63]);
entry.rain_chance3 = atoi(row[64]); entry.rain_chance2 = atoi(row[64]);
entry.rain_chance4 = atoi(row[65]); entry.rain_chance3 = atoi(row[65]);
entry.rain_duration1 = atoi(row[66]); entry.rain_chance4 = atoi(row[66]);
entry.rain_duration2 = atoi(row[67]); entry.rain_duration1 = atoi(row[67]);
entry.rain_duration3 = atoi(row[68]); entry.rain_duration2 = atoi(row[68]);
entry.rain_duration4 = atoi(row[69]); entry.rain_duration3 = atoi(row[69]);
entry.snow_chance1 = atoi(row[70]); entry.rain_duration4 = atoi(row[70]);
entry.snow_chance2 = atoi(row[71]); entry.snow_chance1 = atoi(row[71]);
entry.snow_chance3 = atoi(row[72]); entry.snow_chance2 = atoi(row[72]);
entry.snow_chance4 = atoi(row[73]); entry.snow_chance3 = atoi(row[73]);
entry.snow_duration1 = atoi(row[74]); entry.snow_chance4 = atoi(row[74]);
entry.snow_duration2 = atoi(row[75]); entry.snow_duration1 = atoi(row[75]);
entry.snow_duration3 = atoi(row[76]); entry.snow_duration2 = atoi(row[76]);
entry.snow_duration4 = atoi(row[77]); entry.snow_duration3 = atoi(row[77]);
entry.gravity = static_cast<float>(atof(row[78])); entry.snow_duration4 = atoi(row[78]);
entry.type = atoi(row[79]); entry.gravity = static_cast<float>(atof(row[79]));
entry.skylock = atoi(row[80]); entry.type = atoi(row[80]);
entry.fast_regen_hp = atoi(row[81]); entry.skylock = atoi(row[81]);
entry.fast_regen_mana = atoi(row[82]); entry.fast_regen_hp = atoi(row[82]);
entry.fast_regen_endurance = atoi(row[83]); entry.fast_regen_mana = atoi(row[83]);
entry.npc_max_aggro_dist = atoi(row[84]); entry.fast_regen_endurance = atoi(row[84]);
entry.max_movement_update_range = atoi(row[85]); entry.npc_max_aggro_dist = atoi(row[85]);
entry.min_expansion = atoi(row[86]); entry.max_movement_update_range = atoi(row[86]);
entry.max_expansion = atoi(row[87]); entry.min_expansion = atoi(row[87]);
entry.content_flags = row[88] ? row[88] : ""; entry.max_expansion = atoi(row[88]);
entry.content_flags_disabled = row[89] ? row[89] : ""; entry.content_flags = row[89] ? row[89] : "";
entry.underworld_teleport_index = atoi(row[90]); entry.content_flags_disabled = row[90] ? row[90] : "";
entry.underworld_teleport_index = atoi(row[91]);
all_entries.push_back(entry); all_entries.push_back(entry);
} }