pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-24 09:28:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Feature] Add Augments to Starting Items for Bots/Players (#4100)

Browse Source 
* [Feature] Add Augments to Starting Items for Bots/Players

- Adds support for augments to `bot_starting_items` and `starting_items`.
- Will allow operators to kit bots/players out with augmented gear from the start if they so choose.

* Update database_update_manifest.cpp

* Update client.cpp
This commit is contained in:
Alex King
2024-02-20 23:23:22 -05:00
committed by GitHub
parent a221e50cc2
commit f505c2cfd2
8 changed files with 262 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/repositories/base/base_starting_items_repository.h
+96 -24
View File
@@ -26,6 +26,12 @@ public:
std::string zone_id_list;
uint32_t item_id;
uint8_t item_charges;
uint32_t augment_one;
uint32_t augment_two;
uint32_t augment_three;
uint32_t augment_four;
uint32_t augment_five;
uint32_t augment_six;
int32_t status;
int32_t inventory_slot;
int8_t min_expansion;
@@ -49,6 +55,12 @@ public:
"zone_id_list",
"item_id",
"item_charges",
"augment_one",
"augment_two",
"augment_three",
"augment_four",
"augment_five",
"augment_six",
"status",
"inventory_slot",
"min_expansion",
@@ -68,6 +80,12 @@ public:
"zone_id_list",
"item_id",
"item_charges",
"augment_one",
"augment_two",
"augment_three",
"augment_four",
"augment_five",
"augment_six",
"status",
"inventory_slot",
"min_expansion",
@@ -121,6 +139,12 @@ public:
e.zone_id_list = "";
e.item_id = 0;
e.item_charges = 1;
e.augment_one = 0;
e.augment_two = 0;
e.augment_three = 0;
e.augment_four = 0;
e.augment_five = 0;
e.augment_six = 0;
e.status = 0;
e.inventory_slot = -1;
e.min_expansion = -1;
@@ -170,12 +194,18 @@ public:
e.zone_id_list = row[4] ? row[4] : "";
e.item_id = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
e.item_charges = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 1;
e.status = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
e.inventory_slot = row[8] ? static_cast<int32_t>(atoi(row[8])) : -1;
e.min_expansion = row[9] ? static_cast<int8_t>(atoi(row[9])) : -1;
e.max_expansion = row[10] ? static_cast<int8_t>(atoi(row[10])) : -1;
e.content_flags = row[11] ? row[11] : "";
e.content_flags_disabled = row[12] ? row[12] : "";
e.augment_one = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
e.augment_two = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
e.augment_three = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
e.augment_four = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.augment_five = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
e.augment_six = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
e.status = row[13] ? static_cast<int32_t>(atoi(row[13])) : 0;
e.inventory_slot = row[14] ? static_cast<int32_t>(atoi(row[14])) : -1;
e.min_expansion = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
e.max_expansion = row[16] ? static_cast<int8_t>(atoi(row[16])) : -1;
e.content_flags = row[17] ? row[17] : "";
e.content_flags_disabled = row[18] ? row[18] : "";
return e;
}
@@ -215,12 +245,18 @@ public:
v.push_back(columns[4] + " = '" + Strings::Escape(e.zone_id_list) + "'");
v.push_back(columns[5] + " = " + std::to_string(e.item_id));
v.push_back(columns[6] + " = " + std::to_string(e.item_charges));
v.push_back(columns[7] + " = " + std::to_string(e.status));
v.push_back(columns[8] + " = " + std::to_string(e.inventory_slot));
v.push_back(columns[9] + " = " + std::to_string(e.min_expansion));
v.push_back(columns[10] + " = " + std::to_string(e.max_expansion));
v.push_back(columns[11] + " = '" + Strings::Escape(e.content_flags) + "'");
v.push_back(columns[12] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
v.push_back(columns[7] + " = " + std::to_string(e.augment_one));
v.push_back(columns[8] + " = " + std::to_string(e.augment_two));
v.push_back(columns[9] + " = " + std::to_string(e.augment_three));
v.push_back(columns[10] + " = " + std::to_string(e.augment_four));
v.push_back(columns[11] + " = " + std::to_string(e.augment_five));
v.push_back(columns[12] + " = " + std::to_string(e.augment_six));
v.push_back(columns[13] + " = " + std::to_string(e.status));
v.push_back(columns[14] + " = " + std::to_string(e.inventory_slot));
v.push_back(columns[15] + " = " + std::to_string(e.min_expansion));
v.push_back(columns[16] + " = " + std::to_string(e.max_expansion));
v.push_back(columns[17] + " = '" + Strings::Escape(e.content_flags) + "'");
v.push_back(columns[18] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
auto results = db.QueryDatabase(
fmt::format(
@@ -249,6 +285,12 @@ public:
v.push_back("'" + Strings::Escape(e.zone_id_list) + "'");
v.push_back(std::to_string(e.item_id));
v.push_back(std::to_string(e.item_charges));
v.push_back(std::to_string(e.augment_one));
v.push_back(std::to_string(e.augment_two));
v.push_back(std::to_string(e.augment_three));
v.push_back(std::to_string(e.augment_four));
v.push_back(std::to_string(e.augment_five));
v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.status));
v.push_back(std::to_string(e.inventory_slot));
v.push_back(std::to_string(e.min_expansion));
@@ -291,6 +333,12 @@ public:
v.push_back("'" + Strings::Escape(e.zone_id_list) + "'");
v.push_back(std::to_string(e.item_id));
v.push_back(std::to_string(e.item_charges));
v.push_back(std::to_string(e.augment_one));
v.push_back(std::to_string(e.augment_two));
v.push_back(std::to_string(e.augment_three));
v.push_back(std::to_string(e.augment_four));
v.push_back(std::to_string(e.augment_five));
v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.status));
v.push_back(std::to_string(e.inventory_slot));
v.push_back(std::to_string(e.min_expansion));
@@ -337,12 +385,18 @@ public:
e.zone_id_list = row[4] ? row[4] : "";
e.item_id = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
e.item_charges = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 1;
e.status = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
e.inventory_slot = row[8] ? static_cast<int32_t>(atoi(row[8])) : -1;
e.min_expansion = row[9] ? static_cast<int8_t>(atoi(row[9])) : -1;
e.max_expansion = row[10] ? static_cast<int8_t>(atoi(row[10])) : -1;
e.content_flags = row[11] ? row[11] : "";
e.content_flags_disabled = row[12] ? row[12] : "";
e.augment_one = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
e.augment_two = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
e.augment_three = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
e.augment_four = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.augment_five = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
e.augment_six = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
e.status = row[13] ? static_cast<int32_t>(atoi(row[13])) : 0;
e.inventory_slot = row[14] ? static_cast<int32_t>(atoi(row[14])) : -1;
e.min_expansion = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
e.max_expansion = row[16] ? static_cast<int8_t>(atoi(row[16])) : -1;
e.content_flags = row[17] ? row[17] : "";
e.content_flags_disabled = row[18] ? row[18] : "";
all_entries.push_back(e);
}
@@ -374,12 +428,18 @@ public:
e.zone_id_list = row[4] ? row[4] : "";
e.item_id = row[5] ? static_cast<uint32_t>(strtoul(row[5], nullptr, 10)) : 0;
e.item_charges = row[6] ? static_cast<uint8_t>(strtoul(row[6], nullptr, 10)) : 1;
e.status = row[7] ? static_cast<int32_t>(atoi(row[7])) : 0;
e.inventory_slot = row[8] ? static_cast<int32_t>(atoi(row[8])) : -1;
e.min_expansion = row[9] ? static_cast<int8_t>(atoi(row[9])) : -1;
e.max_expansion = row[10] ? static_cast<int8_t>(atoi(row[10])) : -1;
e.content_flags = row[11] ? row[11] : "";
e.content_flags_disabled = row[12] ? row[12] : "";
e.augment_one = row[7] ? static_cast<uint32_t>(strtoul(row[7], nullptr, 10)) : 0;
e.augment_two = row[8] ? static_cast<uint32_t>(strtoul(row[8], nullptr, 10)) : 0;
e.augment_three = row[9] ? static_cast<uint32_t>(strtoul(row[9], nullptr, 10)) : 0;
e.augment_four = row[10] ? static_cast<uint32_t>(strtoul(row[10], nullptr, 10)) : 0;
e.augment_five = row[11] ? static_cast<uint32_t>(strtoul(row[11], nullptr, 10)) : 0;
e.augment_six = row[12] ? static_cast<uint32_t>(strtoul(row[12], nullptr, 10)) : 0;
e.status = row[13] ? static_cast<int32_t>(atoi(row[13])) : 0;
e.inventory_slot = row[14] ? static_cast<int32_t>(atoi(row[14])) : -1;
e.min_expansion = row[15] ? static_cast<int8_t>(atoi(row[15])) : -1;
e.max_expansion = row[16] ? static_cast<int8_t>(atoi(row[16])) : -1;
e.content_flags = row[17] ? row[17] : "";
e.content_flags_disabled = row[18] ? row[18] : "";
all_entries.push_back(e);
}
@@ -461,6 +521,12 @@ public:
v.push_back("'" + Strings::Escape(e.zone_id_list) + "'");
v.push_back(std::to_string(e.item_id));
v.push_back(std::to_string(e.item_charges));
v.push_back(std::to_string(e.augment_one));
v.push_back(std::to_string(e.augment_two));
v.push_back(std::to_string(e.augment_three));
v.push_back(std::to_string(e.augment_four));
v.push_back(std::to_string(e.augment_five));
v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.status));
v.push_back(std::to_string(e.inventory_slot));
v.push_back(std::to_string(e.min_expansion));
@@ -496,6 +562,12 @@ public:
v.push_back("'" + Strings::Escape(e.zone_id_list) + "'");
v.push_back(std::to_string(e.item_id));
v.push_back(std::to_string(e.item_charges));
v.push_back(std::to_string(e.augment_one));
v.push_back(std::to_string(e.augment_two));
v.push_back(std::to_string(e.augment_three));
v.push_back(std::to_string(e.augment_four));
v.push_back(std::to_string(e.augment_five));
v.push_back(std::to_string(e.augment_six));
v.push_back(std::to_string(e.status));
v.push_back(std::to_string(e.inventory_slot));
v.push_back(std::to_string(e.min_expansion));