[Release] 22.15.2 (Hotfix)

# Notes
- Add `#npcedit model [Race ID]` to edit an NPC's race model.
- Add `#npcedit heroic_strikethrough [Heroic Strikethrough]` to edit an NPC's heroic strikethrough.
- Add `#npcedit faction_amount [Faction Amount]` to edit an NPC's faction amount.

CMakeLists.txt

@@ -16,6 +16,15 @@ SET(CMAKE_CXX_STANDARD 20)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 
+OPTION(EQEMU_BUILD_STATIC "Build with static linking" OFF)
+
+IF (EQEMU_BUILD_STATIC)
+	SET(BUILD_SHARED_LIBS OFF)
+	SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".a")
+	MESSAGE(STATUS "Building with static linking")
+	SET(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+ENDIF(EQEMU_BUILD_STATIC)
+
 IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
@@ -307,6 +316,10 @@ ELSE()
 	SET(ZLIB_LIBRARY_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/libs/zlibng")
 ENDIF()
 
+IF (EQEMU_BUILD_STATIC)
+	SET(ZLIB_LIBRARY_LIBS libz.a)
+ENDIF(EQEMU_BUILD_STATIC)
+
 MESSAGE(STATUS "")
 MESSAGE(STATUS "**************************************************")
 MESSAGE(STATUS "* Library Usage                                  *")

README.md

@@ -1,7 +1,7 @@
 # EQEmulator Core Server
-|Travis CI (Linux)|Appveyor (Windows x86)   |Appveyor (Windows x64)   |
-|:---:|:---:|:---:| 
-|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server)   |[![Build status](https://ci.appveyor.com/api/projects/status/v3utuu0dttm2cqd0?svg=true)](https://ci.appveyor.com/project/KimLS/server)   |[![Build status](https://ci.appveyor.com/api/projects/status/scr25kmntx36c1ub?svg=true)](https://ci.appveyor.com/project/KimLS/server-87crp)   |
+| Drone (Linux x64) | Drone (Windows x64)   |
+|:---:|:---:|
+|[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |[![Build Status](http://drone.akkadius.com/api/badges/EQEmu/Server/status.svg)](http://drone.akkadius.com/EQEmu/Server)   |
 
 ***
 

client_files/export/main.cpp

@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 			return 1;
 		}
 	} else {
-		content_db.SetMysql(database.getMySQL());
+		content_db.SetMySQL(database);
 	}
 
 	LogSys.SetDatabase(&database)
@@ -183,7 +183,7 @@ bool SkillUsable(SharedDatabase *db, int skill_id, int class_id)
 	}
 
 	auto row = results.begin();
-	if (row[0] && atoi(row[0]) > 0) {
+	if (row[0] && Strings::ToInt(row[0]) > 0) {
 		return true;
 	}
 
@@ -207,7 +207,7 @@ int GetSkill(SharedDatabase *db, int skill_id, int class_id, int level)
 	}
 
 	auto row = results.begin();
-	return atoi(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 void ExportSkillCaps(SharedDatabase *db)

client_files/import/main.cpp

@@ -83,7 +83,7 @@ int main(int argc, char **argv) {
 			return 1;
 		}
 	} else {
-		content_db.SetMysql(database.getMySQL());
+		content_db.SetMySQL(database);
 	}
 
 	LogSys.SetDatabase(&database)
@@ -241,10 +241,10 @@ void ImportSkillCaps(SharedDatabase *db) {
 		}
 
 		int class_id, skill_id, level, cap;
-		class_id = atoi(split[0].c_str());
-		skill_id = atoi(split[1].c_str());
-		level = atoi(split[2].c_str());
-		cap = atoi(split[3].c_str());
+		class_id = Strings::ToInt(split[0].c_str());
+		skill_id = Strings::ToInt(split[1].c_str());
+		level = Strings::ToInt(split[2].c_str());
+		cap = Strings::ToInt(split[3].c_str());
 
 		std::string sql = StringFormat("INSERT INTO skill_caps(class, skillID, level, cap) VALUES(%d, %d, %d, %d)",
 			class_id, skill_id, level, cap);
@@ -280,16 +280,16 @@ void ImportBaseData(SharedDatabase *db) {
 		int level, class_id;
 		double hp, mana, end, unk1, unk2, hp_fac, mana_fac, end_fac;
 
-		level = atoi(split[0].c_str());
-		class_id = atoi(split[1].c_str());
-		hp = atof(split[2].c_str());
-		mana = atof(split[3].c_str());
-		end = atof(split[4].c_str());
-		unk1 = atof(split[5].c_str());
-		unk2 = atof(split[6].c_str());
-		hp_fac = atof(split[7].c_str());
-		mana_fac = atof(split[8].c_str());
-		end_fac = atof(split[9].c_str());
+		level = Strings::ToInt(split[0].c_str());
+		class_id = Strings::ToInt(split[1].c_str());
+		hp = Strings::ToFloat(split[2].c_str());
+		mana = Strings::ToFloat(split[3].c_str());
+		end = Strings::ToFloat(split[4].c_str());
+		unk1 = Strings::ToFloat(split[5].c_str());
+		unk2 = Strings::ToFloat(split[6].c_str());
+		hp_fac = Strings::ToFloat(split[7].c_str());
+		mana_fac = Strings::ToFloat(split[8].c_str());
+		end_fac = Strings::ToFloat(split[9].c_str());
 
 		sql = StringFormat("INSERT INTO base_data(level, class, hp, mana, end, unk1, unk2, hp_fac, "
 			"mana_fac, end_fac) VALUES(%d, %d, %f, %f, %f, %f, %f, %f, %f, %f)",
@@ -339,8 +339,8 @@ void ImportDBStrings(SharedDatabase *db) {
 		int id, type;
 		std::string value;
 
-		id = atoi(split[0].c_str());
-		type = atoi(split[1].c_str());
+		id = Strings::ToInt(split[0].c_str());
+		type = Strings::ToInt(split[1].c_str());
 
 		if(split.size() >= 3) {
 			value = ::Strings::Escape(split[2]);

common/CMakeLists.txt

@@ -15,6 +15,9 @@ SET(common_sources
     database.cpp
     database_conversions.cpp
     database_instances.cpp
+    database/database_update_manifest.cpp
+    database/database_update_manifest_bots.cpp
+    database/database_update.cpp
     dbcore.cpp
     deity.cpp
     dynamic_zone_base.cpp
@@ -33,9 +36,11 @@ SET(common_sources
     eq_stream_proxy.cpp
     eqtime.cpp
     event_sub.cpp
+    events/player_event_logs.cpp
+    events/player_event_discord_formatter.cpp
     expedition_lockout_timer.cpp
     extprofile.cpp
-    discord_manager.cpp
+    discord/discord_manager.cpp
     faction.cpp
     file.cpp
     guild_base.cpp
@@ -198,7 +203,6 @@ SET(repositories
     repositories/base/base_dynamic_zones_repository.h
     repositories/base/base_dynamic_zone_members_repository.h
     repositories/base/base_dynamic_zone_templates_repository.h
-    repositories/base/base_eventlog_repository.h
     repositories/base/base_expeditions_repository.h
     repositories/base/base_expedition_lockouts_repository.h
     repositories/base/base_faction_association_repository.h
@@ -218,7 +222,6 @@ SET(repositories
     repositories/base/base_guilds_repository.h
     repositories/base/base_guild_ranks_repository.h
     repositories/base/base_guild_relations_repository.h
-    repositories/base/base_hackers_repository.h
     repositories/base/base_horses_repository.h
     repositories/base/base_instance_list_repository.h
     repositories/base/base_instance_list_player_repository.h
@@ -264,6 +267,8 @@ SET(repositories
     repositories/base/base_pets_equipmentset_repository.h
     repositories/base/base_pets_equipmentset_entries_repository.h
     repositories/base/base_player_titlesets_repository.h
+    repositories/base/base_player_event_log_settings_repository.h
+    repositories/base/base_player_event_logs_repository.h
     repositories/base/base_quest_globals_repository.h
     repositories/base/base_raid_details_repository.h
     repositories/base/base_raid_members_repository.h
@@ -376,7 +381,6 @@ SET(repositories
     repositories/dynamic_zones_repository.h
     repositories/dynamic_zone_members_repository.h
     repositories/dynamic_zone_templates_repository.h
-    repositories/eventlog_repository.h
     repositories/expeditions_repository.h
     repositories/expedition_lockouts_repository.h
     repositories/faction_association_repository.h
@@ -396,7 +400,6 @@ SET(repositories
     repositories/guilds_repository.h
     repositories/guild_ranks_repository.h
     repositories/guild_relations_repository.h
-    repositories/hackers_repository.h
     repositories/horses_repository.h
     repositories/instance_list_repository.h
     repositories/instance_list_player_repository.h
@@ -442,6 +445,8 @@ SET(repositories
     repositories/pets_equipmentset_repository.h
     repositories/pets_equipmentset_entries_repository.h
     repositories/player_titlesets_repository.h
+    repositories/player_event_log_settings_repository.h
+    repositories/player_event_logs_repository.h
     repositories/quest_globals_repository.h
     repositories/raid_details_repository.h
     repositories/raid_members_repository.h
@@ -504,10 +509,11 @@ SET(common_headers
     data_verification.h
     database.h
     database_schema.h
+    database/database_update.h
     dbcore.h
     deity.h
     discord/discord.h
-    discord_manager.h
+    discord/discord_manager.h
     dynamic_zone_base.h
     emu_constants.h
     emu_limits.h
@@ -530,6 +536,9 @@ SET(common_headers
     eq_stream_locator.h
     eq_stream_proxy.h
     eqtime.h
+    events/player_event_logs.h
+    events/player_event_discord_formatter.h
+    events/player_events.h
     errmsg.h
     event_sub.h
     expedition_lockout_timer.h
@@ -603,11 +612,11 @@ SET(common_headers
     unix.h
     useperl.h
     version.h
-    zone_numbers.h
     zone_store.h
     event/event_loop.h
     event/task.h
     event/timer.h
+    json/json_archive_single_line.h
     json/json.h
     json/json-forwards.h
     net/console_server.h
@@ -662,7 +671,7 @@ SET(common_headers
     util/memory_stream.h
     util/directory.h
     util/uuid.h
-    )
+)
 
 SOURCE_GROUP(Event FILES
     event/event_loop.h

common/classes.cpp

@@ -630,6 +630,20 @@ bool IsINTCasterClass(uint8 class_id)
 	}
 }
 
+bool IsHeroicINTCasterClass(uint8 class_id)
+{
+	switch (class_id) {
+		case NECROMANCER:
+		case WIZARD:
+		case MAGICIAN:
+		case ENCHANTER:
+		case SHADOWKNIGHT:
+			return true;
+		default:
+			return false;
+	}
+}
+
 bool IsWISCasterClass(uint8 class_id)
 {
 	switch (class_id) {
@@ -642,6 +656,21 @@ bool IsWISCasterClass(uint8 class_id)
 	}
 }
 
+bool IsHeroicWISCasterClass(uint8 class_id)
+{
+	switch (class_id) {
+		case CLERIC:
+		case DRUID:
+		case SHAMAN:
+		case PALADIN:
+		case BEASTLORD:
+		case RANGER:
+			return true;
+		default:
+			return false;
+	}
+}
+
 bool IsPlateClass(uint8 class_id)
 {
 	switch (class_id) {

common/classes.h

@@ -140,7 +140,8 @@ bool IsHybridClass(uint8 class_id);
 bool IsCasterClass(uint8 class_id);
 bool IsINTCasterClass(uint8 class_id);
 bool IsWISCasterClass(uint8 class_id);
-
+bool IsHeroicINTCasterClass(uint8 class_id);
+bool IsHeroicWISCasterClass(uint8 class_id);
 bool IsPlateClass(uint8 class_id);
 bool IsChainClass(uint8 class_id);
 bool IsLeatherClass(uint8 class_id);

common/cli/eqemu_command_handler.cpp

@@ -77,7 +77,7 @@ namespace EQEmuCommand {
 			index++;
 		}
 
-		if (!arguments_filled || argc == 2 || cmd[{"-h", "--help"}]) {
+		if (!arguments_filled || (argc == 2 && !cmd[{"-h", "--help"}]) || (argc == 3 && cmd[{"-h", "--help"}])) {
 			std::string arguments_string;
 			for (auto &arg : arguments) {
 				arguments_string += " " + arg;
@@ -160,7 +160,7 @@ namespace EQEmuCommand {
 			 */
 			std::string command_section;
 			for (auto   &it: in_function_map) {
-				description = "";
+				description.clear();
 
 				(it.second)(argc, argv, cmd, description);
 

common/content/world_content_service.cpp

@@ -120,7 +120,7 @@ std::vector<std::string> WorldContentService::GetContentFlagsDisabled()
 /**
  * @param content_flags
  */
-void WorldContentService::SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags)
+void WorldContentService::SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags)
 {
 	WorldContentService::content_flags = content_flags;
 }

common/content/world_content_service.h

@@ -167,7 +167,7 @@ public:
 	std::vector<std::string> GetContentFlagsDisabled();
 	bool IsContentFlagEnabled(const std::string& content_flag);
 	bool IsContentFlagDisabled(const std::string& content_flag);
-	void SetContentFlags(std::vector<ContentFlagsRepository::ContentFlags> content_flags);
+	void SetContentFlags(const std::vector<ContentFlagsRepository::ContentFlags>& content_flags);
 	void ReloadContentFlags();
 	WorldContentService * SetExpansionContext();
 

common/crash.cpp

@@ -41,9 +41,6 @@ void SendCrashReport(const std::string &crash_report)
 		r.set_connection_timeout(1, 0);
 		r.set_read_timeout(1, 0);
 		r.set_write_timeout(1, 0);
-		httplib::Headers headers = {
-			{"Content-Type", "application/json"}
-		};
 
 		// os info
 		auto os         = EQ::GetOS();
@@ -125,7 +122,7 @@ public:
 		StackWalker::OnOutput(szText);
 	}
 
-	const std::vector<std::string>& const GetLines() { return _lines; }
+	const std::vector<std::string>& GetLines() { return _lines; }
 private:
 	std::vector<std::string> _lines;
 };

common/cron/croncpp.h

@@ -313,7 +313,7 @@ namespace cron
 		{
 			try
 			{
-				return static_cast<cron_int>(std::stoul(text.data()));
+				return static_cast<cron_int>(Strings::ToUnsignedInt(text.data()));
 			}
 			catch (std::exception const & ex)
 			{

common/database.cpp

@@ -121,10 +121,10 @@ uint32 Database::CheckLogin(const char* name, const char* password, const char *
 
 	auto row = results.begin();
 
-	auto id = std::stoul(row[0]);
+	auto id = Strings::ToUnsignedInt(row[0]);
 
 	if (oStatus) {
-		*oStatus = std::stoi(row[1]);
+		*oStatus = Strings::ToInt(row[1]);
 	}
 
 	return id;
@@ -202,11 +202,11 @@ int16 Database::CheckStatus(uint32 account_id)
 	}
 
 	auto row = results.begin();
-	int16 status = std::stoi(row[0]);
+	int16 status = Strings::ToInt(row[0]);
 	int32 date_diff = 0;
 
 	if (row[1]) {
-		date_diff = std::stoi(row[1]);
+		date_diff = Strings::ToInt(row[1]);
 	}
 
 	if (date_diff > 0) {
@@ -345,7 +345,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 	std::string query = StringFormat("SELECT `account_id`, `name` FROM `character_data` WHERE `name` = '%s'", name);
 	auto results = QueryDatabase(query);
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		if (row[0] && atoi(row[0]) > 0){
+		if (row[0] && Strings::ToInt(row[0]) > 0){
 			LogInfo("Account: [{}] tried to request name: [{}], but it is already taken", account_id, name);
 			return false;
 		}
@@ -353,7 +353,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 
 	query = StringFormat("INSERT INTO `character_data` SET `account_id` = %i, `name` = '%s'", account_id, name);
 	results = QueryDatabase(query);
-	if (!results.Success() || results.ErrorMessage() != ""){ return false; }
+	if (!results.Success() || !results.ErrorMessage().empty()){ return false; }
 
 	// Put character into the default guild if rule is being used.
 	int guild_id = RuleI(Character, DefaultGuild);
@@ -363,7 +363,7 @@ bool Database::ReserveName(uint32 account_id, char* name) {
 		if (character_id > -1) {
 			query = StringFormat("INSERT INTO `guild_members` SET `char_id` = %i, `guild_id` = '%i'", character_id, guild_id);
 			results = QueryDatabase(query);
-			if (!results.Success() || results.ErrorMessage() != ""){
+			if (!results.Success() || !results.ErrorMessage().empty()){
 				LogInfo("Could not put character [{}] into default Guild", name);
 			}
 		}
@@ -387,7 +387,7 @@ bool Database::DeleteCharacter(char *character_name)
 	std::string query   = StringFormat("SELECT `id` from `character_data` WHERE `name` = '%s'", character_name);
 	auto        results = QueryDatabase(query);
 	for (auto   row     = results.begin(); row != results.end(); ++row) {
-		character_id = atoi(row[0]);
+		character_id = Strings::ToUnsignedInt(row[0]);
 	}
 
 	if (character_id <= 0) {
@@ -449,7 +449,8 @@ bool Database::DeleteCharacter(char *character_name)
 	return true;
 }
 
-bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct* pp){
+bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp)
+{
 	std::string query = StringFormat(
 		"REPLACE INTO `character_data` ("
 		"id,"
@@ -634,101 +635,102 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		"%u,"  // guild_auto_consent
 		"%u"  // RestTimer
 		")",
-		character_id,					  // " id,                        "
-		account_id,						  // " account_id,                "
-		Strings::Escape(pp->name).c_str(),	  // " `name`,                    "
+		character_id,                      // " id,                        "
+		account_id,                          // " account_id,                "
+		Strings::Escape(pp->name).c_str(),      // " `name`,                    "
 		Strings::Escape(pp->last_name).c_str(), // " last_name,              "
-		pp->gender,						  // " gender,                    "
-		pp->race,						  // " race,                      "
-		pp->class_,						  // " class,                     "
-		pp->level,						  // " `level`,                   "
-		pp->deity,						  // " deity,                     "
-		pp->birthday,					  // " birthday,                  "
-		pp->lastlogin,					  // " last_login,                "
-		pp->timePlayedMin,				  // " time_played,               "
-		pp->pvp,						  // " pvp_status,                "
-		pp->level2,						  // " level2,                    "
-		pp->anon,						  // " anon,                      "
-		pp->gm,							  // " gm,                        "
-		pp->intoxication,				  // " intoxication,              "
-		pp->haircolor,					  // " hair_color,                "
-		pp->beardcolor,					  // " beard_color,               "
-		pp->eyecolor1,					  // " eye_color_1,               "
-		pp->eyecolor2,					  // " eye_color_2,               "
-		pp->hairstyle,					  // " hair_style,                "
-		pp->beard,						  // " beard,                     "
-		pp->ability_time_seconds,		  // " ability_time_seconds,      "
-		pp->ability_number,				  // " ability_number,            "
-		pp->ability_time_minutes,		  // " ability_time_minutes,      "
-		pp->ability_time_hours,			  // " ability_time_hours,        "
+		pp->gender,                          // " gender,                    "
+		pp->race,                          // " race,                      "
+		pp->class_,                          // " class,                     "
+		pp->level,                          // " `level`,                   "
+		pp->deity,                          // " deity,                     "
+		pp->birthday,                      // " birthday,                  "
+		pp->lastlogin,                      // " last_login,                "
+		pp->timePlayedMin,                  // " time_played,               "
+		pp->pvp,                          // " pvp_status,                "
+		pp->level2,                          // " level2,                    "
+		pp->anon,                          // " anon,                      "
+		pp->gm,                              // " gm,                        "
+		pp->intoxication,                  // " intoxication,              "
+		pp->haircolor,                      // " hair_color,                "
+		pp->beardcolor,                      // " beard_color,               "
+		pp->eyecolor1,                      // " eye_color_1,               "
+		pp->eyecolor2,                      // " eye_color_2,               "
+		pp->hairstyle,                      // " hair_style,                "
+		pp->beard,                          // " beard,                     "
+		pp->ability_time_seconds,          // " ability_time_seconds,      "
+		pp->ability_number,                  // " ability_number,            "
+		pp->ability_time_minutes,          // " ability_time_minutes,      "
+		pp->ability_time_hours,              // " ability_time_hours,        "
 		Strings::Escape(pp->title).c_str(),  // " title,                     "
 		Strings::Escape(pp->suffix).c_str(), // " suffix,                    "
-		pp->exp,						  // " exp,                       "
-		pp->points,						  // " points,                    "
-		pp->mana,						  // " mana,                      "
-		pp->cur_hp,						  // " cur_hp,                    "
-		pp->STR,						  // " str,                       "
-		pp->STA,						  // " sta,                       "
-		pp->CHA,						  // " cha,                       "
-		pp->DEX,						  // " dex,                       "
-		pp->INT,						  // " `int`,                     "
-		pp->AGI,						  // " agi,                       "
-		pp->WIS,						  // " wis,                       "
-		pp->face,						  // " face,                      "
-		pp->y,							  // " y,                         "
-		pp->x,							  // " x,                         "
-		pp->z,							  // " z,                         "
-		pp->heading,					  // " heading,                   "
-		pp->pvp2,						  // " pvp2,                      "
-		pp->pvptype,					  // " pvp_type,                  "
-		pp->autosplit,					  // " autosplit_enabled,         "
-		pp->zone_change_count,			  // " zone_change_count,         "
-		pp->drakkin_heritage,			  // " drakkin_heritage,          "
-		pp->drakkin_tattoo,				  // " drakkin_tattoo,            "
-		pp->drakkin_details,			  // " drakkin_details,           "
-		pp->toxicity,					  // " toxicity,                  "
-		pp->hunger_level,				  // " hunger_level,              "
-		pp->thirst_level,				  // " thirst_level,              "
-		pp->ability_up,					  // " ability_up,                "
-		pp->zone_id,					  // " zone_id,                   "
-		pp->zoneInstance,				  // " zone_instance,             "
-		pp->leadAAActive,				  // " leadership_exp_on,         "
-		pp->ldon_points_guk,			  // " ldon_points_guk,           "
-		pp->ldon_points_mir,			  // " ldon_points_mir,           "
-		pp->ldon_points_mmc,			  // " ldon_points_mmc,           "
-		pp->ldon_points_ruj,			  // " ldon_points_ruj,           "
-		pp->ldon_points_tak,			  // " ldon_points_tak,           "
-		pp->ldon_points_available,		  // " ldon_points_available,     "
-		pp->tribute_time_remaining,		  // " tribute_time_remaining,    "
-		pp->showhelm,					  // " show_helm,                 "
-		pp->career_tribute_points,		  // " career_tribute_points,     "
-		pp->tribute_points,				  // " tribute_points,            "
-		pp->tribute_active,				  // " tribute_active,            "
-		pp->endurance,					  // " endurance,                 "
-		pp->group_leadership_exp,		  // " group_leadership_exp,      "
-		pp->raid_leadership_exp,		  // " raid_leadership_exp,       "
-		pp->group_leadership_points,	  // " group_leadership_points,   "
-		pp->raid_leadership_points,		  // " raid_leadership_points,    "
-		pp->air_remaining,				  // " air_remaining,             "
-		pp->PVPKills,					  // " pvp_kills,                 "
-		pp->PVPDeaths,					  // " pvp_deaths,                "
-		pp->PVPCurrentPoints,			  // " pvp_current_points,        "
-		pp->PVPCareerPoints,			  // " pvp_career_points,         "
-		pp->PVPBestKillStreak,			  // " pvp_best_kill_streak,      "
-		pp->PVPWorstDeathStreak,		  // " pvp_worst_death_streak,    "
-		pp->PVPCurrentKillStreak,		  // " pvp_current_kill_streak,   "
-		pp->aapoints_spent,				  // " aa_points_spent,           "
-		pp->expAA,						  // " aa_exp,                    "
-		pp->aapoints,					  // " aa_points,                 "
-		pp->groupAutoconsent,			  // " group_auto_consent,        "
-		pp->raidAutoconsent,			  // " raid_auto_consent,         "
-		pp->guildAutoconsent,			  // " guild_auto_consent,        "
-		pp->RestTimer					  // " RestTimer)                 "
+		pp->exp,                          // " exp,                       "
+		pp->points,                          // " points,                    "
+		pp->mana,                          // " mana,                      "
+		pp->cur_hp,                          // " cur_hp,                    "
+		pp->STR,                          // " str,                       "
+		pp->STA,                          // " sta,                       "
+		pp->CHA,                          // " cha,                       "
+		pp->DEX,                          // " dex,                       "
+		pp->INT,                          // " `int`,                     "
+		pp->AGI,                          // " agi,                       "
+		pp->WIS,                          // " wis,                       "
+		pp->face,                          // " face,                      "
+		pp->y,                              // " y,                         "
+		pp->x,                              // " x,                         "
+		pp->z,                              // " z,                         "
+		pp->heading,                      // " heading,                   "
+		pp->pvp2,                          // " pvp2,                      "
+		pp->pvptype,                      // " pvp_type,                  "
+		pp->autosplit,                      // " autosplit_enabled,         "
+		pp->zone_change_count,              // " zone_change_count,         "
+		pp->drakkin_heritage,              // " drakkin_heritage,          "
+		pp->drakkin_tattoo,                  // " drakkin_tattoo,            "
+		pp->drakkin_details,              // " drakkin_details,           "
+		pp->toxicity,                      // " toxicity,                  "
+		pp->hunger_level,                  // " hunger_level,              "
+		pp->thirst_level,                  // " thirst_level,              "
+		pp->ability_up,                      // " ability_up,                "
+		pp->zone_id,                      // " zone_id,                   "
+		pp->zoneInstance,                  // " zone_instance,             "
+		pp->leadAAActive,                  // " leadership_exp_on,         "
+		pp->ldon_points_guk,              // " ldon_points_guk,           "
+		pp->ldon_points_mir,              // " ldon_points_mir,           "
+		pp->ldon_points_mmc,              // " ldon_points_mmc,           "
+		pp->ldon_points_ruj,              // " ldon_points_ruj,           "
+		pp->ldon_points_tak,              // " ldon_points_tak,           "
+		pp->ldon_points_available,          // " ldon_points_available,     "
+		pp->tribute_time_remaining,          // " tribute_time_remaining,    "
+		pp->showhelm,                      // " show_helm,                 "
+		pp->career_tribute_points,          // " career_tribute_points,     "
+		pp->tribute_points,                  // " tribute_points,            "
+		pp->tribute_active,                  // " tribute_active,            "
+		pp->endurance,                      // " endurance,                 "
+		pp->group_leadership_exp,          // " group_leadership_exp,      "
+		pp->raid_leadership_exp,          // " raid_leadership_exp,       "
+		pp->group_leadership_points,      // " group_leadership_points,   "
+		pp->raid_leadership_points,          // " raid_leadership_points,    "
+		pp->air_remaining,                  // " air_remaining,             "
+		pp->PVPKills,                      // " pvp_kills,                 "
+		pp->PVPDeaths,                      // " pvp_deaths,                "
+		pp->PVPCurrentPoints,              // " pvp_current_points,        "
+		pp->PVPCareerPoints,              // " pvp_career_points,         "
+		pp->PVPBestKillStreak,              // " pvp_best_kill_streak,      "
+		pp->PVPWorstDeathStreak,          // " pvp_worst_death_streak,    "
+		pp->PVPCurrentKillStreak,          // " pvp_current_kill_streak,   "
+		pp->aapoints_spent,                  // " aa_points_spent,           "
+		pp->expAA,                          // " aa_exp,                    "
+		pp->aapoints,                      // " aa_points,                 "
+		pp->groupAutoconsent,              // " group_auto_consent,        "
+		pp->raidAutoconsent,              // " raid_auto_consent,         "
+		pp->guildAutoconsent,              // " guild_auto_consent,        "
+		pp->RestTimer                      // " RestTimer)                 "
 	);
-	auto results = QueryDatabase(query);
+	QueryDatabase(query);
 
 	/* Save Bind Points */
-	query = StringFormat("REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
+	query = StringFormat(
+		"REPLACE INTO `character_bind` (id, zone_id, instance_id, x, y, z, heading, slot)"
 		" VALUES (%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
 		"(%u, %u, %u, %f, %f, %f, %f, %i), "
@@ -739,57 +741,73 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		character_id, pp->binds[2].zone_id, 0, pp->binds[2].x, pp->binds[2].y, pp->binds[2].z, pp->binds[2].heading, 2,
 		character_id, pp->binds[3].zone_id, 0, pp->binds[3].x, pp->binds[3].y, pp->binds[3].z, pp->binds[3].heading, 3,
 		character_id, pp->binds[4].zone_id, 0, pp->binds[4].x, pp->binds[4].y, pp->binds[4].z, pp->binds[4].heading, 4
-	); results = QueryDatabase(query);
+	);
+	QueryDatabase(query);
 
-        /* HoTT Ability */
-        if(RuleB(Character, GrantHoTTOnCreate))
-        {
-                query = StringFormat("INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)", character_id, 14, 1);
-                results = QueryDatabase(query);
-        }
+	/* HoTT Ability */
+	if (RuleB(Character, GrantHoTTOnCreate)) {
+		query = StringFormat(
+			"INSERT INTO `character_leadership_abilities` (id, slot, `rank`) VALUES (%u, %i, %i)",
+			character_id,
+			14,
+			1
+		);
+		QueryDatabase(query);
+	}
 
 	/* Save Skills */
-	int firstquery = 0;
-	for (int i = 0; i < MAX_PP_SKILL; i++){
-		if (pp->skills[i] > 0){
-			if (firstquery != 1){
+	int      firstquery = 0;
+	for (int i          = 0; i < MAX_PP_SKILL; i++) {
+		if (pp->skills[i] > 0) {
+			if (firstquery != 1) {
 				firstquery = 1;
-				query = StringFormat("REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)", character_id, i, pp->skills[i]);
-			}
-			else{
+				query      = StringFormat(
+					"REPLACE INTO `character_skills` (id, skill_id, value) VALUES (%u, %u, %u)",
+					character_id,
+					i,
+					pp->skills[i]
+				);
+			} else {
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->skills[i]);
 			}
 		}
 	}
-	results = QueryDatabase(query);
+	QueryDatabase(query);
 
 	/* Save Language */
 	firstquery = 0;
-	for (int i = 0; i < MAX_PP_LANGUAGE; i++){
-		if (pp->languages[i] > 0){
-			if (firstquery != 1){
+	for (int i = 0; i < MAX_PP_LANGUAGE; i++) {
+		if (pp->languages[i] > 0) {
+			if (firstquery != 1) {
 				firstquery = 1;
-				query = StringFormat("REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)", character_id, i, pp->languages[i]);
-			}
-			else{
+				query      = StringFormat(
+					"REPLACE INTO `character_languages` (id, lang_id, value) VALUES (%u, %u, %u)",
+					character_id,
+					i,
+					pp->languages[i]
+				);
+			} else {
 				query = query + StringFormat(", (%u, %u, %u)", character_id, i, pp->languages[i]);
 			}
 		}
 	}
-	results = QueryDatabase(query);
+	QueryDatabase(query);
 
 	return true;
 }
 
 uint32 Database::GetCharacterID(const char *name) {
-	std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name` = '%s'", name);
+	const auto query = fmt::format(
+		"SELECT `id` FROM `character_data` WHERE `name` = '{}'",
+		Strings::Escape(name)
+	);
 	auto results = QueryDatabase(query);
-	auto row = results.begin();
-	if (results.RowCount() == 1)
-	{
-		return atoi(row[0]);
+	if (!results.Success() || !results.RowCount()) {
+		return 0;
 	}
-	return 0;
+
+	auto row = results.begin();
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 /*
@@ -812,10 +830,10 @@ uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {
 
 	auto row = results.begin();
 
-	uint32 accountId = atoi(row[0]);
+	uint32 accountId = Strings::ToUnsignedInt(row[0]);
 
 	if (oCharID)
-		*oCharID = atoi(row[1]);
+		*oCharID = Strings::ToUnsignedInt(row[1]);
 
 	return accountId;
 }
@@ -832,7 +850,7 @@ uint32 Database::GetAccountIDByChar(uint32 char_id) {
 		return 0;
 
 	auto row = results.begin();
-	return atoi(row[0]);
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 uint32 Database::GetAccountIDByName(std::string account_name, std::string loginserver, int16* status, uint32* lsid) {
@@ -852,14 +870,14 @@ uint32 Database::GetAccountIDByName(std::string account_name, std::string logins
 	}
 
 	auto row = results.begin();
-	auto account_id = std::stoul(row[0]);
+	auto account_id = Strings::ToUnsignedInt(row[0]);
 
 	if (status) {
-		*status = static_cast<int16>(std::stoi(row[1]));
+		*status = static_cast<int16>(Strings::ToInt(row[1]));
 	}
 
 	if (lsid) {
-		*lsid = row[2] ? std::stoul(row[2]) : 0;
+		*lsid = row[2] ? Strings::ToUnsignedInt(row[2]) : 0;
 	}
 
 	return account_id;
@@ -880,7 +898,7 @@ void Database::GetAccountName(uint32 accountid, char* name, uint32* oLSAccountID
 
 	strcpy(name, row[0]);
 	if (row[1] && oLSAccountID) {
-		*oLSAccountID = atoi(row[1]);
+		*oLSAccountID = Strings::ToUnsignedInt(row[1]);
 	}
 
 }
@@ -968,7 +986,7 @@ bool Database::LoadVariables() {
 
 	std::string key, value;
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		varcache.last_update = atoi(row[2]); // ahh should we be comparing if this is newer?
+		varcache.last_update = Strings::ToUnsignedInt(row[2]); // ahh should we be comparing if this is newer?
 		key = row[0];
 		value = row[1];
 		std::transform(std::begin(key), std::end(key), std::begin(key), ::tolower); // keys are lower case, DB doesn't have to be
@@ -999,7 +1017,7 @@ bool Database::GetVariable(std::string varname, std::string &varvalue)
 	return false;
 }
 
-bool Database::SetVariable(const std::string varname, const std::string &varvalue)
+bool Database::SetVariable(const std::string& varname, const std::string &varvalue)
 {
 	std::string escaped_name = Strings::Escape(varname);
 	std::string escaped_value = Strings::Escape(varvalue);
@@ -1052,15 +1070,15 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon
 	auto row = results.begin();
 
 	if(graveyard_zoneid != nullptr)
-		*graveyard_zoneid = atoi(row[0]);
+		*graveyard_zoneid = Strings::ToUnsignedInt(row[0]);
 	if(graveyard_x != nullptr)
-		*graveyard_x = atof(row[1]);
+		*graveyard_x = Strings::ToFloat(row[1]);
 	if(graveyard_y != nullptr)
-		*graveyard_y = atof(row[2]);
+		*graveyard_y = Strings::ToFloat(row[2]);
 	if(graveyard_z != nullptr)
-		*graveyard_z = atof(row[3]);
+		*graveyard_z = Strings::ToFloat(row[3]);
 	if(graveyard_heading != nullptr)
-		*graveyard_heading = atof(row[4]);
+		*graveyard_heading = Strings::ToFloat(row[4]);
 
 	return true;
 }
@@ -1168,13 +1186,13 @@ uint32 Database::GetAccountIDFromLSID(
 	}
 
 	for (auto row = results.begin(); row != results.end(); ++row) {
-		account_id = std::stoi(row[0]);
+		account_id = Strings::ToUnsignedInt(row[0]);
 
 		if (in_account_name) {
 			strcpy(in_account_name, row[1]);
 		}
 		if (in_status) {
-			*in_status = std::stoi(row[2]);
+			*in_status = Strings::ToInt(row[2]);
 		}
 	}
 
@@ -1198,7 +1216,7 @@ void Database::GetAccountFromID(uint32 id, char* oAccountName, int16* oStatus) {
 	if (oAccountName)
 		strcpy(oAccountName, row[0]);
 	if (oStatus)
-		*oStatus = atoi(row[1]);
+		*oStatus = Strings::ToInt(row[1]);
 }
 
 void Database::ClearMerchantTemp(){
@@ -1244,7 +1262,7 @@ uint8 Database::GetServerType() {
 		return 0;
 
 	auto row = results.begin();
-	return atoi(row[0]);
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 bool Database::MoveCharacterToZone(uint32 character_id, uint32 zone_id)
@@ -1281,44 +1299,6 @@ bool Database::MoveCharacterToZone(const char *charname, uint32 zone_id)
 	return results.RowsAffected() != 0;
 }
 
-bool Database::SetHackerFlag(const char* accountname, const char* charactername, const char* hacked) {
-	std::string query = StringFormat("INSERT INTO `hackers` (account, name, hacked) values('%s','%s','%s')", accountname, charactername, hacked);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success()) {
-		return false;
-	}
-
-	return results.RowsAffected() != 0;
-}
-
-bool Database::SetMQDetectionFlag(const char* accountname, const char* charactername, const char* hacked, const char* zone) {
-	//Utilize the "hacker" table, but also give zone information.
-	std::string query = StringFormat("INSERT INTO hackers(account,name,hacked,zone) values('%s','%s','%s','%s')", accountname, charactername, hacked, zone);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success())
-	{
-		return false;
-	}
-
-	return results.RowsAffected() != 0;
-}
-
-bool Database::SetMQDetectionFlag(const char* accountname, const char* charactername, const std::string &hacked, const char* zone) {
-	//Utilize the "hacker" table, but also give zone information.
-	auto query = fmt::format("INSERT INTO hackers(account, name, hacked, zone) values('{}', '{}', '{}', '{}')",
-				 accountname, charactername, hacked, zone);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success())
-	{
-		return false;
-	}
-
-	return results.RowsAffected() != 0;
-}
-
 uint8 Database::GetRaceSkill(uint8 skillid, uint8 in_race)
 {
 	uint16 race_cap = 0;
@@ -1334,7 +1314,7 @@ uint8 Database::GetRaceSkill(uint8 skillid, uint8 in_race)
 		return 0;
 
 	auto row = results.begin();
-	return atoi(row[0]);
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16 in_level)
@@ -1350,12 +1330,12 @@ uint8 Database::GetSkillCap(uint8 skillid, uint8 in_race, uint8 in_class, uint16
 	if (results.Success() && results.RowsAffected() != 0)
 	{
 		auto row = results.begin();
-		skill_level = atoi(row[0]);
-		skill_formula = atoi(row[1]);
-		skill_cap = atoi(row[2]);
-		if (atoi(row[3]) > skill_cap)
-			skill_cap2 = (atoi(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
-		skill_cap3 = atoi(row[4]);
+		skill_level = Strings::ToUnsignedInt(row[0]);
+		skill_formula = Strings::ToUnsignedInt(row[1]);
+		skill_cap = Strings::ToUnsignedInt(row[2]);
+		if (Strings::ToUnsignedInt(row[3]) > skill_cap)
+			skill_cap2 = (Strings::ToUnsignedInt(row[3])-skill_cap)/10; //Split the post-50 skill cap into difference between pre-50 cap and post-50 cap / 10 to determine amount of points per level.
+		skill_cap3 = Strings::ToUnsignedInt(row[4]);
 	}
 
 	int race_skill = GetRaceSkill(skillid,in_race);
@@ -1400,10 +1380,10 @@ uint32 Database::GetCharacterInfo(std::string character_name, uint32 *account_id
 	}
 
 	auto row = results.begin();
-	auto character_id = std::stoul(row[0]);
-	*account_id = std::stoul(row[1]);
-	*zone_id = std::stoul(row[2]);
-	*instance_id = std::stoul(row[3]);
+	auto character_id = Strings::ToUnsignedInt(row[0]);
+	*account_id = Strings::ToUnsignedInt(row[1]);
+	*zone_id = Strings::ToUnsignedInt(row[2]);
+	*instance_id = Strings::ToUnsignedInt(row[3]);
 
 	return character_id;
 }
@@ -1526,7 +1506,7 @@ uint32 Database::GetGroupID(const char* name){
 
 	auto row = results.begin();
 
-	return atoi(row[0]);
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 std::string Database::GetGroupLeaderForLogin(std::string character_name) {
@@ -1540,7 +1520,7 @@ std::string Database::GetGroupLeaderForLogin(std::string character_name) {
 
 	if (results.Success() && results.RowCount()) {
 		auto row = results.begin();
-		group_id = std::stoul(row[0]);
+		group_id = Strings::ToUnsignedInt(row[0]);
 	}
 
 	if (!group_id) {
@@ -1629,7 +1609,7 @@ char *Database::GetGroupLeadershipInfo(uint32 gid, char* leaderbuf, char* mainta
 		strcpy(mentoree, row[5]);
 
 	if (mentor_percent)
-		*mentor_percent = atoi(row[6]);
+		*mentor_percent = Strings::ToInt(row[6]);
 
 	if(GLAA && results.LengthOfColumn(7) == sizeof(GroupLeadershipAA_Struct))
 		memcpy(GLAA, row[7], sizeof(GroupLeadershipAA_Struct));
@@ -1676,7 +1656,7 @@ uint8 Database::GetAgreementFlag(uint32 acctid) {
 
 	auto row = results.begin();
 
-	return atoi(row[0]);
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 void Database::SetAgreementFlag(uint32 acctid) {
@@ -1762,7 +1742,7 @@ uint32 Database::GetRaidID(const char* name)
 	}
 
 	if (row[0]) // would it ever be possible to have a null here?
-		return atoi(row[0]);
+		return Strings::ToUnsignedInt(row[0]);
 
 	return 0;
 }
@@ -1845,7 +1825,7 @@ void Database::GetGroupLeadershipInfo(uint32 gid, uint32 rid, char *maintank,
 		strcpy(mentoree, row[4]);
 
 	if (mentor_percent)
-		*mentor_percent = atoi(row[5]);
+		*mentor_percent = Strings::ToInt(row[5]);
 
 	if (GLAA && results.LengthOfColumn(6) == sizeof(GroupLeadershipAA_Struct))
 		memcpy(GLAA, row[6], sizeof(GroupLeadershipAA_Struct));
@@ -2018,16 +1998,16 @@ bool Database::GetAdventureStats(uint32 char_id, AdventureStats_Struct *as)
 
 	auto row = results.begin();
 
-	as->success.guk = atoi(row[0]);
-	as->success.mir = atoi(row[1]);
-	as->success.mmc = atoi(row[2]);
-	as->success.ruj = atoi(row[3]);
-	as->success.tak = atoi(row[4]);
-	as->failure.guk = atoi(row[5]);
-	as->failure.mir = atoi(row[6]);
-	as->failure.mmc = atoi(row[7]);
-	as->failure.ruj = atoi(row[8]);
-	as->failure.tak = atoi(row[9]);
+	as->success.guk = Strings::ToUnsignedInt(row[0]);
+	as->success.mir = Strings::ToUnsignedInt(row[1]);
+	as->success.mmc = Strings::ToUnsignedInt(row[2]);
+	as->success.ruj = Strings::ToUnsignedInt(row[3]);
+	as->success.tak = Strings::ToUnsignedInt(row[4]);
+	as->failure.guk = Strings::ToUnsignedInt(row[5]);
+	as->failure.mir = Strings::ToUnsignedInt(row[6]);
+	as->failure.mmc = Strings::ToUnsignedInt(row[7]);
+	as->failure.ruj = Strings::ToUnsignedInt(row[8]);
+	as->failure.tak = Strings::ToUnsignedInt(row[9]);
 	as->failure.total = as->failure.guk + as->failure.mir + as->failure.mmc + as->failure.ruj + as->failure.tak;
 	as->success.total = as->success.guk + as->success.mir + as->success.mmc + as->success.ruj + as->success.tak;
 
@@ -2046,7 +2026,7 @@ uint32 Database::GetGuildIDByCharID(uint32 character_id)
 		return 0;
 
 	auto row = results.begin();
-	return atoi(row[0]);
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 uint32 Database::GetGroupIDByCharID(uint32 character_id)
@@ -2068,7 +2048,7 @@ uint32 Database::GetGroupIDByCharID(uint32 character_id)
 		return 0;
 
 	auto row = results.begin();
-	return atoi(row[0]);
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 uint32 Database::GetRaidIDByCharID(uint32 character_id) {
@@ -2081,10 +2061,12 @@ uint32 Database::GetRaidIDByCharID(uint32 character_id) {
 		character_id
 	);
 	auto results = QueryDatabase(query);
-	for (auto row = results.begin(); row != results.end(); ++row) {
-		return atoi(row[0]);
+	if (!results.Success() || !results.RowCount()) {
+		return 0;
 	}
-	return 0;
+
+	auto row = results.begin();
+	return Strings::ToUnsignedInt(row[0]);
 }
 
 int Database::CountInvSnapshots() {
@@ -2096,7 +2078,7 @@ int Database::CountInvSnapshots() {
 
 	auto row = results.begin();
 
-	int64 count = atoll(row[0]);
+	int64 count = Strings::ToBigInt(row[0]);
 	if (count > 2147483647)
 		return -2;
 	if (count < 0)
@@ -2127,17 +2109,17 @@ struct TimeOfDay_Struct Database::LoadTime(time_t &realtime)
 		eqTime.day = 1;
 		eqTime.month = 1;
 		eqTime.year = 3100;
-		realtime = time(0);
+		realtime = time(nullptr);
 	}
 	else{
 		auto row = results.begin();
 
-		eqTime.minute = atoi(row[0]);
-		eqTime.hour = atoi(row[1]);
-		eqTime.day = atoi(row[2]);
-		eqTime.month = atoi(row[3]);
-		eqTime.year = atoi(row[4]);
-		realtime = atoi(row[5]);
+		eqTime.minute = Strings::ToUnsignedInt(row[0]);
+		eqTime.hour = Strings::ToUnsignedInt(row[1]);
+		eqTime.day = Strings::ToUnsignedInt(row[2]);
+		eqTime.month = Strings::ToUnsignedInt(row[3]);
+		eqTime.year = Strings::ToUnsignedInt(row[4]);
+		realtime = Strings::ToBigInt(row[5]);
 	}
 
 	return eqTime;
@@ -2164,7 +2146,7 @@ int Database::GetIPExemption(std::string account_ip) {
 	}
 
 	auto row = results.begin();
-	return std::stoi(row[0]);
+	return Strings::ToInt(row[0]);
 }
 
 void Database::SetIPExemption(std::string account_ip, int exemption_amount) {
@@ -2178,7 +2160,7 @@ void Database::SetIPExemption(std::string account_ip, int exemption_amount) {
 	auto results = QueryDatabase(query);
 	if (results.Success() && results.RowCount()) {
 		auto row = results.begin();
-		exemption_id = std::stoul(row[0]);
+		exemption_id = Strings::ToUnsignedInt(row[0]);
 	}
 
 	query = fmt::format(
@@ -2204,7 +2186,7 @@ int Database::GetInstanceID(uint32 char_id, uint32 zone_id) {
 
 	if (results.Success() && results.RowCount() > 0) {
 		auto row = results.begin();
-		return atoi(row[0]);;
+		return Strings::ToInt(row[0]);;
 	}
 
 	return 0;
@@ -2310,7 +2292,6 @@ bool Database::CopyCharacter(
 			new_rows.emplace_back(new_values);
 		}
 
-		std::string              insert_values;
 		std::vector<std::string> insert_rows;
 
 		for (auto &r: new_rows) {
@@ -2366,7 +2347,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 		);
 
 		if (!DoesTableExist(table_name)) {
-			LogMySQLQuery("Table [{}] does not exist. Downloading from Github and installing...", table_name);
+			LogMySQLQuery("Table [{}] does not exist. Downloading and installing...", table_name);
 
 			// http get request
 			httplib::Client cli(
@@ -2374,7 +2355,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 					"{}://{}",
 					request_uri.get_scheme(),
 					request_uri.get_host()
-				).c_str()
+				)
 			);
 
 			cli.set_connection_timeout(0, 60000000); // 60 sec
@@ -2383,7 +2364,7 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 
 			int sourced_queries = 0;
 
-			if (auto res = cli.Get(request_uri.get_path().c_str())) {
+			if (auto res = cli.Get(request_uri.get_path())) {
 				if (res->status == 200) {
 					for (auto &s: Strings::Split(res->body, ';')) {
 						if (!Strings::Trim(s).empty()) {
@@ -2427,3 +2408,55 @@ uint8 Database::GetMinStatus(uint32 zone_id, uint32 instance_version)
 
 	return !zones.empty() ? zones[0].min_status : 0;
 }
+
+void Database::SourceSqlFromUrl(std::string url)
+{
+	try {
+		uri request_uri(url);
+
+		LogHTTPDetail(
+			"parsing url [{}] path [{}] host [{}] query_string [{}] protocol [{}] port [{}]",
+			url,
+			request_uri.get_path(),
+			request_uri.get_host(),
+			request_uri.get_query(),
+			request_uri.get_scheme(),
+			request_uri.get_port()
+		);
+
+		LogInfo("Downloading and installing from [{}]", url);
+
+		// http get request
+		httplib::Client cli(
+			fmt::format(
+				"{}://{}",
+				request_uri.get_scheme(),
+				request_uri.get_host()
+			)
+		);
+
+		cli.set_connection_timeout(0, 60000000); // 60 sec
+		cli.set_read_timeout(60, 0); // 60 seconds
+		cli.set_write_timeout(60, 0); // 60 seconds
+
+		if (auto res = cli.Get(request_uri.get_path())) {
+			if (res->status == 200) {
+				auto results = QueryDatabaseMulti(res->body);
+				if (!results.ErrorMessage().empty()) {
+					LogError("Error sourcing SQL [{}]", results.ErrorMessage());
+					return;
+				}
+			}
+			if (res->status == 404) {
+				LogError("Error retrieving URL [{}]", url);
+			}
+		}
+		else {
+			LogError("Error retrieving URL [{}]", url);
+		}
+
+	}
+	catch (std::invalid_argument iae) {
+		LogError("URI parser error [{}]", iae.what());
+	}
+}

common/database.h

@@ -34,8 +34,6 @@
 #include <vector>
 #include <map>
 
-//atoi is not uint32 or uint32 safe!!!!
-#define atoul(str) strtoul(str, nullptr, 10)
 
 class MySQLRequestResult;
 class Client;
@@ -108,9 +106,6 @@ public:
 	bool MoveCharacterToZone(uint32 character_id, uint32 zone_id);
 	bool ReserveName(uint32 account_id, char *name);
 	bool SaveCharacterCreate(uint32 character_id, uint32 account_id, PlayerProfile_Struct *pp);
-	bool SetHackerFlag(const char *accountname, const char *charactername, const char *hacked);
-	bool SetMQDetectionFlag(const char *accountname, const char *charactername, const char *hacked, const char *zone);
-	bool SetMQDetectionFlag(const char *accountname, const char *charactername, const std::string &hacked, const char *zone);
 	bool UpdateName(const char *oldname, const char *newname);
 	bool CopyCharacter(
 		const std::string& source_character_name,
@@ -240,7 +235,7 @@ public:
 	/* Database Variables */
 
 	bool	GetVariable(std::string varname, std::string &varvalue);
-	bool	SetVariable(const std::string varname, const std::string &varvalue);
+	bool	SetVariable(const std::string& varname, const std::string &varvalue);
 	bool	LoadVariables();
 
 	/* General Queries */
@@ -268,7 +263,7 @@ public:
 	void	ClearInvSnapshots(bool from_now = false);
 
 	void SourceDatabaseTableFromUrl(std::string table_name, std::string url);
-
+	void SourceSqlFromUrl(std::string url);
 
 private:
 

common/database/database_dump_service.cpp

@@ -28,6 +28,7 @@
 #include "../database_schema.h"
 #include "../file.h"
 #include "../process/process.h"
+#include "../termcolor/rang.hpp"
 
 #include <ctime>
 
@@ -36,6 +37,7 @@
 #else
 
 #include <sys/time.h>
+#include <thread>
 
 #endif
 
@@ -91,6 +93,8 @@ std::string DatabaseDumpService::GetMySQLVersion()
 	return Strings::Trim(version_output);
 }
 
+const std::string CREDENTIALS_FILE = "login.my.cnf";
+
 /**
  * @return
  */
@@ -99,21 +103,15 @@ std::string DatabaseDumpService::GetBaseMySQLDumpCommand()
 	auto config = EQEmuConfig::get();
 	if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
 		return fmt::format(
-			"mysqldump -u {} -p{} -h {} --port={} {}",
-			config->ContentDbUsername,
-			config->ContentDbPassword,
-			config->ContentDbHost,
-			config->ContentDbPort,
+			"mysqldump --defaults-extra-file={} {}",
+			CREDENTIALS_FILE,
 			config->ContentDbName
 		);
 	};
 
 	return fmt::format(
-		"mysqldump -u {} -p{} -h {} --port={} {}",
-		config->DatabaseUsername,
-		config->DatabasePassword,
-		config->DatabaseHost,
-		config->DatabasePort,
+		"mysqldump --defaults-extra-file={} {}",
+		CREDENTIALS_FILE,
 		config->DatabaseDB
 	);
 }
@@ -145,7 +143,7 @@ std::string DatabaseDumpService::GetQueryServTables()
 
 std::string DatabaseDumpService::GetSystemTablesList()
 {
-	auto system_tables = DatabaseSchema::GetServerTables();
+	auto system_tables  = DatabaseSchema::GetServerTables();
 	auto version_tables = DatabaseSchema::GetVersionTables();
 
 	system_tables.insert(
@@ -199,7 +197,7 @@ std::string DatabaseDumpService::GetDumpFileNameWithPath()
 	return GetSetDumpPath() + GetDumpFileName();
 }
 
-void DatabaseDumpService::Dump()
+void DatabaseDumpService::DatabaseDump()
 {
 	if (!IsMySQLInstalled()) {
 		LogError("MySQL is not installed; Please check your PATH for a valid MySQL installation");
@@ -293,14 +291,6 @@ void DatabaseDumpService::Dump()
 		pipe_file = fmt::format(" > {}.sql", GetDumpFileNameWithPath());
 	}
 
-	std::string execute_command = fmt::format(
-		"{} {} {} {}",
-		GetBaseMySQLDumpCommand(),
-		options,
-		tables_to_dump,
-		pipe_file
-	);
-
 	if (!File::Exists(GetSetDumpPath()) && !IsDumpOutputToConsole()) {
 		File::Makedir(GetSetDumpPath());
 	}
@@ -308,30 +298,60 @@ void DatabaseDumpService::Dump()
 	if (IsDumpDropTableSyntaxOnly()) {
 		std::vector<std::string> tables = Strings::Split(tables_to_dump, ' ');
 
-		for (auto &table : tables) {
+		for (auto &table: tables) {
 			std::cout << "DROP TABLE IF EXISTS `" << table << "`;" << std::endl;
 		}
 
 		if (tables_to_dump.empty()) {
 			std::cerr << "No tables were specified" << std::endl;
 		}
+
+		return;
 	}
 	else {
+		const auto execute_command = fmt::format(
+			"{} {} {} {}",
+			GetBaseMySQLDumpCommand(),
+			options,
+			tables_to_dump,
+			pipe_file
+		);
+
+		BuildCredentialsFile();
 		std::string execution_result = Process::execute(execute_command);
 		if (!execution_result.empty() && IsDumpOutputToConsole()) {
 			std::cout << execution_result;
 		}
 	}
 
+	LogSys.LoadLogSettingsDefaults();
+
+	if (!pipe_file.empty()) {
+		std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
+		auto        r    = File::GetContents(file);
+		if (!r.error.empty()) {
+			LogError("{}", r.error);
+		}
+
+		for (auto &line: Strings::Split(r.contents, "\n")) {
+			if (Strings::Contains(line, "mysqldump:")) {
+				LogError("{}", line);
+				LogError("Database dump failed. Correct the error before continuing or trying again");
+				LogError("This is to prevent data loss on behalf of the server operator");
+				RemoveSqlBackup();
+				std::exit(1);
+			}
+		}
+	}
+
 	if (!tables_to_dump.empty()) {
 		LogInfo("Dumping Tables [{}]", Strings::Trim(tables_to_dump));
 	}
 
 	LogInfo("Database dump created at [{}.sql]", GetDumpFileNameWithPath());
-
 	if (IsDumpWithCompression() && !IsDumpOutputToConsole()) {
 		if (HasCompressionBinary()) {
-			LogInfo("Compression requested... Compressing dump [{}.sql]", GetDumpFileNameWithPath());
+			LogInfo("Compression requested. Compressing dump [{}.sql]", GetDumpFileNameWithPath());
 
 			if (IsTarAvailable()) {
 				Process::execute(
@@ -343,6 +363,7 @@ void DatabaseDumpService::Dump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.tar.gz]", GetDumpFileNameWithPath());
+				RemoveSqlBackup();
 			}
 			else if (Is7ZipAvailable()) {
 				Process::execute(
@@ -353,6 +374,7 @@ void DatabaseDumpService::Dump()
 					)
 				);
 				LogInfo("Compressed dump created at [{}.zip]", GetDumpFileNameWithPath());
+				RemoveSqlBackup();
 			}
 			else {
 				LogInfo("Compression requested, but no available compression binary was found");
@@ -363,6 +385,8 @@ void DatabaseDumpService::Dump()
 		}
 	}
 
+	RemoveCredentialsFile();
+
 //	LogDebug("[{}] dump-to-console", IsDumpOutputToConsole());
 //	LogDebug("[{}] dump-path", GetSetDumpPath());
 //	LogDebug("[{}] compression", (IsDumpWithCompression() ? "true" : "false"));
@@ -535,3 +559,48 @@ void DatabaseDumpService::SetDumpMercTables(bool dump_merc_tables)
 {
 	DatabaseDumpService::dump_merc_tables = dump_merc_tables;
 }
+
+void DatabaseDumpService::RemoveSqlBackup()
+{
+	std::string file = fmt::format("{}.sql", GetDumpFileNameWithPath());
+	if (File::Exists(file)) {
+		std::filesystem::remove(file);
+	}
+
+	RemoveCredentialsFile();
+}
+
+void DatabaseDumpService::BuildCredentialsFile()
+{
+	auto          config = EQEmuConfig::get();
+	std::ofstream out(CREDENTIALS_FILE);
+	if (out.is_open()) {
+		if (IsDumpContentTables() && !config->ContentDbHost.empty()) {
+			out << "[mysqldump]" << std::endl;
+			out << "user=" << config->ContentDbUsername << std::endl;
+			out << "password=" << config->ContentDbPassword << std::endl;
+			out << "host=" << config->ContentDbHost << std::endl;
+			out << "port=" << config->ContentDbPort << std::endl;
+			out << "default-character-set=utf8" << std::endl;
+		}
+		else {
+			out << "[mysqldump]" << std::endl;
+			out << "user=" << config->DatabaseUsername << std::endl;
+			out << "password=" << config->DatabasePassword << std::endl;
+			out << "host=" << config->DatabaseHost << std::endl;
+			out << "port=" << config->DatabasePort << std::endl;
+			out << "default-character-set=utf8" << std::endl;
+		}
+		out.close();
+	}
+	else {
+		LogError("Failed to open credentials file for writing");
+	}
+}
+
+void DatabaseDumpService::RemoveCredentialsFile()
+{
+	if (File::Exists(CREDENTIALS_FILE)) {
+		std::filesystem::remove(CREDENTIALS_FILE);
+	}
+}

common/database/database_dump_service.h

@@ -24,7 +24,7 @@
 
 class DatabaseDumpService {
 public:
-	void Dump();
+	void DatabaseDump();
 	bool IsDumpAllTables() const;
 	void SetDumpAllTables(bool dump_all_tables);
 	bool IsDumpWithNoData() const;
@@ -92,6 +92,9 @@ private:
 	std::string GetDumpFileNameWithPath();
 	std::string GetSetDumpPath();
 	std::string GetQueryServTables();
+	void RemoveSqlBackup();
+	void BuildCredentialsFile();
+	void RemoveCredentialsFile();
 };
 
 

common/database/database_update.cpp

@@ -0,0 +1,296 @@
+#include <filesystem>
+#include "database_update.h"
+#include "../eqemu_logsys.h"
+#include "../database.h"
+#include "../strings.h"
+#include "../rulesys.h"
+#include "../http/httplib.h"
+
+#include "database_update_manifest.cpp"
+#include "database_update_manifest_bots.cpp"
+#include "database_dump_service.h"
+
+constexpr int BREAK_LENGTH = 70;
+
+DatabaseVersion DatabaseUpdate::GetDatabaseVersions()
+{
+	auto results = m_database->QueryDatabase("SELECT `version`, `bots_version` FROM `db_version` LIMIT 1");
+	if (!results.Success() || !results.RowCount()) {
+		LogError("Failed to read from [db_version] table!");
+		return DatabaseVersion{};
+	}
+
+	auto r = results.begin();
+
+	return DatabaseVersion{
+		.server_database_version = Strings::ToInt(r[0]),
+		.bots_database_version = Strings::ToInt(r[1]),
+	};
+}
+
+DatabaseVersion DatabaseUpdate::GetBinaryDatabaseVersions()
+{
+	return DatabaseVersion{
+		.server_database_version = CURRENT_BINARY_DATABASE_VERSION,
+		.bots_database_version = (RuleB(Bots, Enabled) ? CURRENT_BINARY_BOTS_DATABASE_VERSION : 0),
+	};
+}
+
+// the amount of versions we look-back to ensure we have all migrations
+// we may not want to force these, but just warn about the look-backs
+constexpr int LOOK_BACK_AMOUNT = 10;
+
+// this check will take action
+void DatabaseUpdate::CheckDbUpdates()
+{
+	InjectBotsVersionColumn();
+	auto v = GetDatabaseVersions();
+	auto b = GetBinaryDatabaseVersions();
+	if (CheckVersions(v, b)) {
+		return;
+	}
+
+	if (UpdateManifest(manifest_entries, v.server_database_version, b.server_database_version)) {
+		LogInfo(
+			"Updates ran successfully, setting database version to [{}] from [{}]",
+			b.server_database_version,
+			v.server_database_version
+		);
+		m_database->QueryDatabase(fmt::format("UPDATE `db_version` SET `version` = {}", b.server_database_version));
+	}
+
+	if (b.bots_database_version > 0) {
+		if (UpdateManifest(bot_manifest_entries, v.bots_database_version, b.bots_database_version)) {
+			LogInfo(
+				"Updates ran successfully, setting database version to [{}] from [{}]",
+				b.bots_database_version,
+				v.bots_database_version
+			);
+			m_database->QueryDatabase(
+				fmt::format(
+					"UPDATE `db_version` SET `bots_version` = {}",
+					b.bots_database_version
+				)
+			);
+		}
+	}
+}
+
+std::string DatabaseUpdate::GetQueryResult(std::string query)
+{
+	auto results = m_database->QueryDatabase(query);
+
+	std::vector<std::string> result_lines = {};
+
+	for (auto row = results.begin(); row != results.end(); ++row) {
+		std::vector<std::string> cols;
+
+		int field_count = results.ColumnCount();
+		cols.reserve(field_count);
+		for (int i = 0; i < field_count; ++i) {
+			if (row[i] != nullptr) {
+				cols.emplace_back(row[i]);
+			}
+		}
+
+		result_lines.emplace_back(Strings::Join(cols, " "));
+	}
+
+	return Strings::Join(result_lines, "\n");
+}
+
+bool DatabaseUpdate::ShouldRunMigration(ManifestEntry &e, std::string query_result)
+{
+	std::string r = Strings::Trim(query_result);
+	if (e.condition == "contains") {
+		return Strings::Contains(r, e.match);
+	}
+	else if (e.condition == "match") {
+		return r == e.match;
+	}
+	else if (e.condition == "missing") {
+		return !Strings::Contains(r, e.match);
+	}
+	else if (e.condition == "empty") {
+		return r.empty();
+	}
+	else if (e.condition == "not_empty") {
+		return !r.empty();
+	}
+
+	return false;
+}
+
+// return true if we ran updates
+bool DatabaseUpdate::UpdateManifest(
+	std::vector<ManifestEntry> entries,
+	int version_low,
+	int version_high
+)
+{
+	std::vector<int> missing_migrations = {};
+	if (version_low != version_high) {
+
+		LogSys.DisableMySQLErrorLogs();
+		for (int version = version_low + 1; version <= version_high; ++version) {
+			for (auto &e: entries) {
+				if (e.version == version) {
+					bool        has_migration = true;
+					std::string r             = GetQueryResult(e.check);
+					if (ShouldRunMigration(e, r)) {
+						has_migration = false;
+						missing_migrations.emplace_back(e.version);
+					}
+
+					std::string prefix = fmt::format(
+						"[{}]",
+						has_migration ? "ok" : "missing"
+					);
+
+					LogInfo(
+						"[{}] {:>10} | [{}]",
+						e.version,
+						prefix,
+						e.description
+					);
+				}
+			}
+		}
+		LogSys.EnableMySQLErrorLogs();
+		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
+
+		if (!missing_migrations.empty()) {
+			LogInfo("Automatically backing up database before applying updates");
+			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
+			auto s = DatabaseDumpService();
+			s.SetDumpAllTables(true);
+			s.SetDumpWithCompression(true);
+			s.DatabaseDump();
+			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
+		}
+
+		if (!missing_migrations.empty()) {
+			LogInfo("Running database migrations. Please wait...");
+			LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
+		}
+
+		for (auto &m: missing_migrations) {
+			for (auto &e: entries) {
+				if (e.version == m) {
+					bool errored_migration = false;
+
+					auto r = m_database->QueryDatabaseMulti(e.sql);
+
+					// ignore empty query result "errors"
+					if (r.ErrorNumber() != 1065 && !r.ErrorMessage().empty()) {
+						LogError("(#{}) [{}]", r.ErrorNumber(), r.ErrorMessage());
+						errored_migration = true;
+
+						LogInfo("Required database update failed. This could be a problem");
+						LogInfo("Would you like to skip this update? [y/n] (Timeout 60s)");
+
+						// user input
+						std::string input;
+						bool        gave_input        = false;
+						time_t      start_time        = time(nullptr);
+						time_t      wait_time_seconds = 60;
+
+						// spawn a concurrent thread that waits for input from std::cin
+						std::thread t1(
+							[&]() {
+								std::cin >> input;
+								gave_input = true;
+							}
+						);
+						t1.detach();
+
+						// check the inputReceived flag once every 50ms for 10 seconds
+						while (time(nullptr) < start_time + wait_time_seconds && !gave_input) {
+							std::this_thread::sleep_for(std::chrono::milliseconds(50));
+						}
+
+						// prompt for user skip
+						if (Strings::Trim(input) == "y") {
+							errored_migration = false;
+							LogInfo("Skipping update [{}] [{}]", e.version, e.description);
+						}
+					}
+
+					LogInfo(
+						"[{}] [{}] [{}]",
+						e.version,
+						e.description,
+						(errored_migration ? "error" : "ok")
+					);
+
+					if (errored_migration) {
+						LogError("Fatal | Database migration [{}] failed to run", e.description);
+						LogError("Fatal | Shutting down");
+						std::exit(1);
+					}
+				}
+			}
+		}
+
+		LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
+
+		return true;
+	}
+
+	return false;
+}
+
+DatabaseUpdate *DatabaseUpdate::SetDatabase(Database *db)
+{
+	m_database = db;
+
+	return this;
+}
+
+bool DatabaseUpdate::CheckVersions(DatabaseVersion v, DatabaseVersion b)
+{
+	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
+
+	LogInfo(
+		"{:>8} | database [{}] binary [{}] {}",
+		"Server",
+		v.server_database_version,
+		b.server_database_version,
+		(v.server_database_version == b.server_database_version) ? "up to date" : "checking updates"
+	);
+
+	if (b.bots_database_version > 0) {
+		LogInfo(
+			"{:>8} | database [{}] binary [{}] {}",
+			"Bots",
+			v.bots_database_version,
+			b.bots_database_version,
+			(v.bots_database_version == b.bots_database_version) ? "up to date" : "checking updates"
+		);
+	}
+
+	LogInfo("{:>8} | [server.auto_database_updates] [<green>true]", "Config");
+
+	LogInfo("{}", Strings::Repeat("-", BREAK_LENGTH));
+
+	return (v.server_database_version == b.server_database_version) &&
+		   (v.bots_database_version == b.bots_database_version);
+}
+
+// checks to see if there are pending updates
+// used by zone to prevent launch or boot loop until updates are applied
+bool DatabaseUpdate::HasPendingUpdates()
+{
+	auto v = GetDatabaseVersions();
+	auto b = GetBinaryDatabaseVersions();
+
+	return !CheckVersions(v, b);
+}
+
+void DatabaseUpdate::InjectBotsVersionColumn()
+{
+	auto r = m_database->QueryDatabase("show columns from db_version where Field like '%bots_version%'");
+	if (r.RowCount() == 0) {
+		m_database->QueryDatabase("ALTER TABLE db_version ADD bots_version int(11) DEFAULT '0' AFTER version");
+	}
+}

common/database/database_update.h

@@ -0,0 +1,37 @@
+#ifndef EQEMU_DATABASE_UPDATE_H
+#define EQEMU_DATABASE_UPDATE_H
+
+#include "../database.h"
+
+struct ManifestEntry {
+	int         version{};     // database version of the migration
+	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
+	std::string check{};       // query that checks against the condition
+	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
+	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
+	std::string sql{};         // the SQL DDL that gets ran when the condition is true
+};
+
+struct DatabaseVersion {
+	int server_database_version;
+	int bots_database_version;
+};
+
+class DatabaseUpdate {
+public:
+	DatabaseVersion GetDatabaseVersions();
+	DatabaseVersion GetBinaryDatabaseVersions();
+	void CheckDbUpdates();
+	std::string GetQueryResult(std::string query);
+	static bool ShouldRunMigration(ManifestEntry &e, std::string query_result);
+	bool UpdateManifest(std::vector<ManifestEntry> entries, int version_low, int version_high);
+
+	DatabaseUpdate *SetDatabase(Database *db);
+	bool HasPendingUpdates();
+private:
+	Database *m_database;
+	static bool CheckVersions(DatabaseVersion v, DatabaseVersion b);
+	void InjectBotsVersionColumn();
+};
+
+#endif //EQEMU_DATABASE_UPDATE_H

common/database/database_update_manifest_bots.cpp

@@ -0,0 +1,84 @@
+#include "database_update.h"
+
+std::vector<ManifestEntry> bot_manifest_entries = {
+	ManifestEntry{
+		.version = 9035,
+		.description = "2022_12_04_bot_archery.sql",
+		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'archery_setting'",
+		.condition = "empty",
+		.match = "",
+		.sql = R"(
+ALTER TABLE `bot_data`
+ADD COLUMN `archery_setting` TINYINT(2) UNSIGNED NOT NULL DEFAULT '0' AFTER `enforce_spell_settings`;
+)",
+	},
+	ManifestEntry{
+		.version = 9036,
+		.description = "2023_01_19_drop_bot_views.sql",
+		.check = "SHOW TABLES LIKE 'vw_groups'",
+		.condition = "not_empty",
+		.match = "",
+		.sql = R"(
+DROP VIEW vw_bot_groups;
+DROP VIEW vw_bot_character_mobs;
+DROP VIEW vw_groups;
+DROP VIEW vw_guild_members;
+DROP TABLE bot_guild_members;
+
+)",
+	},
+	ManifestEntry{
+		.version = 9037,
+		.description = "2023_01_22_add_name_index.sql",
+		.check = "show index from bot_data WHERE key_name = 'name`",
+		.condition = "",
+		.match = "empty",
+		.sql = R"(
+create index `name` on bot_data(`name`);
+)",
+	},
+	ManifestEntry{
+		.version = 9038,
+		.description = "2023_02_16_add_caster_range.sql",
+		.check = "SHOW COLUMNS FROM `bot_data` LIKE 'caster_range'",
+		.condition = "",
+		.match = "empty",
+		.sql = R"(
+ALTER TABLE `bot_data`
+ADD COLUMN `caster_range` INT(11) UNSIGNED NOT NULL DEFAULT '300' AFTER `archery_setting`;
+)",
+	},
+	ManifestEntry{
+		.version = 9039,
+		.description = "2023_03_31_remove_bot_groups.sql",
+		.check = "SHOW TABLES LIKE 'bot_groups'",
+		.condition = "",
+		.match = "not_empty",
+		.sql = R"(
+SET FOREIGN_KEY_CHECKS = 0;
+DROP TABLE IF EXISTS `bot_groups`;
+DROP TABLE IF EXISTS `bot_group_members`;
+SET FOREIGN_KEY_CHECKS = 1;
+)",
+	},
+// -- template; copy/paste this when you need to create a new entry
+//	ManifestEntry{
+//		.version = 9228,
+//		.description = "some_new_migration.sql",
+//		.check = "SHOW COLUMNS FROM `table_name` LIKE 'column_name'",
+//		.condition = "empty",
+//		.match = "",
+//		.sql = R"(
+//
+//)"
+};
+
+// see struct definitions for what each field does
+// struct ManifestEntry {
+// 	int         version{};     // database version of the migration
+// 	std::string description{}; // description of the migration ex: "add_new_table" or "add_index_to_table"
+// 	std::string check{};       // query that checks against the condition
+// 	std::string condition{};   // condition or "match_type" - Possible values [contains|match|missing|empty|not_empty]
+// 	std::string match{};       // match field that is not always used, but works in conjunction with "condition" values [missing|match|contains]
+// 	std::string sql{};         // the SQL DDL that gets ran when the condition is true
+// };

common/database_instances.cpp

@@ -167,8 +167,8 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id)
 
 	auto row = results.begin();
 
-	if (atoi(row[0]) <= max) {
-		instance_id = atoi(row[0]);
+	if (Strings::ToInt(row[0]) <= max) {
+		instance_id = Strings::ToInt(row[0]);
 
 		return true;
 	}
@@ -194,7 +194,7 @@ bool Database::GetUnusedInstanceID(uint16 &instance_id)
 	max_reserved_instance_id++;
 
 	for (auto row : results) {
-		if (max_reserved_instance_id < std::stoul(row[0])) {
+		if (max_reserved_instance_id < Strings::ToUnsignedInt(row[0])) {
 			instance_id = max_reserved_instance_id;
 			return true;
 		}
@@ -301,7 +301,7 @@ uint16 Database::GetInstanceID(uint32 zone_id, uint32 character_id, int16 versio
 
 	auto row = results.begin();
 
-	return static_cast<uint16>(std::stoul(row[0]));
+	return static_cast<uint16>(Strings::ToUnsignedInt(row[0]));
 }
 
 std::vector<uint16> Database::GetInstanceIDs(uint32 zone_id, uint32 character_id)
@@ -328,7 +328,7 @@ std::vector<uint16> Database::GetInstanceIDs(uint32 zone_id, uint32 character_id
 	}
 
 	for (auto row : results) {
-		l.push_back(static_cast<uint16>(std::stoul(row[0])));
+		l.push_back(static_cast<uint16>(Strings::ToUnsignedInt(row[0])));
 	}
 
 	return l;
@@ -409,7 +409,7 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)
 	auto zone_id = GetInstanceZoneID(instance_id);
 	auto version = GetInstanceVersion(instance_id);
 
-	auto l = GroupIdRepository::GetWhere(
+	auto l = RaidMembersRepository::GetWhere(
 		*this,
 		fmt::format(
 			"raidid = {}",
@@ -429,8 +429,6 @@ void Database::AssignRaidToInstance(uint32 raid_id, uint32 instance_id)
 
 void Database::DeleteInstance(uint16 instance_id)
 {
-	std::string query;
-
 	InstanceListPlayerRepository::DeleteWhere(*this, fmt::format("id = {}", instance_id));
 
 	RespawnTimesRepository::DeleteWhere(*this, fmt::format("instance_id = {}", instance_id));

common/database_schema.h

@@ -68,7 +68,7 @@ namespace DatabaseSchema {
 			{"character_spells",               "id"},
 			{"character_task_timers",          "character_id"},
 			{"character_tasks",                "charid"},
-			{"character_tribute",              "id"},
+			{"character_tribute",              "character_id"},
 			{"completed_tasks",                "charid"},
 			{"data_buckets",                   "id"},
 			{"faction_values",                 "char_id"},
@@ -256,6 +256,7 @@ namespace DatabaseSchema {
 	{
 		return {
 			"chatchannels",
+			"chatchannel_reserved_names",
 			"command_settings",
 			"content_flags",
 			"db_str",
@@ -321,13 +322,11 @@ namespace DatabaseSchema {
 			"discord_webhooks",
 			"dynamic_zone_members",
 			"dynamic_zones",
-			"eventlog",
 			"expedition_lockouts",
 			"expeditions",
 			"gm_ips",
 			"group_id",
 			"group_leaders",
-			"hackers",
 			"instance_list",
 			"ip_exemptions",
 			"item_tick",
@@ -343,6 +342,8 @@ namespace DatabaseSchema {
 			"respawn_times",
 			"saylink",
 			"server_scheduled_events",
+			"player_event_log_settings",
+			"player_event_logs",
 			"shared_task_activity_state",
 			"shared_task_dynamic_zones",
 			"shared_task_members",
@@ -392,9 +393,6 @@ namespace DatabaseSchema {
 			"bot_command_settings",
 			"bot_create_combinations",
 			"bot_data",
-			"bot_group_members",
-			"bot_groups",
-			"bot_guild_members",
 			"bot_heal_rotation_members",
 			"bot_heal_rotation_targets",
 			"bot_heal_rotations",

common/dbcore.cpp

@@ -13,6 +13,7 @@
 #include <iostream>
 #include <mysqld_error.h>
 #include <string.h>
+#include "strings.h"
 
 #ifdef _WINDOWS
 #define snprintf	_snprintf
@@ -34,14 +35,16 @@
 
 DBcore::DBcore()
 {
-	mysql_init(&mysql);
-	pHost           = nullptr;
-	pUser           = nullptr;
-	pPassword       = nullptr;
-	pDatabase       = nullptr;
-	pCompress       = false;
-	pSSL            = false;
-	pStatus         = Closed;
+	mysql      = mysql_init(nullptr);
+	mysqlOwner = true;
+	pHost      = nullptr;
+	pUser      = nullptr;
+	pPassword  = nullptr;
+	pDatabase  = nullptr;
+	pCompress  = false;
+	pSSL       = false;
+	pStatus    = Closed;
+	m_mutex    = new Mutex;
 }
 
 DBcore::~DBcore()
@@ -51,16 +54,10 @@ DBcore::~DBcore()
 	 * are re-using the default database connection pointer when we dont have an
 	 * external configuration setup ex: (content_database)
 	 */
-	std::string mysql_connection_host;
-	if (mysql.host) {
-		mysql_connection_host = mysql.host;
+	if (mysqlOwner) {
+		mysql_close(mysql);
 	}
 
-	if (GetOriginHost() != mysql_connection_host) {
-		return;
-	}
-
-	mysql_close(&mysql);
 	safe_delete_array(pHost);
 	safe_delete_array(pUser);
 	safe_delete_array(pPassword);
@@ -70,20 +67,21 @@ DBcore::~DBcore()
 // Sends the MySQL server a keepalive
 void DBcore::ping()
 {
-	if (!MDatabase.trylock()) {
+	if (!m_mutex->trylock()) {
 		// well, if's it's locked, someone's using it. If someone's using it, it doesnt need a keepalive
 		return;
 	}
-	mysql_ping(&mysql);
-	MDatabase.unlock();
+	mysql_ping(mysql);
+	m_mutex->unlock();
 }
 
-MySQLRequestResult DBcore::QueryDatabase(std::string query, bool retryOnFailureOnce)
+MySQLRequestResult DBcore::QueryDatabase(const std::string& query, bool retryOnFailureOnce)
 {
-	return QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
+	auto r = QueryDatabase(query.c_str(), query.length(), retryOnFailureOnce);
+	return r;
 }
 
-bool DBcore::DoesTableExist(std::string table_name)
+bool DBcore::DoesTableExist(const std::string& table_name)
 {
 	auto results = QueryDatabase(fmt::format("SHOW TABLES LIKE '{}'", table_name));
 
@@ -95,18 +93,16 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 	BenchTimer timer;
 	timer.reset();
 
-	LockMutex lock(&MDatabase);
+	LockMutex lock(m_mutex);
 
 	// Reconnect if we are not connected before hand.
 	if (pStatus != Connected) {
 		Open();
 	}
 
-
-
 	// request query. != 0 indicates some kind of error.
-	if (mysql_real_query(&mysql, query, querylen) != 0) {
-		unsigned int errorNumber = mysql_errno(&mysql);
+	if (mysql_real_query(mysql, query, querylen) != 0) {
+		unsigned int errorNumber = mysql_errno(mysql);
 
 		if (errorNumber == CR_SERVER_GONE_ERROR) {
 			pStatus = Error;
@@ -130,26 +126,26 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 
 			auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];
 
-			snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));
+			snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(mysql), mysql_error(mysql));
 
-			return MySQLRequestResult(nullptr, 0, 0, 0, 0, (uint32) mysql_errno(&mysql), errorBuffer);
+			return MySQLRequestResult(nullptr, 0, 0, 0, 0, (uint32) mysql_errno(mysql), errorBuffer);
 		}
 
 		auto errorBuffer = new char[MYSQL_ERRMSG_SIZE];
-		snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));
+		snprintf(errorBuffer, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(mysql), mysql_error(mysql));
 
 		/**
 		 * Error logging
 		 */
-		if (mysql_errno(&mysql) > 0 && strlen(query) > 0) {
-			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(&mysql), mysql_error(&mysql), query);
+		if (mysql_errno(mysql) > 0 && query[0] != '\0') {
+			LogMySQLError("[{}] [{}]\n[{}]", mysql_errno(mysql), mysql_error(mysql), query);
 		}
 
-		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(&mysql), errorBuffer);
+		return MySQLRequestResult(nullptr, 0, 0, 0, 0, mysql_errno(mysql), errorBuffer);
 	}
 
 	// successful query. get results.
-	MYSQL_RES *res     = mysql_store_result(&mysql);
+	MYSQL_RES *res     = mysql_store_result(mysql);
 	uint32    rowCount = 0;
 
 	if (res != nullptr) {
@@ -158,10 +154,10 @@ MySQLRequestResult DBcore::QueryDatabase(const char *query, uint32 querylen, boo
 
 	MySQLRequestResult requestResult(
 		res,
-		(uint32) mysql_affected_rows(&mysql),
+		(uint32) mysql_affected_rows(mysql),
 		rowCount,
-		(uint32) mysql_field_count(&mysql),
-		(uint32) mysql_insert_id(&mysql)
+		(uint32) mysql_field_count(mysql),
+		(uint32) mysql_insert_id(mysql)
 	);
 
 	if (LogSys.log_settings[Logs::MySQLQuery].is_category_enabled == 1) {
@@ -207,7 +203,7 @@ uint32 DBcore::DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen)
 {
 //	No good reason to lock the DB, we only need it in the first place to check char encoding.
 //	LockMutex lock(&MDatabase);
-	return mysql_real_escape_string(&mysql, tobuf, frombuf, fromlen);
+	return mysql_real_escape_string(mysql, tobuf, frombuf, fromlen);
 }
 
 bool DBcore::Open(
@@ -222,7 +218,7 @@ bool DBcore::Open(
 	bool iSSL
 )
 {
-	LockMutex lock(&MDatabase);
+	LockMutex lock(m_mutex);
 	safe_delete_array(pHost);
 	safe_delete_array(pUser);
 	safe_delete_array(pPassword);
@@ -242,13 +238,13 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	if (errbuf) {
 		errbuf[0] = 0;
 	}
-	LockMutex lock(&MDatabase);
+	LockMutex lock(m_mutex);
 	if (GetStatus() == Connected) {
 		return true;
 	}
 	if (GetStatus() == Error) {
-		mysql_close(&mysql);
-		mysql_init(&mysql);        // Initialize structure again
+		mysql_close(mysql);
+		mysql_init(mysql);        // Initialize structure again
 	}
 	if (!pHost) {
 		return false;
@@ -265,7 +261,7 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	if (pSSL) {
 		flags |= CLIENT_SSL;
 	}
-	if (mysql_real_connect(&mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
+	if (mysql_real_connect(mysql, pHost, pUser, pPassword, pDatabase, pPort, 0, flags)) {
 		pStatus = Connected;
 
 		std::string connected_origin_host = pHost;
@@ -275,21 +271,16 @@ bool DBcore::Open(uint32 *errnum, char *errbuf)
 	}
 	else {
 		if (errnum) {
-			*errnum = mysql_errno(&mysql);
+			*errnum = mysql_errno(mysql);
 		}
 		if (errbuf) {
-			snprintf(errbuf, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(&mysql), mysql_error(&mysql));
+			snprintf(errbuf, MYSQL_ERRMSG_SIZE, "#%i: %s", mysql_errno(mysql), mysql_error(mysql));
 		}
 		pStatus = Error;
 		return false;
 	}
 }
 
-void DBcore::SetMysql(MYSQL *mysql)
-{
-	DBcore::mysql = *mysql;
-}
-
 const std::string &DBcore::GetOriginHost() const
 {
 	return origin_host;
@@ -299,3 +290,146 @@ void DBcore::SetOriginHost(const std::string &origin_host)
 {
 	DBcore::origin_host = origin_host;
 }
+
+std::string DBcore::Escape(const std::string& s)
+{
+	const std::size_t s_len = s.length();
+	std::vector<char> temp((s_len * 2) + 1, '\0');
+	mysql_real_escape_string(mysql, temp.data(), s.c_str(), s_len);
+
+	return temp.data();
+}
+
+void DBcore::SetMutex(Mutex *mutex)
+{
+	safe_delete(m_mutex);
+
+	DBcore::m_mutex = mutex;
+}
+
+// executes multiple statements in one query
+// do not use this in application logic
+// this was built and maintained for database migrations only
+MySQLRequestResult DBcore::QueryDatabaseMulti(const std::string &query)
+{
+	SetMultiStatementsOn();
+
+	BenchTimer timer;
+	timer.reset();
+
+	LockMutex lock(m_mutex);
+
+	// Reconnect if we are not connected before hand.
+	if (pStatus != Connected) {
+		Open();
+	}
+	auto r = MySQLRequestResult{};
+
+	int status = mysql_real_query(mysql, query.c_str(), query.length());
+
+	// process single result
+	if (status != 0) {
+		unsigned int error_number = mysql_errno(mysql);
+
+		if (error_number == CR_SERVER_GONE_ERROR) {
+			pStatus = Error;
+		}
+
+		// error logging
+		if (mysql_errno(mysql) > 0 && query.length() > 0 && mysql_errno(mysql) != 1065) {
+			std::string error_raw   = fmt::format("{}", mysql_error(mysql));
+			std::string mysql_err   = Strings::Trim(error_raw);
+			std::string clean_query = Strings::Replace(query, "\n", "");
+			LogMySQLError("[{}] ({}) query [{}]", mysql_err, mysql_errno(mysql), clean_query);
+
+			MYSQL_RES *res = mysql_store_result(mysql);
+
+			uint32 row_count = 0;
+			if (res) {
+				row_count = (uint32) mysql_num_rows(res);
+			}
+
+			r = MySQLRequestResult(
+				res,
+				(uint32) mysql_affected_rows(mysql),
+				row_count,
+				(uint32) mysql_field_count(mysql),
+				(uint32) mysql_insert_id(mysql)
+			);
+
+			std::string error_message = mysql_error(mysql);
+			r.SetErrorMessage(error_message);
+			r.SetErrorNumber(mysql_errno(mysql));
+
+			if (res) {
+				mysql_free_result(res);
+			}
+
+			return r;
+		}
+	}
+
+
+	int index = 0;
+
+	// there could be a query with a semicolon in the actual data, this is best effort for
+	// logging / display purposes
+	// rare that we see this when this is only used in DDL statements
+	auto pieces = Strings::Split(query, ";");
+
+	// process each statement result
+	do {
+		uint32    row_count = 0;
+		MYSQL_RES *res      = mysql_store_result(mysql);
+
+		r = MySQLRequestResult(
+			res,
+			(uint32) mysql_affected_rows(mysql),
+			row_count,
+			(uint32) mysql_field_count(mysql),
+			(uint32) mysql_insert_id(mysql)
+		);
+
+		if (pieces.size() >= index) {
+			auto piece = pieces[index];
+			LogMySQLQuery(
+				"{} -- ({} row{} affected) ({}s)",
+				piece,
+				r.RowsAffected(),
+				r.RowsAffected() == 1 ? "" : "s",
+				std::to_string(timer.elapsed())
+			);
+		}
+
+		if (res) {
+			row_count = (uint32) mysql_num_rows(res);
+		}
+
+		// more results? -1 = no, >0 = error, 0 = yes (keep looping)
+		if ((status = mysql_next_result(mysql)) > 0) {
+			if (mysql_errno(mysql) > 0) {
+				LogMySQLError("[{}] [{}]", mysql_errno(mysql), mysql_error(mysql));
+			}
+
+			mysql_free_result(res);
+
+			// error logging
+			std::string error_message = mysql_error(mysql);
+			r.SetErrorMessage(error_message);
+			r.SetErrorNumber(mysql_errno(mysql));
+
+			// we handle errors elsewhere
+			return r;
+		}
+
+		if (res) {
+			mysql_free_result(res);
+		}
+
+		index++;
+	} while (status == 0);
+
+	SetMultiStatementsOff();
+
+	return r;
+}

common/dbcore.h

@@ -12,6 +12,7 @@
 
 #include <mysql.h>
 #include <string.h>
+#include <mutex>
 
 class DBcore {
 public:
@@ -23,19 +24,26 @@ public:
 	~DBcore();
 	eStatus GetStatus() { return pStatus; }
 	MySQLRequestResult QueryDatabase(const char *query, uint32 querylen, bool retryOnFailureOnce = true);
-	MySQLRequestResult QueryDatabase(std::string query, bool retryOnFailureOnce = true);
+	MySQLRequestResult QueryDatabase(const std::string& query, bool retryOnFailureOnce = true);
+	MySQLRequestResult QueryDatabaseMulti(const std::string &query);
 	void TransactionBegin();
 	void TransactionCommit();
 	void TransactionRollback();
+	std::string Escape(const std::string& s);
 	uint32 DoEscapeString(char *tobuf, const char *frombuf, uint32 fromlen);
 	void ping();
-	MYSQL *getMySQL() { return &mysql; }
-	void SetMysql(MYSQL *mysql);
 
 	const std::string &GetOriginHost() const;
 	void SetOriginHost(const std::string &origin_host);
 
-	bool DoesTableExist(std::string table_name);
+	bool DoesTableExist(const std::string& table_name);
+
+	void SetMySQL(const DBcore &o)
+	{
+		mysql      = o.mysql;
+		mysqlOwner = false;
+	}
+	void SetMutex(Mutex *mutex);
 
 protected:
 	bool Open(
@@ -53,10 +61,13 @@ protected:
 private:
 	bool Open(uint32 *errnum = nullptr, char *errbuf = nullptr);
 
-	MYSQL   mysql;
-	Mutex   MDatabase;
+	MYSQL*  mysql;
+	bool    mysqlOwner;
+	Mutex   *m_mutex;
 	eStatus pStatus;
 
+	std::mutex m_query_lock{};
+
 	std::string origin_host;
 
 	char   *pHost;
@@ -67,8 +78,20 @@ private:
 	uint32 pPort;
 	bool   pSSL;
 
+	// allows multiple queries to be executed within the same query
+	// do not use this under normal operation
+	// we use this during database migrations only currently
+	void SetMultiStatementsOn()
+	{
+		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_ON);
+	}
+
+	// disables multiple statements to be executed in one query
+	void SetMultiStatementsOff()
+	{
+		mysql_set_server_option(mysql, MYSQL_OPTION_MULTI_STATEMENTS_OFF);
+	}
 };
 
 
 #endif
-

common/discord/discord.cpp

@@ -1,22 +1,17 @@
+#include <cereal/archives/json.hpp>
+#include <cereal/archives/binary.hpp>
 #include "discord.h"
 #include "../http/httplib.h"
 #include "../json/json.h"
 #include "../strings.h"
 #include "../eqemu_logsys.h"
+#include "../events/player_event_logs.h"
 
 constexpr int MAX_RETRIES = 10;
 
 void Discord::SendWebhookMessage(const std::string &message, const std::string &webhook_url)
 {
-	// validate
-	if (webhook_url.empty()) {
-		LogDiscord("[webhook_url] is empty");
-		return;
-	}
-
-	// validate
-	if (webhook_url.find("http://") == std::string::npos && webhook_url.find("https://") == std::string::npos) {
-		LogDiscord("[webhook_url] [{}] does not contain a valid http/s prefix.", webhook_url);
+	if (!ValidateWebhookUrl(webhook_url)) {
 		return;
 	}
 
@@ -28,13 +23,10 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	std::string endpoint = Strings::Replace(webhook_url, base_url, "");
 
 	// client
-	httplib::Client cli(base_url.c_str());
+	httplib::Client cli(base_url);
 	cli.set_connection_timeout(0, 15000000); // 15 sec
 	cli.set_read_timeout(15, 0); // 15 seconds
 	cli.set_write_timeout(15, 0); // 15 seconds
-	httplib::Headers headers = {
-		{"Content-Type", "application/json"}
-	};
 
 	// payload
 	Json::Value p;
@@ -46,9 +38,9 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	int  retries     = 0;
 	int  retry_timer = 1000;
 	while (retry) {
-		if (auto res = cli.Post(endpoint.c_str(), payload.str(), "application/json")) {
+		if (auto res = cli.Post(endpoint, payload.str(), "application/json")) {
 			if (res->status != 200 && res->status != 204) {
-				LogError("Code [{}] Error [{}]", res->status, res->body);
+				LogError("[Discord Client] Code [{}] Error [{}]", res->status, res->body);
 			}
 			if (res->status == 429) {
 				if (!res->body.empty()) {
@@ -62,7 +54,7 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 						LogDiscord("JSON serialization failure [{}] via [{}]", ex.what(), res->body);
 					}
 
-					retry_timer = std::stoi(response["retry_after"].asString()) + 500;
+					retry_timer = Strings::ToInt(response["retry_after"].asString()) + 500;
 				}
 
 				LogDiscord("Rate limited... retrying message in [{}ms]", retry_timer);
@@ -81,6 +73,71 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	}
 }
 
+void Discord::SendPlayerEventMessage(
+	const PlayerEvent::PlayerEventContainer &e,
+	const std::string &webhook_url
+)
+{
+	if (!ValidateWebhookUrl(webhook_url)) {
+		return;
+	}
+
+	auto s = Strings::Split(webhook_url, '/');
+
+	// url
+	std::string base_url = fmt::format("{}//{}", s[0], s[2]);
+	std::string endpoint = Strings::Replace(webhook_url, base_url, "");
+
+	// client
+	httplib::Client cli(base_url);
+	cli.set_connection_timeout(0, 15000000); // 15 sec
+	cli.set_read_timeout(15, 0); // 15 seconds
+	cli.set_write_timeout(15, 0); // 15 seconds
+
+	std::string payload = PlayerEventLogs::GetDiscordPayloadFromEvent(e);
+	if (payload.empty()) {
+		return;
+	}
+
+	bool retry       = true;
+	int  retries     = 0;
+	int  retry_timer = 1000;
+	while (retry) {
+		if (auto res = cli.Post(endpoint, payload, "application/json")) {
+			if (res->status != 200 && res->status != 204) {
+				LogError("Code [{}] Error [{}]", res->status, res->body);
+			}
+			if (res->status == 429) {
+				if (!res->body.empty()) {
+					std::stringstream ss(res->body);
+					Json::Value       response;
+
+					try {
+						ss >> response;
+					}
+					catch (std::exception const &ex) {
+						LogDiscord("JSON serialization failure [{}] via [{}]", ex.what(), res->body);
+					}
+
+					retry_timer = Strings::ToInt(response["retry_after"].asString()) + 500;
+				}
+
+				LogDiscord("Rate limited... retrying message in [{}ms]", retry_timer);
+				std::this_thread::sleep_for(std::chrono::milliseconds(retry_timer + 500));
+			}
+			if (res->status == 204) {
+				retry = false;
+			}
+			if (retries > MAX_RETRIES) {
+				LogDiscord("Retries exceeded for player event message");
+				retry = false;
+			}
+
+			retries++;
+		}
+	}
+}
+
 std::string Discord::FormatDiscordMessage(uint16 category_id, const std::string &message)
 {
 	if (category_id == Logs::LogCategory::MySQLQuery) {
@@ -89,3 +146,20 @@ std::string Discord::FormatDiscordMessage(uint16 category_id, const std::string
 
 	return message + "\n";
 }
+
+bool Discord::ValidateWebhookUrl(const std::string &webhook_url)
+{
+	// validate
+	if (webhook_url.empty()) {
+		LogDiscord("[webhook_url] is empty");
+		return false;
+	}
+
+	// validate
+	if (!Strings::Contains(webhook_url, "http://") && !Strings::Contains(webhook_url, "https://")) {
+		LogDiscord("[webhook_url] [{}] does not contain a valid http/s prefix.", webhook_url);
+		return false;
+	}
+
+	return true;
+}

common/discord/discord.h

@@ -4,11 +4,16 @@
 
 #include <string>
 #include "../types.h"
+#include "../http/httplib.h"
+#include "../repositories/player_event_logs_repository.h"
+#include "../events/player_events.h"
 
 class Discord {
 public:
 	static void SendWebhookMessage(const std::string& message, const std::string& webhook_url);
 	static std::string FormatDiscordMessage(uint16 category_id, const std::string& message);
+	static void SendPlayerEventMessage(const PlayerEvent::PlayerEventContainer& e, const std::string &webhook_url);
+	static bool ValidateWebhookUrl(const std::string &webhook_url);
 };
 
 

common/discord/discord_manager.cpp

@@ -1,7 +1,6 @@
 #include "discord_manager.h"
-#include "../common/discord/discord.h"
-#include "../common/eqemu_logsys.h"
-#include "../common/strings.h"
+#include "../../common/discord/discord.h"
+#include "../events/player_event_logs.h"
 
 void DiscordManager::QueueWebhookMessage(uint32 webhook_id, const std::string &message)
 {
@@ -38,7 +37,7 @@ void DiscordManager::ProcessMessageQueue()
 					message,
 					webhook.webhook_url
 				);
-				message = "";
+				message.clear();
 			}
 
 			message += m;
@@ -52,10 +51,9 @@ void DiscordManager::ProcessMessageQueue()
 						webhook.webhook_url
 					);
 				}
-				message = "";
+				message.clear();
 			}
 		}
-
 		// final flush
 		if (!message.empty()) {
 			Discord::SendWebhookMessage(
@@ -67,3 +65,11 @@ void DiscordManager::ProcessMessageQueue()
 	webhook_message_queue.clear();
 	webhook_queue_lock.unlock();
 }
+
+void DiscordManager::QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e)
+{
+	auto w = player_event_logs.GetDiscordWebhookUrlFromEventType(e.player_event_log.event_type_id);
+	if (!w.empty()) {
+		Discord::SendPlayerEventMessage(e, w);
+	}
+}

common/discord/discord_manager.h

@@ -4,12 +4,15 @@
 #include <mutex>
 #include <map>
 #include <vector>
-#include "../common/types.h"
+#include "../../common/types.h"
+#include "../repositories/player_event_logs_repository.h"
+#include "../events/player_events.h"
 
 class DiscordManager {
 public:
 	void QueueWebhookMessage(uint32 webhook_id, const std::string& message);
 	void ProcessMessageQueue();
+	void QueuePlayerEventMessage(const PlayerEvent::PlayerEventContainer& e);
 private:
 	std::mutex webhook_queue_lock{};
 	std::map<uint32, std::vector<std::string>> webhook_message_queue{};

common/emu_constants.cpp

@@ -197,11 +197,11 @@ const std::map<int, std::string>& EQ::constants::GetLanguageMap()
 
 std::string EQ::constants::GetLanguageName(int language_id)
 {
-	if (EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
-		return EQ::constants::GetLanguageMap().find(language_id)->second;
+	if (!EQ::ValueWithin(language_id, LANG_COMMON_TONGUE, LANG_UNKNOWN)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetLanguageMap().find(language_id)->second;
 }
 
 const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
@@ -220,11 +220,11 @@ const std::map<uint32, std::string>& EQ::constants::GetLDoNThemeMap()
 
 std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
 {
-	if (EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
-		return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
+	if (!EQ::ValueWithin(theme_id, LDoNThemes::Unused, LDoNThemes::TAK)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
 }
 
 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
@@ -243,11 +243,11 @@ const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
 
 std::string EQ::constants::GetFlyModeName(int8 flymode_id)
 {
-	if (EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
-		return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
+	if (!EQ::ValueWithin(flymode_id, GravityBehavior::Ground, GravityBehavior::LevitateWhileRunning)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetFlyModeMap().find(flymode_id)->second;
 }
 
 const std::map<bodyType, std::string>& EQ::constants::GetBodyTypeMap()
@@ -365,11 +365,11 @@ const std::map<uint8, std::string>& EQ::constants::GetConsiderLevelMap()
 
 std::string EQ::constants::GetConsiderLevelName(uint8 faction_consider_level)
 {
-	if (EQ::constants::GetConsiderLevelMap().find(faction_consider_level) != EQ::constants::GetConsiderLevelMap().end()) {
-		return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
+	if (!EQ::ValueWithin(faction_consider_level, ConsiderLevel::Ally, ConsiderLevel::Scowls)) {
+		return std::string();;
 	}
 
-	return std::string();
+	return EQ::constants::GetConsiderLevelMap().find(faction_consider_level)->second;
 }
 
 const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
@@ -386,11 +386,11 @@ const std::map<uint8, std::string>& EQ::constants::GetEnvironmentalDamageMap()
 
 std::string EQ::constants::GetEnvironmentalDamageName(uint8 damage_type)
 {
-	if (EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
-		return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
+	if (!EQ::ValueWithin(damage_type, EnvironmentalDamage::Lava, EnvironmentalDamage::Trap)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetEnvironmentalDamageMap().find(damage_type)->second;
 }
 
 const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
@@ -407,11 +407,11 @@ const std::map<uint8, std::string>& EQ::constants::GetStuckBehaviorMap()
 
 std::string EQ::constants::GetStuckBehaviorName(uint8 behavior_id)
 {
-	if (EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
-		return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
+	if (!EQ::ValueWithin(behavior_id, StuckBehavior::RunToTarget, StuckBehavior::EvadeCombat)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetStuckBehaviorMap().find(behavior_id)->second;
 }
 
 const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
@@ -429,11 +429,11 @@ const std::map<uint8, std::string>& EQ::constants::GetSpawnAnimationMap()
 
 std::string EQ::constants::GetSpawnAnimationName(uint8 animation_id)
 {
-	if (EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
-		return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
+	if (!EQ::ValueWithin(animation_id, SpawnAnimations::Standing, SpawnAnimations::Looting)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetSpawnAnimationMap().find(animation_id)->second;
 }
 
 const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
@@ -507,11 +507,12 @@ const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
 
 std::string EQ::constants::GetObjectTypeName(int object_type)
 {
-	if (EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
-		return EQ::constants::GetObjectTypeMap().find(object_type)->second;
+	if (!EQ::ValueWithin(object_type, ObjectTypes::SmallBag, ObjectTypes::NoDeposit)) {
+		return std::string();
+
 	}
 
-	return std::string();
+	return EQ::constants::GetObjectTypeMap().find(object_type)->second;
 }
 
 const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
@@ -527,11 +528,11 @@ const std::map<uint8, std::string> &EQ::constants::GetWeatherTypeMap()
 
 std::string EQ::constants::GetWeatherTypeName(uint8 weather_type)
 {
-	if (EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
-		return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
+	if (!EQ::ValueWithin(weather_type, WeatherTypes::None, WeatherTypes::Snowing)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetWeatherTypeMap().find(weather_type)->second;
 }
 
 const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
@@ -553,11 +554,11 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteEventTypeMap()
 
 std::string EQ::constants::GetEmoteEventTypeName(uint8 emote_event_type)
 {
-	if (EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
-		return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
+	if (!EQ::ValueWithin(emote_event_type, EmoteEventTypes::LeaveCombat, EmoteEventTypes::OnDespawn)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetEmoteEventTypeMap().find(emote_event_type)->second;
 }
 
 const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
@@ -573,9 +574,9 @@ const std::map<uint8, std::string> &EQ::constants::GetEmoteTypeMap()
 
 std::string EQ::constants::GetEmoteTypeName(uint8 emote_type)
 {
-	if (EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
-		return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
+	if (!EQ::ValueWithin(emote_type, EmoteTypes::Emote, EmoteTypes::Proximity)) {
+		return std::string();
 	}
 
-	return std::string();
+	return EQ::constants::GetEmoteTypeMap().find(emote_type)->second;
 }

common/emu_constants.h

@@ -593,4 +593,29 @@ enum class ApplySpellType {
 	Raid
 };
 
+
+namespace HeroicBonusBucket
+{
+	const std::string WisMaxMana 			= "HWIS-MaxMana";
+	const std::string WisManaRegen			= "HWIS-ManaRegen";
+	const std::string WisHealAmt			= "HWIS-HealAmt";
+	const std::string IntMaxMana			= "HINT-MaxMana";
+	const std::string IntManaRegen			= "HINT-ManaRegen";
+	const std::string IntSpellDmg			= "HINT-SpellDmg";
+	const std::string StrMeleeDamage		= "HSTR-MeleeDamage";
+	const std::string StrShieldAC			= "HSTR-ShieldAC";
+	const std::string StrMaxEndurance		= "HSTR-MaxEndurance";
+	const std::string StrEnduranceRegen		= "HSTR-EnduranceRegen";
+	const std::string StaMaxHP			= "HSTA-MaxHP";
+	const std::string StaHPRegen			= "HSTA-HPRegen";
+	const std::string StaMaxEndurance		= "HSTA-MaxEndurance";
+	const std::string StaEnduranceRegen		= "HSTA-EnduranceRegen";
+	const std::string AgiAvoidance			= "HAGI-Avoidance";
+	const std::string AgiMaxEndurance		= "HAGI-MaxEndurance";
+	const std::string AgiEnduranceRegen		= "HAGI-EnduranceRegen";
+	const std::string DexRangedDamage		= "HDEX-RangedDamage";
+	const std::string DexMaxEndurance		= "HDEX-MaxEndurance";
+	const std::string DexEnduranceRegen		= "HDEX-EnduranceRegen";
+}
+
 #endif /*COMMON_EMU_CONSTANTS_H*/

common/eq_constants.h

@@ -1017,15 +1017,39 @@ enum Anonymity : uint8
 	Roleplaying
 };
 
-enum ZoningMessage : int8
-{
-	ZoneNoMessage = 0,
-	ZoneSuccess = 1,
-	ZoneNotReady = -1,
-	ZoneValidPC = -2,
-	ZoneStoryZone = -3,
-	ZoneNoExpansion = -6,
+enum ZoningMessage : int8 {
+	ZoneNoMessage    = 0,
+	ZoneSuccess      = 1,
+	ZoneNotReady     = -1,
+	ZoneValidPC      = -2,
+	ZoneStoryZone    = -3,
+	ZoneNoExpansion  = -6,
 	ZoneNoExperience = -7
 };
 
+enum class RecipeCountType : uint8
+{
+	Component,
+	Container,
+	Fail,
+	Salvage,
+	Success
+};
+
+#define ALT_CURRENCY_ID_RADIANT 4
+#define ALT_CURRENCY_ID_EBON 5
+
+enum ResurrectionActions
+{
+	Decline,
+	Accept
+};
+
+enum ScribeSpellActions
+{
+	Scribe,
+	Memorize,
+	Unmemorize
+};
+
 #endif /*COMMON_EQ_CONSTANTS_H*/

common/eq_limits.h

@@ -129,7 +129,7 @@ namespace EQ
 
 			LookupEntry(const LookupEntry *lookup_entry) { }
 			LookupEntry(
-				InventoryTypeSize_Struct InventoryTypeSize,
+				const InventoryTypeSize_Struct& InventoryTypeSize,
 				uint64 EquipmentBitmask,
 				uint64 GeneralBitmask,
 				uint64 CursorBitmask,

common/eq_packet.cpp

@@ -236,26 +236,6 @@ uint32 EQApplicationPacket::serialize(uint16 opcode, unsigned char *dest) const
 	return size+OpCodeBytes;
 }
 
-/*EQProtocolPacket::EQProtocolPacket(uint16 op, const unsigned char *buf, uint32 len)
-:	BasePacket(buf, len),
-	opcode(op)
-{
-
-uint32 offset;
-	opcode=ntohs(*(const uint16 *)buf);
-	offset=2;
-
-	if (len-offset) {
-		pBuffer= new unsigned char[len-offset];
-		memcpy(pBuffer,buf+offset,len-offset);
-		size=len-offset;
-	} else {
-		pBuffer=nullptr;
-		size=0;
-	}
-	OpMgr=&RawOpcodeManager;
-}*/
-
 bool EQProtocolPacket::combine(const EQProtocolPacket *rhs)
 {
 bool result=false;
@@ -287,74 +267,6 @@ bool result=false;
 
 }
 
-/*
-this is the code to do app-layer combining, instead of protocol layer.
-this was taken out due to complex interactions with the opcode manager,
-and will require a bit more thinking (likely moving into EQStream) to
-get running again... but might be a good thing some day.
-
-bool EQApplicationPacket::combine(const EQApplicationPacket *rhs)
-{
-uint32 newsize=0, offset=0;
-unsigned char *tmpbuffer=nullptr;
-
-	if (opcode!=OP_AppCombined) {
-		newsize=app_opcode_size+size+(size>254?3:1)+app_opcode_size+rhs->size+(rhs->size>254?3:1);
-		tmpbuffer=new unsigned char [newsize];
-		offset=0;
-		if (size>254) {
-			tmpbuffer[offset++]=0xff;
-			*(uint16 *)(tmpbuffer+offset)=htons(size);
-			offset+=1;
-		} else {
-			tmpbuffer[offset++]=size;
-		}
-		offset+=serialize(tmpbuffer+offset);
-	} else {
-		newsize=size+app_opcode_size+rhs->size+(rhs->size>254?3:1);
-		tmpbuffer=new unsigned char [newsize];
-		memcpy(tmpbuffer,pBuffer,size);
-		offset=size;
-	}
-
-	if (rhs->size>254) {
-		tmpbuffer[offset++]=0xff;
-		*(uint16 *)(tmpbuffer+offset)=htons(rhs->size);
-		offset+=1;
-	} else {
-		tmpbuffer[offset++]=rhs->size;
-	}
-	offset+=rhs->serialize(tmpbuffer+offset);
-
-	size=offset;
-	opcode=OP_AppCombined;
-
-	delete[] pBuffer;
-	pBuffer=tmpbuffer;
-
-	return true;
-}
-*/
-
-bool EQProtocolPacket::ValidateCRC(const unsigned char *buffer, int length, uint32 Key)
-{
-bool valid=false;
-	// OP_SessionRequest, OP_SessionResponse, OP_OutOfSession are not CRC'd
-	if (buffer[0]==0x00 && (buffer[1]==OP_SessionRequest || buffer[1]==OP_SessionResponse || buffer[1]==OP_OutOfSession)) {
-		valid=true;
-	} else {
-		uint16 comp_crc=CRC16(buffer,length-2,Key);
-		uint16 packet_crc=ntohs(*(const uint16 *)(buffer+length-2));
-#ifdef EQN_DEBUG
-		if (packet_crc && comp_crc != packet_crc) {
-			std::cout << "CRC mismatch: comp=" << std::hex << comp_crc << ", packet=" << packet_crc << std::dec << std::endl;
-		}
-#endif
-		valid = (!packet_crc || comp_crc == packet_crc);
-	}
-	return valid;
-}
-
 uint32 EQProtocolPacket::Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize)
 {
 uint32 newlen=0;
@@ -403,55 +315,6 @@ uint32 flag_offset=1,newlength;
 	return newlength;
 }
 
-void EQProtocolPacket::ChatDecode(unsigned char *buffer, int size, int DecodeKey)
-{
-	if ((size >= 2) && buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
-		int Key=DecodeKey;
-		unsigned char *test=(unsigned char *)malloc(size);
-		buffer+=2;
-		size-=2;
-
-		int i;
-		for (i = 0 ; i+4 <= size ; i+=4)
-		{
-			int pt = (*(int*)&buffer[i])^(Key);
-			Key = (*(int*)&buffer[i]);
-			*(int*)&test[i]=pt;
-		}
-		unsigned char KC=Key&0xFF;
-		for ( ; i < size ; i++)
-		{
-			test[i]=buffer[i]^KC;
-		}
-		memcpy(buffer,test,size);
-		free(test);
-	}
-}
-
-void EQProtocolPacket::ChatEncode(unsigned char *buffer, int size, int EncodeKey)
-{
-	if (buffer[1]!=0x01 && buffer[0]!=0x02 && buffer[0]!=0x1d) {
-		int Key=EncodeKey;
-		char *test=(char*)malloc(size);
-		int i;
-		buffer+=2;
-		size-=2;
-		for ( i = 0 ; i+4 <= size ; i+=4)
-		{
-			int pt = (*(int*)&buffer[i])^(Key);
-			Key = pt;
-			*(int*)&test[i]=pt;
-		}
-		unsigned char KC=Key&0xFF;
-		for ( ; i < size ; i++)
-		{
-			test[i]=buffer[i]^KC;
-		}
-		memcpy(buffer,test,size);
-		free(test);
-	}
-}
-
 EQApplicationPacket *EQApplicationPacket::Copy() const {
 	return(new EQApplicationPacket(*this));
 }
@@ -515,4 +378,4 @@ std::string DumpPacketToString(const EQApplicationPacket* app){
 	std::ostringstream out;
 	out << DumpPacketHexToString(app->pBuffer, app->size);
 	return out.str();
-}
+}

common/eq_packet.h

@@ -80,11 +80,8 @@ public:
 
 protected:
 
-	static bool ValidateCRC(const unsigned char *buffer, int length, uint32 Key);
 	static uint32 Decompress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
 	static uint32 Compress(const unsigned char *buffer, const uint32 length, unsigned char *newbuf, uint32 newbufsize);
-	static void ChatDecode(unsigned char *buffer, int size, int DecodeKey);
-	static void ChatEncode(unsigned char *buffer, int size, int EncodeKey);
 
 	uint16 GetRawOpcode() const { return(opcode); }
 

common/eq_packet_structs.h

@@ -29,7 +29,7 @@
 #include "textures.h"
 
 
-static const uint32 BUFF_COUNT = 25;
+static const uint32 BUFF_COUNT = 42;
 static const uint32 PET_BUFF_COUNT = 30;
 static const uint32 MAX_MERC = 100;
 static const uint32 MAX_MERC_GRADES = 10;
@@ -1793,6 +1793,17 @@ struct GMSummon_Struct {
 /*104*/	uint32	unknown2; // E0 E0 56 00
 };
 
+struct GMFind_Struct {
+	char	charname[64];
+	char	gmname[64];
+	uint32	success;
+	uint32	zoneID;
+	float	x;
+	float	y;
+	float	z;
+	uint32	unknown2;
+};
+
 struct GMGoto_Struct { // x,y is swapped as compared to summon and makes sense as own packet
 /*  0*/ char	charname[64];
 
@@ -3632,17 +3643,19 @@ struct LevelAppearance_Struct { //Sends a little graphic on level up
 };
 
 struct MerchantList {
-	uint32 id;
-	uint32 slot;
-	uint32 item;
-	int16 faction_required;
-	int8 level_required;
-	uint16 alt_currency_cost;
-	uint32 classes_required;
-	uint8 probability;
+	uint32      id;
+	uint32      slot;
+	uint32      item;
+	int16       faction_required;
+	int8        level_required;
+	uint8       min_status;
+	uint8       max_status;
+	uint16      alt_currency_cost;
+	uint32      classes_required;
+	uint8       probability;
 	std::string bucket_name;
 	std::string bucket_value;
-	uint8 bucket_comparison;
+	uint8       bucket_comparison;
 };
 
 struct TempMerchantList {
@@ -5520,7 +5533,11 @@ struct ServerLootItem_Struct {
 	uint32 aug_4;		  // uint32	aug_4;
 	uint32 aug_5;		  // uint32	aug_5;
 	uint32 aug_6;		  // uint32	aug_5;
-	uint8  attuned;
+	bool attuned;
+	std::string custom_data;
+	uint32 ornamenticon {};
+	uint32 ornamentidfile {};
+	uint32 ornament_hero_model {};
 	uint16 trivial_min_level;
 	uint16 trivial_max_level;
 	uint16 npc_min_level;

common/eq_stream_ident.cpp

@@ -26,7 +26,7 @@ EQStreamIdentifier::~EQStreamIdentifier() {
 	}
 }
 
-void EQStreamIdentifier::RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
+void EQStreamIdentifier::RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs) {
 	auto p = new Patch;
 	p->signature = sig;
 	p->name = name;
@@ -145,7 +145,7 @@ void EQStreamIdentifier::Process() {
 }
 
 void EQStreamIdentifier::AddStream(std::shared_ptr<EQStreamInterface> eqs) {
-	m_streams.push_back(Record(eqs));
+	m_streams.emplace_back(Record(eqs));
 	eqs = nullptr;
 }
 

common/eq_stream_ident.h

@@ -18,7 +18,7 @@ public:
 	~EQStreamIdentifier();
 
 	//registration interface.
-	void RegisterPatch(const EQStreamInterface::Signature &sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
+	void RegisterPatch(EQStreamInterface::Signature sig, const char *name, OpcodeManager ** opcodes, const StructStrategy *structs);
 
 	//main processing interface
 	void Process();

common/eqdb.cpp

@@ -23,9 +23,6 @@
 
 EQDB EQDB::s_EQDB;
 
-EQDB::EQDB() {
-}
-
 unsigned int EQDB::field_count() {
 	return mysql_field_count(mysql_ref);
 }

common/eqdb.h

@@ -27,7 +27,7 @@
 
 //this is the main object exported to perl.
 class EQDB {
-	EQDB();
+	EQDB() = default;
 public:
 	static EQDB *Singleton() { return(&s_EQDB); }
 

common/eqemu_config.cpp

@@ -19,6 +19,7 @@
 #include "../common/global_define.h"
 #include "eqemu_config.h"
 #include "misc_functions.h"
+#include "strings.h"
 
 #include <iostream>
 #include <sstream>
@@ -33,13 +34,13 @@ void EQEmuConfig::parse_config()
 	LongName     = _root["server"]["world"].get("longname", "").asString();
 	WorldAddress = _root["server"]["world"].get("address", "").asString();
 	LocalAddress = _root["server"]["world"].get("localaddress", "").asString();
-	MaxClients   = atoi(_root["server"]["world"].get("maxclients", "-1").asString().c_str());
+	MaxClients   = Strings::ToInt(_root["server"]["world"].get("maxclients", "-1").asString());
 	SharedKey    = _root["server"]["world"].get("key", "").asString();
 	LoginCount   = 0;
 
 	if (_root["server"]["world"]["loginserver"].isObject()) {
 		LoginHost   = _root["server"]["world"]["loginserver"].get("host", "login.eqemulator.net").asString();
-		LoginPort   = atoi(_root["server"]["world"]["loginserver"].get("port", "5998").asString().c_str());
+		LoginPort   = Strings::ToUnsignedInt(_root["server"]["world"]["loginserver"].get("port", "5998").asString());
 		LoginLegacy = false;
 		if (_root["server"]["world"]["loginserver"].get("legacy", "0").asString() == "1") { LoginLegacy = true; }
 		LoginAccount  = _root["server"]["world"]["loginserver"].get("account", "").asString();
@@ -62,7 +63,7 @@ void EQEmuConfig::parse_config()
 
 			auto loginconfig = new LoginConfig;
 			loginconfig->LoginHost     = _root["server"]["world"][str].get("host", "login.eqemulator.net").asString();
-			loginconfig->LoginPort     = atoi(_root["server"]["world"][str].get("port", "5998").asString().c_str());
+			loginconfig->LoginPort     = Strings::ToUnsignedInt(_root["server"]["world"][str].get("port", "5998").asString());
 			loginconfig->LoginAccount  = _root["server"]["world"][str].get("account", "").asString();
 			loginconfig->LoginPassword = _root["server"]["world"][str].get("password", "").asString();
 
@@ -84,16 +85,22 @@ void EQEmuConfig::parse_config()
 	//The only way to enable locked is by switching to true, meaning this value is always false until manually set true
 	Locked = false;
 	if (_root["server"]["world"].get("locked", "false").asString() == "true") { Locked = true; }
+
+	auto_database_updates = false;
+	if (_root["server"].get("auto_database_updates", "true").asString() == "true") {
+		auto_database_updates = true;
+	}
+
 	WorldIP      = _root["server"]["world"]["tcp"].get("host", "127.0.0.1").asString();
-	WorldTCPPort = atoi(_root["server"]["world"]["tcp"].get("port", "9000").asString().c_str());
+	WorldTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["tcp"].get("port", "9000").asString());
 
 	TelnetIP      = _root["server"]["world"]["telnet"].get("ip", "127.0.0.1").asString();
-	TelnetTCPPort = atoi(_root["server"]["world"]["telnet"].get("port", "9001").asString().c_str());
+	TelnetTCPPort = Strings::ToUnsignedInt(_root["server"]["world"]["telnet"].get("port", "9001").asString());
 	TelnetEnabled = false;
 	if (_root["server"]["world"]["telnet"].get("enabled", "false").asString() == "true") { TelnetEnabled = true; }
 
 	WorldHTTPMimeFile = _root["server"]["world"]["http"].get("mimefile", "mime.types").asString();
-	WorldHTTPPort     = atoi(_root["server"]["world"]["http"].get("port", "9080").asString().c_str());
+	WorldHTTPPort     = Strings::ToUnsignedInt(_root["server"]["world"]["http"].get("port", "9080").asString());
 	WorldHTTPEnabled  = false;
 
 	if (_root["server"]["world"]["http"].get("enabled", "false").asString() == "true") {
@@ -108,9 +115,9 @@ void EQEmuConfig::parse_config()
 	 * UCS
 	 */
 	ChatHost = _root["server"]["chatserver"].get("host", "eqchat.eqemulator.net").asString();
-	ChatPort = atoi(_root["server"]["chatserver"].get("port", "7778").asString().c_str());
+	ChatPort = Strings::ToUnsignedInt(_root["server"]["chatserver"].get("port", "7778").asString());
 	MailHost = _root["server"]["mailserver"].get("host", "eqmail.eqemulator.net").asString();
-	MailPort = atoi(_root["server"]["mailserver"].get("port", "7778").asString().c_str());
+	MailPort = Strings::ToUnsignedInt(_root["server"]["mailserver"].get("port", "7778").asString());
 
 	/**
 	 * Database
@@ -118,7 +125,7 @@ void EQEmuConfig::parse_config()
 	DatabaseUsername = _root["server"]["database"].get("username", "eq").asString();
 	DatabasePassword = _root["server"]["database"].get("password", "eq").asString();
 	DatabaseHost     = _root["server"]["database"].get("host", "localhost").asString();
-	DatabasePort     = atoi(_root["server"]["database"].get("port", "3306").asString().c_str());
+	DatabasePort     = Strings::ToUnsignedInt(_root["server"]["database"].get("port", "3306").asString());
 	DatabaseDB       = _root["server"]["database"].get("db", "eq").asString();
 
 	/**
@@ -127,14 +134,14 @@ void EQEmuConfig::parse_config()
 	ContentDbUsername = _root["server"]["content_database"].get("username", "").asString();
 	ContentDbPassword = _root["server"]["content_database"].get("password", "").asString();
 	ContentDbHost     = _root["server"]["content_database"].get("host", "").asString();
-	ContentDbPort     = atoi(_root["server"]["content_database"].get("port", 0).asString().c_str());
+	ContentDbPort     = Strings::ToUnsignedInt(_root["server"]["content_database"].get("port", 0).asString());
 	ContentDbName     = _root["server"]["content_database"].get("db", "").asString();
 
 	/**
 	 * QS
 	 */
 	QSDatabaseHost     = _root["server"]["qsdatabase"].get("host", "localhost").asString();
-	QSDatabasePort     = atoi(_root["server"]["qsdatabase"].get("port", "3306").asString().c_str());
+	QSDatabasePort     = Strings::ToUnsignedInt(_root["server"]["qsdatabase"].get("port", "3306").asString());
 	QSDatabaseUsername = _root["server"]["qsdatabase"].get("username", "eq").asString();
 	QSDatabasePassword = _root["server"]["qsdatabase"].get("password", "eq").asString();
 	QSDatabaseDB       = _root["server"]["qsdatabase"].get("db", "eq").asString();
@@ -142,9 +149,9 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Zones
 	 */
-	DefaultStatus = atoi(_root["server"]["zones"].get("defaultstatus", 0).asString().c_str());
-	ZonePortLow   = atoi(_root["server"]["zones"]["ports"].get("low", "7000").asString().c_str());
-	ZonePortHigh  = atoi(_root["server"]["zones"]["ports"].get("high", "7999").asString().c_str());
+	DefaultStatus = Strings::ToUnsignedInt(_root["server"]["zones"].get("defaultstatus", 0).asString());
+	ZonePortLow   = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("low", "7000").asString());
+	ZonePortHigh  = Strings::ToUnsignedInt(_root["server"]["zones"]["ports"].get("high", "7999").asString());
 
 	/**
 	 * Files
@@ -174,10 +181,10 @@ void EQEmuConfig::parse_config()
 	/**
 	 * Launcher
 	 */
-	RestartWait      = atoi(_root["server"]["launcher"]["timers"].get("restart", "10000").asString().c_str());
-	TerminateWait    = atoi(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString().c_str());
-	InitialBootWait  = atoi(_root["server"]["launcher"]["timers"].get("initial", "20000").asString().c_str());
-	ZoneBootInterval = atoi(_root["server"]["launcher"]["timers"].get("interval", "2000").asString().c_str());
+	RestartWait      = Strings::ToInt(_root["server"]["launcher"]["timers"].get("restart", "10000").asString());
+	TerminateWait    = Strings::ToInt(_root["server"]["launcher"]["timers"].get("reterminate", "10000").asString());
+	InitialBootWait  = Strings::ToInt(_root["server"]["launcher"]["timers"].get("initial", "20000").asString());
+	ZoneBootInterval = Strings::ToInt(_root["server"]["launcher"]["timers"].get("interval", "2000").asString());
 #ifdef WIN32
 	ZoneExe = _root["server"]["launcher"].get("exe", "zone.exe").asString();
 #else

common/eqemu_config.h

@@ -120,6 +120,8 @@ class EQEmuConfig
 		uint16 ZonePortHigh;
 		uint8 DefaultStatus;
 
+		bool auto_database_updates;
+
 //	uint16 DynamicCount;
 
 //	map<string,uint16> StaticZones;
@@ -147,12 +149,6 @@ class EQEmuConfig
 			return (_config);
 		}
 
-		// Allow the use to set the conf file to be used.
-		static void SetConfigFile(std::string file)
-		{
-			EQEmuConfig::ConfigFile = file;
-		}
-
 		// Load the config
 		static bool LoadConfig(const std::string& path = "")
 		{

common/eqemu_logsys.cpp

@@ -104,9 +104,9 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * RFC 5424
 	 */
-	log_settings[Logs::Error].log_to_console     = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Warning].log_to_console   = static_cast<uint8>(Logs::General);
-	log_settings[Logs::Info].log_to_console      = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Error].log_to_console   = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Warning].log_to_console = static_cast<uint8>(Logs::General);
+	log_settings[Logs::Info].log_to_console    = static_cast<uint8>(Logs::General);
 
 	/**
 	 * Set Category enabled status on defaults
@@ -187,9 +187,10 @@ void EQEmuLogSys::ProcessLogWrite(
 uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 {
 	switch (log_category) {
+		case Logs::Crash:
+		case Logs::Error:
 		case Logs::MySQLError:
 		case Logs::QuestErrors:
-		case Logs::Error:
 			return Chat::Red;
 		case Logs::MySQLQuery:
 		case Logs::Debug:
@@ -199,8 +200,6 @@ uint16 EQEmuLogSys::GetGMSayColorFromCategory(uint16 log_category)
 		case Logs::Commands:
 		case Logs::Mercenaries:
 			return Chat::Magenta;
-		case Logs::Crash:
-			return Chat::Red;
 		default:
 			return Chat::Yellow;
 	}
@@ -220,7 +219,7 @@ void EQEmuLogSys::ProcessConsoleMessage(
 	int line
 )
 {
-	bool is_error = (
+	bool is_error   = (
 		log_category == Logs::LogCategory::Error ||
 		log_category == Logs::LogCategory::MySQLError ||
 		log_category == Logs::LogCategory::Crash ||
@@ -262,7 +261,7 @@ void EQEmuLogSys::ProcessConsoleMessage(
 	}
 
 	if (log_category == Logs::LogCategory::MySQLQuery) {
-		auto        s     = Strings::Split(message, "--");
+		auto s = Strings::Split(message, "--");
 		if (s.size() > 1) {
 			std::string query = Strings::Trim(s[0]);
 			std::string meta  = Strings::Trim(s[1]);
@@ -298,19 +297,76 @@ void EQEmuLogSys::ProcessConsoleMessage(
 					}
 				}
 
-				if (!is_upper) {
-					(!is_error ? std::cout : std::cerr)
-						<< rang::fgB::gray
-						<< "["
-						<< rang::style::bold
-						<< rang::fgB::yellow
-						<< e
-						<< rang::fgB::gray
-						<< "] "
-						;
+				// color matching in []
+				// ex: [<red>variable] would produce [variable] with red inside brackets
+				std::map<std::string, rang::fgB> colors = {
+					{"<black>",   rang::fgB::black},
+					{"<green>",   rang::fgB::green},
+					{"<yellow>",  rang::fgB::yellow},
+					{"<blue>",    rang::fgB::blue},
+					{"<magenta>", rang::fgB::magenta},
+					{"<cyan>",    rang::fgB::cyan},
+					{"<gray>",    rang::fgB::gray},
+					{"<red>",     rang::fgB::red},
+				};
+
+				bool      match_color = false;
+				for (auto &c: colors) {
+					if (Strings::Contains(e, c.first)) {
+						e = Strings::Replace(e, c.first, "");
+						(!is_error ? std::cout : std::cerr)
+							<< rang::fgB::gray
+							<< "["
+							<< rang::style::bold
+							<< c.second
+							<< e
+							<< rang::style::reset
+							<< rang::fgB::gray
+							<< "] ";
+						match_color = true;
+					}
 				}
-				else {
-					(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
+
+				// string match to colors
+				std::map<std::string, rang::fgB> matches = {
+					{"missing", rang::fgB::red},
+					{"error",   rang::fgB::red},
+					{"ok",      rang::fgB::green},
+				};
+
+				for (auto &c: matches) {
+					if (Strings::Contains(e, c.first)) {
+						(!is_error ? std::cout : std::cerr)
+							<< rang::fgB::gray
+							<< "["
+							<< rang::style::bold
+							<< c.second
+							<< e
+							<< rang::style::reset
+							<< rang::fgB::gray
+							<< "] ";
+						match_color = true;
+					}
+				}
+
+				// if we don't match a color in either the string matching or
+				// the color tag matching, we default to yellow inside brackets
+				// if uppercase, does not get colored
+				if (!match_color) {
+					if (!is_upper) {
+						(!is_error ? std::cout : std::cerr)
+							<< rang::fgB::gray
+							<< "["
+							<< rang::style::bold
+							<< rang::fgB::yellow
+							<< e
+							<< rang::style::reset
+							<< rang::fgB::gray
+							<< "] ";
+					}
+					else {
+						(!is_error ? std::cout : std::cerr) << rang::fgB::gray << "[" << e << "] ";
+					}
 				}
 			}
 			else {
@@ -524,6 +580,8 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
  */
 void EQEmuLogSys::SilenceConsoleLogging()
 {
+	std::copy(std::begin(log_settings), std::end(log_settings), std::begin(pre_silence_settings));
+
 	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
 		log_settings[log_index].log_to_console      = 0;
 		log_settings[log_index].is_category_enabled = 0;
@@ -537,10 +595,7 @@ void EQEmuLogSys::SilenceConsoleLogging()
  */
 void EQEmuLogSys::EnableConsoleLogging()
 {
-	for (int log_index = Logs::AA; log_index != Logs::MaxCategoryID; log_index++) {
-		log_settings[log_index].log_to_console      = Logs::General;
-		log_settings[log_index].is_category_enabled = 1;
-	}
+	std::copy(std::begin(pre_silence_settings), std::end(pre_silence_settings), std::begin(log_settings));
 }
 
 EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
@@ -742,3 +797,16 @@ EQEmuLogSys *EQEmuLogSys::SetLogPath(const std::string &log_path)
 	return this;
 }
 
+void EQEmuLogSys::DisableMySQLErrorLogs()
+{
+	log_settings[Logs::MySQLError].log_to_file    = 0;
+	log_settings[Logs::MySQLError].log_to_console = 0;
+	log_settings[Logs::MySQLError].log_to_gmsay   = 0;
+}
+
+void EQEmuLogSys::EnableMySQLErrorLogs()
+{
+	log_settings[Logs::MySQLError].log_to_file    = 1;
+	log_settings[Logs::MySQLError].log_to_console = 1;
+	log_settings[Logs::MySQLError].log_to_gmsay   = 1;
+}

common/eqemu_logsys.h

@@ -136,6 +136,7 @@ namespace Logs {
 		PacketServerToServer,
 		Bugs,
 		QuestErrors,
+		PlayerEvents,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -230,7 +231,8 @@ namespace Logs {
 		"Packet C->S",
 		"Packet S->S",
 		"Bugs",
-		"QuestErrors"
+		"QuestErrors",
+		"PlayerEvents",
 	};
 }
 
@@ -322,6 +324,9 @@ public:
 	*/
 	LogSettings log_settings[Logs::LogCategory::MaxCategoryID]{};
 
+	// temporary bucket to re-load after silencing
+	LogSettings pre_silence_settings[Logs::LogCategory::MaxCategoryID]{};
+
 	struct LogEnabled {
 		bool log_to_file_enabled;
 		bool log_to_console_enabled;
@@ -372,6 +377,9 @@ public:
 	[[nodiscard]] const std::string &GetLogPath() const;
 	EQEmuLogSys * SetLogPath(const std::string &log_path);
 
+	void DisableMySQLErrorLogs();
+	void EnableMySQLErrorLogs();
+
 private:
 
 	// reference to database

common/eqemu_logsys_log_aliases.h

@@ -784,6 +784,16 @@
         OutF(LogSys, Logs::Detail, Logs::QuestErrors, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
+#define LogPlayerEvents(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::General, Logs::PlayerEvents))\
+        OutF(LogSys, Logs::General, Logs::PlayerEvents, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
+#define LogPlayerEventsDetail(message, ...) do {\
+    if (LogSys.IsLogEnabled(Logs::Detail, Logs::PlayerEvents))\
+        OutF(LogSys, Logs::Detail, Logs::PlayerEvents, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while (0)
+
 #define Log(debug_level, log_category, message, ...) do {\
     if (LogSys.IsLogEnabled(debug_level, log_category))\
         LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\

common/eqtime.cpp

@@ -58,10 +58,6 @@ EQTime::EQTime()
 	SetCurrentEQTimeOfDay(start, time(0));
 }
 
-EQTime::~EQTime()
-{
-}
-
 //getEQTimeOfDay - Reads timeConvert and writes the result to eqTimeOfDay
 //This function was written by the ShowEQ Project.
 //Input: Current Time (as a time_t), a pointer to the TimeOfDay_Struct that will be written to.
@@ -203,4 +199,4 @@ void EQTime::ToString(TimeOfDay_Struct *t, std::string &str) {
 		t->month, t->day, t->year, t->hour, t->minute);
 	buf[127] = '\0';
 	str = buf;
-}
+}

common/eqtime.h

@@ -18,7 +18,7 @@ public:
 	//Constructor/destructor
 	EQTime(TimeOfDay_Struct start_eq, time_t start_real);
 	EQTime();
-	~EQTime();
+	~EQTime() = default;
 
 	//Get functions
 	int GetCurrentEQTimeOfDay( TimeOfDay_Struct *eqTimeOfDay ) { return(GetCurrentEQTimeOfDay(time(nullptr), eqTimeOfDay)); }

common/event/task_scheduler.h

@@ -38,7 +38,7 @@ namespace EQ
 				_running = true;
 
 				for (size_t i = 0; i < threads; ++i) {
-					_threads.push_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
+					_threads.emplace_back(std::thread(std::bind(&TaskScheduler::ProcessWork, this)));
 				}
 			}
 			

common/events/player_event_discord_formatter.h

@@ -0,0 +1,214 @@
+#ifndef EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
+#define EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H
+
+#include <string>
+#include "player_events.h"
+#include "../repositories/base/base_player_event_logs_repository.h"
+#include <cereal/archives/json.hpp>
+#include <cereal/types/vector.hpp>
+
+struct DiscordField {
+	std::string name;
+	std::string value;
+	bool        is_inline;
+
+	// cereal
+	template<class Archive>
+	void serialize(Archive &ar)
+	{
+		ar(
+			CEREAL_NVP(name),
+			CEREAL_NVP(value),
+			cereal::make_nvp("inline", is_inline)
+		);
+	}
+};
+
+struct DiscordAuthor {
+	std::string name;
+	std::string icon_url;
+	std::string url;
+
+	// cereal
+	template<class Archive>
+	void serialize(Archive &ar)
+	{
+		ar(
+			CEREAL_NVP(name),
+			CEREAL_NVP(icon_url),
+			CEREAL_NVP(url)
+		);
+	}
+};
+
+struct DiscordEmbed {
+	std::vector<DiscordField> fields;
+	std::string               title;
+	std::string               description;
+	std::string               timestamp;
+	DiscordAuthor             author;
+
+
+	// cereal
+	template<class Archive>
+	void serialize(Archive &ar)
+	{
+		ar(
+			CEREAL_NVP(fields),
+			CEREAL_NVP(title),
+			CEREAL_NVP(description),
+			CEREAL_NVP(timestamp),
+			CEREAL_NVP(author)
+		);
+	}
+};
+
+struct DiscordWebhook {
+	std::vector<DiscordEmbed> embeds;
+	std::string               content;
+	std::string               avatar_url;
+
+	// cereal
+	template<class Archive>
+	void serialize(Archive &ar)
+	{
+		ar(
+			CEREAL_NVP(embeds),
+			CEREAL_NVP(avatar_url),
+			CEREAL_NVP(content)
+		);
+	}
+};
+
+
+class PlayerEventDiscordFormatter {
+public:
+	static std::string GetCurrentTimestamp();
+	static std::string FormatEventSay(const PlayerEvent::PlayerEventContainer &c, const PlayerEvent::SayEvent &e);
+	static std::string
+	FormatGMCommand(const PlayerEvent::PlayerEventContainer &c, const PlayerEvent::GMCommandEvent &e);
+	static void BuildDiscordField(
+		std::vector<DiscordField> *f,
+		const std::string &name,
+		const std::string &value,
+		bool is_inline = true
+	);
+	static void BuildBaseEmbed(
+		std::vector<DiscordEmbed> *e,
+		const std::vector<DiscordField> &f,
+		PlayerEvent::PlayerEventContainer c
+	);
+	static std::string FormatWithNodata(const PlayerEvent::PlayerEventContainer &c);
+
+	static std::string FormatAAGainedEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::AAGainedEvent &e
+	);
+	static std::string FormatAAPurchasedEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::AAPurchasedEvent &e
+	);
+	static std::string FormatDeathEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::DeathEvent &e
+	);
+	static std::string FormatFishSuccessEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::FishSuccessEvent &e
+	);
+	static std::string FormatForageSuccessEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::ForageSuccessEvent &e
+	);
+	static std::string FormatDestroyItemEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::DestroyItemEvent &e
+	);
+	static std::string FormatDiscoverItemEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::DiscoverItemEvent &e
+	);
+	static std::string FormatDroppedItemEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::DroppedItemEvent &e
+	);
+	static std::string FormatLevelGainedEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::LevelGainedEvent &e
+	);
+	static std::string FormatLevelLostEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::LevelLostEvent &e
+	);
+	static std::string FormatLootItemEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::LootItemEvent &e
+	);
+	static std::string FormatGroundSpawnPickupEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::GroundSpawnPickupEvent &e
+	);
+	static std::string FormatMerchantPurchaseEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::MerchantPurchaseEvent &e
+	);
+	static std::string FormatMerchantSellEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::MerchantSellEvent &e
+	);
+	static std::string FormatNPCHandinEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::HandinEvent &e
+	);
+	static std::string FormatSkillUpEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::SkillUpEvent &e
+	);
+	static std::string FormatTaskAcceptEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::TaskAcceptEvent &e
+	);
+	static std::string FormatTaskCompleteEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::TaskCompleteEvent &e
+	);
+	static std::string FormatTaskUpdateEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::TaskUpdateEvent &e
+	);
+	static std::string FormatTradeEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::TradeEvent &e
+	);
+	static std::string FormatTraderPurchaseEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::TraderPurchaseEvent &e
+	);
+	static std::string FormatTraderSellEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::TraderSellEvent &e
+	);
+	static std::string FormatResurrectAcceptEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::ResurrectAcceptEvent &e
+	);
+	static std::string FormatSplitMoneyEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::SplitMoneyEvent &e
+	);
+	static std::string FormatCombineEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::CombineEvent &e
+	);
+	static std::string FormatZoningEvent(
+		const PlayerEvent::PlayerEventContainer &c,
+		const PlayerEvent::ZoningEvent &e
+	);
+	static DiscordWebhook BuildDiscordWebhook(
+		const PlayerEvent::PlayerEventContainer &p,
+		std::vector<DiscordEmbed> &embeds
+	);
+};
+
+
+#endif //EQEMU_PLAYER_EVENT_DISCORD_FORMATTER_H

common/events/player_event_logs.cpp

@@ -0,0 +1,702 @@
+#include <cereal/archives/json.hpp>
+#include "player_event_logs.h"
+#include "player_event_discord_formatter.h"
+#include "../platform.h"
+#include "../rulesys.h"
+
+const uint32 PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL = 60 * 60 * 1000; // 1 hour
+
+// general initialization routine
+void PlayerEventLogs::Init()
+{
+	m_process_batch_events_timer.SetTimer(RuleI(Logging, BatchPlayerEventProcessIntervalSeconds) * 1000);
+	m_process_retention_truncation_timer.SetTimer(PROCESS_RETENTION_TRUNCATION_TIMER_INTERVAL);
+
+	ValidateDatabaseConnection();
+
+	// initialize settings array
+	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
+		m_settings[i].id                 = i;
+		m_settings[i].event_name         = PlayerEvent::EventName[i];
+		m_settings[i].event_enabled      = 1;
+		m_settings[i].retention_days     = 0;
+		m_settings[i].discord_webhook_id = 0;
+	}
+
+	SetSettingsDefaults();
+
+	// initialize settings from database
+	auto             s = PlayerEventLogSettingsRepository::All(*m_database);
+	std::vector<int> db{};
+	db.reserve(s.size());
+	for (auto &e: s) {
+		if (e.id >= PlayerEvent::MAX) {
+			continue;
+		}
+		m_settings[e.id] = e;
+		db.emplace_back(e.id);
+	}
+
+	// insert entries that don't exist in database
+	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
+		bool is_in_database = std::find(db.begin(), db.end(), i) != db.end();
+		bool is_deprecated  = Strings::Contains(PlayerEvent::EventName[i], "Deprecated");
+		bool is_implemented = !Strings::Contains(PlayerEvent::EventName[i], "Unimplemented");
+
+		// remove when deprecated
+		if (is_deprecated && is_in_database) {
+			LogInfo("[Deprecated] Removing PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
+			PlayerEventLogSettingsRepository::DeleteWhere(*m_database, fmt::format("id = {}", i));
+		}
+		// remove when unimplemented if present
+		if (!is_implemented && is_in_database) {
+			LogInfo("[Unimplemented] Removing PlayerEvent [{}] ({})", PlayerEvent::EventName[i], i);
+			PlayerEventLogSettingsRepository::DeleteWhere(*m_database, fmt::format("id = {}", i));
+		}
+
+		bool is_missing_in_database = std::find(db.begin(), db.end(), i) == db.end();
+		if (is_missing_in_database && is_implemented && !is_deprecated) {
+			LogInfo(
+				"[New] PlayerEvent [{}] ({})",
+				PlayerEvent::EventName[i],
+				i
+			);
+
+			auto c = PlayerEventLogSettingsRepository::NewEntity();
+			c.id             = i;
+			c.event_name     = PlayerEvent::EventName[i];
+			c.event_enabled  = m_settings[i].event_enabled;
+			c.retention_days = m_settings[i].retention_days;
+			PlayerEventLogSettingsRepository::InsertOne(*m_database, c);
+		}
+	}
+
+	bool processing_in_world = !RuleB(Logging, PlayerEventsQSProcess) && IsWorld();
+	bool processing_in_qs    = RuleB(Logging, PlayerEventsQSProcess) && IsQueryServ();
+
+	// on initial boot process truncation
+	if (processing_in_world || processing_in_qs) {
+		ProcessRetentionTruncation();
+	}
+}
+
+// set the database object, during initialization
+PlayerEventLogs *PlayerEventLogs::SetDatabase(Database *db)
+{
+	m_database = db;
+
+	return this;
+}
+
+// validates whether the connection is valid or not, used in initialization
+bool PlayerEventLogs::ValidateDatabaseConnection()
+{
+	if (!m_database) {
+		LogError("No database connection");
+		return false;
+	}
+
+	return true;
+}
+
+// determines if the passed in event is enabled or not
+// this is used to gate logic or events from firing off
+// this is used prior to building the events, we don't want to
+// build the events, send them through the stack in a function call
+// only to discard them immediately afterwards, very wasteful on resources
+// the quest api currently does this
+bool PlayerEventLogs::IsEventEnabled(PlayerEvent::EventType event)
+{
+	return m_settings[event].event_enabled ? m_settings[event].event_enabled : false;
+}
+
+// this processes any current player events on the queue
+void PlayerEventLogs::ProcessBatchQueue()
+{
+	m_batch_queue_lock.lock();
+	if (m_record_batch_queue.empty()) {
+		m_batch_queue_lock.unlock();
+		return;
+	}
+
+	BenchTimer benchmark;
+
+	// flush many
+	PlayerEventLogsRepository::InsertMany(*m_database, m_record_batch_queue);
+	LogPlayerEventsDetail(
+		"Processing batch player event log queue of [{}] took [{}]",
+		m_record_batch_queue.size(),
+		benchmark.elapsed()
+	);
+
+	// empty
+	m_record_batch_queue = {};
+	m_batch_queue_lock.unlock();
+}
+
+// adds a player event to the queue
+void PlayerEventLogs::AddToQueue(const PlayerEventLogsRepository::PlayerEventLogs &log)
+{
+	m_batch_queue_lock.lock();
+	m_record_batch_queue.emplace_back(log);
+	m_batch_queue_lock.unlock();
+}
+
+// fills common event data in the SendEvent function
+void PlayerEventLogs::FillPlayerEvent(
+	const PlayerEvent::PlayerEvent &p,
+	PlayerEventLogsRepository::PlayerEventLogs &n
+)
+{
+	n.account_id   = p.account_id;
+	n.character_id = p.character_id;
+	n.zone_id      = p.zone_id;
+	n.instance_id  = p.instance_id;
+	n.x            = p.x;
+	n.y            = p.y;
+	n.z            = p.z;
+	n.heading      = p.heading;
+}
+
+// builds the dynamic packet used to ship the player event over the wire
+// supports serializing the struct so it can be rebuilt on the other end
+std::unique_ptr<ServerPacket>
+PlayerEventLogs::BuildPlayerEventPacket(const PlayerEvent::PlayerEventContainer &e)
+{
+	EQ::Net::DynamicPacket dyn_pack;
+	dyn_pack.PutSerialize(0, e);
+	auto pack_size = sizeof(ServerSendPlayerEvent_Struct) + dyn_pack.Length();
+	auto pack      = std::make_unique<ServerPacket>(ServerOP_PlayerEvent, static_cast<uint32_t>(pack_size));
+	auto buf       = reinterpret_cast<ServerSendPlayerEvent_Struct *>(pack->pBuffer);
+	buf->cereal_size = static_cast<uint32_t>(dyn_pack.Length());
+	memcpy(buf->cereal_data, dyn_pack.Data(), dyn_pack.Length());
+
+	return pack;
+}
+
+const PlayerEventLogSettingsRepository::PlayerEventLogSettings *PlayerEventLogs::GetSettings() const
+{
+	return m_settings;
+}
+
+bool PlayerEventLogs::IsEventDiscordEnabled(int32_t event_type_id)
+{
+	// out of bounds check
+	if (event_type_id >= PlayerEvent::EventType::MAX) {
+		return false;
+	}
+
+	// make sure webhook id is set
+	if (m_settings[event_type_id].discord_webhook_id == 0) {
+		return false;
+	}
+
+	// ensure there is a matching webhook to begin with
+	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
+		return true;
+	}
+
+	return false;
+}
+
+std::string PlayerEventLogs::GetDiscordWebhookUrlFromEventType(int32_t event_type_id)
+{
+	// out of bounds check
+	if (event_type_id >= PlayerEvent::EventType::MAX) {
+		return "";
+	}
+
+	// make sure webhook id is set
+	if (m_settings[event_type_id].discord_webhook_id == 0) {
+		return "";
+	}
+
+	// ensure there is a matching webhook to begin with
+	if (!LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url.empty()) {
+		return LogSys.GetDiscordWebhooks()[m_settings[event_type_id].discord_webhook_id].webhook_url;
+	}
+
+	return "";
+}
+
+// GM_COMMAND           | [x] Implemented Formatter
+// ZONING               | [x] Implemented Formatter
+// AA_GAIN              | [x] Implemented Formatter
+// AA_PURCHASE          | [x] Implemented Formatter
+// FORAGE_SUCCESS       | [x] Implemented Formatter
+// FORAGE_FAILURE       | [x] Implemented Formatter
+// FISH_SUCCESS         | [x] Implemented Formatter
+// FISH_FAILURE         | [x] Implemented Formatter
+// ITEM_DESTROY         | [x] Implemented Formatter
+// WENT_ONLINE          | [x] Implemented Formatter
+// WENT_OFFLINE         | [x] Implemented Formatter
+// LEVEL_GAIN           | [x] Implemented Formatter
+// LEVEL_LOSS           | [x] Implemented Formatter
+// LOOT_ITEM            | [x] Implemented Formatter
+// MERCHANT_PURCHASE    | [x] Implemented Formatter
+// MERCHANT_SELL        | [x] Implemented Formatter
+// GROUP_JOIN           | [] Implemented Formatter
+// GROUP_LEAVE          | [] Implemented Formatter
+// RAID_JOIN            | [] Implemented Formatter
+// RAID_LEAVE           | [] Implemented Formatter
+// GROUNDSPAWN_PICKUP   | [x] Implemented Formatter
+// NPC_HANDIN           | [x] Implemented Formatter
+// SKILL_UP             | [x] Implemented Formatter
+// TASK_ACCEPT          | [x] Implemented Formatter
+// TASK_UPDATE          | [x] Implemented Formatter
+// TASK_COMPLETE        | [x] Implemented Formatter
+// TRADE                | [] Implemented Formatter
+// GIVE_ITEM            | [] Implemented Formatter
+// SAY                  | [x] Implemented Formatter
+// REZ_ACCEPTED         | [x] Implemented Formatter
+// DEATH                | [x] Implemented Formatter
+// COMBINE_FAILURE      | [x] Implemented Formatter
+// COMBINE_SUCCESS      | [x] Implemented Formatter
+// DROPPED_ITEM         | [x] Implemented Formatter
+// SPLIT_MONEY          | [x] Implemented Formatter
+// DZ_JOIN              | [] Implemented Formatter
+// DZ_LEAVE             | [] Implemented Formatter
+// TRADER_PURCHASE      | [x] Implemented Formatter
+// TRADER_SELL          | [x] Implemented Formatter
+// BANDOLIER_CREATE     | [] Implemented Formatter
+// BANDOLIER_SWAP       | [] Implemented Formatter
+// DISCOVER_ITEM        | [X] Implemented Formatter
+
+std::string PlayerEventLogs::GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e)
+{
+	std::string payload;
+	switch (e.player_event_log.event_type_id) {
+		case PlayerEvent::AA_GAIN: {
+			PlayerEvent::AAGainedEvent n{};
+			std::stringstream          ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatAAGainedEvent(e, n);
+			break;
+		}
+		case PlayerEvent::AA_PURCHASE: {
+			PlayerEvent::AAPurchasedEvent n{};
+			std::stringstream             ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatAAPurchasedEvent(e, n);
+			break;
+		}
+		case PlayerEvent::COMBINE_FAILURE:
+		case PlayerEvent::COMBINE_SUCCESS: {
+			PlayerEvent::CombineEvent n{};
+			std::stringstream         ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatCombineEvent(e, n);
+			break;
+		}
+		case PlayerEvent::DEATH: {
+			PlayerEvent::DeathEvent n{};
+			std::stringstream       ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatDeathEvent(e, n);
+			break;
+		}
+		case PlayerEvent::DISCOVER_ITEM: {
+			PlayerEvent::DiscoverItemEvent n{};
+			std::stringstream              ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatDiscoverItemEvent(e, n);
+			break;
+		}
+		case PlayerEvent::DROPPED_ITEM: {
+			PlayerEvent::DroppedItemEvent n{};
+			std::stringstream             ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatDroppedItemEvent(e, n);
+			break;
+		}
+		case PlayerEvent::FISH_FAILURE:
+		case PlayerEvent::FORAGE_FAILURE:
+		case PlayerEvent::WENT_ONLINE:
+		case PlayerEvent::WENT_OFFLINE: {
+			payload = PlayerEventDiscordFormatter::FormatWithNodata(e);
+			break;
+		}
+		case PlayerEvent::FISH_SUCCESS: {
+			PlayerEvent::FishSuccessEvent n{};
+			std::stringstream             ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatFishSuccessEvent(e, n);
+			break;
+		}
+		case PlayerEvent::FORAGE_SUCCESS: {
+			PlayerEvent::ForageSuccessEvent n{};
+			std::stringstream               ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatForageSuccessEvent(e, n);
+			break;
+		}
+		case PlayerEvent::ITEM_DESTROY: {
+			PlayerEvent::DestroyItemEvent n{};
+			std::stringstream             ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatDestroyItemEvent(e, n);
+			break;
+		}
+		case PlayerEvent::LEVEL_GAIN: {
+			PlayerEvent::LevelGainedEvent n{};
+			std::stringstream             ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatLevelGainedEvent(e, n);
+			break;
+		}
+		case PlayerEvent::LEVEL_LOSS: {
+			PlayerEvent::LevelLostEvent n{};
+			std::stringstream           ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatLevelLostEvent(e, n);
+			break;
+		}
+		case PlayerEvent::LOOT_ITEM: {
+			PlayerEvent::LootItemEvent n{};
+			std::stringstream          ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatLootItemEvent(e, n);
+			break;
+		}
+		case PlayerEvent::GROUNDSPAWN_PICKUP: {
+			PlayerEvent::GroundSpawnPickupEvent n{};
+			std::stringstream                   ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatGroundSpawnPickupEvent(e, n);
+			break;
+		}
+		case PlayerEvent::NPC_HANDIN: {
+			PlayerEvent::HandinEvent n{};
+			std::stringstream        ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatNPCHandinEvent(e, n);
+			break;
+		}
+		case PlayerEvent::SAY: {
+			PlayerEvent::SayEvent n{};
+			std::stringstream     ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatEventSay(e, n);
+			break;
+		}
+		case PlayerEvent::GM_COMMAND: {
+			PlayerEvent::GMCommandEvent n{};
+			std::stringstream           ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatGMCommand(e, n);
+			break;
+		}
+		case PlayerEvent::SKILL_UP: {
+			PlayerEvent::SkillUpEvent n{};
+			std::stringstream         ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatSkillUpEvent(e, n);
+			break;
+		}
+		case PlayerEvent::SPLIT_MONEY: {
+			PlayerEvent::SplitMoneyEvent n{};
+			std::stringstream            ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatSplitMoneyEvent(e, n);
+			break;
+		}
+		case PlayerEvent::TASK_ACCEPT: {
+			PlayerEvent::TaskAcceptEvent n{};
+			std::stringstream            ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatTaskAcceptEvent(e, n);
+			break;
+		}
+		case PlayerEvent::TASK_COMPLETE: {
+			PlayerEvent::TaskCompleteEvent n{};
+			std::stringstream              ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatTaskCompleteEvent(e, n);
+			break;
+		}
+		case PlayerEvent::TASK_UPDATE: {
+			PlayerEvent::TaskUpdateEvent n{};
+			std::stringstream            ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatTaskUpdateEvent(e, n);
+			break;
+		}
+		case PlayerEvent::TRADE: {
+			PlayerEvent::TradeEvent n{};
+			std::stringstream       ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatTradeEvent(e, n);
+			break;
+		}
+		case PlayerEvent::TRADER_PURCHASE: {
+			PlayerEvent::TraderPurchaseEvent n{};
+			std::stringstream                ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatTraderPurchaseEvent(e, n);
+			break;
+		}
+		case PlayerEvent::TRADER_SELL: {
+			PlayerEvent::TraderSellEvent n{};
+			std::stringstream            ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatTraderSellEvent(e, n);
+			break;
+		}
+		case PlayerEvent::REZ_ACCEPTED: {
+			PlayerEvent::ResurrectAcceptEvent n{};
+			std::stringstream                 ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+			payload = PlayerEventDiscordFormatter::FormatResurrectAcceptEvent(e, n);
+			break;
+		}
+		case PlayerEvent::MERCHANT_PURCHASE: {
+			PlayerEvent::MerchantPurchaseEvent n{};
+			std::stringstream                  ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+
+			payload = PlayerEventDiscordFormatter::FormatMerchantPurchaseEvent(e, n);
+			break;
+		}
+		case PlayerEvent::MERCHANT_SELL: {
+			PlayerEvent::MerchantSellEvent n{};
+			std::stringstream              ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+
+			payload = PlayerEventDiscordFormatter::FormatMerchantSellEvent(e, n);
+			break;
+		}
+		case PlayerEvent::ZONING: {
+			PlayerEvent::ZoningEvent n{};
+			std::stringstream        ss;
+			{
+				ss << e.player_event_log.event_data;
+				cereal::JSONInputArchive ar(ss);
+				n.serialize(ar);
+			}
+
+			payload = PlayerEventDiscordFormatter::FormatZoningEvent(e, n);
+			break;
+		}
+		default: {
+			LogInfo(
+				"Player event [{}] ({}) Discord formatter not implemented",
+				e.player_event_log.event_type_name,
+				e.player_event_log.event_type_id
+			);
+		}
+	}
+
+	return payload;
+}
+
+// general process function, used in world or QS depending on rule Logging:PlayerEventsQSProcess
+void PlayerEventLogs::Process()
+{
+	if (m_process_batch_events_timer.Check() || m_record_batch_queue.size() >= RuleI(Logging, BatchPlayerEventProcessChunkSize)) {
+		ProcessBatchQueue();
+	}
+
+	if (m_process_retention_truncation_timer.Check()) {
+		ProcessRetentionTruncation();
+	}
+}
+
+void PlayerEventLogs::ProcessRetentionTruncation()
+{
+	LogInfo("Running truncation");
+
+	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
+		if (m_settings[i].retention_days > 0) {
+			int deleted_count = PlayerEventLogsRepository::DeleteWhere(
+				*m_database,
+				fmt::format(
+					"event_type_id = {} AND created_at < (NOW() - INTERVAL {} DAY)",
+					i,
+					m_settings[i].retention_days
+				)
+			);
+
+			if (deleted_count > 0) {
+				LogInfo(
+					"Truncated [{}] events of type [{}] ({}) older than [{}] days",
+					deleted_count,
+					PlayerEvent::EventName[i],
+					i,
+					m_settings[i].retention_days
+				);
+			}
+		}
+	}
+}
+
+void PlayerEventLogs::ReloadSettings()
+{
+	for (auto &e: PlayerEventLogSettingsRepository::All(*m_database)) {
+		m_settings[e.id] = e;
+	}
+}
+
+const int32_t RETENTION_DAYS_DEFAULT = 7;
+
+void PlayerEventLogs::SetSettingsDefaults()
+{
+	m_settings[PlayerEvent::GM_COMMAND].event_enabled         = 1;
+	m_settings[PlayerEvent::ZONING].event_enabled             = 1;
+	m_settings[PlayerEvent::AA_GAIN].event_enabled            = 1;
+	m_settings[PlayerEvent::AA_PURCHASE].event_enabled        = 1;
+	m_settings[PlayerEvent::FORAGE_SUCCESS].event_enabled     = 0;
+	m_settings[PlayerEvent::FORAGE_FAILURE].event_enabled     = 0;
+	m_settings[PlayerEvent::FISH_SUCCESS].event_enabled       = 0;
+	m_settings[PlayerEvent::FISH_FAILURE].event_enabled       = 0;
+	m_settings[PlayerEvent::ITEM_DESTROY].event_enabled       = 1;
+	m_settings[PlayerEvent::WENT_ONLINE].event_enabled        = 0;
+	m_settings[PlayerEvent::WENT_OFFLINE].event_enabled       = 0;
+	m_settings[PlayerEvent::LEVEL_GAIN].event_enabled         = 1;
+	m_settings[PlayerEvent::LEVEL_LOSS].event_enabled         = 1;
+	m_settings[PlayerEvent::LOOT_ITEM].event_enabled          = 1;
+	m_settings[PlayerEvent::MERCHANT_PURCHASE].event_enabled  = 1;
+	m_settings[PlayerEvent::MERCHANT_SELL].event_enabled      = 1;
+	m_settings[PlayerEvent::GROUP_JOIN].event_enabled         = 0;
+	m_settings[PlayerEvent::GROUP_LEAVE].event_enabled        = 0;
+	m_settings[PlayerEvent::RAID_JOIN].event_enabled          = 0;
+	m_settings[PlayerEvent::RAID_LEAVE].event_enabled         = 0;
+	m_settings[PlayerEvent::GROUNDSPAWN_PICKUP].event_enabled = 1;
+	m_settings[PlayerEvent::NPC_HANDIN].event_enabled         = 1;
+	m_settings[PlayerEvent::SKILL_UP].event_enabled           = 0;
+	m_settings[PlayerEvent::TASK_ACCEPT].event_enabled        = 1;
+	m_settings[PlayerEvent::TASK_UPDATE].event_enabled        = 1;
+	m_settings[PlayerEvent::TASK_COMPLETE].event_enabled      = 1;
+	m_settings[PlayerEvent::TRADE].event_enabled              = 1;
+	m_settings[PlayerEvent::GIVE_ITEM].event_enabled          = 1;
+	m_settings[PlayerEvent::SAY].event_enabled                = 0;
+	m_settings[PlayerEvent::REZ_ACCEPTED].event_enabled       = 1;
+	m_settings[PlayerEvent::DEATH].event_enabled              = 1;
+	m_settings[PlayerEvent::COMBINE_FAILURE].event_enabled    = 1;
+	m_settings[PlayerEvent::COMBINE_SUCCESS].event_enabled    = 1;
+	m_settings[PlayerEvent::DROPPED_ITEM].event_enabled       = 1;
+	m_settings[PlayerEvent::SPLIT_MONEY].event_enabled        = 1;
+	m_settings[PlayerEvent::DZ_JOIN].event_enabled            = 1;
+	m_settings[PlayerEvent::DZ_LEAVE].event_enabled           = 1;
+	m_settings[PlayerEvent::TRADER_PURCHASE].event_enabled    = 1;
+	m_settings[PlayerEvent::TRADER_SELL].event_enabled        = 1;
+	m_settings[PlayerEvent::BANDOLIER_CREATE].event_enabled   = 0;
+	m_settings[PlayerEvent::BANDOLIER_SWAP].event_enabled     = 0;
+	m_settings[PlayerEvent::DISCOVER_ITEM].event_enabled      = 1;
+	m_settings[PlayerEvent::POSSIBLE_HACK].event_enabled      = 1;
+	m_settings[PlayerEvent::KILLED_NPC].event_enabled         = 0;
+	m_settings[PlayerEvent::KILLED_NAMED_NPC].event_enabled   = 1;
+	m_settings[PlayerEvent::KILLED_RAID_NPC].event_enabled    = 1;
+	m_settings[PlayerEvent::ITEM_CREATION].event_enabled      = 1;
+
+	for (int i = PlayerEvent::GM_COMMAND; i != PlayerEvent::MAX; i++) {
+		m_settings[i].retention_days = RETENTION_DAYS_DEFAULT;
+	}
+}

common/events/player_event_logs.h

@@ -0,0 +1,85 @@
+#ifndef EQEMU_PLAYER_EVENT_LOGS_H
+#define EQEMU_PLAYER_EVENT_LOGS_H
+
+#include "../repositories/player_event_log_settings_repository.h"
+#include "player_events.h"
+#include "../servertalk.h"
+#include "../repositories/player_event_logs_repository.h"
+#include "../timer.h"
+#include "../json/json_archive_single_line.h"
+#include <cereal/archives/json.hpp>
+#include <mutex>
+
+class PlayerEventLogs {
+public:
+	void Init();
+	void ReloadSettings();
+	PlayerEventLogs *SetDatabase(Database *db);
+	bool ValidateDatabaseConnection();
+	bool IsEventEnabled(PlayerEvent::EventType event);
+
+	void Process();
+
+	// batch queue
+	void AddToQueue(const PlayerEventLogsRepository::PlayerEventLogs &logs);
+
+	// main event record generic function
+	// can ingest any struct event types
+	template<typename T>
+	std::unique_ptr<ServerPacket> RecordEvent(
+		PlayerEvent::EventType t,
+		const PlayerEvent::PlayerEvent &p,
+		T e
+	)
+	{
+		auto n = PlayerEventLogsRepository::NewEntity();
+		FillPlayerEvent(p, n);
+		n.event_type_id = t;
+
+		std::stringstream ss;
+		{
+			cereal::JSONOutputArchiveSingleLine ar(ss);
+			e.serialize(ar);
+		}
+
+		n.event_type_name = PlayerEvent::EventName[t];
+		n.event_data      = Strings::Contains(ss.str(), "noop") ? "{}" : ss.str();
+		n.created_at      = std::time(nullptr);
+
+		auto c = PlayerEvent::PlayerEventContainer{
+			.player_event = p,
+			.player_event_log = n
+		};
+
+		return BuildPlayerEventPacket(c);
+	}
+
+	[[nodiscard]] const PlayerEventLogSettingsRepository::PlayerEventLogSettings *GetSettings() const;
+	bool IsEventDiscordEnabled(int32_t event_type_id);
+	std::string GetDiscordWebhookUrlFromEventType(int32_t event_type_id);
+
+	static std::string GetDiscordPayloadFromEvent(const PlayerEvent::PlayerEventContainer &e);
+private:
+	Database                                                 *m_database; // reference to database
+	PlayerEventLogSettingsRepository::PlayerEventLogSettings m_settings[PlayerEvent::EventType::MAX]{};
+
+	// batch queue is used to record events in batch
+	std::vector<PlayerEventLogsRepository::PlayerEventLogs> m_record_batch_queue{};
+	static void FillPlayerEvent(const PlayerEvent::PlayerEvent &p, PlayerEventLogsRepository::PlayerEventLogs &n);
+	static std::unique_ptr<ServerPacket>
+	BuildPlayerEventPacket(const PlayerEvent::PlayerEventContainer &e);
+
+	// timers
+	Timer m_process_batch_events_timer; // events processing timer
+	Timer m_process_retention_truncation_timer; // timer for truncating events based on retention settings
+
+	// processing
+	std::mutex m_batch_queue_lock{};
+	void ProcessBatchQueue();
+	void ProcessRetentionTruncation();
+	void SetSettingsDefaults();
+};
+
+extern PlayerEventLogs player_event_logs;
+
+#endif //EQEMU_PLAYER_EVENT_LOGS_H

common/events/player_events.h

@@ -0,0 +1,971 @@
+#ifndef EQEMU_PLAYER_EVENTS_H
+#define EQEMU_PLAYER_EVENTS_H
+
+#include <string>
+#include <cereal/cereal.hpp>
+#include "../types.h"
+#include "../repositories/player_event_logs_repository.h"
+
+namespace PlayerEvent {
+
+	enum EventType {
+		GM_COMMAND = 1,
+		ZONING,
+		AA_GAIN,
+		AA_PURCHASE,
+		FORAGE_SUCCESS,
+		FORAGE_FAILURE,
+		FISH_SUCCESS,
+		FISH_FAILURE,
+		ITEM_DESTROY,
+		WENT_ONLINE,
+		WENT_OFFLINE,
+		LEVEL_GAIN,
+		LEVEL_LOSS,
+		LOOT_ITEM,
+		MERCHANT_PURCHASE,
+		MERCHANT_SELL,
+		GROUP_JOIN, // unimplemented
+		GROUP_LEAVE, // unimplemented
+		RAID_JOIN, // unimplemented
+		RAID_LEAVE, // unimplemented
+		GROUNDSPAWN_PICKUP,
+		NPC_HANDIN,
+		SKILL_UP,
+		TASK_ACCEPT,
+		TASK_UPDATE,
+		TASK_COMPLETE,
+		TRADE,
+		GIVE_ITEM, // unimplemented
+		SAY,
+		REZ_ACCEPTED,
+		DEATH,
+		COMBINE_FAILURE,
+		COMBINE_SUCCESS,
+		DROPPED_ITEM,
+		SPLIT_MONEY,
+		DZ_JOIN, // unimplemented
+		DZ_LEAVE, // unimplemented
+		TRADER_PURCHASE,
+		TRADER_SELL,
+		BANDOLIER_CREATE, // unimplemented
+		BANDOLIER_SWAP, // unimplemented
+		DISCOVER_ITEM,
+		POSSIBLE_HACK,
+		KILLED_NPC,
+		KILLED_NAMED_NPC,
+		KILLED_RAID_NPC,
+		ITEM_CREATION,
+		MAX // dont remove
+	};
+
+	// Don't ever remove items, even if they are deprecated
+	// If event is deprecated just tag (Deprecated) in the name
+	// If event is unimplemented just tag (Unimplemented) in the name
+	// Events don't get saved to the database if unimplemented or deprecated
+	// Events tagged as deprecated will get automatically removed
+	static const char *EventName[PlayerEvent::MAX] = {
+		"None",
+		"GM Command",
+		"Zoning",
+		"AA Gain",
+		"AA Purchase",
+		"Forage Success",
+		"Forage Failure",
+		"Fish Success",
+		"Fish Failure",
+		"Item Destroy",
+		"Went Online",
+		"Went Offline",
+		"Level Gain",
+		"Level Loss",
+		"Loot Item",
+		"Merchant Purchase",
+		"Merchant Sell",
+		"Group Join (Unimplemented)",
+		"Group Leave (Unimplemented)",
+		"Raid Join (Unimplemented)",
+		"Raid Leave (Unimplemented)",
+		"Groundspawn Pickup",
+		"NPC Handin",
+		"Skill Up",
+		"Task Accept",
+		"Task Update",
+		"Task Complete",
+		"Trade",
+		"Given Item (Unimplemented)",
+		"Say",
+		"Rez Accepted",
+		"Death",
+		"Combine Failure",
+		"Combine Success",
+		"Dropped Item",
+		"Split Money",
+		"DZ Join (Unimplemented)",
+		"DZ Leave (Unimplemented)",
+		"Trader Purchase",
+		"Trader Sell",
+		"Bandolier Create (Unimplemented)",
+		"Bandolier Swap (Unimplemented)",
+		"Discover Item",
+		"Possible Hack",
+		"Killed NPC",
+		"Killed Named NPC",
+		"Killed Raid NPC",
+		"Item Creation"
+	};
+
+	// Generic struct used by all events
+	struct PlayerEvent {
+		int64       account_id;
+		std::string account_name;
+		int64       character_id;
+		std::string character_name;
+		int64       guild_id;
+		std::string guild_name;
+		int         zone_id;
+		std::string zone_short_name;
+		std::string zone_long_name;
+		int         instance_id;
+		float       x;
+		float       y;
+		float       z;
+		float       heading;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(account_id),
+				CEREAL_NVP(account_name),
+				CEREAL_NVP(character_id),
+				CEREAL_NVP(character_name),
+				CEREAL_NVP(guild_id),
+				CEREAL_NVP(guild_name),
+				CEREAL_NVP(zone_id),
+				CEREAL_NVP(zone_short_name),
+				CEREAL_NVP(zone_long_name),
+				CEREAL_NVP(instance_id),
+				CEREAL_NVP(x),
+				CEREAL_NVP(y),
+				CEREAL_NVP(z),
+				CEREAL_NVP(heading)
+			);
+		}
+	};
+
+	// contains metadata in use for things like log/discord formatters
+	// along with the actual event to be persisted
+	struct PlayerEventContainer {
+		PlayerEvent                                player_event;
+		PlayerEventLogsRepository::PlayerEventLogs player_event_log;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(player_event),
+				CEREAL_NVP(player_event_log)
+			);
+		}
+	};
+
+	// used in events with no extra data
+	struct EmptyEvent {
+		std::string noop; // noop, gets discard upstream
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(noop)
+			);
+		}
+	};
+
+	// used in Trade event
+	struct ItemCreationEvent {
+		int64       item_id;
+		std::string item_name;
+		uint16      to_slot;
+		int16       charges;
+		uint32      aug1;
+		uint32      aug2;
+		uint32      aug3;
+		uint32      aug4;
+		uint32      aug5;
+		uint32      aug6;
+		bool        attuned;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(to_slot),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(aug1),
+				CEREAL_NVP(aug2),
+				CEREAL_NVP(aug3),
+				CEREAL_NVP(aug4),
+				CEREAL_NVP(aug5),
+				CEREAL_NVP(aug6),
+				CEREAL_NVP(attuned)
+			);
+		}
+	};
+
+	// used in Trade event
+	struct TradeItem {
+		int64       item_id;
+		std::string item_name;
+		int32       slot;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(slot)
+			);
+		}
+	};
+
+	// used in Trade event
+	class TradeItemEntry {
+	public:
+		uint16      slot;
+		uint32      item_id;
+		std::string item_name;
+		uint16      charges;
+		uint32      aug_1_item_id;
+		std::string aug_1_item_name;
+		uint32      aug_2_item_id;
+		std::string aug_2_item_name;
+		uint32      aug_3_item_id;
+		std::string aug_3_item_name;
+		uint32      aug_4_item_id;
+		std::string aug_4_item_name;
+		uint32      aug_5_item_id;
+		std::string aug_5_item_name;
+		uint32      aug_6_item_id;
+		std::string aug_6_item_name;
+		bool        in_bag;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(slot),
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(aug_1_item_id),
+				CEREAL_NVP(aug_2_item_id),
+				CEREAL_NVP(aug_3_item_id),
+				CEREAL_NVP(aug_4_item_id),
+				CEREAL_NVP(aug_5_item_id),
+				CEREAL_NVP(in_bag)
+			);
+		}
+	};
+
+	/**
+	 * Events
+	 */
+	struct Money {
+		int32 platinum;
+		int32 gold;
+		int32 silver;
+		int32 copper;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(platinum),
+				CEREAL_NVP(gold),
+				CEREAL_NVP(silver),
+				CEREAL_NVP(copper)
+			);
+		}
+	};
+
+	struct TradeEvent {
+		uint32                      character_1_id;
+		std::string                 character_1_name;
+		uint32                      character_2_id;
+		std::string                 character_2_name;
+		Money                       character_1_give_money;
+		Money                       character_2_give_money;
+		std::vector<TradeItemEntry> character_1_give_items;
+		std::vector<TradeItemEntry> character_2_give_items;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(character_1_id),
+				CEREAL_NVP(character_1_name),
+				CEREAL_NVP(character_2_id),
+				CEREAL_NVP(character_2_name),
+				CEREAL_NVP(character_1_give_money),
+				CEREAL_NVP(character_2_give_money),
+				CEREAL_NVP(character_1_give_items),
+				CEREAL_NVP(character_2_give_items)
+			);
+		}
+	};
+
+	struct GMCommandEvent {
+		std::string message;
+		std::string target;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(message),
+				CEREAL_NVP(target)
+			);
+		}
+	};
+
+	struct ZoningEvent {
+		std::string from_zone_long_name;
+		std::string from_zone_short_name;
+		int32       from_zone_id;
+		int32       from_instance_id;
+		int32       from_instance_version;
+		std::string to_zone_long_name;
+		std::string to_zone_short_name;
+		int32       to_zone_id;
+		int32       to_instance_id;
+		int32       to_instance_version;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(from_zone_long_name),
+				CEREAL_NVP(from_zone_short_name),
+				CEREAL_NVP(from_zone_id),
+				CEREAL_NVP(from_instance_id),
+				CEREAL_NVP(from_instance_version),
+				CEREAL_NVP(to_zone_long_name),
+				CEREAL_NVP(to_zone_short_name),
+				CEREAL_NVP(to_zone_id),
+				CEREAL_NVP(to_instance_id),
+				CEREAL_NVP(to_instance_version)
+			);
+		}
+	};
+
+	struct AAGainedEvent {
+		uint32 aa_gained;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(CEREAL_NVP(aa_gained));
+		}
+	};
+
+	struct AAPurchasedEvent {
+		uint32 aa_id;
+		int32 aa_cost;
+		int32 aa_previous_id;
+		int32 aa_next_id;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(aa_id),
+				CEREAL_NVP(aa_cost),
+				CEREAL_NVP(aa_previous_id),
+				CEREAL_NVP(aa_next_id)
+			);
+		}
+	};
+
+	struct ForageSuccessEvent {
+		uint32      item_id;
+		std::string item_name;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name)
+			);
+		}
+	};
+
+	struct FishSuccessEvent {
+		uint32      item_id;
+		std::string item_name;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name)
+			);
+		}
+	};
+
+	struct DestroyItemEvent {
+		uint32      item_id;
+		std::string item_name;
+		int16       charges;
+		std::string reason;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(reason),
+				CEREAL_NVP(charges)
+			);
+		}
+	};
+
+	struct LevelGainedEvent {
+		uint32 from_level;
+		uint8  to_level;
+		int    levels_gained;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(from_level),
+				CEREAL_NVP(to_level),
+				CEREAL_NVP(levels_gained)
+			);
+		}
+	};
+
+	struct LevelLostEvent {
+		uint32 from_level;
+		uint8  to_level;
+		int    levels_lost;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(from_level),
+				CEREAL_NVP(to_level),
+				CEREAL_NVP(levels_lost)
+			);
+		}
+	};
+
+	struct LootItemEvent {
+		uint32      item_id;
+		std::string item_name;
+		int16       charges;
+		uint32      npc_id;
+		std::string corpse_name;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(npc_id),
+				CEREAL_NVP(corpse_name)
+			);
+		}
+	};
+
+	struct MerchantPurchaseEvent {
+		uint32      npc_id;
+		std::string merchant_name;
+		uint32      merchant_type;
+		uint32      item_id;
+		std::string item_name;
+		int16       charges;
+		uint32      cost;
+		uint32      alternate_currency_id;
+		uint64      player_money_balance;
+		uint64      player_currency_balance;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(npc_id),
+				CEREAL_NVP(merchant_name),
+				CEREAL_NVP(merchant_type),
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(cost),
+				CEREAL_NVP(alternate_currency_id),
+				CEREAL_NVP(player_money_balance),
+				CEREAL_NVP(player_currency_balance)
+			);
+		}
+	};
+
+	struct MerchantSellEvent {
+		uint32      npc_id;
+		std::string merchant_name;
+		uint32      merchant_type;
+		uint32      item_id;
+		std::string item_name;
+		int16       charges;
+		uint32      cost;
+		uint32      alternate_currency_id;
+		uint64      player_money_balance;
+		uint64      player_currency_balance;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(npc_id),
+				CEREAL_NVP(merchant_name),
+				CEREAL_NVP(merchant_type),
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(cost),
+				CEREAL_NVP(alternate_currency_id),
+				CEREAL_NVP(player_money_balance),
+				CEREAL_NVP(player_currency_balance)
+			);
+		}
+	};
+
+	struct SkillUpEvent {
+		uint32      skill_id;
+		int         value;
+		int16       max_skill;
+		std::string against_who;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(skill_id),
+				CEREAL_NVP(value),
+				CEREAL_NVP(max_skill),
+				CEREAL_NVP(against_who)
+			);
+		}
+	};
+
+	struct TaskAcceptEvent {
+		uint32      npc_id;
+		std::string npc_name;
+		uint32      task_id;
+		std::string task_name;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(npc_id),
+				CEREAL_NVP(npc_name),
+				CEREAL_NVP(task_id),
+				CEREAL_NVP(task_name)
+			);
+		}
+	};
+
+	struct TaskUpdateEvent {
+		uint32      task_id;
+		std::string task_name;
+		uint32      activity_id;
+		uint32      done_count;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(task_id),
+				CEREAL_NVP(task_name),
+				CEREAL_NVP(activity_id),
+				CEREAL_NVP(done_count)
+			);
+		}
+	};
+
+	struct TaskCompleteEvent {
+		uint32      task_id;
+		std::string task_name;
+		uint32      activity_id;
+		uint32      done_count;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(task_id),
+				CEREAL_NVP(task_name),
+				CEREAL_NVP(activity_id),
+				CEREAL_NVP(done_count)
+			);
+		}
+	};
+
+	struct GroundSpawnPickupEvent {
+		uint32      item_id;
+		std::string item_name;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name)
+			);
+		}
+	};
+
+	struct SayEvent {
+		std::string message;
+		std::string target;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(message),
+				CEREAL_NVP(target)
+			);
+		}
+	};
+
+	struct ResurrectAcceptEvent {
+		std::string resurrecter_name;
+		std::string spell_name;
+		uint32      spell_id;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(resurrecter_name),
+				CEREAL_NVP(spell_name),
+				CEREAL_NVP(spell_id)
+			);
+		}
+	};
+
+	struct CombineEvent {
+		uint32      recipe_id;
+		std::string recipe_name;
+		uint32      made_count;
+		uint32      tradeskill_id;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(recipe_id),
+				CEREAL_NVP(recipe_name),
+				CEREAL_NVP(made_count),
+				CEREAL_NVP(tradeskill_id)
+			);
+		}
+	};
+
+	struct DroppedItemEvent {
+		uint32      item_id;
+		std::string item_name;
+		int16       slot_id;
+		uint32      charges;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(slot_id),
+				CEREAL_NVP(charges)
+			);
+		}
+	};
+
+	struct DeathEvent {
+		uint32      killer_id;
+		std::string killer_name;
+		int64       damage;
+		uint32      spell_id;
+		std::string spell_name;
+		int         skill_id;
+		std::string skill_name;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(killer_id),
+				CEREAL_NVP(killer_name),
+				CEREAL_NVP(damage),
+				CEREAL_NVP(spell_id),
+				CEREAL_NVP(spell_name),
+				CEREAL_NVP(skill_id),
+				CEREAL_NVP(skill_name)
+			);
+		}
+	};
+
+	struct SplitMoneyEvent {
+		uint32 copper;
+		uint32 silver;
+		uint32 gold;
+		uint32 platinum;
+		uint64 player_money_balance;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(copper),
+				CEREAL_NVP(silver),
+				CEREAL_NVP(gold),
+				CEREAL_NVP(platinum),
+				CEREAL_NVP(player_money_balance)
+			);
+		}
+	};
+
+	struct TraderPurchaseEvent {
+		uint32      item_id;
+		std::string item_name;
+		uint32      trader_id;
+		std::string trader_name;
+		uint32      price;
+		uint32      charges;
+		uint32      total_cost;
+		uint64      player_money_balance;
+
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(trader_id),
+				CEREAL_NVP(trader_name),
+				CEREAL_NVP(price),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(total_cost),
+				CEREAL_NVP(player_money_balance)
+			);
+		}
+	};
+
+	struct TraderSellEvent {
+		uint32      item_id;
+		std::string item_name;
+		uint32      buyer_id;
+		std::string buyer_name;
+		uint32      price;
+		uint32      charges;
+		uint32      total_cost;
+		uint64      player_money_balance;
+
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(buyer_id),
+				CEREAL_NVP(buyer_name),
+				CEREAL_NVP(price),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(total_cost),
+				CEREAL_NVP(player_money_balance)
+			);
+		}
+	};
+
+	struct DiscoverItemEvent {
+		uint32      item_id;
+		std::string item_name;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name)
+			);
+		}
+	};
+
+	class HandinEntry {
+	public:
+		uint32      item_id;
+		std::string item_name;
+		uint16      charges;
+		bool        attuned;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(item_id),
+				CEREAL_NVP(item_name),
+				CEREAL_NVP(charges),
+				CEREAL_NVP(attuned)
+			);
+		}
+	};
+
+	class HandinMoney {
+	public:
+		uint32 copper;
+		uint32 silver;
+		uint32 gold;
+		uint32 platinum;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(copper),
+				CEREAL_NVP(silver),
+				CEREAL_NVP(gold),
+				CEREAL_NVP(platinum)
+			);
+		}
+	};
+
+	struct HandinEvent {
+		uint32                   npc_id;
+		std::string              npc_name;
+		std::vector<HandinEntry> handin_items;
+		HandinMoney              handin_money;
+		std::vector<HandinEntry> return_items;
+		HandinMoney              return_money;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(npc_id),
+				CEREAL_NVP(npc_name),
+				CEREAL_NVP(handin_items),
+				CEREAL_NVP(handin_money),
+				CEREAL_NVP(return_items),
+				CEREAL_NVP(return_money)
+			);
+		}
+	};
+
+	struct PossibleHackEvent {
+		std::string message;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(message)
+			);
+		}
+	};
+
+	struct KilledNPCEvent {
+		uint32      npc_id;
+		std::string npc_name;
+		uint32      combat_time_seconds;
+		uint64      total_damage_per_second_taken;
+		uint64      total_heal_per_second_taken;
+
+		// cereal
+		template<class Archive>
+		void serialize(Archive &ar)
+		{
+			ar(
+				CEREAL_NVP(npc_id),
+				CEREAL_NVP(npc_name),
+				CEREAL_NVP(combat_time_seconds),
+				CEREAL_NVP(total_damage_per_second_taken),
+				CEREAL_NVP(total_heal_per_second_taken)
+			);
+		}
+	};
+}
+
+#endif //EQEMU_PLAYER_EVENTS_H
+
+#define RecordPlayerEventLog(event_type, event_data) do {\
+    if (player_event_logs.IsEventEnabled(event_type)) {\
+        worldserver.SendPacket(\
+            player_event_logs.RecordEvent(\
+                event_type,\
+                GetPlayerEvent(),\
+                event_data\
+            ).get()\
+        );\
+    }\
+} while (0)
+
+#define RecordPlayerEventLogWithClient(c, event_type, event_data) do {\
+    if (player_event_logs.IsEventEnabled(event_type)) {\
+        worldserver.SendPacket(\
+            player_event_logs.RecordEvent(\
+                event_type,\
+                (c)->GetPlayerEvent(),\
+                event_data\
+            ).get()\
+        );\
+    }\
+} while (0)

common/features.h

@@ -132,7 +132,7 @@ enum {	//reuse times
 	InstillDoubtReuseTime = 9,
 	FishingReuseTime = 11,
 	ForagingReuseTime = 50,
-	MendReuseTime = 290,
+	MendReuseTime = 360,
 	BashReuseTime = 5,
 	BackstabReuseTime = 9,
 	KickReuseTime = 5,
@@ -218,14 +218,14 @@ enum {	//some random constants
 #define HARD_LEVEL_CAP 127
 
 //the square of the maximum range at whihc you could possibly use NPC services (shop, tribute, etc)
-#define USE_NPC_RANGE2 200*200		//arbitrary right now
+#define USE_NPC_RANGE2 40000		//arbitrary right now
 
 // Squared range for rampage 75.0 * 75.0 for now
 #define NPC_RAMPAGE_RANGE2 5625.0f
 
 //the formula for experience for killing a mob.
 //level is the only valid variable to use
-#define EXP_FORMULA level*level*75*35/10
+#define EXP_FORMULA (level * level * 75 * 35 / 10)
 
 #define HIGHEST_AA_VALUE 35
 
@@ -295,7 +295,7 @@ Developer configuration
 
 #define COMMON_PROFILE
 
-#define PROFILE_DUMP_TIME 3*60
+#define PROFILE_DUMP_TIME 180
 #endif	//EQPROFILE
 
 

common/file.cpp

@@ -37,6 +37,7 @@
 
 #include <fmt/format.h>
 #include <filesystem>
+#include <iostream>
 
 namespace fs = std::filesystem;
 
@@ -80,3 +81,26 @@ std::string File::GetCwd()
 {
 	return fs::current_path().string();
 }
+
+FileContentsResult File::GetContents(const std::string &file_name)
+{
+	std::string   error;
+	std::ifstream f;
+	f.open(file_name);
+	std::string line;
+	std::string lines;
+	if (f.is_open()) {
+		while (f) {
+			std::getline(f, line);
+			lines += line + "\n";
+		}
+	}
+	else {
+		error = fmt::format("Couldn't open file [{}]", file_name);
+	}
+
+	return FileContentsResult{
+		.contents = lines,
+		.error = error,
+	};
+}

common/file.h

@@ -25,10 +25,16 @@
 
 namespace fs = std::filesystem;
 
+struct FileContentsResult {
+	std::string contents;
+	std::string error;
+};
+
 class File {
 public:
 	static bool Exists(const std::string &name);
 	static void Makedir(const std::string& directory_name);
+	static FileContentsResult GetContents(const std::string &file_name);
 	static std::string FindEqemuConfigPath();
 	static std::string GetCwd();
 };

common/guild_base.cpp

@@ -61,7 +61,7 @@ bool BaseGuildManager::LoadGuilds() {
 	}
 
 	for (auto row=results.begin();row!=results.end();++row)
-		_CreateGuild(atoi(row[0]), row[1], atoi(row[2]), atoi(row[3]), row[4], row[5], row[6], row[7]);
+		_CreateGuild(Strings::ToUnsignedInt(row[0]), row[1], Strings::ToUnsignedInt(row[2]), Strings::ToUnsignedInt(row[3]), row[4], row[5], row[6], row[7]);
 
 	LogInfo("Loaded [{}] Guilds", Strings::Commify(std::to_string(results.RowCount())));
 
@@ -75,8 +75,8 @@ bool BaseGuildManager::LoadGuilds() {
 
 	for (auto row=results.begin();row!=results.end();++row)
 	{
-		uint32 guild_id = atoi(row[0]);
-		uint8 rankn = atoi(row[1]);
+		uint32 guild_id = Strings::ToUnsignedInt(row[0]);
+		uint8 rankn = Strings::ToUnsignedInt(row[1]);
 
 		if(rankn > GUILD_MAX_RANK) {
 			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
@@ -131,7 +131,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {
 
 	auto row = results.begin();
 
-	info = _CreateGuild(guild_id, row[0], atoi(row[1]), atoi(row[2]), row[3], row[4], row[5], row[6]);
+	info = _CreateGuild(guild_id, row[0], Strings::ToUnsignedInt(row[1]), Strings::ToUnsignedInt(row[2]), row[3], row[4], row[5], row[6]);
 
     query = StringFormat("SELECT guild_id, `rank`, title, can_hear, can_speak, can_invite, can_remove, can_promote, can_demote, can_motd, can_warpeace "
                         "FROM guild_ranks WHERE guild_id=%lu", (unsigned long)guild_id);
@@ -144,7 +144,7 @@ bool BaseGuildManager::RefreshGuild(uint32 guild_id) {
 
 	for (auto row=results.begin();row!=results.end();++row)
 	{
-		uint8 rankn = atoi(row[1]);
+		uint8 rankn = Strings::ToUnsignedInt(row[1]);
 
 		if(rankn > GUILD_MAX_RANK) {
 			LogGuilds("Found invalid (too high) rank [{}] for guild [{}], skipping", rankn, guild_id);
@@ -787,9 +787,7 @@ bool BaseGuildManager::GetBankerFlag(uint32 CharID)
 
 	auto row = results.begin();
 
-	bool IsBanker = atoi(row[0]);
-
-	return IsBanker;
+	return Strings::ToBool(row[0]);
 }
 
 bool BaseGuildManager::DBSetAltFlag(uint32 charid, bool is_alt)
@@ -817,9 +815,7 @@ bool BaseGuildManager::GetAltFlag(uint32 CharID)
 
 	auto row = results.begin();
 
-	bool IsAlt = atoi(row[0]);
-
-	return IsAlt;
+	return Strings::ToBool(row[0]);
 }
 
 bool BaseGuildManager::DBSetTributeFlag(uint32 charid, bool enabled) {
@@ -873,19 +869,19 @@ bool BaseGuildManager::QueryWithLogging(std::string query, const char *errmsg) {
 " FROM `character_data` AS c LEFT JOIN `guild_members` AS g ON c.`id` = g.`char_id` "
 static void ProcessGuildMember(MySQLRequestRow row, CharGuildInfo &into) {
 	//fields from `characer_`
-	into.char_id		= atoi(row[0]);
+	into.char_id		= Strings::ToUnsignedInt(row[0]);
 	into.char_name		= row[1];
-	into.class_			= atoi(row[2]);
-	into.level			= atoi(row[3]);
-	into.time_last_on	= atoul(row[4]);
-	into.zone_id		= atoi(row[5]);
+	into.class_			= Strings::ToUnsignedInt(row[2]);
+	into.level			= Strings::ToUnsignedInt(row[3]);
+	into.time_last_on	= Strings::ToUnsignedInt(row[4]);
+	into.zone_id		= Strings::ToUnsignedInt(row[5]);
 
 	//fields from `guild_members`, leave at defaults if missing
-	into.guild_id		= row[6] ? atoi(row[6]) : GUILD_NONE;
-	into.rank			= row[7] ? atoi(row[7]) : (GUILD_MAX_RANK+1);
+	into.guild_id		= row[6] ? Strings::ToUnsignedInt(row[6]) : GUILD_NONE;
+	into.rank			= row[7] ? Strings::ToUnsignedInt(row[7]) : (GUILD_MAX_RANK+1);
 	into.tribute_enable = row[8] ? (row[8][0] == '0'?false:true) : false;
-	into.total_tribute	= row[9] ? atoi(row[9]) : 0;
-	into.last_tribute	= row[10]? atoul(row[10]) : 0;		//timestamp
+	into.total_tribute	= row[9] ? Strings::ToUnsignedInt(row[9]) : 0;
+	into.last_tribute	= row[10]? Strings::ToUnsignedInt(row[10]) : 0;		//timestamp
 	into.banker			= row[11]? (row[11][0] == '0'?false:true) : false;
 	into.public_note	= row[12]? row[12] : "";
 	into.alt		= row[13]? (row[13][0] == '0'?false:true) : false;
@@ -1258,7 +1254,7 @@ uint32 BaseGuildManager::GetGuildIDByCharacterID(uint32 character_id)
 	}
 
 	auto row = results.begin();
-	auto guild_id = std::stoul(row[0]);
+	auto guild_id = Strings::ToUnsignedInt(row[0]);
 	return guild_id;
 }
 

common/http/httplib.h

@@ -272,6 +272,8 @@ inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) {
 #include <brotli/encode.h>
 #endif
 
+#include "../strings.h"
+
 /*
  * Declaration
  */
@@ -3812,12 +3814,12 @@ inline bool brotli_decompressor::decompress(const char *data,
 					if (std::regex_match(b, e, cm, re_another_range)) {
 						ssize_t first = -1;
 						if (!cm.str(1).empty()) {
-							first = static_cast<ssize_t>(std::stoll(cm.str(1)));
+							first = static_cast<ssize_t>(Strings::ToBigInt(cm.str(1)));
 						}
 
 						ssize_t last = -1;
 						if (!cm.str(2).empty()) {
-							last = static_cast<ssize_t>(std::stoll(cm.str(2)));
+							last = static_cast<ssize_t>(Strings::ToBigInt(cm.str(2)));
 						}
 
 						if (first != -1 && last != -1 && first > last) {
@@ -6688,7 +6690,7 @@ static WSInit wsinit_;
 		if (params.empty()) { return Get(path, headers); }
 
 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query.c_str(), headers, progress);
+		return Get(path_with_query, headers, progress);
 	}
 
 	inline Result ClientImpl::Get(const std::string &path, const Params &params,
@@ -6708,7 +6710,7 @@ static WSInit wsinit_;
 		}
 
 		std::string path_with_query = append_query_params(path, params);
-		return Get(path_with_query.c_str(), headers, response_handler,
+		return Get(path_with_query, headers, response_handler,
 				   content_receiver, progress);
 	}
 
@@ -6805,7 +6807,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body = detail::serialize_multipart_formdata(
 			items, detail::make_multipart_data_boundary(), content_type);
-		return Post(path, headers, body, content_type.c_str());
+		return Post(path, headers, body, content_type);
 	}
 
 	inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
@@ -6818,7 +6820,7 @@ static WSInit wsinit_;
 		std::string content_type;
 		const auto &body =
 						detail::serialize_multipart_formdata(items, boundary, content_type);
-		return Post(path, headers, body, content_type.c_str());
+		return Post(path, headers, body, content_type);
 	}
 
 	inline Result ClientImpl::Put(const std::string &path) {

common/inventory_profile.cpp

@@ -412,11 +412,12 @@ bool EQ::InventoryProfile::DeleteItem(int16 slot_id, int16 quantity) {
 		// If there are no charges left on the item,
 		if (item_to_delete->GetCharges() <= 0) {
 			// If the item is stackable (e.g arrows), or
-			// the item is not stackable, and is not a charged item, or is expendable, delete it
-			if (item_to_delete->IsStackable() ||
-				(!item_to_delete->IsStackable() &&
-				 ((item_to_delete->GetItem()->MaxCharges == 0) || item_to_delete->IsExpendable()))
-				) {
+			// the item is not a charged item, or is expendable, delete it
+			if (
+				item_to_delete->IsStackable() ||
+				item_to_delete->GetItem()->MaxCharges == 0 ||
+				item_to_delete->IsExpendable()
+			) {
 				// Item can now be destroyed
 				InventoryProfile::MarkDirty(item_to_delete);
 				return true;

common/inventory_profile.h

@@ -203,12 +203,12 @@ namespace EQ
 		void dumpBankItems();
 		void dumpSharedBankItems();
 
-		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, std::string value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, int value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, float value);
-		void SetCustomItemData(uint32 character_id, int16 slot_id, std::string identifier, bool value);
-		std::string GetCustomItemData(int16 slot_id, std::string identifier);
-		static const int GetItemStatValue(uint32 item_id, std::string identifier);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, const std::string& value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, int value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, float value);
+		void SetCustomItemData(uint32 character_id, int16 slot_id, const std::string &identifier, bool value);
+		std::string GetCustomItemData(int16 slot_id, const std::string& identifier);
+		static const int GetItemStatValue(uint32 item_id, const std::string& identifier);
 	protected:
 		///////////////////////////////
 		// Protected Methods

common/item_data.h

@@ -131,7 +131,7 @@ namespace EQ
 			Mounts?
 			Ornamentations?
 			GuildBanners?
-			Collectible? 
+			Collectible?
 			Placeable?
 			(others?)
 */
@@ -355,181 +355,186 @@ namespace EQ
 
 	struct ItemData {
 		// Non packet based fields
-		uint8	MinStatus;
+		uint8	MinStatus {};
 
 		// Packet based fields
-		uint8	ItemClass;		// Item Type: 0=common, 1=container, 2=book
-		char	Name[64];		// Name
-		char	Lore[80];		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
-		char	IDFile[30];		// Visible model
-		uint32	ID;				// Unique ID (also PK for DB)
-		int32	Weight;			// Item weight * 10
-		uint8	NoRent;			// No Rent: 0=norent, 255=not norent
-		uint8	NoDrop;			// No Drop: 0=nodrop, 255=not nodrop
-		uint8	Size;			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
-		uint32	Slots;			// Bitfield for which slots this item can be used in
-		uint32	Price;			// Item cost (?)
-		uint32	Icon;			// Icon Number
-		int32	LoreGroup;		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
-		bool	LoreFlag;		// This will be true if LoreGroup is non-zero
-		bool	PendingLoreFlag;
-		bool	ArtifactFlag;
-		bool	SummonedFlag;
-		uint8	FVNoDrop;		// Firiona Vie nodrop flag
-		uint32	Favor;			// Individual favor
-		uint32	GuildFavor;		// Guild favor
-		uint32	PointType;
+		uint8	ItemClass {};		// Item Type: 0=common, 1=container, 2=book
+		char	Name[64] {};		// Name
+		char	Lore[80] {};		// Lore Name: *=lore, &=summoned, #=artifact, ~=pending lore
+		char	IDFile[30] {};		// Visible model
+		uint32	ID {};				// Unique ID (also PK for DB)
+		int32	Weight {};			// Item weight * 10
+		uint8	NoRent{} ;			// No Rent: 0=norent, 255=not norent
+		uint8	NoDrop {};			// No Drop: 0=nodrop, 255=not nodrop
+		uint8	Size {};			// Size: 0=tiny, 1=small, 2=medium, 3=large, 4=giant
+		uint32	Slots {};			// Bitfield for which slots this item can be used in
+		uint32	Price {};			// Item cost (?)
+		uint32	Icon {};			// Icon Number
+		int32	LoreGroup {};		// Later items use LoreGroup instead of LoreFlag. we might want to see about changing this to int32 since it is commonly -1 and is constantly being cast from signed (-1) to unsigned (4294967295)
+		bool	LoreFlag {};		// This will be true if LoreGroup is non-zero
+		bool	PendingLoreFlag {};
+		bool	ArtifactFlag {};
+		bool	SummonedFlag {};
+		uint8	FVNoDrop {};		// Firiona Vie nodrop flag
+		uint32	Favor {};			// Individual favor
+		uint32	GuildFavor {};		// Guild favor
+		uint32	PointType {};
 
 		//uint32	Unk117;
 		//uint32	Unk118;
 		//uint32	Unk121;
 		//uint32	Unk124;
 
-		uint8	BagType;		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
-		uint8	BagSlots;		// Number of slots: can only be 2, 4, 6, 8, or 10
-		uint8	BagSize;		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
-		uint8	BagWR;			// 0->100
+		uint8	BagType {};		// 0:Small Bag, 1:Large Bag, 2:Quiver, 3:Belt Pouch ... there are 50 types
+		uint8	BagSlots {};		// Number of slots: can only be 2, 4, 6, 8, or 10
+		uint8	BagSize {};		// 0:TINY, 1:SMALL, 2:MEDIUM, 3:LARGE, 4:GIANT
+		uint8	BagWR {};			// 0->100
 
-		bool	BenefitFlag;
-		bool	Tradeskills;	// Is this a tradeskill item?
-		int8	CR;				// Save vs Cold
-		int8	DR;				// Save vs Disease
-		int8	PR;				// Save vs Poison
-		int8	MR;				// Save vs Magic
-		int8	FR;				// Save vs Fire
-		int8	AStr;			// Strength
-		int8	ASta;			// Stamina
-		int8	AAgi;			// Agility
-		int8	ADex;			// Dexterity
-		int8	ACha;			// Charisma
-		int8	AInt;			// Intelligence
-		int8	AWis;			// Wisdom
-		int32	HP;				// HP
-		int32	Mana;			// Mana
-		int32	AC;				// AC
-		uint32	Deity;			// Bitmask of Deities that can equip this item
+		bool	BenefitFlag {};
+		bool	Tradeskills {};	// Is this a tradeskill item?
+		int8	CR {};				// Save vs Cold
+		int8	DR {};				// Save vs Disease
+		int8	PR {};				// Save vs Poison
+		int8	MR {};				// Save vs Magic
+		int8	FR {};				// Save vs Fire
+		int8	AStr {};			// Strength
+		int8	ASta {};			// Stamina
+		int8	AAgi {};			// Agility
+		int8	ADex {};			// Dexterity
+		int8	ACha {};			// Charisma
+		int8	AInt {};			// Intelligence
+		int8	AWis {};			// Wisdom
+		int32	HP {};				// HP
+		int32	Mana {};			// Mana
+		int32	AC {};				// AC
+		uint32	Deity {};			// Bitmask of Deities that can equip this item
 		//uint32	Unk033
-		int32	SkillModValue;	// % Mod to skill specified in SkillModType
-		int32	SkillModMax;	// Max skill point modification
-		uint32	SkillModType;	// Type of skill for SkillModValue to apply to
-		uint32	BaneDmgRace;	// Bane Damage Race
-		int32	BaneDmgAmt;		// Bane Damage Body Amount
-		uint32	BaneDmgBody;	// Bane Damage Body
-		bool	Magic;			// True=Magic Item, False=not
-		int32	CastTime_;
-		uint8	ReqLevel;		// Required Level to use item
-		uint32	BardType;		// Bard Skill Type
-		int32	BardValue;		// Bard Skill Amount
-		int8	Light;			// Light
-		uint8	Delay;			// Delay * 10
-		uint8	RecLevel;		// Recommended level to use item
-		uint8	RecSkill;		// Recommended skill to use item (refers to primary skill of item)
-		uint8	ElemDmgType;	// Elemental Damage Type (1=magic, 2=fire)
-		uint8	ElemDmgAmt;		// Elemental Damage
-		uint8	Range;			// Range of item
-		uint32	Damage;			// Delay between item usage (in 0.1 sec increments)
-		uint32	Color;			// RR GG BB 00 <-- as it appears in pc
-		uint32	Classes;		// Bitfield of classes that can equip item (1 << class#)
-		uint32	Races;			// Bitfield of races that can equip item (1 << race#)
-		//uint32	Unk054;
-		int16	MaxCharges;		// Maximum charges items can hold: -1 if not a chargeable item
-		uint8	ItemType;		// Item Type/Skill (itemClass* from above)
-		int32	SubType;		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
-		uint8	Material;		// Item material type
-		uint32	HerosForgeModel;// Hero's Forge Armor Model Type (2-13?)
-		float	SellRate;		// Sell rate
-		//uint32	Unk059;
+		int32	SkillModValue {};	// % Mod to skill specified in SkillModType
+		int32	SkillModMax {};	// Max skill point modification
+		uint32	SkillModType {};	// Type of skill for SkillModValue to apply to
+		uint32	BaneDmgRace {};	// Bane Damage Race
+		int32	BaneDmgAmt {};		// Bane Damage Body Amount
+		uint32	BaneDmgBody {};	// Bane Damage Body
+		bool	Magic {};			// True=Magic Item, False=not
+		int32	CastTime_ {};
+		uint8	ReqLevel {};		// Required Level to use item
+		uint32	BardType {};		// Bard Skill Type
+		int32	BardValue {};		// Bard Skill Amount
+		int8	Light {};			// Light
+		uint8	Delay {};			// Delay * 10
+		uint8	RecLevel {};		// Recommended level to use item
+		uint8	RecSkill {};		// Recommended skill to use item (refers to primary skill of item)
+		uint8	ElemDmgType {};	// Elemental Damage Type (1=magic, 2=fire)
+		uint8	ElemDmgAmt {};		// Elemental Damage
+		uint8	Range {};			// Range of item
+		uint32	Damage {};			// Delay between item usage (in 0.1 sec increments)
+		uint32	Color {};			// RR GG BB 00 <-- as it appears in pc
+		uint32	Classes {};		// Bitfield of classes that can equip item (1 << class#)
+		uint32	Races {};			// Bitfield of races that can equip item (1 << race#)
+		//uint32	Unk054 {};
+		int16	MaxCharges {};		// Maximum charges items can hold: -1 if not a chargeable item
+		uint8	ItemType {};		// Item Type/Skill (itemClass* from above)
+		int32	SubType {};		// Some items have sub types that can be used for other things (unbreakable fishing poles, SE_FFItemClass)
+		uint8	Material {};		// Item material type
+		uint32	HerosForgeModel {};// Hero's Forge Armor Model Type (2-13?)
+		float	SellRate {};		// Sell rate
+		//uint32	Unk059 {};
 		union {
 			uint32 Fulfilment;	// Food fulfilment (How long it lasts)
 			uint32 CastTime;		// Cast Time for clicky effects, in milliseconds
 		};
-		uint32 EliteMaterial;
-		int32	ProcRate;
-		int8	CombatEffects;	// PoP: Combat Effects +
-		int8	Shielding;		// PoP: Shielding %
-		int8	StunResist;		// PoP: Stun Resist %
-		int8	StrikeThrough;	// PoP: Strike Through %
-		uint32	ExtraDmgSkill;
-		uint32	ExtraDmgAmt;
-		int8	SpellShield;	// PoP: Spell Shield %
-		int8	Avoidance;		// PoP: Avoidance +
-		int8	Accuracy;		// PoP: Accuracy +
-		uint32	CharmFileID;
-		int32	FactionMod1;	// Faction Mod 1
-		int32	FactionMod2;	// Faction Mod 2
-		int32	FactionMod3;	// Faction Mod 3
-		int32	FactionMod4;	// Faction Mod 4
-		int32	FactionAmt1;	// Faction Amt 1
-		int32	FactionAmt2;	// Faction Amt 2
-		int32	FactionAmt3;	// Faction Amt 3
-		int32	FactionAmt4;	// Faction Amt 4
-		char	CharmFile[32];	// ?
-		uint32	AugType;
-		uint8	AugSlotType[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Type
-		uint8	AugSlotVisible[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Visible
-		uint8	AugSlotUnk2[invaug::SOCKET_COUNT];	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
-		uint32	LDoNTheme;
-		uint32	LDoNPrice;
-		uint32	LDoNSold;
-		uint32	BaneDmgRaceAmt;
-		uint32	AugRestrict;
-		int32	Endur;
-		int32	DotShielding;
-		int32	Attack;
-		int32	Regen;
-		int32	ManaRegen;
-		int32	EnduranceRegen;
-		int32	Haste;
-		int32	DamageShield;
-		uint32	RecastDelay;
-		int	RecastType;
-		uint32	AugDistiller;
-		bool	Attuneable;
-		bool	NoPet;
-		bool	PotionBelt;
-		bool	Stackable;
-		bool	NoTransfer;
-		bool	QuestItemFlag;
-		int16	StackSize;
-		uint8	PotionBeltSlots;
-		item::ItemEffect_Struct Click, Proc, Worn, Focus, Scroll, Bard;
+		uint32 EliteMaterial {};
+		int32	ProcRate {};
+		int8	CombatEffects {};	// PoP: Combat Effects +
+		int8	Shielding {};		// PoP: Shielding %
+		int8	StunResist {};		// PoP: Stun Resist %
+		int8	StrikeThrough {};	// PoP: Strike Through %
+		int32	ExtraDmgSkill {};
+		int32	ExtraDmgAmt {};
+		int8	SpellShield {};	// PoP: Spell Shield %
+		int8	Avoidance {};		// PoP: Avoidance +
+		int8	Accuracy {};		// PoP: Accuracy +
+		uint32	CharmFileID {};
+		int32	FactionMod1 {};	// Faction Mod 1
+		int32	FactionMod2 {};	// Faction Mod 2
+		int32	FactionMod3 {};	// Faction Mod 3
+		int32	FactionMod4 {};	// Faction Mod 4
+		int32	FactionAmt1 {};	// Faction Amt 1
+		int32	FactionAmt2 {};	// Faction Amt 2
+		int32	FactionAmt3 {};	// Faction Amt 3
+		int32	FactionAmt4 {};	// Faction Amt 4
+		char	CharmFile[32] {};	// ?
+		uint32	AugType {};
+		uint8	AugSlotType[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Type
+		uint8	AugSlotVisible[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Visible
+		uint8	AugSlotUnk2[invaug::SOCKET_COUNT] {};	// RoF: Augment Slot 1-6 Unknown Most likely Powersource related
+		uint32	LDoNTheme {};
+		uint32	LDoNPrice {};
+		uint32	LDoNSold {};
+		uint32	BaneDmgRaceAmt {};
+		uint32	AugRestrict {};
+		int32	Endur {};
+		int32	DotShielding {};
+		int32	Attack {};
+		int32	Regen {};
+		int32	ManaRegen {};
+		int32	EnduranceRegen {};
+		int32	Haste {};
+		int32	DamageShield {};
+		uint32	RecastDelay {};
+		int	RecastType {};
+		uint32	AugDistiller {};
+		bool	Attuneable {};
+		bool	NoPet {};
+		bool	PotionBelt {};
+		bool	Stackable {};
+		bool	NoTransfer {};
+		bool	QuestItemFlag {};
+		int16	StackSize {};
+		uint8	PotionBeltSlots {};
+		item::ItemEffect_Struct Click {};
+		item::ItemEffect_Struct Proc {};
+		item::ItemEffect_Struct Worn {};
+		item::ItemEffect_Struct Focus {};
+		item::ItemEffect_Struct Scroll {};
+		item::ItemEffect_Struct Bard {};
 
-		uint8	Book;			// 0=Not book, 1=Book
-		uint32	BookType;
-		char	Filename[33];	// Filename for book data
+		uint8	Book {};			// 0=Not book, 1=Book
+		uint32	BookType {};
+		char	Filename[33] {};	// Filename for book data
 		// Begin SoF Fields
-		int32 SVCorruption;
-		uint32 Purity;
-		uint8 EvolvingItem;
-		uint32 EvolvingID;
-		uint8 EvolvingLevel;
-		uint8 EvolvingMax;
-		uint32 BackstabDmg;
-		uint32 DSMitigation;
-		int32 HeroicStr;
-		int32 HeroicInt;
-		int32 HeroicWis;
-		int32 HeroicAgi;
-		int32 HeroicDex;
-		int32 HeroicSta;
-		int32 HeroicCha;
-		int32 HeroicMR;
-		int32 HeroicFR;
-		int32 HeroicCR;
-		int32 HeroicDR;
-		int32 HeroicPR;
-		int32 HeroicSVCorrup;
-		int32 HealAmt;
-		int32 SpellDmg;
-		uint32 LDoNSellBackRate;
-		uint32 ScriptFileID;
-		uint16 ExpendableArrow;
-		uint32 Clairvoyance;
-		char	ClickName[65];
-		char	ProcName[65];
-		char	WornName[65];
-		char	FocusName[65];
-		char	ScrollName[65];
+		int32 SVCorruption {};
+		uint32 Purity {};
+		uint8 EvolvingItem {};
+		uint32 EvolvingID {};
+		uint8 EvolvingLevel {};
+		uint8 EvolvingMax {};
+		uint32 BackstabDmg {};
+		uint32 DSMitigation {};
+		int32 HeroicStr {};
+		int32 HeroicInt {};
+		int32 HeroicWis {};
+		int32 HeroicAgi {};
+		int32 HeroicDex {};
+		int32 HeroicSta {};
+		int32 HeroicCha {};
+		int32 HeroicMR {};
+		int32 HeroicFR {};
+		int32 HeroicCR {};
+		int32 HeroicDR {};
+		int32 HeroicPR {};
+		int32 HeroicSVCorrup {};
+		int32 HealAmt {};
+		int32 SpellDmg {};
+		uint32 LDoNSellBackRate {};
+		uint32 ScriptFileID {};
+		uint16 ExpendableArrow {};
+		uint32 Clairvoyance {};
+		char	ClickName[65] {};
+		char	ProcName[65] {};
+		char	WornName[65] {};
+		char	FocusName[65] {};
+		char	ScrollName[65] {};
 		//BardName
 
 		bool IsEquipable(uint16 Race, uint16 Class) const;

common/item_instance.cpp

@@ -17,6 +17,7 @@
 */
 
 #include "inventory_profile.h"
+#include "../common/data_verification.h"
 //#include "classes.h"
 //#include "global_define.h"
 //#include "item_instance.h"
@@ -57,108 +58,62 @@ static inline int32 GetNextItemInstSerialNumber() {
 // class EQ::ItemInstance
 //
 EQ::ItemInstance::ItemInstance(const ItemData* item, int16 charges) {
-	m_use_type = ItemInstNormal;
-	if(item) {
-		m_item = new ItemData(*item);
-	} else {
-		m_item = nullptr;
-	}
-	m_charges = charges;
-	m_price = 0;
-	m_attuned = false;
-	m_merchantslot = 0;
-	if (m_item && m_item->IsClassCommon())
-		m_color = m_item->Color;
-	else
-		m_color = 0;
-	m_merchantcount = 1;
-	m_SerialNumber = GetNextItemInstSerialNumber();
 
-	m_exp = 0;
-	m_evolveLvl = 0;
-	m_activated = false;
-	m_scaledItem = nullptr;
-	m_evolveInfo = nullptr;
-	m_scaling = false;
-	m_ornamenticon = 0;
-	m_ornamentidfile = 0;
-	m_ornament_hero_model = 0;
-	m_recast_timestamp = 0;
-	m_new_id_file = 0;
+	if (item) {
+		m_item = new ItemData(*item);
+	}
+
+	m_charges = charges;
+
+	if (m_item && m_item->IsClassCommon()) {
+		m_color = m_item->Color;
+	}
+
+	m_SerialNumber  = GetNextItemInstSerialNumber();
 }
 
 EQ::ItemInstance::ItemInstance(SharedDatabase *db, uint32 item_id, int16 charges) {
-	m_use_type = ItemInstNormal;
-	m_item = db->GetItem(item_id);
-	if(m_item) {
+
+	m_item     = db->GetItem(item_id);
+
+	if (m_item) {
 		m_item = new ItemData(*m_item);
 	}
-	else {
-		m_item = nullptr;
-	}
 
 	m_charges = charges;
-	m_price = 0;
-	m_merchantslot = 0;
-	m_attuned=false;
-	if (m_item && m_item->IsClassCommon())
-		m_color = m_item->Color;
-	else
-		m_color = 0;
-	m_merchantcount = 1;
-	m_SerialNumber = GetNextItemInstSerialNumber();
 
-	m_exp = 0;
-	m_evolveLvl = 0;
-	m_activated = false;
-	m_scaledItem = nullptr;
-	m_evolveInfo = nullptr;
-	m_scaling = false;
-	m_ornamenticon = 0;
-	m_ornamentidfile = 0;
-	m_ornament_hero_model = 0;
-	m_recast_timestamp = 0;
-	m_new_id_file = 0;
+	if (m_item && m_item->IsClassCommon()) {
+		m_color = m_item->Color;
+	} else {
+		m_color = 0;
+	}
+
+	m_SerialNumber  = GetNextItemInstSerialNumber();
 }
 
 EQ::ItemInstance::ItemInstance(ItemInstTypes use_type) {
-	m_use_type = use_type;
-	m_item = nullptr;
-	m_charges = 0;
-	m_price = 0;
-	m_attuned = false;
-	m_merchantslot = 0;
-	m_color = 0;
-
-	m_exp = 0;
-	m_evolveLvl = 0;
-	m_activated = false;
-	m_scaledItem = nullptr;
-	m_evolveInfo = nullptr;
-	m_scaling = false;
-	m_ornamenticon = 0;
-	m_ornamentidfile = 0;
-	m_ornament_hero_model = 0;
-	m_recast_timestamp = 0;
-	m_new_id_file = 0;
+	m_use_type     = use_type;
 }
 
 // Make a copy of an EQ::ItemInstance object
 EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 {
-	m_use_type=copy.m_use_type;
-	if(copy.m_item)
-		m_item = new ItemData(*copy.m_item);
-	else
-		m_item = nullptr;
+	m_use_type = copy.m_use_type;
+
+	if (copy.m_item) {
+		m_item = new ItemData(*copy.m_item);
+	} else {
+		m_item = nullptr;
+	}
+
+	m_charges       = copy.m_charges;
+	m_price         = copy.m_price;
+	m_color         = copy.m_color;
+	m_merchantslot  = copy.m_merchantslot;
+	m_currentslot   = copy.m_currentslot;
+	m_attuned       = copy.m_attuned;
+	m_merchantcount = copy.m_merchantcount;
 
-	m_charges=copy.m_charges;
-	m_price=copy.m_price;
-	m_color=copy.m_color;
-	m_merchantslot=copy.m_merchantslot;
-	m_currentslot=copy.m_currentslot;
-	m_attuned=copy.m_attuned;
-	m_merchantcount=copy.m_merchantcount;
 	// Copy container contents
 	for (auto it = copy.m_contents.begin(); it != copy.m_contents.end(); ++it) {
 		ItemInstance* inst_old = it->second;
@@ -168,37 +123,42 @@ EQ::ItemInstance::ItemInstance(const ItemInstance& copy)
 			inst_new = inst_old->Clone();
 		}
 
-		if (inst_new != nullptr) {
+		if (inst_new) {
 			m_contents[it->first] = inst_new;
 		}
 	}
+
 	std::map<std::string, std::string>::const_iterator iter;
 	for (iter = copy.m_custom_data.begin(); iter != copy.m_custom_data.end(); ++iter) {
 		m_custom_data[iter->first] = iter->second;
 	}
-	m_SerialNumber = copy.m_SerialNumber;
-	m_custom_data = copy.m_custom_data;
-	m_timers = copy.m_timers;
 
-	m_exp = copy.m_exp;
+	m_SerialNumber = copy.m_SerialNumber;
+	m_custom_data  = copy.m_custom_data;
+	m_timers       = copy.m_timers;
+
+	m_exp       = copy.m_exp;
 	m_evolveLvl = copy.m_evolveLvl;
 	m_activated = copy.m_activated;
-	if (copy.m_scaledItem)
+
+	if (copy.m_scaledItem) {
 		m_scaledItem = new ItemData(*copy.m_scaledItem);
-	else
+	} else {
 		m_scaledItem = nullptr;
+	}
 
-	if(copy.m_evolveInfo)
+	if (copy.m_evolveInfo) {
 		m_evolveInfo = new EvolveInfo(*copy.m_evolveInfo);
-	else
+	} else {
 		m_evolveInfo = nullptr;
+	}
 
-	m_scaling = copy.m_scaling;
-	m_ornamenticon = copy.m_ornamenticon;
-	m_ornamentidfile = copy.m_ornamentidfile;
+	m_scaling             = copy.m_scaling;
+	m_ornamenticon        = copy.m_ornamenticon;
+	m_ornamentidfile      = copy.m_ornamentidfile;
 	m_ornament_hero_model = copy.m_ornament_hero_model;
-	m_recast_timestamp = copy.m_recast_timestamp;
-	m_new_id_file = copy.m_new_id_file;
+	m_recast_timestamp    = copy.m_recast_timestamp;
+	m_new_id_file         = copy.m_new_id_file;
 }
 
 // Clean up container contents
@@ -216,11 +176,13 @@ bool EQ::ItemInstance::IsType(item::ItemClass item_class) const
 	// IsType(<ItemClassTypes>) does not protect against 'm_item = nullptr'
 
 	// Check usage type
-	if ((m_use_type == ItemInstWorldContainer) && (item_class == item::ItemClassBag))
+	if (m_use_type == ItemInstWorldContainer && item_class == item::ItemClassBag) {
 		return true;
+	}
 
-	if (!m_item)
+	if (!m_item) {
 		return false;
+	}
 
 	return (m_item->ItemClass == item_class);
 }
@@ -243,21 +205,20 @@ bool EQ::ItemInstance::IsClassBook() const
 // Is item stackable?
 bool EQ::ItemInstance::IsStackable() const
 {
-	if (!m_item)
-		return false;
-
-	return m_item->Stackable;
+	return (m_item && m_item->Stackable);
 }
 
 bool EQ::ItemInstance::IsCharged() const
 {
-	if (!m_item)
+	if (!m_item) {
 		return false;
+	}
 
-	if (m_item->MaxCharges > 1)
+	if (m_item->MaxCharges > 1) {
 		return true;
-	else
+	} else {
 		return false;
+	}
 }
 
 // Can item be equipped?
@@ -306,26 +267,30 @@ bool EQ::ItemInstance::IsEquipable(int16 slot_id) const
 
 bool EQ::ItemInstance::IsAugmentable() const
 {
-	if (!m_item)
+	if (!m_item) {
 		return false;
+	}
 
 	for (int index = invaug::SOCKET_BEGIN; index <= invaug::SOCKET_END; ++index) {
-		if (m_item->AugSlotType[index] != 0)
+		if (m_item->AugSlotType[index] != 0) {
 			return true;
+		}
 	}
 
 	return false;
 }
 
 bool EQ::ItemInstance::AvailableWearSlot(uint32 aug_wear_slots) const {
-	if (!m_item || !m_item->IsClassCommon())
+	if (!m_item || !m_item->IsClassCommon()) {
 		return false;
+	}
 
 	int index = invslot::EQUIPMENT_BEGIN;
 	for (; index <= invslot::EQUIPMENT_END; ++index) {
 		if (m_item->Slots & (1 << index)) {
-			if (aug_wear_slots & (1 << index))
+			if (aug_wear_slots & (1 << index)) {
 				break;
+			}
 		}
 	}
 
@@ -358,15 +323,27 @@ int8 EQ::ItemInstance::AvailableAugmentSlot(int32 augment_type) const
 	return (i <= invaug::SOCKET_END) ? i : INVALID_INDEX;
 }
 
-bool EQ::ItemInstance::IsAugmentSlotAvailable(int32 augtype, uint8 slot) const
+bool EQ::ItemInstance::IsAugmentSlotAvailable(int32 augment_type, uint8 slot) const
 {
-	if (!m_item || !m_item->IsClassCommon())
-		 return false;
+	if (!m_item || !m_item->IsClassCommon()) {
+		return false;
+	}
 
-	if ((!GetItem(slot) && m_item->AugSlotVisible[slot]) && augtype == -1 || (m_item->AugSlotType[slot] && ((1 << (m_item->AugSlotType[slot] - 1)) & augtype))) {
+	if (
+		(
+			!GetItem(slot) &&
+			m_item->AugSlotVisible[slot]
+		) &&
+		augment_type == -1 ||
+		(
+			m_item->AugSlotType[slot] &&
+			((1 << (m_item->AugSlotType[slot] - 1)) & augment_type)
+		)
+	) {
 		return true;
 	}
-		return false;
+
+	return false;
 }
 
 // Retrieve item inside container
@@ -382,9 +359,10 @@ EQ::ItemInstance* EQ::ItemInstance::GetItem(uint8 index) const
 
 uint32 EQ::ItemInstance::GetItemID(uint8 slot) const
 {
-	ItemInstance *item = GetItem(slot);
-	if (item)
+	const auto item = GetItem(slot);
+	if (item) {
 		return item->GetID();
+	}
 
 	return 0;
 }
@@ -508,14 +486,21 @@ uint8 EQ::ItemInstance::FirstOpenSlot() const
 
 uint8 EQ::ItemInstance::GetTotalItemCount() const
 {
-	if (!m_item)
+	if (!m_item) {
 		return 0;
+	}
 
 	uint8 item_count = 1;
 
-	if (m_item && !m_item->IsClassBag()) { return item_count; }
+	if (!m_item->IsClassBag()) {
+		return item_count;
+	}
 
-	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) { if (GetItem(index)) { ++item_count; } }
+	for (int index = invbag::SLOT_BEGIN; index < m_item->BagSlots; ++index) {
+		if (GetItem(index)) {
+			++item_count;
+		}
+	}
 
 	return item_count;
 }
@@ -543,78 +528,99 @@ EQ::ItemInstance* EQ::ItemInstance::GetAugment(uint8 augment_index) const
 	return nullptr;
 }
 
-EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAug(int32 ornamentationAugtype) const
+bool EQ::ItemInstance::IsOrnamentationAugment(EQ::ItemInstance* augment) const
 {
-	if (!m_item || !m_item->IsClassCommon()) { return nullptr; }
-	if (ornamentationAugtype == 0) { return nullptr; }
+	if (!m_item || !m_item->IsClassCommon() || !augment) {
+		return false;
+	}
 
-	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++)
-	{
-		if (GetAugment(i) && m_item->AugSlotType[i] == ornamentationAugtype)
-		{
-			const char *item_IDFile = GetAugment(i)->GetItem()->IDFile;
-			if (
-				(strncmp(item_IDFile, "IT64", strlen(item_IDFile)) == 0
-				|| strncmp(item_IDFile, "IT63", strlen(item_IDFile)) == 0)
-				&& GetAugment(i)->GetItem()->HerosForgeModel == 0
-				)
-			{
-				continue;
-			}
-			return GetAugment(i);
+	const auto augment_item = augment->GetItem();
+	if (!augment_item) {
+		return false;
+	}
+
+	const std::string& idfile = augment_item->IDFile;
+
+	if (
+		EQ::ValueWithin(
+			augment->GetAugmentType(),
+			OrnamentationAugmentTypes::StandardOrnamentation,
+			OrnamentationAugmentTypes::SpecialOrnamentation
+		) ||
+		(
+			idfile != "IT63" &&
+			idfile != "IT64"
+		) ||
+		augment_item->HerosForgeModel
+	) {
+		return true;
+	}
+
+	return false;
+}
+
+EQ::ItemInstance* EQ::ItemInstance::GetOrnamentationAugment() const
+{
+	if (!m_item || !m_item->IsClassCommon()) {
+		return nullptr;
+	}
+
+	for (int i = invaug::SOCKET_BEGIN; i <= invaug::SOCKET_END; i++) {
+		const auto augment = GetAugment(i);
+		if (augment && IsOrnamentationAugment(augment)) {
+			return augment;
 		}
 	}
 
 	return nullptr;
 }
 
-uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const {
+uint32 EQ::ItemInstance::GetOrnamentHeroModel(int32 material_slot) const
+{
 	// Not a Hero Forge item.
-	if (m_ornament_hero_model == 0 || material_slot < 0)
+	if (m_ornament_hero_model == 0 || material_slot < 0) {
 		return 0;
+	}
 
 	// Item is using an explicit Hero Forge ID
-	if (m_ornament_hero_model >= 1000)
+	if (m_ornament_hero_model >= 1000) {
 		return m_ornament_hero_model;
+	}
 
 	// Item is using a shorthand ID
 	return (m_ornament_hero_model * 100) + material_slot;
 }
 
-bool EQ::ItemInstance::UpdateOrnamentationInfo() {
-	if (!m_item || !m_item->IsClassCommon())
+bool EQ::ItemInstance::UpdateOrnamentationInfo()
+{
+	if (!m_item || !m_item->IsClassCommon()) {
 		return false;
+	}
 
-	bool ornamentSet = false;
+	const auto augment = GetOrnamentationAugment();
 
-	int32 ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
-	if (GetOrnamentationAug(ornamentationAugtype))
-	{
-		const ItemData* ornamentItem;
-		ornamentItem = GetOrnamentationAug(ornamentationAugtype)->GetItem();
-		if (ornamentItem != nullptr)
-		{
-			SetOrnamentIcon(ornamentItem->Icon);
-			SetOrnamentHeroModel(ornamentItem->HerosForgeModel);
-			if (strlen(ornamentItem->IDFile) > 2)
-			{
-				SetOrnamentationIDFile(atoi(&ornamentItem->IDFile[2]));
-			}
-			else
-			{
+	if (augment) {
+		const auto augment_item = GetOrnamentationAugment()->GetItem();
+
+		if (augment_item) {
+			SetOrnamentIcon(augment_item->Icon);
+			SetOrnamentHeroModel(augment_item->HerosForgeModel);
+
+			if (strlen(augment_item->IDFile) > 2) {
+				SetOrnamentationIDFile(Strings::ToUnsignedInt(&augment_item->IDFile[2]));
+			} else {
 				SetOrnamentationIDFile(0);
 			}
-			ornamentSet = true;
+
+			return true;
 		}
 	}
-	else
-	{
-		SetOrnamentIcon(0);
-		SetOrnamentHeroModel(0);
-		SetOrnamentationIDFile(0);
-	}
 
-	return ornamentSet;
+	SetOrnamentIcon(0);
+	SetOrnamentHeroModel(0);
+	SetOrnamentationIDFile(0);
+
+	return false;
 }
 
 bool EQ::ItemInstance::CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll) {
@@ -828,7 +834,20 @@ std::string EQ::ItemInstance::GetCustomDataString() const {
 	return ret_val;
 }
 
-std::string EQ::ItemInstance::GetCustomData(std::string identifier) {
+void EQ::ItemInstance::SetCustomDataString(const std::string& str)
+{
+	auto components = Strings::Split(str, "^");
+	auto value_count = components.size() / 2;
+
+	for (auto i = 0; i < value_count; i++) {
+		auto identifier = components[i * 2];
+		auto value = components[(i * 2) + 1];
+
+		SetCustomData(identifier, value);
+	}
+}
+
+std::string EQ::ItemInstance::GetCustomData(const std::string& identifier) {
 	std::map<std::string, std::string>::const_iterator iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		return iter->second;
@@ -837,33 +856,33 @@ std::string EQ::ItemInstance::GetCustomData(std::string identifier) {
 	return "";
 }
 
-void EQ::ItemInstance::SetCustomData(std::string identifier, std::string value) {
+void EQ::ItemInstance::SetCustomData(const std::string& identifier, const std::string& value) {
 	DeleteCustomData(identifier);
 	m_custom_data[identifier] = value;
 }
 
-void EQ::ItemInstance::SetCustomData(std::string identifier, int value) {
+void EQ::ItemInstance::SetCustomData(const std::string& identifier, int value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQ::ItemInstance::SetCustomData(std::string identifier, float value) {
+void EQ::ItemInstance::SetCustomData(const std::string& identifier, float value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQ::ItemInstance::SetCustomData(std::string identifier, bool value) {
+void EQ::ItemInstance::SetCustomData(const std::string& identifier, bool value) {
 	DeleteCustomData(identifier);
 	std::stringstream ss;
 	ss << value;
 	m_custom_data[identifier] = ss.str();
 }
 
-void EQ::ItemInstance::DeleteCustomData(std::string identifier) {
+void EQ::ItemInstance::DeleteCustomData(const std::string& identifier) {
 	auto iter = m_custom_data.find(identifier);
 	if (iter != m_custom_data.end()) {
 		m_custom_data.erase(iter);
@@ -915,8 +934,9 @@ bool EQ::ItemInstance::IsDroppable(bool recurse) const
 
 void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	// if there's no actual item, don't do anything
-	if (!m_item)
+	if (!m_item) {
 		return;
+	}
 
 	// initialize scaling items
 	if (m_item->CharmFileID != 0) {
@@ -925,7 +945,7 @@ void EQ::ItemInstance::Initialize(SharedDatabase *db) {
 	}
 
 	// initialize evolving items
-	else if ((db) && m_item->LoreGroup >= 1000 && m_item->LoreGroup != -1) {
+	else if (db && m_item->LoreGroup >= 1000) {
 		// not complete yet
 	}
 }

common/item_instance.h

@@ -51,6 +51,11 @@ typedef enum {
 	byFlagNotSet	//apply action if the flag is NOT set
 } byFlagSetting;
 
+enum OrnamentationAugmentTypes {
+	StandardOrnamentation = 20,
+	SpecialOrnamentation = 21
+};
+
 class SharedDatabase;
 
 // ########################################
@@ -101,9 +106,10 @@ namespace EQ
 		//
 		bool IsAugmentable() const;
 		bool AvailableWearSlot(uint32 aug_wear_slots) const;
-		int8 AvailableAugmentSlot(int32 augtype) const;
-		bool IsAugmentSlotAvailable(int32 augtype, uint8 slot) const;
-		inline int32 GetAugmentType() const { return ((m_item) ? m_item->AugType : 0); }
+		int8 AvailableAugmentSlot(int32 augment_type) const;
+		bool IsAugmentSlotAvailable(int32 augment_type, uint8 slot) const;
+		inline int GetAugmentType() const { return m_item ? m_item->AugType : 0; }
+		inline uint32 GetAugmentRestriction() const { return m_item ? m_item->AugRestrict : 0; }
 
 		inline bool IsExpendable() const { return ((m_item) ? ((m_item->Click.Type == item::ItemEffectExpendable) || (m_item->ItemType == item::ItemTypePotion)) : false); }
 
@@ -136,7 +142,8 @@ namespace EQ
 		bool IsAugmented();
 		bool ContainsAugmentByID(uint32 item_id);
 		int CountAugmentByID(uint32 item_id);
-		ItemInstance* GetOrnamentationAug(int32 ornamentationAugtype) const;
+		bool IsOrnamentationAugment(EQ::ItemInstance* augment) const;
+		ItemInstance* GetOrnamentationAugment() const;
 		bool UpdateOrnamentationInfo();
 		static bool CanTransform(const ItemData *ItemToTry, const ItemData *Container, bool AllowAll = false);
 
@@ -175,12 +182,13 @@ namespace EQ
 		void SetAttuned(bool flag)				{ m_attuned = flag; }
 
 		std::string GetCustomDataString() const;
-		std::string GetCustomData(std::string identifier);
-		void SetCustomData(std::string identifier, std::string value);
-		void SetCustomData(std::string identifier, int value);
-		void SetCustomData(std::string identifier, float value);
-		void SetCustomData(std::string identifier, bool value);
-		void DeleteCustomData(std::string identifier);
+		std::string GetCustomData(const std::string &identifier);
+		void SetCustomDataString(const std::string& str);
+		void SetCustomData(const std::string &identifier, const std::string& value);
+		void SetCustomData(const std::string &identifier, int value);
+		void SetCustomData(const std::string &identifier, float value);
+		void SetCustomData(const std::string &identifier, bool value);
+		void DeleteCustomData(const std::string& identifier);
 
 		// Allows treatment of this object as though it were a pointer to m_item
 		operator bool() const { return (m_item != nullptr); }
@@ -303,34 +311,33 @@ namespace EQ
 
 		void _PutItem(uint8 index, ItemInstance* inst) { m_contents[index] = inst; }
 
-		ItemInstTypes		m_use_type;	// Usage type for item
-		const ItemData*		m_item;		// Ptr to item data
-		int16				m_charges;	// # of charges for chargeable items
-		uint32				m_price;	// Bazaar /trader price
-		uint32				m_color;
-		uint32				m_merchantslot;
-		int16				m_currentslot;
-		bool				m_attuned;
-		int32				m_merchantcount;		//number avaliable on the merchant, -1=unlimited
-		int32				m_SerialNumber;	// Unique identifier for this instance of an item. Needed for Bazaar.
-		uint32				m_exp;
-		int8				m_evolveLvl;
-		bool				m_activated;
-		ItemData*			m_scaledItem;
-		::EvolveInfo*		m_evolveInfo;
-		bool				m_scaling;
-		uint32				m_ornamenticon;
-		uint32				m_ornamentidfile;
-		uint32				m_new_id_file;
-		uint32				m_ornament_hero_model;
-		uint32				m_recast_timestamp;
-		int                 m_task_delivered_count = 0;
+		ItemInstTypes		m_use_type {ItemInstNormal};	// Usage type for item
+		const ItemData*		m_item {nullptr};		// Ptr to item data
+		int16				m_charges {0};	// # of charges for chargeable items
+		uint32				m_price {0};	// Bazaar /trader price
+		uint32				m_color {0};
+		uint32				m_merchantslot {0};
+		int16				m_currentslot {0};
+		bool				m_attuned {false};
+		int32				m_merchantcount {1}; //number avaliable on the merchant, -1=unlimited
+		int32				m_SerialNumber {0};	// Unique identifier for this instance of an item. Needed for Bazaar.
+		uint32				m_exp {0};
+		int8				m_evolveLvl {0};
+		bool				m_activated {false};
+		ItemData*			m_scaledItem {nullptr};
+		::EvolveInfo*		m_evolveInfo {nullptr};
+		bool				m_scaling {false};
+		uint32				m_ornamenticon {0};
+		uint32				m_ornamentidfile {0};
+		uint32				m_new_id_file {0};
+		uint32				m_ornament_hero_model {0};
+		uint32				m_recast_timestamp {0};
+		int                 m_task_delivered_count {0};
 
-		//
-		// Items inside of this item (augs or contents);
-		std::map<uint8, ItemInstance*>		m_contents; // Zero-based index: min=0, max=9
-		std::map<std::string, std::string>	m_custom_data;
-		std::map<std::string, ::Timer>		m_timers;
+		// Items inside of this item (augs or contents) {};
+		std::map<uint8, ItemInstance*>		m_contents {}; // Zero-based index: min=0, max=9
+		std::map<std::string, std::string>	m_custom_data {};
+		std::map<std::string, ::Timer>		m_timers {};
 	};
 }
 

common/misc.cpp

@@ -18,6 +18,7 @@
 #include "misc.h"
 #include "types.h"
 #include <cstring>
+#include "strings.h"
 
 std::map<int,std::string> DBFieldNames;
 
@@ -150,7 +151,7 @@ static char *temp=nullptr;
 		return false;
 	}
 	ptr++;
-	uint32 id = atoi(field[id_pos].c_str());
+	uint32 id = Strings::ToUnsignedInt(field[id_pos]);
 	items[id]=field;
 
 	for(i=0;i<10;i++) {

common/misc_functions.cpp

@@ -21,6 +21,7 @@
 #include "misc_functions.h"
 #include <string.h>
 #include <time.h>
+#include "strings.h"
 
 #ifndef WIN32
 #include <netinet/in.h>
@@ -130,7 +131,7 @@ bool ParseAddress(const char* iAddress, uint32* oIP, uint16* oPort, char* errbuf
 		if (*oIP == 0)
 			return false;
 		if (oPort)
-			*oPort = atoi(sep.arg[1]);
+			*oPort = Strings::ToUnsignedInt(sep.arg[1]);
 		return true;
 	}
 	return false;

common/mysql_request_result.cpp

@@ -51,6 +51,7 @@ void MySQLRequestResult::ZeroOut()
 	m_RowCount = 0;
 	m_RowsAffected = 0;
 	m_LastInsertedID = 0;
+	m_error_message = "";
 }
 
 MySQLRequestResult::~MySQLRequestResult()
@@ -137,3 +138,23 @@ MySQLRequestResult& MySQLRequestResult::operator=(MySQLRequestResult&& other)
 	other.ZeroOut();
 	return *this;
 }
+
+uint32 MySQLRequestResult::GetErrorNumber() const
+{
+	return m_ErrorNumber;
+}
+
+void MySQLRequestResult::SetErrorNumber(uint32 m_error_number)
+{
+	m_ErrorNumber = m_error_number;
+}
+
+const std::string &MySQLRequestResult::GetErrorMessage() const
+{
+	return m_error_message;
+}
+
+void MySQLRequestResult::SetErrorMessage(const std::string &m_error_message)
+{
+	MySQLRequestResult::m_error_message = m_error_message;
+}

common/mysql_request_result.h

@@ -33,30 +33,42 @@ private:
 	uint32 m_LastInsertedID;
 	uint32 m_ErrorNumber;
 
+	std::string m_error_message;
 
 public:
 
 	MySQLRequestResult(MYSQL_RES* result, uint32 rowsAffected = 0, uint32 rowCount = 0, uint32 columnCount = 0, uint32 lastInsertedID = 0, uint32 errorNumber = 0, char *errorBuffer = nullptr);
-	MySQLRequestResult();	
+	MySQLRequestResult();
 	MySQLRequestResult(MySQLRequestResult&& moveItem);
 	~MySQLRequestResult();
 
 	MySQLRequestResult& operator=(MySQLRequestResult&& other);
 
 	bool Success() const { return m_Success;}
-	std::string ErrorMessage() const {return m_ErrorBuffer ? std::string(m_ErrorBuffer) : std::string("");}
+	std::string ErrorMessage() const {
+		if (!m_error_message.empty()) {
+			return m_error_message;
+		}
+
+		return m_ErrorBuffer ? std::string(m_ErrorBuffer) : std::string("");
+	}
 	uint32 ErrorNumber() const {return m_ErrorNumber;}
 	uint32 RowsAffected() const {return m_RowsAffected;}
 	uint32 RowCount() const {return m_RowCount;}
 	uint32 ColumnCount() const {return m_ColumnCount;}
 	uint32 LastInsertedID() const {return m_LastInsertedID;}
 	// default to 0 index since we mostly use it that way anyways.
-	uint32 LengthOfColumn(int columnIndex = 0); 
+	uint32 LengthOfColumn(int columnIndex = 0);
 	const std::string FieldName(int columnIndex);
 
 	MySQLRequestRow& begin() { return m_CurrentRow; }
 	MySQLRequestRow& end() { return m_OneBeyondRow; }
 
+	uint32 GetErrorNumber() const;
+	void SetErrorNumber(uint32 m_error_number);
+	const std::string &GetErrorMessage() const;
+	void SetErrorMessage(const std::string &m_error_message);
+
 private:
 	void FreeInternals();
 	void ZeroOut();

common/net/console_server.cpp

@@ -7,7 +7,7 @@ EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
 	m_server = std::make_unique<EQ::Net::TCPServer>();
 	m_server->Listen(addr, port, false, [this](std::shared_ptr<EQ::Net::TCPConnection> connection) {
 		ConsoleServerConnection *c = new ConsoleServerConnection(this, connection);
-		m_connections.insert(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
+		m_connections.emplace(std::make_pair(c->GetUUID(), std::unique_ptr<ConsoleServerConnection>(c)));
 	});
 }
 

common/net/daybreak_connection.cpp

@@ -97,7 +97,7 @@ void EQ::Net::DaybreakConnectionManager::Connect(const std::string &addr, int po
 		m_on_new_connection(connection);
 	}
 
-	m_connections.insert(std::make_pair(std::make_pair(addr, port), connection));
+	m_connections.emplace(std::make_pair(std::make_pair(addr, port), connection));
 }
 
 void EQ::Net::DaybreakConnectionManager::Process()
@@ -234,7 +234,7 @@ void EQ::Net::DaybreakConnectionManager::ProcessPacket(const std::string &endpoi
 				if (m_on_new_connection) {
 					m_on_new_connection(connection);
 				}
-				m_connections.insert(std::make_pair(std::make_pair(endpoint, port), connection));
+				m_connections.emplace(std::make_pair(std::make_pair(endpoint, port), connection));
 				connection->ProcessPacket(p);
 			}
 			else if (data[1] != OP_OutOfSession) {
@@ -527,7 +527,7 @@ void EQ::Net::DaybreakConnection::AddToQueue(int stream, uint16_t seq, const Pac
 		DynamicPacket *out = new DynamicPacket();
 		out->PutPacket(0, p);
 
-		s->packet_queue.insert(std::make_pair(seq, out));
+		s->packet_queue.emplace(std::make_pair(seq, out));
 	}
 }
 
@@ -1427,7 +1427,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;
 
 		InternalBufferedSend(first_packet);
@@ -1459,7 +1459,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 				static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 				m_owner->m_options.resend_delay_min,
 				m_owner->m_options.resend_delay_max);
-			stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
+			stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
 			stream->sequence_out++;
 
 			InternalBufferedSend(packet);
@@ -1483,7 +1483,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 			static_cast<size_t>((m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms),
 			m_owner->m_options.resend_delay_min,
 			m_owner->m_options.resend_delay_max);
-		stream->sent_packets.insert(std::make_pair(stream->sequence_out, sent));
+		stream->sent_packets.emplace(std::make_pair(stream->sequence_out, sent));
 		stream->sequence_out++;
 
 		InternalBufferedSend(packet);

common/net/eqstream.cpp

@@ -22,7 +22,7 @@ void EQ::Net::EQStreamManager::SetOptions(const EQStreamManagerInterfaceOptions
 void EQ::Net::EQStreamManager::DaybreakNewConnection(std::shared_ptr<DaybreakConnection> connection)
 {
 	std::shared_ptr<EQStream> stream(new EQStream(this, connection));
-	m_streams.insert(std::make_pair(connection, stream));
+	m_streams.emplace(std::make_pair(connection, stream));
 	if (m_on_new_connection) {
 		m_on_new_connection(stream);
 	}

common/net/servertalk_client_connection.cpp

@@ -45,7 +45,7 @@ void EQ::Net::ServertalkClient::SendPacket(ServerPacket *p)
 
 void EQ::Net::ServertalkClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.insert(std::make_pair(opcode, cb));
+	m_message_callbacks.emplace(std::make_pair(opcode, cb));
 }
 
 void EQ::Net::ServertalkClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)

common/net/servertalk_legacy_client_connection.cpp

@@ -41,7 +41,7 @@ void EQ::Net::ServertalkLegacyClient::SendPacket(ServerPacket *p)
 
 void EQ::Net::ServertalkLegacyClient::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.insert(std::make_pair(opcode, cb));
+	m_message_callbacks.emplace(std::make_pair(opcode, cb));
 }
 
 void EQ::Net::ServertalkLegacyClient::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)

common/net/servertalk_server.cpp

@@ -19,12 +19,12 @@ void EQ::Net::ServertalkServer::Listen(const ServertalkServerOptions& opts)
 
 void EQ::Net::ServertalkServer::OnConnectionIdentified(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_ident.insert(std::make_pair(type, cb));
+	m_on_ident.emplace(std::make_pair(type, cb));
 }
 
 void EQ::Net::ServertalkServer::OnConnectionRemoved(const std::string &type, std::function<void(std::shared_ptr<ServertalkServerConnection>)> cb)
 {
-	m_on_disc.insert(std::make_pair(type, cb));
+	m_on_disc.emplace(std::make_pair(type, cb));
 }
 
 void EQ::Net::ServertalkServer::ConnectionDisconnected(ServertalkServerConnection *conn)
@@ -75,7 +75,7 @@ void EQ::Net::ServertalkServer::ConnectionIdentified(ServertalkServerConnection
 			else {
 				std::vector<std::shared_ptr<EQ::Net::ServertalkServerConnection>> vec;
 				vec.push_back(*iter);
-				m_ident_connections.insert(std::make_pair(conn->GetIdentifier(), vec));
+				m_ident_connections.emplace(std::make_pair(conn->GetIdentifier(), vec));
 			}
 
 			m_unident_connections.erase(iter);

common/net/servertalk_server_connection.cpp

@@ -100,7 +100,7 @@ void EQ::Net::ServertalkServerConnection::SendPacket(ServerPacket *p)
 
 void EQ::Net::ServertalkServerConnection::OnMessage(uint16_t opcode, std::function<void(uint16_t, EQ::Net::Packet&)> cb)
 {
-	m_message_callbacks.insert(std::make_pair(opcode, cb));
+	m_message_callbacks.emplace(std::make_pair(opcode, cb));
 }
 
 void EQ::Net::ServertalkServerConnection::OnMessage(std::function<void(uint16_t, EQ::Net::Packet&)> cb)

common/net/tcp_connection.cpp

@@ -142,7 +142,7 @@ void EQ::Net::TCPConnection::Write(const char *data, size_t count)
 
 	WriteBaton *baton = new WriteBaton;
 	baton->connection = this;
-	baton->buffer = new char[count];;
+	baton->buffer = new char[count];
 
 	uv_write_t *write_req = new uv_write_t;
 	memset(write_req, 0, sizeof(uv_write_t));

common/patches/rof.cpp

@@ -1050,7 +1050,7 @@ namespace RoF
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1069,7 +1069,7 @@ namespace RoF
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1099,7 +1099,7 @@ namespace RoF
 
 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1169,7 +1169,7 @@ namespace RoF
 			return;
 
 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);
 
@@ -5218,7 +5218,6 @@ namespace RoF
 		/**
 		 * Ornamentation
 		 */
-		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;
 

common/patches/rof2.cpp

@@ -1101,7 +1101,7 @@ namespace RoF2
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -1120,7 +1120,7 @@ namespace RoF2
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -1150,7 +1150,7 @@ namespace RoF2
 
 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1220,7 +1220,7 @@ namespace RoF2
 			return;
 
 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);
 
@@ -5477,7 +5477,6 @@ namespace RoF2
 		/**
 		 * Ornamentation
 		 */
-		int    ornamentation_augment_type = RuleI(Character, OrnamentationAugmentType);
 		uint32 ornamentation_icon         = (inst->GetOrnamentationIcon() ? inst->GetOrnamentationIcon() : 0);
 		uint32 hero_model                 = 0;
 

common/patches/rof2_structs.h

@@ -2590,7 +2590,7 @@ struct GroupUpdate_Struct_Live {	// New for Live
 
 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	membername[0];	// Member Name Null Terminated
+/*0000*/	//char	member_name[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2600,7 +2600,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	membername[0];	// Null Terminated?
+/*0013*/	//char	member_name[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0

common/patches/rof_structs.h

@@ -2566,7 +2566,7 @@ struct GroupUpdate_Struct_Live {	// New for Live
 
 struct GroupMembers_Struct {	// New for Live
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	membername[0];	// Member Name Null Terminated
+/*0000*/	//char	member_name[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2576,7 +2576,7 @@ struct GroupJoin_Struct_Live {	// New for Live
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	membername[0];	// Null Terminated?
+/*0013*/	//char	member_name[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0

common/patches/sod.cpp

@@ -785,7 +785,7 @@ namespace SoD
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -804,7 +804,7 @@ namespace SoD
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -834,7 +834,7 @@ namespace SoD
 
 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -902,7 +902,7 @@ namespace SoD
 			return;
 		}
 
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);
 

common/patches/sod_structs.h

@@ -2085,7 +2085,7 @@ struct GroupUpdate_Struct_SoD {	// New for SoD
 
 struct GroupMembers_Struct {	// New for SoD
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	membername[0];	// Member Name Null Terminated
+/*0000*/	//char	member_name[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2095,7 +2095,7 @@ struct GroupJoin_Struct_SoD {	// New for SoD
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	membername[0];	// Null Terminated?
+/*0013*/	//char	member_name[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0

common/patches/sof.cpp

@@ -2095,13 +2095,13 @@ namespace SoF
 			}
 			else
 			{
-			val = atoi(&emu->lastName[2]);
+			val = Strings::ToInt(&emu->lastName[2]);
 			}
 			}
 			else
 			{
 			sep[0] = nullptr;
-			ofs = atoi(&emu->lastName[2]);
+			ofs = Strings::ToInt(&emu->lastName[2]);
 			sep[0] = '=';
 			if ((sep[1] < '0') || (sep[1] > '9'))
 			{
@@ -2109,7 +2109,7 @@ namespace SoF
 			}
 			else
 			{
-			val = atoi(&sep[1]);
+			val = Strings::ToInt(&sep[1]);
 			}
 			}
 

common/patches/uf.cpp

@@ -927,7 +927,7 @@ namespace UF
 		{
 			if ((gjs->action == groupActDisband) || !strcmp(gjs->yourname, gjs->membername))
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 				auto outapp =
 				    new EQApplicationPacket(OP_GroupDisbandYou, sizeof(structs::GroupGeneric_Struct));
@@ -947,7 +947,7 @@ namespace UF
 				return;
 			}
 			//if(gjs->action == groupActLeave)
-			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+			//	Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Group Leave, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 
 			auto outapp =
 			    new EQApplicationPacket(OP_GroupDisbandOther, sizeof(structs::GroupGeneric_Struct));
@@ -977,7 +977,7 @@ namespace UF
 
 			for (int i = 0; i < 5; ++i)
 			{
-				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->membername[i]);
+				//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Membername[%i] is %s", i,  gu2->member_name[i]);
 				if (gu2->membername[i][0] != '\0')
 				{
 					PacketLength += (22 + strlen(gu2->membername[i]) + 1);
@@ -1045,7 +1045,7 @@ namespace UF
 			delete in;
 			return;
 		}
-		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, membername = %s", gjs->yourname, gjs->membername);
+		//Log.LogDebugType(Logs::General, Logs::Netcode, "[ERROR] Generic GroupUpdate, yourname = %s, member_name = %s", gjs->yourname, gjs->member_name);
 		ENCODE_LENGTH_EXACT(GroupJoin_Struct);
 		SETUP_DIRECT_ENCODE(GroupJoin_Struct, structs::GroupJoin_Struct);
 
@@ -3851,17 +3851,17 @@ namespace UF
 			ob.write((const char*)&evotop, sizeof(UF::structs::EvolvingItem));
 		}
 
-		//ORNAMENT IDFILE / ICON -
-		int ornamentationAugtype = RuleI(Character, OrnamentationAugmentType);
-		uint16 ornaIcon = 0;
-		if (inst->GetOrnamentationAug(ornamentationAugtype)) {
-			const EQ::ItemData *aug_weap = inst->GetOrnamentationAug(ornamentationAugtype)->GetItem();
-			ornaIcon = aug_weap->Icon;
+		uint16     ornament_icon = 0;
+		const auto augment       = inst->GetOrnamentationAugment();
 
-			ob.write(aug_weap->IDFile, strlen(aug_weap->IDFile));
+		if (augment) {
+			const auto augment_item = augment->GetItem();
+			ornament_icon = augment_item->Icon;
+
+			ob.write(augment_item->IDFile, strlen(augment_item->IDFile));
 		}
 		else if (inst->GetOrnamentationIDFile() && inst->GetOrnamentationIcon()) {
-			ornaIcon = inst->GetOrnamentationIcon();
+			ornament_icon = inst->GetOrnamentationIcon();
 			char tmp[30]; memset(tmp, 0x0, 30); sprintf(tmp, "IT%d", inst->GetOrnamentationIDFile());
 
 			ob.write(tmp, strlen(tmp));
@@ -3870,7 +3870,7 @@ namespace UF
 
 		UF::structs::ItemSerializationHeaderFinish hdrf;
 
-		hdrf.ornamentIcon = ornaIcon;
+		hdrf.ornamentIcon = ornament_icon;
 		hdrf.unknown060 = 0; //This is Always 0.. or it breaks shit..
 		hdrf.unknown061 = 0; //possibly ornament / special ornament
 		hdrf.isCopied = 0; //Flag for item to be 'Copied'

common/patches/uf_structs.h

@@ -2128,7 +2128,7 @@ struct GroupUpdate_Struct_Underfoot {	// New for Underfoot
 
 struct GroupMembers_Struct {	// New for Underfoot
 /*0000*/	uint32	membernumber;	// Guess - number of member in the group (0 to 5?)
-/*0000*/	//char	membername[0];	// Member Name Null Terminated
+/*0000*/	//char	member_name[0];	// Member Name Null Terminated
 /*0000*/	uint8	unknown001[3];	// Seen 0
 /*0000*/	uint32	memberlevel;	// Guess
 /*0000*/	uint8	unknown002[11];	// Seen 0
@@ -2138,7 +2138,7 @@ struct GroupJoin_Struct_Underfoot {	// New for Underfoot
 /*0000*/	uint32	unknown0000;	// Matches unknown0136 from GroupFollow_Struct
 /*0004*/	uint32	action;
 /*0008*/	uint8	unknown0008[5];	// Seen 0
-/*0013*/	//char	membername[0];	// Null Terminated?
+/*0013*/	//char	member_name[0];	// Null Terminated?
 /*0000*/	uint8	unknown0013[3];	// Seen 0
 /*0000*/	uint32	unknown0016;	// Matches unknown0132 from GroupFollow_Struct
 /*0000*/	uint8	unknown0020[11];	// Seen 0

common/platform.cpp

@@ -22,26 +22,31 @@
 
 EQEmuExePlatform exe_platform = ExePlatformNone;
 
-void RegisterExecutablePlatform(EQEmuExePlatform p) {
+void RegisterExecutablePlatform(EQEmuExePlatform p)
+{
 	exe_platform = p;
 }
 
-const EQEmuExePlatform& GetExecutablePlatform() {
+const EQEmuExePlatform &GetExecutablePlatform()
+{
 	return exe_platform;
 }
 
-/**
- * @return
- */
-int GetExecutablePlatformInt(){
+int GetExecutablePlatformInt()
+{
 	return exe_platform;
 }
 
-/**
- * Returns platform name by string
- *
- * @return
- */
+bool IsWorld()
+{
+	return exe_platform == EQEmuExePlatform::ExePlatformWorld;
+}
+
+bool IsQueryServ()
+{
+	return exe_platform == EQEmuExePlatform::ExePlatformQueryServ;
+}
+
 std::string GetPlatformName()
 {
 	switch (GetExecutablePlatformInt()) {

common/platform.h

@@ -44,5 +44,7 @@ void RegisterExecutablePlatform(EQEmuExePlatform p);
 const EQEmuExePlatform& GetExecutablePlatform();
 int GetExecutablePlatformInt();
 std::string GetPlatformName();
+bool IsWorld();
+bool IsQueryServ();
 
 #endif

common/proc_launcher.cpp

@@ -64,7 +64,7 @@ void ProcLauncher::Process() {
 		if(GetExitCodeProcess(cur->second->proc_info.hProcess, &res)) {
 			//got exit code, see if its still running...
 			if(res == STILL_ACTIVE) {
-				cur++;
+				++cur;
 				continue;
 			}
 			//else, it died, handle properly
@@ -76,7 +76,7 @@ void ProcLauncher::Process() {
 
 		//if we get here, the current process died.
 		tmp = cur;
-		tmp++;
+		++tmp;
 		ProcessTerminated(cur);
 		cur = tmp;
 	}
@@ -174,7 +174,7 @@ ProcLauncher::ProcRef ProcLauncher::Launch(Spec *&to_launch) {
 	std::vector<std::string>::iterator cur, end;
 	cur = it->args.begin();
 	end = it->args.end();
-	for(; cur != end; cur++) {
+	for(; cur != end; ++cur) {
 		args += " ";
 		args += *cur;
 	}
@@ -306,7 +306,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = m_running.begin();
 		end = m_running.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			Terminate(cur->first, true);
 		}
 	} else {
@@ -317,7 +317,7 @@ void ProcLauncher::TerminateAll(bool final) {
 		std::map<ProcRef, Spec *>::iterator cur, end;
 		cur = running.begin();
 		end = running.end();
-		for(; cur != end; cur++) {
+		for(; cur != end; ++cur) {
 			Terminate(cur->first, true);
 			safe_delete(cur->second);
 		}

common/process/process.cpp

@@ -4,7 +4,8 @@
 
 std::string Process::execute(const std::string &cmd)
 {
-	std::shared_ptr<FILE> pipe(popen(cmd.c_str(), "r"), pclose);
+	std::string           command = fmt::format("{} 2>&1", cmd);
+	std::shared_ptr<FILE> pipe(popen(command.c_str(), "r"), pclose);
 	if (!pipe) { return "ERROR"; }
 	char        buffer[128];
 	std::string result;

common/profanity_manager.cpp

@@ -258,7 +258,7 @@ bool EQ::ProfanityManager::clear_database_entries(DBcore *db) {
 	return true;
 }
 
-bool EQ::ProfanityManager::check_for_existing_entry(std::string profanity) {
+bool EQ::ProfanityManager::check_for_existing_entry(const std::string& profanity) {
 	if (profanity.empty()) {
 		return false;
 	}

common/profanity_manager.h

@@ -53,7 +53,7 @@ namespace EQ
 	private:
 		static bool load_database_entries(DBcore *db);
 		static bool clear_database_entries(DBcore *db);
-		static bool check_for_existing_entry(std::string profanity);
+		static bool check_for_existing_entry(const std::string& profanity);
 		
 	};
 

common/ptimer.cpp

@@ -288,9 +288,9 @@ bool PTimerList::Load(Database *db) {
 	PersistentTimer *cur;
 
     for (auto row = results.begin(); row != results.end(); ++row) {
-		type = atoi(row[0]);
-		start_time = strtoul(row[1], nullptr, 10);
-		timer_time = strtoul(row[2], nullptr, 10);
+		type = Strings::ToUnsignedInt(row[0]);
+		start_time = Strings::ToUnsignedInt(row[1]);
+		timer_time = Strings::ToUnsignedInt(row[2]);
 		enabled = (row[3][0] == '1');
 
 		//if it expired allready, dont bother.

common/repositories/base/base_bot_data_repository.h

@@ -69,6 +69,7 @@ public:
 		int32_t     expansion_bitmask;
 		uint8_t     enforce_spell_settings;
 		uint8_t     archery_setting;
+		uint32_t    caster_range;
 	};
 
 	static std::string PrimaryKey()
@@ -129,6 +130,7 @@ public:
 			"expansion_bitmask",
 			"enforce_spell_settings",
 			"archery_setting",
+			"caster_range",
 		};
 	}
 
@@ -185,6 +187,7 @@ public:
 			"expansion_bitmask",
 			"enforce_spell_settings",
 			"archery_setting",
+			"caster_range",
 		};
 	}
 
@@ -275,6 +278,7 @@ public:
 		e.expansion_bitmask      = -1;
 		e.enforce_spell_settings = 0;
 		e.archery_setting        = 0;
+		e.caster_range           = 0;
 
 		return e;
 	}
@@ -361,6 +365,7 @@ public:
 			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
 			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
 			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
+			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));
 
 			return e;
 		}
@@ -443,6 +448,7 @@ public:
 		v.push_back(columns[47] + " = " + std::to_string(e.expansion_bitmask));
 		v.push_back(columns[48] + " = " + std::to_string(e.enforce_spell_settings));
 		v.push_back(columns[49] + " = " + std::to_string(e.archery_setting));
+		v.push_back(columns[50] + " = " + std::to_string(e.caster_range));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -514,6 +520,7 @@ public:
 		v.push_back(std::to_string(e.expansion_bitmask));
 		v.push_back(std::to_string(e.enforce_spell_settings));
 		v.push_back(std::to_string(e.archery_setting));
+		v.push_back(std::to_string(e.caster_range));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -593,6 +600,7 @@ public:
 			v.push_back(std::to_string(e.expansion_bitmask));
 			v.push_back(std::to_string(e.enforce_spell_settings));
 			v.push_back(std::to_string(e.archery_setting));
+			v.push_back(std::to_string(e.caster_range));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -676,6 +684,7 @@ public:
 			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
 			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
 			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
+			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));
 
 			all_entries.push_back(e);
 		}
@@ -750,6 +759,7 @@ public:
 			e.expansion_bitmask      = static_cast<int32_t>(atoi(row[47]));
 			e.enforce_spell_settings = static_cast<uint8_t>(strtoul(row[48], nullptr, 10));
 			e.archery_setting        = static_cast<uint8_t>(strtoul(row[49], nullptr, 10));
+			e.caster_range           = static_cast<uint32_t>(strtoul(row[50], nullptr, 10));
 
 			all_entries.push_back(e);
 		}

common/repositories/base/base_character_tribute_repository.h

@@ -9,22 +9,21 @@
  * @docs https://eqemu.gitbook.io/server/in-development/developer-area/repositories
  */
 
-#ifndef EQEMU_BASE_HACKERS_REPOSITORY_H
-#define EQEMU_BASE_HACKERS_REPOSITORY_H
+#ifndef EQEMU_BASE_CHARACTER_TRIBUTE_REPOSITORY_H
+#define EQEMU_BASE_CHARACTER_TRIBUTE_REPOSITORY_H
 
 #include "../../database.h"
 #include "../../strings.h"
 #include <ctime>
 
-class BaseHackersRepository {
+
+class BaseCharacterTributeRepository {
 public:
-	struct Hackers {
-		int32_t     id;
-		std::string account;
-		std::string name;
-		std::string hacked;
-		std::string zone;
-		std::string date;
+	struct CharacterTribute {
+		int32_t  id;
+		uint32_t character_id;
+		uint8_t  tier;
+		uint32_t tribute;
 	};
 
 	static std::string PrimaryKey()
@@ -36,11 +35,9 @@ public:
 	{
 		return {
 			"id",
-			"account",
-			"name",
-			"hacked",
-			"zone",
-			"date",
+			"character_id",
+			"tier",
+			"tribute",
 		};
 	}
 
@@ -48,11 +45,9 @@ public:
 	{
 		return {
 			"id",
-			"account",
-			"name",
-			"hacked",
-			"zone",
-			"date",
+			"character_id",
+			"tier",
+			"tribute",
 		};
 	}
 
@@ -68,7 +63,7 @@ public:
 
 	static std::string TableName()
 	{
-		return std::string("hackers");
+		return std::string("character_tribute");
 	}
 
 	static std::string BaseSelect()
@@ -89,57 +84,54 @@ public:
 		);
 	}
 
-	static Hackers NewEntity()
+	static CharacterTribute NewEntity()
 	{
-		Hackers e{};
+		CharacterTribute e{};
 
-		e.id      = 0;
-		e.account = "";
-		e.name    = "";
-		e.hacked  = "";
-		e.zone    = "";
-		e.date    = std::time(nullptr);
+		e.id           = 0;
+		e.character_id = 0;
+		e.tier         = 0;
+		e.tribute      = 0;
 
 		return e;
 	}
 
-	static Hackers GetHackers(
-		const std::vector<Hackers> &hackerss,
-		int hackers_id
+	static CharacterTribute GetCharacterTribute(
+		const std::vector<CharacterTribute> &character_tributes,
+		int character_tribute_id
 	)
 	{
-		for (auto &hackers : hackerss) {
-			if (hackers.id == hackers_id) {
-				return hackers;
+		for (auto &character_tribute : character_tributes) {
+			if (character_tribute.id == character_tribute_id) {
+				return character_tribute;
 			}
 		}
 
 		return NewEntity();
 	}
 
-	static Hackers FindOne(
+	static CharacterTribute FindOne(
 		Database& db,
-		int hackers_id
+		int character_tribute_id
 	)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
-				hackers_id
+				PrimaryKey(),
+				character_tribute_id
 			)
 		);
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			Hackers e{};
+			CharacterTribute e{};
 
-			e.id      = static_cast<int32_t>(atoi(row[0]));
-			e.account = row[1] ? row[1] : "";
-			e.name    = row[2] ? row[2] : "";
-			e.hacked  = row[3] ? row[3] : "";
-			e.zone    = row[4] ? row[4] : "";
-			e.date    = row[5] ? row[5] : "";
+			e.id           = static_cast<int32_t>(atoi(row[0]));
+			e.character_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.tier         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
+			e.tribute      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
 
 			return e;
 		}
@@ -149,7 +141,7 @@ public:
 
 	static int DeleteOne(
 		Database& db,
-		int hackers_id
+		int character_tribute_id
 	)
 	{
 		auto results = db.QueryDatabase(
@@ -157,7 +149,7 @@ public:
 				"DELETE FROM {} WHERE {} = {}",
 				TableName(),
 				PrimaryKey(),
-				hackers_id
+				character_tribute_id
 			)
 		);
 
@@ -166,18 +158,16 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		const Hackers &e
+		const CharacterTribute &e
 	)
 	{
 		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.account) + "'");
-		v.push_back(columns[2] + " = '" + Strings::Escape(e.name) + "'");
-		v.push_back(columns[3] + " = '" + Strings::Escape(e.hacked) + "'");
-		v.push_back(columns[4] + " = '" + Strings::Escape(e.zone) + "'");
-		v.push_back(columns[5] + " = '" + Strings::Escape(e.date) + "'");
+		v.push_back(columns[1] + " = " + std::to_string(e.character_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.tier));
+		v.push_back(columns[3] + " = " + std::to_string(e.tribute));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -192,19 +182,17 @@ public:
 		return (results.Success() ? results.RowsAffected() : 0);
 	}
 
-	static Hackers InsertOne(
+	static CharacterTribute InsertOne(
 		Database& db,
-		Hackers e
+		CharacterTribute e
 	)
 	{
 		std::vector<std::string> v;
 
 		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.account) + "'");
-		v.push_back("'" + Strings::Escape(e.name) + "'");
-		v.push_back("'" + Strings::Escape(e.hacked) + "'");
-		v.push_back("'" + Strings::Escape(e.zone) + "'");
-		v.push_back("'" + Strings::Escape(e.date) + "'");
+		v.push_back(std::to_string(e.character_id));
+		v.push_back(std::to_string(e.tier));
+		v.push_back(std::to_string(e.tribute));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -226,7 +214,7 @@ public:
 
 	static int InsertMany(
 		Database& db,
-		const std::vector<Hackers> &entries
+		const std::vector<CharacterTribute> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
@@ -235,11 +223,9 @@ public:
 			std::vector<std::string> v;
 
 			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.account) + "'");
-			v.push_back("'" + Strings::Escape(e.name) + "'");
-			v.push_back("'" + Strings::Escape(e.hacked) + "'");
-			v.push_back("'" + Strings::Escape(e.zone) + "'");
-			v.push_back("'" + Strings::Escape(e.date) + "'");
+			v.push_back(std::to_string(e.character_id));
+			v.push_back(std::to_string(e.tier));
+			v.push_back(std::to_string(e.tribute));
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
@@ -257,9 +243,9 @@ public:
 		return (results.Success() ? results.RowsAffected() : 0);
 	}
 
-	static std::vector<Hackers> All(Database& db)
+	static std::vector<CharacterTribute> All(Database& db)
 	{
-		std::vector<Hackers> all_entries;
+		std::vector<CharacterTribute> all_entries;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -271,14 +257,12 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			Hackers e{};
+			CharacterTribute e{};
 
-			e.id      = static_cast<int32_t>(atoi(row[0]));
-			e.account = row[1] ? row[1] : "";
-			e.name    = row[2] ? row[2] : "";
-			e.hacked  = row[3] ? row[3] : "";
-			e.zone    = row[4] ? row[4] : "";
-			e.date    = row[5] ? row[5] : "";
+			e.id           = static_cast<int32_t>(atoi(row[0]));
+			e.character_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.tier         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
+			e.tribute      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
 
 			all_entries.push_back(e);
 		}
@@ -286,9 +270,9 @@ public:
 		return all_entries;
 	}
 
-	static std::vector<Hackers> GetWhere(Database& db, const std::string &where_filter)
+	static std::vector<CharacterTribute> GetWhere(Database& db, const std::string &where_filter)
 	{
-		std::vector<Hackers> all_entries;
+		std::vector<CharacterTribute> all_entries;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -301,14 +285,12 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			Hackers e{};
+			CharacterTribute e{};
 
-			e.id      = static_cast<int32_t>(atoi(row[0]));
-			e.account = row[1] ? row[1] : "";
-			e.name    = row[2] ? row[2] : "";
-			e.hacked  = row[3] ? row[3] : "";
-			e.zone    = row[4] ? row[4] : "";
-			e.date    = row[5] ? row[5] : "";
+			e.id           = static_cast<int32_t>(atoi(row[0]));
+			e.character_id = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.tier         = static_cast<uint8_t>(strtoul(row[2], nullptr, 10));
+			e.tribute      = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
 
 			all_entries.push_back(e);
 		}
@@ -369,4 +351,4 @@ public:
 
 };
 
-#endif //EQEMU_BASE_HACKERS_REPOSITORY_H
+#endif //EQEMU_BASE_CHARACTER_TRIBUTE_REPOSITORY_H

common/repositories/base/base_data_buckets_repository.h

@@ -16,11 +16,12 @@
 #include "../../strings.h"
 #include <ctime>
 
+
 class BaseDataBucketsRepository {
 public:
 	struct DataBuckets {
 		uint64_t    id;
-		std::string key;
+		std::string key_;
 		std::string value;
 		uint32_t    expires;
 	};
@@ -34,7 +35,7 @@ public:
 	{
 		return {
 			"id",
-			"key",
+			"`key`",
 			"value",
 			"expires",
 		};
@@ -44,7 +45,7 @@ public:
 	{
 		return {
 			"id",
-			"key",
+			"`key`",
 			"value",
 			"expires",
 		};
@@ -88,7 +89,7 @@ public:
 		DataBuckets e{};
 
 		e.id      = 0;
-		e.key     = "";
+		e.key_    = "";
 		e.value   = "";
 		e.expires = 0;
 
@@ -116,8 +117,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				data_buckets_id
 			)
 		);
@@ -127,7 +129,7 @@ public:
 			DataBuckets e{};
 
 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key     = row[1] ? row[1] : "";
+			e.key_    = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
 
@@ -163,7 +165,7 @@ public:
 
 		auto columns = Columns();
 
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.key) + "'");
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.key_) + "'");
 		v.push_back(columns[2] + " = '" + Strings::Escape(e.value) + "'");
 		v.push_back(columns[3] + " = " + std::to_string(e.expires));
 
@@ -188,7 +190,7 @@ public:
 		std::vector<std::string> v;
 
 		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.key) + "'");
+		v.push_back("'" + Strings::Escape(e.key_) + "'");
 		v.push_back("'" + Strings::Escape(e.value) + "'");
 		v.push_back(std::to_string(e.expires));
 
@@ -221,7 +223,7 @@ public:
 			std::vector<std::string> v;
 
 			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.key) + "'");
+			v.push_back("'" + Strings::Escape(e.key_) + "'");
 			v.push_back("'" + Strings::Escape(e.value) + "'");
 			v.push_back(std::to_string(e.expires));
 
@@ -258,7 +260,7 @@ public:
 			DataBuckets e{};
 
 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key     = row[1] ? row[1] : "";
+			e.key_    = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
 
@@ -286,7 +288,7 @@ public:
 			DataBuckets e{};
 
 			e.id      = strtoull(row[0], nullptr, 10);
-			e.key     = row[1] ? row[1] : "";
+			e.key_    = row[1] ? row[1] : "";
 			e.value   = row[2] ? row[2] : "";
 			e.expires = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
 

common/repositories/base/base_eventlog_repository.h

@@ -1,412 +0,0 @@
-/**
- * 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_EVENTLOG_REPOSITORY_H
-#define EQEMU_BASE_EVENTLOG_REPOSITORY_H
-
-#include "../../database.h"
-#include "../../strings.h"
-#include <ctime>
-
-class BaseEventlogRepository {
-public:
-	struct Eventlog {
-		uint32_t    id;
-		std::string accountname;
-		uint32_t    accountid;
-		int32_t     status;
-		std::string charname;
-		std::string target;
-		std::string time;
-		std::string descriptiontype;
-		std::string description;
-		int32_t     event_nid;
-	};
-
-	static std::string PrimaryKey()
-	{
-		return std::string("id");
-	}
-
-	static std::vector<std::string> Columns()
-	{
-		return {
-			"id",
-			"accountname",
-			"accountid",
-			"status",
-			"charname",
-			"target",
-			"time",
-			"descriptiontype",
-			"description",
-			"event_nid",
-		};
-	}
-
-	static std::vector<std::string> SelectColumns()
-	{
-		return {
-			"id",
-			"accountname",
-			"accountid",
-			"status",
-			"charname",
-			"target",
-			"time",
-			"descriptiontype",
-			"description",
-			"event_nid",
-		};
-	}
-
-	static std::string ColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", Columns()));
-	}
-
-	static std::string SelectColumnsRaw()
-	{
-		return std::string(Strings::Implode(", ", SelectColumns()));
-	}
-
-	static std::string TableName()
-	{
-		return std::string("eventlog");
-	}
-
-	static std::string BaseSelect()
-	{
-		return fmt::format(
-			"SELECT {} FROM {}",
-			SelectColumnsRaw(),
-			TableName()
-		);
-	}
-
-	static std::string BaseInsert()
-	{
-		return fmt::format(
-			"INSERT INTO {} ({}) ",
-			TableName(),
-			ColumnsRaw()
-		);
-	}
-
-	static Eventlog NewEntity()
-	{
-		Eventlog e{};
-
-		e.id              = 0;
-		e.accountname     = "";
-		e.accountid       = 0;
-		e.status          = 0;
-		e.charname        = "";
-		e.target          = "None";
-		e.time            = std::time(nullptr);
-		e.descriptiontype = "";
-		e.description     = "";
-		e.event_nid       = 0;
-
-		return e;
-	}
-
-	static Eventlog GetEventlog(
-		const std::vector<Eventlog> &eventlogs,
-		int eventlog_id
-	)
-	{
-		for (auto &eventlog : eventlogs) {
-			if (eventlog.id == eventlog_id) {
-				return eventlog;
-			}
-		}
-
-		return NewEntity();
-	}
-
-	static Eventlog FindOne(
-		Database& db,
-		int eventlog_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
-				BaseSelect(),
-				eventlog_id
-			)
-		);
-
-		auto row = results.begin();
-		if (results.RowCount() == 1) {
-			Eventlog e{};
-
-			e.id              = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.accountname     = row[1] ? row[1] : "";
-			e.accountid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.status          = static_cast<int32_t>(atoi(row[3]));
-			e.charname        = row[4] ? row[4] : "";
-			e.target          = row[5] ? row[5] : "";
-			e.time            = row[6] ? row[6] : "";
-			e.descriptiontype = row[7] ? row[7] : "";
-			e.description     = row[8] ? row[8] : "";
-			e.event_nid       = static_cast<int32_t>(atoi(row[9]));
-
-			return e;
-		}
-
-		return NewEntity();
-	}
-
-	static int DeleteOne(
-		Database& db,
-		int eventlog_id
-	)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"DELETE FROM {} WHERE {} = {}",
-				TableName(),
-				PrimaryKey(),
-				eventlog_id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static int UpdateOne(
-		Database& db,
-		const Eventlog &e
-	)
-	{
-		std::vector<std::string> v;
-
-		auto columns = Columns();
-
-		v.push_back(columns[1] + " = '" + Strings::Escape(e.accountname) + "'");
-		v.push_back(columns[2] + " = " + std::to_string(e.accountid));
-		v.push_back(columns[3] + " = " + std::to_string(e.status));
-		v.push_back(columns[4] + " = '" + Strings::Escape(e.charname) + "'");
-		v.push_back(columns[5] + " = '" + Strings::Escape(e.target) + "'");
-		v.push_back(columns[6] + " = '" + Strings::Escape(e.time) + "'");
-		v.push_back(columns[7] + " = '" + Strings::Escape(e.descriptiontype) + "'");
-		v.push_back(columns[8] + " = '" + Strings::Escape(e.description) + "'");
-		v.push_back(columns[9] + " = " + std::to_string(e.event_nid));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"UPDATE {} SET {} WHERE {} = {}",
-				TableName(),
-				Strings::Implode(", ", v),
-				PrimaryKey(),
-				e.id
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static Eventlog InsertOne(
-		Database& db,
-		Eventlog e
-	)
-	{
-		std::vector<std::string> v;
-
-		v.push_back(std::to_string(e.id));
-		v.push_back("'" + Strings::Escape(e.accountname) + "'");
-		v.push_back(std::to_string(e.accountid));
-		v.push_back(std::to_string(e.status));
-		v.push_back("'" + Strings::Escape(e.charname) + "'");
-		v.push_back("'" + Strings::Escape(e.target) + "'");
-		v.push_back("'" + Strings::Escape(e.time) + "'");
-		v.push_back("'" + Strings::Escape(e.descriptiontype) + "'");
-		v.push_back("'" + Strings::Escape(e.description) + "'");
-		v.push_back(std::to_string(e.event_nid));
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES ({})",
-				BaseInsert(),
-				Strings::Implode(",", v)
-			)
-		);
-
-		if (results.Success()) {
-			e.id = results.LastInsertedID();
-			return e;
-		}
-
-		e = NewEntity();
-
-		return e;
-	}
-
-	static int InsertMany(
-		Database& db,
-		const std::vector<Eventlog> &entries
-	)
-	{
-		std::vector<std::string> insert_chunks;
-
-		for (auto &e: entries) {
-			std::vector<std::string> v;
-
-			v.push_back(std::to_string(e.id));
-			v.push_back("'" + Strings::Escape(e.accountname) + "'");
-			v.push_back(std::to_string(e.accountid));
-			v.push_back(std::to_string(e.status));
-			v.push_back("'" + Strings::Escape(e.charname) + "'");
-			v.push_back("'" + Strings::Escape(e.target) + "'");
-			v.push_back("'" + Strings::Escape(e.time) + "'");
-			v.push_back("'" + Strings::Escape(e.descriptiontype) + "'");
-			v.push_back("'" + Strings::Escape(e.description) + "'");
-			v.push_back(std::to_string(e.event_nid));
-
-			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
-		}
-
-		std::vector<std::string> v;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{} VALUES {}",
-				BaseInsert(),
-				Strings::Implode(",", insert_chunks)
-			)
-		);
-
-		return (results.Success() ? results.RowsAffected() : 0);
-	}
-
-	static std::vector<Eventlog> All(Database& db)
-	{
-		std::vector<Eventlog> all_entries;
-
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"{}",
-				BaseSelect()
-			)
-		);
-
-		all_entries.reserve(results.RowCount());
-
-		for (auto row = results.begin(); row != results.end(); ++row) {
-			Eventlog e{};
-
-			e.id              = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.accountname     = row[1] ? row[1] : "";
-			e.accountid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.status          = static_cast<int32_t>(atoi(row[3]));
-			e.charname        = row[4] ? row[4] : "";
-			e.target          = row[5] ? row[5] : "";
-			e.time            = row[6] ? row[6] : "";
-			e.descriptiontype = row[7] ? row[7] : "";
-			e.description     = row[8] ? row[8] : "";
-			e.event_nid       = static_cast<int32_t>(atoi(row[9]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static std::vector<Eventlog> GetWhere(Database& db, const std::string &where_filter)
-	{
-		std::vector<Eventlog> 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) {
-			Eventlog e{};
-
-			e.id              = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
-			e.accountname     = row[1] ? row[1] : "";
-			e.accountid       = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
-			e.status          = static_cast<int32_t>(atoi(row[3]));
-			e.charname        = row[4] ? row[4] : "";
-			e.target          = row[5] ? row[5] : "";
-			e.time            = row[6] ? row[6] : "";
-			e.descriptiontype = row[7] ? row[7] : "";
-			e.description     = row[8] ? row[8] : "";
-			e.event_nid       = static_cast<int32_t>(atoi(row[9]));
-
-			all_entries.push_back(e);
-		}
-
-		return all_entries;
-	}
-
-	static int DeleteWhere(Database& db, const 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);
-	}
-
-	static int64 GetMaxId(Database& db)
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COALESCE(MAX({}), 0) FROM {}",
-				PrimaryKey(),
-				TableName()
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-	static int64 Count(Database& db, const std::string &where_filter = "")
-	{
-		auto results = db.QueryDatabase(
-			fmt::format(
-				"SELECT COUNT(*) FROM {} {}",
-				TableName(),
-				(where_filter.empty() ? "" : "WHERE " + where_filter)
-			)
-		);
-
-		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
-	}
-
-};
-
-#endif //EQEMU_BASE_EVENTLOG_REPOSITORY_H

common/repositories/base/base_merchantlist_repository.h

@@ -16,6 +16,7 @@
 #include "../../strings.h"
 #include <ctime>
 
+
 class BaseMerchantlistRepository {
 public:
 	struct Merchantlist {
@@ -24,6 +25,8 @@ public:
 		int32_t     item;
 		int16_t     faction_required;
 		uint8_t     level_required;
+		uint8_t     min_status;
+		uint8_t     max_status;
 		uint16_t    alt_currency_cost;
 		int32_t     classes_required;
 		int32_t     probability;
@@ -49,6 +52,8 @@ public:
 			"item",
 			"faction_required",
 			"level_required",
+			"min_status",
+			"max_status",
 			"alt_currency_cost",
 			"classes_required",
 			"probability",
@@ -70,6 +75,8 @@ public:
 			"item",
 			"faction_required",
 			"level_required",
+			"min_status",
+			"max_status",
 			"alt_currency_cost",
 			"classes_required",
 			"probability",
@@ -125,6 +132,8 @@ public:
 		e.item                   = 0;
 		e.faction_required       = -100;
 		e.level_required         = 0;
+		e.min_status             = 0;
+		e.max_status             = 255;
 		e.alt_currency_cost      = 0;
 		e.classes_required       = 65535;
 		e.probability            = 100;
@@ -160,8 +169,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				merchantlist_id
 			)
 		);
@@ -175,16 +185,18 @@ public:
 			e.item                   = static_cast<int32_t>(atoi(row[2]));
 			e.faction_required       = static_cast<int16_t>(atoi(row[3]));
 			e.level_required         = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.alt_currency_cost      = static_cast<uint16_t>(strtoul(row[5], nullptr, 10));
-			e.classes_required       = static_cast<int32_t>(atoi(row[6]));
-			e.probability            = static_cast<int32_t>(atoi(row[7]));
-			e.bucket_name            = row[8] ? row[8] : "";
-			e.bucket_value           = row[9] ? row[9] : "";
-			e.bucket_comparison      = static_cast<uint8_t>(strtoul(row[10], nullptr, 10));
-			e.min_expansion          = static_cast<int8_t>(atoi(row[11]));
-			e.max_expansion          = static_cast<int8_t>(atoi(row[12]));
-			e.content_flags          = row[13] ? row[13] : "";
-			e.content_flags_disabled = row[14] ? row[14] : "";
+			e.min_status             = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
+			e.max_status             = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
+			e.alt_currency_cost      = static_cast<uint16_t>(strtoul(row[7], nullptr, 10));
+			e.classes_required       = static_cast<int32_t>(atoi(row[8]));
+			e.probability            = static_cast<int32_t>(atoi(row[9]));
+			e.bucket_name            = row[10] ? row[10] : "";
+			e.bucket_value           = row[11] ? row[11] : "";
+			e.bucket_comparison      = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.min_expansion          = static_cast<int8_t>(atoi(row[13]));
+			e.max_expansion          = static_cast<int8_t>(atoi(row[14]));
+			e.content_flags          = row[15] ? row[15] : "";
+			e.content_flags_disabled = row[16] ? row[16] : "";
 
 			return e;
 		}
@@ -223,16 +235,18 @@ public:
 		v.push_back(columns[2] + " = " + std::to_string(e.item));
 		v.push_back(columns[3] + " = " + std::to_string(e.faction_required));
 		v.push_back(columns[4] + " = " + std::to_string(e.level_required));
-		v.push_back(columns[5] + " = " + std::to_string(e.alt_currency_cost));
-		v.push_back(columns[6] + " = " + std::to_string(e.classes_required));
-		v.push_back(columns[7] + " = " + std::to_string(e.probability));
-		v.push_back(columns[8] + " = '" + Strings::Escape(e.bucket_name) + "'");
-		v.push_back(columns[9] + " = '" + Strings::Escape(e.bucket_value) + "'");
-		v.push_back(columns[10] + " = " + std::to_string(e.bucket_comparison));
-		v.push_back(columns[11] + " = " + std::to_string(e.min_expansion));
-		v.push_back(columns[12] + " = " + std::to_string(e.max_expansion));
-		v.push_back(columns[13] + " = '" + Strings::Escape(e.content_flags) + "'");
-		v.push_back(columns[14] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
+		v.push_back(columns[5] + " = " + std::to_string(e.min_status));
+		v.push_back(columns[6] + " = " + std::to_string(e.max_status));
+		v.push_back(columns[7] + " = " + std::to_string(e.alt_currency_cost));
+		v.push_back(columns[8] + " = " + std::to_string(e.classes_required));
+		v.push_back(columns[9] + " = " + std::to_string(e.probability));
+		v.push_back(columns[10] + " = '" + Strings::Escape(e.bucket_name) + "'");
+		v.push_back(columns[11] + " = '" + Strings::Escape(e.bucket_value) + "'");
+		v.push_back(columns[12] + " = " + std::to_string(e.bucket_comparison));
+		v.push_back(columns[13] + " = " + std::to_string(e.min_expansion));
+		v.push_back(columns[14] + " = " + std::to_string(e.max_expansion));
+		v.push_back(columns[15] + " = '" + Strings::Escape(e.content_flags) + "'");
+		v.push_back(columns[16] + " = '" + Strings::Escape(e.content_flags_disabled) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -259,6 +273,8 @@ public:
 		v.push_back(std::to_string(e.item));
 		v.push_back(std::to_string(e.faction_required));
 		v.push_back(std::to_string(e.level_required));
+		v.push_back(std::to_string(e.min_status));
+		v.push_back(std::to_string(e.max_status));
 		v.push_back(std::to_string(e.alt_currency_cost));
 		v.push_back(std::to_string(e.classes_required));
 		v.push_back(std::to_string(e.probability));
@@ -303,6 +319,8 @@ public:
 			v.push_back(std::to_string(e.item));
 			v.push_back(std::to_string(e.faction_required));
 			v.push_back(std::to_string(e.level_required));
+			v.push_back(std::to_string(e.min_status));
+			v.push_back(std::to_string(e.max_status));
 			v.push_back(std::to_string(e.alt_currency_cost));
 			v.push_back(std::to_string(e.classes_required));
 			v.push_back(std::to_string(e.probability));
@@ -351,16 +369,18 @@ public:
 			e.item                   = static_cast<int32_t>(atoi(row[2]));
 			e.faction_required       = static_cast<int16_t>(atoi(row[3]));
 			e.level_required         = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.alt_currency_cost      = static_cast<uint16_t>(strtoul(row[5], nullptr, 10));
-			e.classes_required       = static_cast<int32_t>(atoi(row[6]));
-			e.probability            = static_cast<int32_t>(atoi(row[7]));
-			e.bucket_name            = row[8] ? row[8] : "";
-			e.bucket_value           = row[9] ? row[9] : "";
-			e.bucket_comparison      = static_cast<uint8_t>(strtoul(row[10], nullptr, 10));
-			e.min_expansion          = static_cast<int8_t>(atoi(row[11]));
-			e.max_expansion          = static_cast<int8_t>(atoi(row[12]));
-			e.content_flags          = row[13] ? row[13] : "";
-			e.content_flags_disabled = row[14] ? row[14] : "";
+			e.min_status             = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
+			e.max_status             = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
+			e.alt_currency_cost      = static_cast<uint16_t>(strtoul(row[7], nullptr, 10));
+			e.classes_required       = static_cast<int32_t>(atoi(row[8]));
+			e.probability            = static_cast<int32_t>(atoi(row[9]));
+			e.bucket_name            = row[10] ? row[10] : "";
+			e.bucket_value           = row[11] ? row[11] : "";
+			e.bucket_comparison      = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.min_expansion          = static_cast<int8_t>(atoi(row[13]));
+			e.max_expansion          = static_cast<int8_t>(atoi(row[14]));
+			e.content_flags          = row[15] ? row[15] : "";
+			e.content_flags_disabled = row[16] ? row[16] : "";
 
 			all_entries.push_back(e);
 		}
@@ -390,16 +410,18 @@ public:
 			e.item                   = static_cast<int32_t>(atoi(row[2]));
 			e.faction_required       = static_cast<int16_t>(atoi(row[3]));
 			e.level_required         = static_cast<uint8_t>(strtoul(row[4], nullptr, 10));
-			e.alt_currency_cost      = static_cast<uint16_t>(strtoul(row[5], nullptr, 10));
-			e.classes_required       = static_cast<int32_t>(atoi(row[6]));
-			e.probability            = static_cast<int32_t>(atoi(row[7]));
-			e.bucket_name            = row[8] ? row[8] : "";
-			e.bucket_value           = row[9] ? row[9] : "";
-			e.bucket_comparison      = static_cast<uint8_t>(strtoul(row[10], nullptr, 10));
-			e.min_expansion          = static_cast<int8_t>(atoi(row[11]));
-			e.max_expansion          = static_cast<int8_t>(atoi(row[12]));
-			e.content_flags          = row[13] ? row[13] : "";
-			e.content_flags_disabled = row[14] ? row[14] : "";
+			e.min_status             = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
+			e.max_status             = static_cast<uint8_t>(strtoul(row[6], nullptr, 10));
+			e.alt_currency_cost      = static_cast<uint16_t>(strtoul(row[7], nullptr, 10));
+			e.classes_required       = static_cast<int32_t>(atoi(row[8]));
+			e.probability            = static_cast<int32_t>(atoi(row[9]));
+			e.bucket_name            = row[10] ? row[10] : "";
+			e.bucket_value           = row[11] ? row[11] : "";
+			e.bucket_comparison      = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.min_expansion          = static_cast<int8_t>(atoi(row[13]));
+			e.max_expansion          = static_cast<int8_t>(atoi(row[14]));
+			e.content_flags          = row[15] ? row[15] : "";
+			e.content_flags_disabled = row[16] ? row[16] : "";
 
 			all_entries.push_back(e);
 		}

common/repositories/base/base_npc_scale_global_base_repository.h

@@ -16,13 +16,16 @@
 #include "../../strings.h"
 #include <ctime>
 
+
 class BaseNpcScaleGlobalBaseRepository {
 public:
 	struct NpcScaleGlobalBase {
 		int32_t     type;
 		int32_t     level;
+		std::string zone_id_list;
+		std::string instance_version_list;
 		int32_t     ac;
-		int32_t     hp;
+		int64_t     hp;
 		int32_t     accuracy;
 		int32_t     slow_mitigation;
 		int32_t     attack;
@@ -42,10 +45,13 @@ public:
 		int32_t     physical_resist;
 		int32_t     min_dmg;
 		int32_t     max_dmg;
-		int32_t     hp_regen_rate;
+		int64_t     hp_regen_rate;
+		int64_t     hp_regen_per_second;
 		int32_t     attack_delay;
 		int32_t     spell_scale;
 		int32_t     heal_scale;
+		uint32_t    avoidance;
+		int32_t     heroic_strikethrough;
 		std::string special_abilities;
 	};
 
@@ -59,6 +65,8 @@ public:
 		return {
 			"type",
 			"level",
+			"zone_id_list",
+			"instance_version_list",
 			"ac",
 			"hp",
 			"accuracy",
@@ -81,9 +89,12 @@ public:
 			"min_dmg",
 			"max_dmg",
 			"hp_regen_rate",
+			"hp_regen_per_second",
 			"attack_delay",
 			"spell_scale",
 			"heal_scale",
+			"avoidance",
+			"heroic_strikethrough",
 			"special_abilities",
 		};
 	}
@@ -93,6 +104,8 @@ public:
 		return {
 			"type",
 			"level",
+			"zone_id_list",
+			"instance_version_list",
 			"ac",
 			"hp",
 			"accuracy",
@@ -115,9 +128,12 @@ public:
 			"min_dmg",
 			"max_dmg",
 			"hp_regen_rate",
+			"hp_regen_per_second",
 			"attack_delay",
 			"spell_scale",
 			"heal_scale",
+			"avoidance",
+			"heroic_strikethrough",
 			"special_abilities",
 		};
 	}
@@ -159,34 +175,39 @@ public:
 	{
 		NpcScaleGlobalBase e{};
 
-		e.type              = 0;
-		e.level             = 0;
-		e.ac                = 0;
-		e.hp                = 0;
-		e.accuracy          = 0;
-		e.slow_mitigation   = 0;
-		e.attack            = 0;
-		e.strength          = 0;
-		e.stamina           = 0;
-		e.dexterity         = 0;
-		e.agility           = 0;
-		e.intelligence      = 0;
-		e.wisdom            = 0;
-		e.charisma          = 0;
-		e.magic_resist      = 0;
-		e.cold_resist       = 0;
-		e.fire_resist       = 0;
-		e.poison_resist     = 0;
-		e.disease_resist    = 0;
-		e.corruption_resist = 0;
-		e.physical_resist   = 0;
-		e.min_dmg           = 0;
-		e.max_dmg           = 0;
-		e.hp_regen_rate     = 0;
-		e.attack_delay      = 0;
-		e.spell_scale       = 100;
-		e.heal_scale        = 100;
-		e.special_abilities = "";
+		e.type                  = 0;
+		e.level                 = 0;
+		e.zone_id_list          = "";
+		e.instance_version_list = "";
+		e.ac                    = 0;
+		e.hp                    = 0;
+		e.accuracy              = 0;
+		e.slow_mitigation       = 0;
+		e.attack                = 0;
+		e.strength              = 0;
+		e.stamina               = 0;
+		e.dexterity             = 0;
+		e.agility               = 0;
+		e.intelligence          = 0;
+		e.wisdom                = 0;
+		e.charisma              = 0;
+		e.magic_resist          = 0;
+		e.cold_resist           = 0;
+		e.fire_resist           = 0;
+		e.poison_resist         = 0;
+		e.disease_resist        = 0;
+		e.corruption_resist     = 0;
+		e.physical_resist       = 0;
+		e.min_dmg               = 0;
+		e.max_dmg               = 0;
+		e.hp_regen_rate         = 0;
+		e.hp_regen_per_second   = 0;
+		e.attack_delay          = 0;
+		e.spell_scale           = 100;
+		e.heal_scale            = 100;
+		e.avoidance             = 0;
+		e.heroic_strikethrough  = 0;
+		e.special_abilities     = "";
 
 		return e;
 	}
@@ -212,8 +233,9 @@ public:
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
-				"{} WHERE id = {} LIMIT 1",
+				"{} WHERE {} = {} LIMIT 1",
 				BaseSelect(),
+				PrimaryKey(),
 				npc_scale_global_base_id
 			)
 		);
@@ -222,34 +244,39 @@ public:
 		if (results.RowCount() == 1) {
 			NpcScaleGlobalBase e{};
 
-			e.type              = static_cast<int32_t>(atoi(row[0]));
-			e.level             = static_cast<int32_t>(atoi(row[1]));
-			e.ac                = static_cast<int32_t>(atoi(row[2]));
-			e.hp                = static_cast<int32_t>(atoi(row[3]));
-			e.accuracy          = static_cast<int32_t>(atoi(row[4]));
-			e.slow_mitigation   = static_cast<int32_t>(atoi(row[5]));
-			e.attack            = static_cast<int32_t>(atoi(row[6]));
-			e.strength          = static_cast<int32_t>(atoi(row[7]));
-			e.stamina           = static_cast<int32_t>(atoi(row[8]));
-			e.dexterity         = static_cast<int32_t>(atoi(row[9]));
-			e.agility           = static_cast<int32_t>(atoi(row[10]));
-			e.intelligence      = static_cast<int32_t>(atoi(row[11]));
-			e.wisdom            = static_cast<int32_t>(atoi(row[12]));
-			e.charisma          = static_cast<int32_t>(atoi(row[13]));
-			e.magic_resist      = static_cast<int32_t>(atoi(row[14]));
-			e.cold_resist       = static_cast<int32_t>(atoi(row[15]));
-			e.fire_resist       = static_cast<int32_t>(atoi(row[16]));
-			e.poison_resist     = static_cast<int32_t>(atoi(row[17]));
-			e.disease_resist    = static_cast<int32_t>(atoi(row[18]));
-			e.corruption_resist = static_cast<int32_t>(atoi(row[19]));
-			e.physical_resist   = static_cast<int32_t>(atoi(row[20]));
-			e.min_dmg           = static_cast<int32_t>(atoi(row[21]));
-			e.max_dmg           = static_cast<int32_t>(atoi(row[22]));
-			e.hp_regen_rate     = static_cast<int32_t>(atoi(row[23]));
-			e.attack_delay      = static_cast<int32_t>(atoi(row[24]));
-			e.spell_scale       = static_cast<int32_t>(atoi(row[25]));
-			e.heal_scale        = static_cast<int32_t>(atoi(row[26]));
-			e.special_abilities = row[27] ? row[27] : "";
+			e.type                  = static_cast<int32_t>(atoi(row[0]));
+			e.level                 = static_cast<int32_t>(atoi(row[1]));
+			e.zone_id_list          = row[2] ? row[2] : "";
+			e.instance_version_list = row[3] ? row[3] : "";
+			e.ac                    = static_cast<int32_t>(atoi(row[4]));
+			e.hp                    = strtoll(row[5], nullptr, 10);
+			e.accuracy              = static_cast<int32_t>(atoi(row[6]));
+			e.slow_mitigation       = static_cast<int32_t>(atoi(row[7]));
+			e.attack                = static_cast<int32_t>(atoi(row[8]));
+			e.strength              = static_cast<int32_t>(atoi(row[9]));
+			e.stamina               = static_cast<int32_t>(atoi(row[10]));
+			e.dexterity             = static_cast<int32_t>(atoi(row[11]));
+			e.agility               = static_cast<int32_t>(atoi(row[12]));
+			e.intelligence          = static_cast<int32_t>(atoi(row[13]));
+			e.wisdom                = static_cast<int32_t>(atoi(row[14]));
+			e.charisma              = static_cast<int32_t>(atoi(row[15]));
+			e.magic_resist          = static_cast<int32_t>(atoi(row[16]));
+			e.cold_resist           = static_cast<int32_t>(atoi(row[17]));
+			e.fire_resist           = static_cast<int32_t>(atoi(row[18]));
+			e.poison_resist         = static_cast<int32_t>(atoi(row[19]));
+			e.disease_resist        = static_cast<int32_t>(atoi(row[20]));
+			e.corruption_resist     = static_cast<int32_t>(atoi(row[21]));
+			e.physical_resist       = static_cast<int32_t>(atoi(row[22]));
+			e.min_dmg               = static_cast<int32_t>(atoi(row[23]));
+			e.max_dmg               = static_cast<int32_t>(atoi(row[24]));
+			e.hp_regen_rate         = strtoll(row[25], nullptr, 10);
+			e.hp_regen_per_second   = strtoll(row[26], nullptr, 10);
+			e.attack_delay          = static_cast<int32_t>(atoi(row[27]));
+			e.spell_scale           = static_cast<int32_t>(atoi(row[28]));
+			e.heal_scale            = static_cast<int32_t>(atoi(row[29]));
+			e.avoidance             = static_cast<uint32_t>(strtoul(row[30], nullptr, 10));
+			e.heroic_strikethrough  = static_cast<int32_t>(atoi(row[31]));
+			e.special_abilities     = row[32] ? row[32] : "";
 
 			return e;
 		}
@@ -285,32 +312,37 @@ public:
 
 		v.push_back(columns[0] + " = " + std::to_string(e.type));
 		v.push_back(columns[1] + " = " + std::to_string(e.level));
-		v.push_back(columns[2] + " = " + std::to_string(e.ac));
-		v.push_back(columns[3] + " = " + std::to_string(e.hp));
-		v.push_back(columns[4] + " = " + std::to_string(e.accuracy));
-		v.push_back(columns[5] + " = " + std::to_string(e.slow_mitigation));
-		v.push_back(columns[6] + " = " + std::to_string(e.attack));
-		v.push_back(columns[7] + " = " + std::to_string(e.strength));
-		v.push_back(columns[8] + " = " + std::to_string(e.stamina));
-		v.push_back(columns[9] + " = " + std::to_string(e.dexterity));
-		v.push_back(columns[10] + " = " + std::to_string(e.agility));
-		v.push_back(columns[11] + " = " + std::to_string(e.intelligence));
-		v.push_back(columns[12] + " = " + std::to_string(e.wisdom));
-		v.push_back(columns[13] + " = " + std::to_string(e.charisma));
-		v.push_back(columns[14] + " = " + std::to_string(e.magic_resist));
-		v.push_back(columns[15] + " = " + std::to_string(e.cold_resist));
-		v.push_back(columns[16] + " = " + std::to_string(e.fire_resist));
-		v.push_back(columns[17] + " = " + std::to_string(e.poison_resist));
-		v.push_back(columns[18] + " = " + std::to_string(e.disease_resist));
-		v.push_back(columns[19] + " = " + std::to_string(e.corruption_resist));
-		v.push_back(columns[20] + " = " + std::to_string(e.physical_resist));
-		v.push_back(columns[21] + " = " + std::to_string(e.min_dmg));
-		v.push_back(columns[22] + " = " + std::to_string(e.max_dmg));
-		v.push_back(columns[23] + " = " + std::to_string(e.hp_regen_rate));
-		v.push_back(columns[24] + " = " + std::to_string(e.attack_delay));
-		v.push_back(columns[25] + " = " + std::to_string(e.spell_scale));
-		v.push_back(columns[26] + " = " + std::to_string(e.heal_scale));
-		v.push_back(columns[27] + " = '" + Strings::Escape(e.special_abilities) + "'");
+		v.push_back(columns[2] + " = '" + Strings::Escape(e.zone_id_list) + "'");
+		v.push_back(columns[3] + " = '" + Strings::Escape(e.instance_version_list) + "'");
+		v.push_back(columns[4] + " = " + std::to_string(e.ac));
+		v.push_back(columns[5] + " = " + std::to_string(e.hp));
+		v.push_back(columns[6] + " = " + std::to_string(e.accuracy));
+		v.push_back(columns[7] + " = " + std::to_string(e.slow_mitigation));
+		v.push_back(columns[8] + " = " + std::to_string(e.attack));
+		v.push_back(columns[9] + " = " + std::to_string(e.strength));
+		v.push_back(columns[10] + " = " + std::to_string(e.stamina));
+		v.push_back(columns[11] + " = " + std::to_string(e.dexterity));
+		v.push_back(columns[12] + " = " + std::to_string(e.agility));
+		v.push_back(columns[13] + " = " + std::to_string(e.intelligence));
+		v.push_back(columns[14] + " = " + std::to_string(e.wisdom));
+		v.push_back(columns[15] + " = " + std::to_string(e.charisma));
+		v.push_back(columns[16] + " = " + std::to_string(e.magic_resist));
+		v.push_back(columns[17] + " = " + std::to_string(e.cold_resist));
+		v.push_back(columns[18] + " = " + std::to_string(e.fire_resist));
+		v.push_back(columns[19] + " = " + std::to_string(e.poison_resist));
+		v.push_back(columns[20] + " = " + std::to_string(e.disease_resist));
+		v.push_back(columns[21] + " = " + std::to_string(e.corruption_resist));
+		v.push_back(columns[22] + " = " + std::to_string(e.physical_resist));
+		v.push_back(columns[23] + " = " + std::to_string(e.min_dmg));
+		v.push_back(columns[24] + " = " + std::to_string(e.max_dmg));
+		v.push_back(columns[25] + " = " + std::to_string(e.hp_regen_rate));
+		v.push_back(columns[26] + " = " + std::to_string(e.hp_regen_per_second));
+		v.push_back(columns[27] + " = " + std::to_string(e.attack_delay));
+		v.push_back(columns[28] + " = " + std::to_string(e.spell_scale));
+		v.push_back(columns[29] + " = " + std::to_string(e.heal_scale));
+		v.push_back(columns[30] + " = " + std::to_string(e.avoidance));
+		v.push_back(columns[31] + " = " + std::to_string(e.heroic_strikethrough));
+		v.push_back(columns[32] + " = '" + Strings::Escape(e.special_abilities) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -334,6 +366,8 @@ public:
 
 		v.push_back(std::to_string(e.type));
 		v.push_back(std::to_string(e.level));
+		v.push_back("'" + Strings::Escape(e.zone_id_list) + "'");
+		v.push_back("'" + Strings::Escape(e.instance_version_list) + "'");
 		v.push_back(std::to_string(e.ac));
 		v.push_back(std::to_string(e.hp));
 		v.push_back(std::to_string(e.accuracy));
@@ -356,9 +390,12 @@ public:
 		v.push_back(std::to_string(e.min_dmg));
 		v.push_back(std::to_string(e.max_dmg));
 		v.push_back(std::to_string(e.hp_regen_rate));
+		v.push_back(std::to_string(e.hp_regen_per_second));
 		v.push_back(std::to_string(e.attack_delay));
 		v.push_back(std::to_string(e.spell_scale));
 		v.push_back(std::to_string(e.heal_scale));
+		v.push_back(std::to_string(e.avoidance));
+		v.push_back(std::to_string(e.heroic_strikethrough));
 		v.push_back("'" + Strings::Escape(e.special_abilities) + "'");
 
 		auto results = db.QueryDatabase(
@@ -391,6 +428,8 @@ public:
 
 			v.push_back(std::to_string(e.type));
 			v.push_back(std::to_string(e.level));
+			v.push_back("'" + Strings::Escape(e.zone_id_list) + "'");
+			v.push_back("'" + Strings::Escape(e.instance_version_list) + "'");
 			v.push_back(std::to_string(e.ac));
 			v.push_back(std::to_string(e.hp));
 			v.push_back(std::to_string(e.accuracy));
@@ -413,9 +452,12 @@ public:
 			v.push_back(std::to_string(e.min_dmg));
 			v.push_back(std::to_string(e.max_dmg));
 			v.push_back(std::to_string(e.hp_regen_rate));
+			v.push_back(std::to_string(e.hp_regen_per_second));
 			v.push_back(std::to_string(e.attack_delay));
 			v.push_back(std::to_string(e.spell_scale));
 			v.push_back(std::to_string(e.heal_scale));
+			v.push_back(std::to_string(e.avoidance));
+			v.push_back(std::to_string(e.heroic_strikethrough));
 			v.push_back("'" + Strings::Escape(e.special_abilities) + "'");
 
 			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
@@ -450,34 +492,39 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			NpcScaleGlobalBase e{};
 
-			e.type              = static_cast<int32_t>(atoi(row[0]));
-			e.level             = static_cast<int32_t>(atoi(row[1]));
-			e.ac                = static_cast<int32_t>(atoi(row[2]));
-			e.hp                = static_cast<int32_t>(atoi(row[3]));
-			e.accuracy          = static_cast<int32_t>(atoi(row[4]));
-			e.slow_mitigation   = static_cast<int32_t>(atoi(row[5]));
-			e.attack            = static_cast<int32_t>(atoi(row[6]));
-			e.strength          = static_cast<int32_t>(atoi(row[7]));
-			e.stamina           = static_cast<int32_t>(atoi(row[8]));
-			e.dexterity         = static_cast<int32_t>(atoi(row[9]));
-			e.agility           = static_cast<int32_t>(atoi(row[10]));
-			e.intelligence      = static_cast<int32_t>(atoi(row[11]));
-			e.wisdom            = static_cast<int32_t>(atoi(row[12]));
-			e.charisma          = static_cast<int32_t>(atoi(row[13]));
-			e.magic_resist      = static_cast<int32_t>(atoi(row[14]));
-			e.cold_resist       = static_cast<int32_t>(atoi(row[15]));
-			e.fire_resist       = static_cast<int32_t>(atoi(row[16]));
-			e.poison_resist     = static_cast<int32_t>(atoi(row[17]));
-			e.disease_resist    = static_cast<int32_t>(atoi(row[18]));
-			e.corruption_resist = static_cast<int32_t>(atoi(row[19]));
-			e.physical_resist   = static_cast<int32_t>(atoi(row[20]));
-			e.min_dmg           = static_cast<int32_t>(atoi(row[21]));
-			e.max_dmg           = static_cast<int32_t>(atoi(row[22]));
-			e.hp_regen_rate     = static_cast<int32_t>(atoi(row[23]));
-			e.attack_delay      = static_cast<int32_t>(atoi(row[24]));
-			e.spell_scale       = static_cast<int32_t>(atoi(row[25]));
-			e.heal_scale        = static_cast<int32_t>(atoi(row[26]));
-			e.special_abilities = row[27] ? row[27] : "";
+			e.type                  = static_cast<int32_t>(atoi(row[0]));
+			e.level                 = static_cast<int32_t>(atoi(row[1]));
+			e.zone_id_list          = row[2] ? row[2] : "";
+			e.instance_version_list = row[3] ? row[3] : "";
+			e.ac                    = static_cast<int32_t>(atoi(row[4]));
+			e.hp                    = strtoll(row[5], nullptr, 10);
+			e.accuracy              = static_cast<int32_t>(atoi(row[6]));
+			e.slow_mitigation       = static_cast<int32_t>(atoi(row[7]));
+			e.attack                = static_cast<int32_t>(atoi(row[8]));
+			e.strength              = static_cast<int32_t>(atoi(row[9]));
+			e.stamina               = static_cast<int32_t>(atoi(row[10]));
+			e.dexterity             = static_cast<int32_t>(atoi(row[11]));
+			e.agility               = static_cast<int32_t>(atoi(row[12]));
+			e.intelligence          = static_cast<int32_t>(atoi(row[13]));
+			e.wisdom                = static_cast<int32_t>(atoi(row[14]));
+			e.charisma              = static_cast<int32_t>(atoi(row[15]));
+			e.magic_resist          = static_cast<int32_t>(atoi(row[16]));
+			e.cold_resist           = static_cast<int32_t>(atoi(row[17]));
+			e.fire_resist           = static_cast<int32_t>(atoi(row[18]));
+			e.poison_resist         = static_cast<int32_t>(atoi(row[19]));
+			e.disease_resist        = static_cast<int32_t>(atoi(row[20]));
+			e.corruption_resist     = static_cast<int32_t>(atoi(row[21]));
+			e.physical_resist       = static_cast<int32_t>(atoi(row[22]));
+			e.min_dmg               = static_cast<int32_t>(atoi(row[23]));
+			e.max_dmg               = static_cast<int32_t>(atoi(row[24]));
+			e.hp_regen_rate         = strtoll(row[25], nullptr, 10);
+			e.hp_regen_per_second   = strtoll(row[26], nullptr, 10);
+			e.attack_delay          = static_cast<int32_t>(atoi(row[27]));
+			e.spell_scale           = static_cast<int32_t>(atoi(row[28]));
+			e.heal_scale            = static_cast<int32_t>(atoi(row[29]));
+			e.avoidance             = static_cast<uint32_t>(strtoul(row[30], nullptr, 10));
+			e.heroic_strikethrough  = static_cast<int32_t>(atoi(row[31]));
+			e.special_abilities     = row[32] ? row[32] : "";
 
 			all_entries.push_back(e);
 		}
@@ -502,34 +549,39 @@ public:
 		for (auto row = results.begin(); row != results.end(); ++row) {
 			NpcScaleGlobalBase e{};
 
-			e.type              = static_cast<int32_t>(atoi(row[0]));
-			e.level             = static_cast<int32_t>(atoi(row[1]));
-			e.ac                = static_cast<int32_t>(atoi(row[2]));
-			e.hp                = static_cast<int32_t>(atoi(row[3]));
-			e.accuracy          = static_cast<int32_t>(atoi(row[4]));
-			e.slow_mitigation   = static_cast<int32_t>(atoi(row[5]));
-			e.attack            = static_cast<int32_t>(atoi(row[6]));
-			e.strength          = static_cast<int32_t>(atoi(row[7]));
-			e.stamina           = static_cast<int32_t>(atoi(row[8]));
-			e.dexterity         = static_cast<int32_t>(atoi(row[9]));
-			e.agility           = static_cast<int32_t>(atoi(row[10]));
-			e.intelligence      = static_cast<int32_t>(atoi(row[11]));
-			e.wisdom            = static_cast<int32_t>(atoi(row[12]));
-			e.charisma          = static_cast<int32_t>(atoi(row[13]));
-			e.magic_resist      = static_cast<int32_t>(atoi(row[14]));
-			e.cold_resist       = static_cast<int32_t>(atoi(row[15]));
-			e.fire_resist       = static_cast<int32_t>(atoi(row[16]));
-			e.poison_resist     = static_cast<int32_t>(atoi(row[17]));
-			e.disease_resist    = static_cast<int32_t>(atoi(row[18]));
-			e.corruption_resist = static_cast<int32_t>(atoi(row[19]));
-			e.physical_resist   = static_cast<int32_t>(atoi(row[20]));
-			e.min_dmg           = static_cast<int32_t>(atoi(row[21]));
-			e.max_dmg           = static_cast<int32_t>(atoi(row[22]));
-			e.hp_regen_rate     = static_cast<int32_t>(atoi(row[23]));
-			e.attack_delay      = static_cast<int32_t>(atoi(row[24]));
-			e.spell_scale       = static_cast<int32_t>(atoi(row[25]));
-			e.heal_scale        = static_cast<int32_t>(atoi(row[26]));
-			e.special_abilities = row[27] ? row[27] : "";
+			e.type                  = static_cast<int32_t>(atoi(row[0]));
+			e.level                 = static_cast<int32_t>(atoi(row[1]));
+			e.zone_id_list          = row[2] ? row[2] : "";
+			e.instance_version_list = row[3] ? row[3] : "";
+			e.ac                    = static_cast<int32_t>(atoi(row[4]));
+			e.hp                    = strtoll(row[5], nullptr, 10);
+			e.accuracy              = static_cast<int32_t>(atoi(row[6]));
+			e.slow_mitigation       = static_cast<int32_t>(atoi(row[7]));
+			e.attack                = static_cast<int32_t>(atoi(row[8]));
+			e.strength              = static_cast<int32_t>(atoi(row[9]));
+			e.stamina               = static_cast<int32_t>(atoi(row[10]));
+			e.dexterity             = static_cast<int32_t>(atoi(row[11]));
+			e.agility               = static_cast<int32_t>(atoi(row[12]));
+			e.intelligence          = static_cast<int32_t>(atoi(row[13]));
+			e.wisdom                = static_cast<int32_t>(atoi(row[14]));
+			e.charisma              = static_cast<int32_t>(atoi(row[15]));
+			e.magic_resist          = static_cast<int32_t>(atoi(row[16]));
+			e.cold_resist           = static_cast<int32_t>(atoi(row[17]));
+			e.fire_resist           = static_cast<int32_t>(atoi(row[18]));
+			e.poison_resist         = static_cast<int32_t>(atoi(row[19]));
+			e.disease_resist        = static_cast<int32_t>(atoi(row[20]));
+			e.corruption_resist     = static_cast<int32_t>(atoi(row[21]));
+			e.physical_resist       = static_cast<int32_t>(atoi(row[22]));
+			e.min_dmg               = static_cast<int32_t>(atoi(row[23]));
+			e.max_dmg               = static_cast<int32_t>(atoi(row[24]));
+			e.hp_regen_rate         = strtoll(row[25], nullptr, 10);
+			e.hp_regen_per_second   = strtoll(row[26], nullptr, 10);
+			e.attack_delay          = static_cast<int32_t>(atoi(row[27]));
+			e.spell_scale           = static_cast<int32_t>(atoi(row[28]));
+			e.heal_scale            = static_cast<int32_t>(atoi(row[29]));
+			e.avoidance             = static_cast<uint32_t>(strtoul(row[30], nullptr, 10));
+			e.heroic_strikethrough  = static_cast<int32_t>(atoi(row[31]));
+			e.special_abilities     = row[32] ? row[32] : "";
 
 			all_entries.push_back(e);
 		}

common/repositories/base/base_player_event_log_settings_repository.h

@@ -0,0 +1,364 @@
+/**
+ * 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_PLAYER_EVENT_LOG_SETTINGS_REPOSITORY_H
+#define EQEMU_BASE_PLAYER_EVENT_LOG_SETTINGS_REPOSITORY_H
+
+#include "../../database.h"
+#include "../../strings.h"
+#include <ctime>
+
+class BasePlayerEventLogSettingsRepository {
+public:
+	struct PlayerEventLogSettings {
+		int64_t     id;
+		std::string event_name;
+		int8_t      event_enabled;
+		int32_t     retention_days;
+		int32_t     discord_webhook_id;
+	};
+
+	static std::string PrimaryKey()
+	{
+		return std::string("id");
+	}
+
+	static std::vector<std::string> Columns()
+	{
+		return {
+			"id",
+			"event_name",
+			"event_enabled",
+			"retention_days",
+			"discord_webhook_id",
+		};
+	}
+
+	static std::vector<std::string> SelectColumns()
+	{
+		return {
+			"id",
+			"event_name",
+			"event_enabled",
+			"retention_days",
+			"discord_webhook_id",
+		};
+	}
+
+	static std::string ColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", Columns()));
+	}
+
+	static std::string SelectColumnsRaw()
+	{
+		return std::string(Strings::Implode(", ", SelectColumns()));
+	}
+
+	static std::string TableName()
+	{
+		return std::string("player_event_log_settings");
+	}
+
+	static std::string BaseSelect()
+	{
+		return fmt::format(
+			"SELECT {} FROM {}",
+			SelectColumnsRaw(),
+			TableName()
+		);
+	}
+
+	static std::string BaseInsert()
+	{
+		return fmt::format(
+			"INSERT INTO {} ({}) ",
+			TableName(),
+			ColumnsRaw()
+		);
+	}
+
+	static PlayerEventLogSettings NewEntity()
+	{
+		PlayerEventLogSettings e{};
+
+		e.id                 = 0;
+		e.event_name         = "";
+		e.event_enabled      = 0;
+		e.retention_days     = 0;
+		e.discord_webhook_id = 0;
+
+		return e;
+	}
+
+	static PlayerEventLogSettings GetPlayerEventLogSettings(
+		const std::vector<PlayerEventLogSettings> &player_event_log_settingss,
+		int player_event_log_settings_id
+	)
+	{
+		for (auto &player_event_log_settings : player_event_log_settingss) {
+			if (player_event_log_settings.id == player_event_log_settings_id) {
+				return player_event_log_settings;
+			}
+		}
+
+		return NewEntity();
+	}
+
+	static PlayerEventLogSettings FindOne(
+		Database& db,
+		int player_event_log_settings_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} WHERE {} = {} LIMIT 1",
+				BaseSelect(),
+				PrimaryKey(),
+				player_event_log_settings_id
+			)
+		);
+
+		auto row = results.begin();
+		if (results.RowCount() == 1) {
+			PlayerEventLogSettings e{};
+
+			e.id                 = strtoll(row[0], nullptr, 10);
+			e.event_name         = row[1] ? row[1] : "";
+			e.event_enabled      = static_cast<int8_t>(atoi(row[2]));
+			e.retention_days     = static_cast<int32_t>(atoi(row[3]));
+			e.discord_webhook_id = static_cast<int32_t>(atoi(row[4]));
+
+			return e;
+		}
+
+		return NewEntity();
+	}
+
+	static int DeleteOne(
+		Database& db,
+		int player_event_log_settings_id
+	)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"DELETE FROM {} WHERE {} = {}",
+				TableName(),
+				PrimaryKey(),
+				player_event_log_settings_id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static int UpdateOne(
+		Database& db,
+		const PlayerEventLogSettings &e
+	)
+	{
+		std::vector<std::string> v;
+
+		auto columns = Columns();
+
+		v.push_back(columns[0] + " = " + std::to_string(e.id));
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.event_name) + "'");
+		v.push_back(columns[2] + " = " + std::to_string(e.event_enabled));
+		v.push_back(columns[3] + " = " + std::to_string(e.retention_days));
+		v.push_back(columns[4] + " = " + std::to_string(e.discord_webhook_id));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"UPDATE {} SET {} WHERE {} = {}",
+				TableName(),
+				Strings::Implode(", ", v),
+				PrimaryKey(),
+				e.id
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static PlayerEventLogSettings InsertOne(
+		Database& db,
+		PlayerEventLogSettings e
+	)
+	{
+		std::vector<std::string> v;
+
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.event_name) + "'");
+		v.push_back(std::to_string(e.event_enabled));
+		v.push_back(std::to_string(e.retention_days));
+		v.push_back(std::to_string(e.discord_webhook_id));
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES ({})",
+				BaseInsert(),
+				Strings::Implode(",", v)
+			)
+		);
+
+		if (results.Success()) {
+			e.id = results.LastInsertedID();
+			return e;
+		}
+
+		e = NewEntity();
+
+		return e;
+	}
+
+	static int InsertMany(
+		Database& db,
+		const std::vector<PlayerEventLogSettings> &entries
+	)
+	{
+		std::vector<std::string> insert_chunks;
+
+		for (auto &e: entries) {
+			std::vector<std::string> v;
+
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.event_name) + "'");
+			v.push_back(std::to_string(e.event_enabled));
+			v.push_back(std::to_string(e.retention_days));
+			v.push_back(std::to_string(e.discord_webhook_id));
+
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
+		}
+
+		std::vector<std::string> v;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{} VALUES {}",
+				BaseInsert(),
+				Strings::Implode(",", insert_chunks)
+			)
+		);
+
+		return (results.Success() ? results.RowsAffected() : 0);
+	}
+
+	static std::vector<PlayerEventLogSettings> All(Database& db)
+	{
+		std::vector<PlayerEventLogSettings> all_entries;
+
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"{}",
+				BaseSelect()
+			)
+		);
+
+		all_entries.reserve(results.RowCount());
+
+		for (auto row = results.begin(); row != results.end(); ++row) {
+			PlayerEventLogSettings e{};
+
+			e.id                 = strtoll(row[0], nullptr, 10);
+			e.event_name         = row[1] ? row[1] : "";
+			e.event_enabled      = static_cast<int8_t>(atoi(row[2]));
+			e.retention_days     = static_cast<int32_t>(atoi(row[3]));
+			e.discord_webhook_id = static_cast<int32_t>(atoi(row[4]));
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static std::vector<PlayerEventLogSettings> GetWhere(Database& db, const std::string &where_filter)
+	{
+		std::vector<PlayerEventLogSettings> 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) {
+			PlayerEventLogSettings e{};
+
+			e.id                 = strtoll(row[0], nullptr, 10);
+			e.event_name         = row[1] ? row[1] : "";
+			e.event_enabled      = static_cast<int8_t>(atoi(row[2]));
+			e.retention_days     = static_cast<int32_t>(atoi(row[3]));
+			e.discord_webhook_id = static_cast<int32_t>(atoi(row[4]));
+
+			all_entries.push_back(e);
+		}
+
+		return all_entries;
+	}
+
+	static int DeleteWhere(Database& db, const 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);
+	}
+
+	static int64 GetMaxId(Database& db)
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COALESCE(MAX({}), 0) FROM {}",
+				PrimaryKey(),
+				TableName()
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+	static int64 Count(Database& db, const std::string &where_filter = "")
+	{
+		auto results = db.QueryDatabase(
+			fmt::format(
+				"SELECT COUNT(*) FROM {} {}",
+				TableName(),
+				(where_filter.empty() ? "" : "WHERE " + where_filter)
+			)
+		);
+
+		return (results.Success() && results.begin()[0] ? strtoll(results.begin()[0], nullptr, 10) : 0);
+	}
+
+};
+
+#endif //EQEMU_BASE_PLAYER_EVENT_LOG_SETTINGS_REPOSITORY_H