Fix item reward message

This will make tooling easier.

While denormalizing goallists may not be ideal, it decouples tasks from
rewards which share the table and removes a redundant column in favor
of a using the delimited string which better matches live packet data.

.drone.yml

@@ -19,7 +19,9 @@ steps:
     commands:
       - sudo chown eqemu:eqemu /drone/src/ * -R
       - sudo chown eqemu:eqemu /home/eqemu/.ccache/ * -R
-      - git submodule init && git submodule update && mkdir -p build && cd build && cmake -DEQEMU_BUILD_LOGIN=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LUA=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-O0 -g -DNDEBUG" -G 'Unix Makefiles' .. && make -j$((`nproc`-4))
+      - git submodule init && git submodule update && mkdir -p build && cd build && cmake -DEQEMU_BUILD_TESTS=ON -DEQEMU_BUILD_LOGIN=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LUA=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-O0 -g -DNDEBUG" -G 'Unix Makefiles' .. && make -j$((`nproc`-4))
+      - curl https://raw.githubusercontent.com/Akkadius/eqemu-install-v2/master/eqemu_config.json --output eqemu_config.json
+      - ./bin/tests
     volumes:
       - name: cache
         path: /home/eqemu/.ccache/

.travis.yml

@@ -1,19 +0,0 @@
-language: cpp
-compiler: gcc
-dist: bionic
-
-addons:
-  apt:
-    packages:
-      - libmysqlclient-dev
-      - libperl-dev
-      - libboost-dev
-      - liblua5.1-0-dev
-      - zlib1g-dev
-      - uuid-dev
-      - libssl-dev
-
-script:
-  - cmake -G "Unix Makefiles" -DEQEMU_BUILD_TESTS=ON -DEQEMU_ENABLE_BOTS=ON -DEQEMU_BUILD_LOGIN=ON
-  - make -j2
-  - ./bin/tests

CMakeLists.txt

@@ -12,7 +12,7 @@ IF(NOT CMAKE_BUILD_TYPE)
 	SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Choose the type of build." FORCE)
 ENDIF(NOT CMAKE_BUILD_TYPE)
 
-SET(CMAKE_CXX_STANDARD 14)
+SET(CMAKE_CXX_STANDARD 17)
 SET(CMAKE_CXX_STANDARD_REQUIRED ON)
 SET(CMAKE_CXX_EXTENSIONS OFF)
 
@@ -20,6 +20,7 @@ IF(MSVC)
 	ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 	ADD_DEFINITIONS(-DNOMINMAX)
 	ADD_DEFINITIONS(-DCRASH_LOGGING)
+	ADD_DEFINITIONS(-D_HAS_AUTO_PTR_ETC) # for Luabind on C++17
 	
 	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 ELSE(MSVC)
@@ -121,7 +122,6 @@ ENDIF()
 MESSAGE(STATUS "**************************************************")
 
 #options
-OPTION(EQEMU_DEPOP_INVALIDATES_CACHE "#repop invalidates the npc_types cache (will cause a larger database hit on #repop but is more convienent)." ON)
 OPTION(EQEMU_ENABLE_BOTS "Enable Bots" OFF)
 OPTION(EQEMU_COMMANDS_LOGGING "Enable GM Command logs" ON)
 OPTION(EQEMU_BUILD_SERVER "Build the game server." ON)
@@ -186,7 +186,7 @@ IF(MySQL_FOUND AND MariaDB_FOUND)
 			MySQL
 			MariaDB"
 	)
-	
+
 	IF(DATABASE_LIBRARY_SELECTION STREQUAL "MySQL")
 		SET(DATABASE_LIBRARY_TYPE "  MySQL")
 		SET(DATABASE_LIBRARY_LIBS ${MySQL_LIBRARIES})
@@ -217,7 +217,7 @@ IF(OpenSSL_FOUND AND MBEDTLS_FOUND)
 			OpenSSL
 			mbedTLS"
 	)
-	
+
 	IF(TLS_LIBRARY_SELECTION STREQUAL "OpenSSL")
 		SET(TLS_LIBRARY_TYPE " OpenSSL")
 		SET(TLS_LIBRARY_ENABLED ON)
@@ -357,12 +357,12 @@ ENDIF()
 
 IF(LUA_LIBRARY_ENABLED)
 	OPTION(EQEMU_BUILD_LUA "Build Lua parser." ON)
-	
+
 	IF(EQEMU_BUILD_LUA)
 		ADD_DEFINITIONS(-DLUA_EQEMU)
 		SET(ZONE_LIBS ${LUA_LIBRARY_LIBS})
 		INCLUDE_DIRECTORIES(SYSTEM "${LUA_LIBRARY_INCLUDE}")
-		
+
 		OPTION(EQEMU_SANITIZE_LUA_LIBS "Sanitize Lua Libraries (Remove OS and IO standard libraries from being able to run)." ON)
 		IF(EQEMU_SANITIZE_LUA_LIBS)
 			ADD_DEFINITIONS(-DSANITIZE_LUA_LIBS)
@@ -410,13 +410,13 @@ IF(EQEMU_BUILD_SERVER OR EQEMU_BUILD_LOGIN OR EQEMU_BUILD_TESTS OR EQEMU_BUILD_H
 	ADD_SUBDIRECTORY(libs)
 	ADD_SUBDIRECTORY(submodules/fmt)
 	ADD_SUBDIRECTORY(submodules/libuv)
-	
+
 	IF(EQEMU_BUILD_ZLIB)
 		SET(ZLIB_COMPAT ON CACHE BOOL "Compile with zlib compatible API")
 		SET(ZLIB_ENABLE_TESTS OFF CACHE BOOL "Build test binaries")
 		ADD_SUBDIRECTORY(libs/zlibng)
 	ENDIF()
-	
+
 	SET(RECASTNAVIGATION_DEMO OFF CACHE BOOL "Build demo")
 	SET(RECASTNAVIGATION_TESTS OFF CACHE BOOL "Build tests")
 	SET(RECASTNAVIGATION_EXAMPLES OFF CACHE BOOL "Build examples")

client_files/export/main.cpp

@@ -25,11 +25,13 @@
 #include "../../common/platform.h"
 #include "../../common/crash.h"
 #include "../../common/rulesys.h"
-#include "../../common/string_util.h"
+#include "../../common/strings.h"
 #include "../../common/content/world_content_service.h"
+#include "../../common/zone_store.h"
 
 EQEmuLogSys LogSys;
 WorldContentService content_service;
+ZoneStore zone_store;
 
 void ExportSpells(SharedDatabase *db);
 void ExportSkillCaps(SharedDatabase *db);

client_files/import/main.cpp

@@ -23,11 +23,13 @@
 #include "../../common/platform.h"
 #include "../../common/crash.h"
 #include "../../common/rulesys.h"
-#include "../../common/string_util.h"
+#include "../../common/strings.h"
 #include "../../common/content/world_content_service.h"
+#include "../../common/zone_store.h"
 
 EQEmuLogSys LogSys;
 WorldContentService content_service;
+ZoneStore zone_store;
 
 void ImportSpells(SharedDatabase *db);
 void ImportSkillCaps(SharedDatabase *db);
@@ -146,8 +148,8 @@ void ImportSpells(SharedDatabase *db) {
 			}
 		}
 
-		std::string escaped = ::EscapeString(buffer);
-		auto split = SplitString(escaped, '^');
+		std::string escaped = ::Strings::Escape(buffer);
+		auto split = Strings::Split(escaped, '^');
 		int line_columns = (int)split.size();
 
 		std::string sql;
@@ -225,7 +227,7 @@ void ImportSkillCaps(SharedDatabase *db) {
 
 	char buffer[2048];
 	while(fgets(buffer, 2048, f)) {
-		auto split = SplitString(buffer, '^');
+		auto split = Strings::Split(buffer, '^');
 
 		if(split.size() < 4) {
 			continue;
@@ -260,7 +262,7 @@ void ImportBaseData(SharedDatabase *db) {
 
 	char buffer[2048];
 	while(fgets(buffer, 2048, f)) {
-		auto split = SplitString(buffer, '^');
+		auto split = Strings::Split(buffer, '^');
 
 		if(split.size() < 10) {
 			continue;
@@ -318,7 +320,7 @@ void ImportDBStrings(SharedDatabase *db) {
 			}
 		}
 
-		auto split = SplitString(buffer, '^');
+		auto split = Strings::Split(buffer, '^');
 
 		if(split.size() < 2) {
 			continue;
@@ -332,7 +334,7 @@ void ImportDBStrings(SharedDatabase *db) {
 		type = atoi(split[1].c_str());
 
 		if(split.size() >= 3) {
-			value = ::EscapeString(split[2]);
+			value = ::Strings::Escape(split[2]);
 		}
 
 		sql = StringFormat("INSERT INTO db_str(id, type, value) VALUES(%u, %u, '%s')",

common/any.h

@@ -1,190 +0,0 @@
-/*
- *  Boost Software License - Version 1.0 - August 17th, 2003
- *  
- *  Permission is hereby granted, free of charge, to any person or organization
- *  obtaining a copy of the software and accompanying documentation covered by
- *  this license (the "Software") to use, reproduce, display, distribute,
- *  execute, and transmit the Software, and to prepare derivative works of the
- *  Software, and to permit third-parties to whom the Software is furnished to
- *  do so, all subject to the following:
- *  
- *  The copyright notices in the Software and this entire statement, including
- *  the above license grant, this restriction and the following disclaimer,
- *  must be included in all copies of the Software, in whole or in part, and
- *  all derivative works of the Software, unless such copies or derivative
- *  works are solely in the form of machine-executable object code generated by
- *  a source language processor.
- *  
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- *  SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- *  FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- *  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- *  DEALINGS IN THE SOFTWARE.
- */
-
-// EQ::Any is a modified version of Boost::Any and as such retains the Boost licensing.
-
-#ifndef EQEMU_COMMON_ANY_H
-#define EQEMU_COMMON_ANY_H
-
-#include <algorithm>
-#include <typeinfo>
-
-namespace EQ
-{
-	class Any
-	{
-	public:
-		Any()
-			: content(nullptr) 
-		{
-		}
-
-		template<typename ValueType>
-		Any(const ValueType &value)
-			: content(new Holder<ValueType>(value))
-		{
-		}
-
-		Any(const Any &other)
-			: content(other.content ? other.content->clone() : 0)
-		{
-		}
-		
-		~Any()
-		{
-			if(content)
-				delete content;
-		}
-
-		Any& swap(Any &rhs)
-		{
-			std::swap(content, rhs.content);
-			return *this;
-		}
-
-		template<typename ValueType>
-		Any& operator=(const ValueType &rhs)
-		{
-			Any(rhs).swap(*this);
-			return *this;
-		}
-
-		Any& operator=(Any rhs)
-		{
-			rhs.swap(*this);
-			return *this;
-		}
-
-		bool empty() const
-		{
-			return !content;
-		}
-
-		const std::type_info& type() const
-		{
-			return content ? content->type() : typeid(void);
-		}
-
-		class Placeholder
-		{
-		public:
-			virtual ~Placeholder()
-			{
-			}
-
-			virtual const std::type_info& type() const = 0;
-			virtual Placeholder* clone() const = 0;
-		};
-
-
-		template<typename ValueType>
-		class Holder : public Placeholder
-		{
-		public:
-			Holder(const ValueType &value)
-				: held(value)
-			{
-			}
-
-			virtual const std::type_info& type() const
-			{
-				return typeid(ValueType);
-			}
-
-			virtual Placeholder* clone() const
-			{
-				return new Holder(held);
-			}
-
-			 ValueType held;
-
-		private:
-			Holder& operator=(const Holder&);
-		};
-
-	private:
-		template<typename ValueType>
-		friend ValueType* any_cast(Any*);
-
-		template<typename ValueType>
-		friend ValueType* unsafe_any_cast(Any*);
-
-		Placeholder* content;
-	};
-
-	class bad_any_cast : public std::bad_cast
-	{
-	public:
-		virtual const char * what() const throw()
-		{
-			return "DBI::bad_any_cast: failed conversion using DBI::any_cast";
-		}
-	};
-
-	template<typename ValueType>
-	ValueType* any_cast(Any* operand)
-	{
-		return operand && 
-			operand->type() == typeid(ValueType) ? &static_cast<Any::Holder<ValueType>*>(operand->content)->held : nullptr;
-	}
-
-	template<typename ValueType>
-	inline const ValueType* any_cast(const Any* operand)
-	{
-		return any_cast<ValueType>(const_cast<Any*>(operand));
-	}
-
-	template<typename ValueType>
-	ValueType any_cast(Any& operand)
-	{
-		typedef typename std::remove_reference<ValueType>::type nonref;
-		nonref* result = any_cast<nonref>(&operand);
-		if(!result)
-			throw bad_any_cast();
-		return *result;
-	}
-	
-	template<typename ValueType>
-	inline ValueType any_cast(const Any& operand)
-	{
-		typedef typename std::remove_reference<ValueType>::type nonref;
-		return any_cast<const nonref&>(const_cast<Any&>(operand));
-	}
-
-	template<typename ValueType>
-	inline ValueType* unsafe_any_cast(Any* operand)
-	{
-		return &static_cast<Any::Holder<ValueType>*>(operand->content)->held;
-	}
-
-	template<typename ValueType>
-	inline const ValueType* unsafe_any_cast(const Any* operand)
-	{
-		return unsafe_any_cast<ValueType>(const_cast<Any*>(operand));
-	}
-}
-
-#endif

common/content/world_content_service.cpp

@@ -158,25 +158,25 @@ bool WorldContentService::IsContentFlagDisabled(const std::string &content_flag)
 bool WorldContentService::DoesPassContentFiltering(const ContentFlags &f)
 {
 	// if we're not set to (-1 All) then fail when we aren't within minimum expansion
-	if (f.min_expansion > Expansion::EXPANSION_ALL && current_expansion < f.min_expansion) {
+	if (f.min_expansion > Expansion::EXPANSION_ALL && current_expansion < f.min_expansion && current_expansion != -1) {
 		return false;
 	}
 
 	// if we're not set to (-1 All) then fail when we aren't within max expansion
-	if (f.max_expansion > Expansion::EXPANSION_ALL && current_expansion > f.max_expansion) {
+	if (f.max_expansion > Expansion::EXPANSION_ALL && current_expansion > f.max_expansion && current_expansion != -1) {
 		return false;
 	}
 
 	// if we don't have any enabled flag in enabled flags, we fail
-	for (const auto& flag: SplitString(f.content_flags)) {
-		if (!contains(GetContentFlagsEnabled(), flag)) {
+	for (const auto& flag: Strings::Split(f.content_flags)) {
+		if (!Strings::Contains(GetContentFlagsEnabled(), flag)) {
 			return false;
 		}
 	}
 
 	// if we don't have any disabled flag in disabled flags, we fail
-	for (const auto& flag: SplitString(f.content_flags_disabled)) {
-		if (!contains(GetContentFlagsDisabled(), flag)) {
+	for (const auto& flag: Strings::Split(f.content_flags_disabled)) {
+		if (!Strings::Contains(GetContentFlagsDisabled(), flag)) {
 			return false;
 		}
 	}

common/crash.cpp

@@ -2,6 +2,48 @@
 #include "eqemu_logsys.h"
 #include "crash.h"
 
+inline std::string random_string(size_t length)
+{
+	auto        randchar = []() -> char {
+		const char   charset[] = "0123456789"
+								 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+								 "abcdefghijklmnopqrstuvwxyz";
+		const size_t max_index = (sizeof(charset) - 1);
+		return charset[static_cast<size_t>(std::rand()) % max_index];
+	};
+	std::string str(length, 0);
+	std::generate_n(str.begin(), length, randchar);
+	return str;
+}
+
+std::string execute(const std::string &cmd, bool return_result = true)
+{
+	std::string random     = "/tmp/" + random_string(25);
+	const char  *file_name = random.c_str();
+
+	if (return_result) {
+#ifdef _WINDOWS
+		std::system((cmd + " > " + file_name + " 2>&1").c_str());
+#else
+		std::system((cmd + " > " + file_name + " 2>&1").c_str());
+#endif
+	}
+	else {
+		std::system((cmd).c_str());
+	}
+
+	std::string result;
+
+	if (return_result) {
+		std::ifstream file(file_name);
+		result = {std::istreambuf_iterator<char>(file), std::istreambuf_iterator<char>()};
+		std::remove(file_name);
+
+	}
+
+	return result;
+}
+
 #if defined(_WINDOWS) && defined(CRASH_LOGGING)
 #include "StackWalker.h"
 
@@ -125,10 +167,28 @@ void set_exception_handler() {
 
 void print_trace()
 {
-	auto uid = geteuid();
+	bool does_gdb_exist = execute("gdb -v").find("GNU") != std::string::npos;
+	if (!does_gdb_exist) {
+		LogCrash(
+			"[Error] GDB is not installed, if you want crash dumps on Linux to work properly you will need GDB installed"
+		);
+		std::exit(1);
+	}
 
+	auto        uid              = geteuid();
 	std::string temp_output_file = "/tmp/dump-output";
 
+	// check for passwordless sudo if not root
+	if (uid != 0) {
+		bool has_passwordless_sudo = execute("sudo -n true").find("a password is required") == std::string::npos;
+		if (!has_passwordless_sudo) {
+			LogCrash(
+				"[Error] Current user does not have passwordless sudo installed. It is required to automatically process crash dumps with GDB as non-root."
+			);
+			std::exit(1);
+		}
+	}
+
 	char pid_buf[30];
 	sprintf(pid_buf, "%d", getpid());
 	char name_buf[512];
@@ -136,7 +196,6 @@ void print_trace()
 	int child_pid = fork();
 	if (!child_pid) {
 		int fd = open(temp_output_file.c_str(), O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
-
 		dup2(fd, 1); // redirect output to stderr
 		fprintf(stdout, "stack trace for %s pid=%s\n", name_buf, pid_buf);
 		if (uid == 0) {

common/database.cpp

@@ -45,12 +45,13 @@
 #include "database.h"
 #include "eq_packet_structs.h"
 #include "extprofile.h"
-#include "string_util.h"
+#include "strings.h"
 #include "database_schema.h"
 #include "http/httplib.h"
 #include "http/uri.h"
 
 #include "repositories/zone_repository.h"
+#include "zone_store.h"
 
 extern Client client;
 
@@ -107,7 +108,7 @@ uint32 Database::CheckLogin(const char* name, const char* password, const char *
 		"SELECT id, status FROM account WHERE `name` = '{}' AND ls_id = '{}' AND password is NOT NULL "
 		"AND length(password) > 0 AND (password = '{}' OR password = MD5('{}'))",
 		temporary_username,
-		EscapeString(loginserver),
+		Strings::Escape(loginserver),
 		temporary_password,
 		temporary_password
 	);
@@ -148,8 +149,8 @@ bool Database::CheckBannedIPs(std::string login_ip)
 bool Database::AddBannedIP(std::string banned_ip, std::string notes) {
 	auto query = fmt::format(
 		"INSERT into banned_ips SET ip_address = '{}', notes = '{}'",
-		EscapeString(banned_ip),
-		EscapeString(notes)
+		Strings::Escape(banned_ip),
+		Strings::Escape(notes)
 	);
 	auto results = QueryDatabase(query);
 
@@ -280,7 +281,7 @@ bool Database::DeleteAccount(const char* name, const char *loginserver) {
 }
 
 bool Database::SetLocalPassword(uint32 accid, const char* password) {
-	std::string query = StringFormat("UPDATE account SET password=MD5('%s') where id=%i;", EscapeString(password).c_str(), accid);
+	std::string query = StringFormat("UPDATE account SET password=MD5('%s') where id=%i;", Strings::Escape(password).c_str(), accid);
 
 	auto results = QueryDatabase(query);
 
@@ -619,8 +620,8 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		")",
 		character_id,					  // " id,                        "
 		account_id,						  // " account_id,                "
-		EscapeString(pp->name).c_str(),	  // " `name`,                    "
-		EscapeString(pp->last_name).c_str(), // " last_name,              "
+		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,                     "
@@ -644,8 +645,8 @@ bool Database::SaveCharacterCreate(uint32 character_id, uint32 account_id, Playe
 		pp->ability_number,				  // " ability_number,            "
 		pp->ability_time_minutes,		  // " ability_time_minutes,      "
 		pp->ability_time_hours,			  // " ability_time_hours,        "
-		EscapeString(pp->title).c_str(),  // " title,                     "
-		EscapeString(pp->suffix).c_str(), // " suffix,                    "
+		Strings::Escape(pp->title).c_str(),  // " title,                     "
+		Strings::Escape(pp->suffix).c_str(), // " suffix,                    "
 		pp->exp,						  // " exp,                       "
 		pp->points,						  // " points,                    "
 		pp->mana,						  // " mana,                      "
@@ -781,7 +782,7 @@ uint32 Database::GetCharacterID(const char *name) {
 	Zero will also be returned if there is a database error.
 */
 uint32 Database::GetAccountIDByChar(const char* charname, uint32* oCharID) {
-	std::string query = StringFormat("SELECT `account_id`, `id` FROM `character_data` WHERE name='%s'", EscapeString(charname).c_str());
+	std::string query = StringFormat("SELECT `account_id`, `id` FROM `character_data` WHERE name='%s'", Strings::Escape(charname).c_str());
 
 	auto results = QueryDatabase(query);
 
@@ -825,8 +826,8 @@ uint32 Database::GetAccountIDByName(std::string account_name, std::string logins
 
 	auto query = fmt::format(
 		"SELECT `id`, `status`, `lsaccount_id` FROM `account` WHERE `name` = '{}' AND `ls_id` = '{}' LIMIT 1",
-		EscapeString(account_name),
-		EscapeString(loginserver)
+		Strings::Escape(account_name),
+		Strings::Escape(loginserver)
 	);
 	auto results = QueryDatabase(query);
 
@@ -982,8 +983,8 @@ bool Database::GetVariable(std::string varname, std::string &varvalue)
 
 bool Database::SetVariable(const std::string varname, const std::string &varvalue)
 {
-	std::string escaped_name = EscapeString(varname);
-	std::string escaped_value = EscapeString(varvalue);
+	std::string escaped_name = Strings::Escape(varname);
+	std::string escaped_value = Strings::Escape(varvalue);
 	std::string query = StringFormat("Update variables set value='%s' WHERE varname like '%s'", escaped_value.c_str(), escaped_name.c_str());
 	auto results = QueryDatabase(query);
 
@@ -1018,97 +1019,6 @@ void Database::SetAccountCRCField(uint32 account_id, std::string field_name, uin
 	);
 }
 
-// Get zone starting points from DB
-bool Database::GetSafePoints(const char* zone_short_name, uint32 instance_version, float* safe_x, float* safe_y, float* safe_z, float* safe_heading, int16* min_status, uint8* min_level, char *flag_needed) {
-
-	if (zone_short_name == nullptr)
-		return false;
-
-	std::string query = fmt::format(
-		SQL(
-			SELECT
-			`safe_x`, `safe_y`, `safe_z`, `safe_heading`, `min_status`, `min_level`, `flag_needed`
-			FROM
-			zone
-			WHERE
-			`short_name` = '{}'
-			AND
-			(`version` = {} OR `version` = 0)
-			ORDER BY `version` DESC
-		), zone_short_name, instance_version
-	);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success())
-		return false;
-
-	if (results.RowCount() == 0)
-		return false;
-
-	auto row = results.begin();
-
-	if (safe_x != nullptr)
-		*safe_x = atof(row[0]);
-
-	if (safe_y != nullptr)
-		*safe_y = atof(row[1]);
-
-	if (safe_z != nullptr)
-		*safe_z = atof(row[2]);
-
-	if (safe_heading != nullptr)
-		*safe_heading = atof(row[3]);
-
-	if (min_status != nullptr)
-		*min_status = atoi(row[4]);
-
-	if (min_level != nullptr)
-		*min_level = atoi(row[5]);
-
-	if (flag_needed != nullptr)
-		strcpy(flag_needed, row[6]);
-
-	return true;
-}
-
-bool Database::GetZoneLongName(const char* short_name, char** long_name, char* file_name, float* safe_x, float* safe_y, float* safe_z, uint32* graveyard_id, uint32* maxclients) {
-
-	std::string query = StringFormat("SELECT long_name, file_name, safe_x, safe_y, safe_z, graveyard_id, maxclients FROM zone WHERE short_name='%s' AND version=0", short_name);
-	auto results = QueryDatabase(query);
-
-	if (!results.Success()) {
-		return false;
-	}
-
-	if (results.RowCount() == 0)
-		return false;
-
-	auto row = results.begin();
-
-	if (long_name != nullptr)
-		*long_name = strcpy(new char[strlen(row[0])+1], row[0]);
-
-	if (file_name != nullptr) {
-		if (row[1] == nullptr)
-			strcpy(file_name, short_name);
-		else
-			strcpy(file_name, row[1]);
-	}
-
-	if (safe_x != nullptr)
-		*safe_x = atof(row[2]);
-	if (safe_y != nullptr)
-		*safe_y = atof(row[3]);
-	if (safe_z != nullptr)
-		*safe_z = atof(row[4]);
-	if (graveyard_id != nullptr)
-		*graveyard_id = atoi(row[5]);
-	if (maxclients != nullptr)
-		*maxclients = atoi(row[6]);
-
-	return true;
-}
-
 bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid, float* graveyard_x, float* graveyard_y, float* graveyard_z, float* graveyard_heading) {
 
 	std::string query = StringFormat("SELECT zone_id, x, y, z, heading FROM graveyard WHERE id=%i", graveyard_id);
@@ -1138,25 +1048,15 @@ bool Database::GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zon
 }
 
 uint8 Database::GetPEQZone(uint32 zone_id, uint32 version){
-	std::string query = fmt::format(
-		"SELECT peqzone FROM zone WHERE zoneidnumber = {} AND (version = {} OR version = 0) ORDER BY version DESC LIMIT 1",
-		zone_id,
-		version
-	);
-	auto results = QueryDatabase(query);
 
-	if (!results.Success() || !results.RowCount()) {
-		return 0;
-	}
+	auto z = GetZoneVersionWithFallback(zone_id, version);
 
-	auto row = results.begin();
-
-	return static_cast<uint8>(std::stoi(row[0]));
+	return z ? z->peqzone : 0;
 }
 
 bool Database::CheckNameFilter(std::string name, bool surname)
 {
-	name = str_tolower(name);
+	name = Strings::ToLower(name);
 
 	// the minimum 4 is enforced by the client too
 	if (name.empty() || name.size() < 4) {
@@ -1196,7 +1096,7 @@ bool Database::CheckNameFilter(std::string name, bool surname)
 	}
 
 	for (auto row : results) {
-		std::string current_row = str_tolower(row[0]);
+		std::string current_row = Strings::ToLower(row[0]);
 		if (name.find(current_row) != std::string::npos) {
 			return false;
 		}
@@ -1473,7 +1373,7 @@ uint32 Database::GetCharacterInfo(std::string character_name, uint32 *account_id
 {
 	auto query = fmt::format(
 		"SELECT `id`, `account_id`, `zone_id`, `zone_instance` FROM `character_data` WHERE `name` = '{}'",
-		EscapeString(character_name)
+		Strings::Escape(character_name)
 	);
 
 	auto results = QueryDatabase(query);
@@ -1546,7 +1446,7 @@ void Database::AddReport(std::string who, std::string against, std::string lines
 	auto escape_str = new char[lines.size() * 2 + 1];
 	DoEscapeString(escape_str, lines.c_str(), lines.size());
 
-	std::string query = StringFormat("INSERT INTO reports (name, reported, reported_text) VALUES('%s', '%s', '%s')", EscapeString(who).c_str(), EscapeString(against).c_str(), escape_str);
+	std::string query = StringFormat("INSERT INTO reports (name, reported, reported_text) VALUES('%s', '%s', '%s')", Strings::Escape(who).c_str(), Strings::Escape(against).c_str(), escape_str);
 	QueryDatabase(query);
 	safe_delete_array(escape_str);
 }
@@ -1644,7 +1544,7 @@ std::string Database::GetGroupLeaderForLogin(std::string character_name) {
 }
 
 void Database::SetGroupLeaderName(uint32 gid, const char* name) {
-	std::string query = StringFormat("UPDATE group_leaders SET leadername = '%s' WHERE gid = %u", EscapeString(name).c_str(), gid);
+	std::string query = StringFormat("UPDATE group_leaders SET leadername = '%s' WHERE gid = %u", Strings::Escape(name).c_str(), gid);
 	auto result = QueryDatabase(query);
 
 	if(result.RowsAffected() != 0) {
@@ -1652,7 +1552,7 @@ void Database::SetGroupLeaderName(uint32 gid, const char* name) {
 	}
 
 	query = StringFormat("REPLACE INTO group_leaders(gid, leadername, marknpc, leadershipaa, maintank, assist, puller, mentoree, mentor_percent) VALUES(%u, '%s', '', '', '', '', '', '', '0')",
-						 gid, EscapeString(name).c_str());
+						 gid, Strings::Escape(name).c_str());
 	result = QueryDatabase(query);
 
 	if(!result.Success()) {
@@ -2299,9 +2199,9 @@ int Database::GetInstanceID(uint32 char_id, uint32 zone_id) {
  * @return
  */
 bool Database::CopyCharacter(
-	std::string source_character_name,
-	std::string destination_character_name,
-	std::string destination_account_name
+	const std::string& source_character_name,
+	const std::string& destination_character_name,
+	const std::string& destination_account_name
 )
 {
 	auto results = QueryDatabase(
@@ -2313,6 +2213,7 @@ bool Database::CopyCharacter(
 
 	if (results.RowCount() == 0) {
 		LogError("No character found with name [{}]", source_character_name);
+		return false;
 	}
 
 	auto        row                 = results.begin();
@@ -2327,6 +2228,7 @@ bool Database::CopyCharacter(
 
 	if (results.RowCount() == 0) {
 		LogError("No account found with name [{}]", destination_account_name);
+		return false;
 	}
 
 	row = results.begin();
@@ -2358,7 +2260,7 @@ bool Database::CopyCharacter(
 		results = QueryDatabase(
 			fmt::format(
 				"SELECT {} FROM {} WHERE {} = {}",
-				implode(",", wrap(columns, "`")),
+				Strings::Implode(",", Strings::Wrap(columns, "`")),
 				table_name,
 				character_id_column_name,
 				source_character_id
@@ -2394,7 +2296,7 @@ bool Database::CopyCharacter(
 		std::vector<std::string> insert_rows;
 
 		for (auto &r: new_rows) {
-			std::string insert_row = "(" + implode(",", wrap(r, "'")) + ")";
+			std::string insert_row = "(" + Strings::Implode(",", Strings::Wrap(r, "'")) + ")";
 			insert_rows.emplace_back(insert_row);
 		}
 
@@ -2412,8 +2314,8 @@ bool Database::CopyCharacter(
 				fmt::format(
 					"INSERT INTO {} ({}) VALUES {}",
 					table_name,
-					implode(",", wrap(columns, "`")),
-					implode(",", insert_rows)
+					Strings::Implode(",", Strings::Wrap(columns, "`")),
+					Strings::Implode(",", insert_rows)
 				)
 			);
 
@@ -2465,8 +2367,8 @@ void Database::SourceDatabaseTableFromUrl(std::string table_name, std::string ur
 
 			if (auto res = cli.Get(request_uri.get_path().c_str())) {
 				if (res->status == 200) {
-					for (auto &s: SplitString(res->body, ';')) {
-						if (!trim(s).empty()) {
+					for (auto &s: Strings::Split(res->body, ';')) {
+						if (!Strings::Trim(s).empty()) {
 							auto results = QueryDatabase(s);
 							if (!results.ErrorMessage().empty()) {
 								LogError("Error sourcing SQL [{}]", results.ErrorMessage());

common/database.h

@@ -113,9 +113,9 @@ public:
 	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(
-		std::string source_character_name,
-		std::string destination_character_name,
-		std::string destination_account_name
+		const std::string& source_character_name,
+		const std::string& destination_character_name,
+		const std::string& destination_account_name
 	);
 
 	/* General Information Queries */
@@ -246,9 +246,7 @@ public:
 
 	/* General Queries */
 
-	bool	GetSafePoints(const char* zone_short_name, uint32 instance_version, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, float* safe_heading = 0, int16* minstatus = 0, uint8* minlevel = 0, char *flag_needed = nullptr);
 	bool	GetZoneGraveyard(const uint32 graveyard_id, uint32* graveyard_zoneid = 0, float* graveyard_x = 0, float* graveyard_y = 0, float* graveyard_z = 0, float* graveyard_heading = 0);
-	bool	GetZoneLongName(const char* short_name, char** long_name, char* file_name = 0, float* safe_x = 0, float* safe_y = 0, float* safe_z = 0, uint32* graveyard_id = 0, uint32* maxclients = 0);
 	bool	LoadPTimers(uint32 charid, PTimerList &into);
 
 	uint8	GetPEQZone(uint32 zone_id, uint32 version);

common/database/database_dump_service.cpp

@@ -23,7 +23,7 @@
 #include <iterator>
 #include "database_dump_service.h"
 #include "../eqemu_logsys.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../eqemu_config.h"
 #include "../database_schema.h"
 #include "../file_util.h"
@@ -119,7 +119,7 @@ std::string DatabaseDumpService::GetMySQLVersion()
 {
 	std::string version_output = execute("mysql --version");
 
-	return trim(version_output);
+	return Strings::Trim(version_output);
 }
 
 /**
@@ -160,7 +160,7 @@ std::string DatabaseDumpService::GetPlayerTablesList()
 		tables_list += table + " ";
 	}
 
-	return trim(tables_list);
+	return Strings::Trim(tables_list);
 }
 
 /**
@@ -174,7 +174,7 @@ std::string DatabaseDumpService::GetBotTablesList()
 		tables_list += table + " ";
 	}
 
-	return trim(tables_list);
+	return Strings::Trim(tables_list);
 }
 
 /**
@@ -188,7 +188,7 @@ std::string DatabaseDumpService::GetLoginTableList()
 		tables_list += table + " ";
 	}
 
-	return trim(tables_list);
+	return Strings::Trim(tables_list);
 }
 
 /**
@@ -202,7 +202,7 @@ std::string DatabaseDumpService::GetQueryServTables()
 		tables_list += table + " ";
 	}
 
-	return trim(tables_list);
+	return Strings::Trim(tables_list);
 }
 
 /**
@@ -222,7 +222,7 @@ std::string DatabaseDumpService::GetSystemTablesList()
 		tables_list += table + " ";
 	}
 
-	return trim(tables_list);
+	return Strings::Trim(tables_list);
 }
 /**
  * @return
@@ -236,7 +236,7 @@ std::string DatabaseDumpService::GetStateTablesList()
 		tables_list += table + " ";
 	}
 
-	return trim(tables_list);
+	return Strings::Trim(tables_list);
 }
 
 /**
@@ -251,7 +251,7 @@ std::string DatabaseDumpService::GetContentTablesList()
 		tables_list += table + " ";
 	}
 
-	return trim(tables_list);
+	return Strings::Trim(tables_list);
 }
 
 /**
@@ -331,7 +331,7 @@ void DatabaseDumpService::Dump()
 			tables_to_dump += GetPlayerTablesList() + " ";
 			dump_descriptor += "-player";
 		}
-		
+
 		if (IsDumpBotTables()) {
 			tables_to_dump += GetBotTablesList() + " ";
 			dump_descriptor += "-bots";
@@ -388,7 +388,7 @@ void DatabaseDumpService::Dump()
 	}
 
 	if (IsDumpDropTableSyntaxOnly()) {
-		std::vector<std::string> tables = SplitString(tables_to_dump, ' ');
+		std::vector<std::string> tables = Strings::Split(tables_to_dump, ' ');
 
 		for (auto &table : tables) {
 			std::cout << "DROP TABLE IF EXISTS `" << table << "`;" << std::endl;

common/database_conversions.cpp

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 #include "../common/global_define.h"
 #include "../common/rulesys.h"
-#include "../common/string_util.h"
+#include "../common/strings.h"
 #include "../common/timer.h"
 
 #include "database.h"
@@ -961,7 +961,7 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 					std::string rquery = StringFormat("REPLACE INTO `character_inspect_messages` (id, inspect_message)"
 						"VALUES (%u, '%s')",
 						character_id,
-						EscapeString(inspectmessage).c_str()
+						Strings::Escape(inspectmessage).c_str()
 						);
 					auto results = QueryDatabase(rquery);
 				}
@@ -1097,95 +1097,95 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 					"e_expended_aa_spent"
 					")"
 					"VALUES ("
-					"%u,"		// id														
-					"%u,"		// account_id												
-					"'%s',"		// `name`					  
-					"'%s',"		// last_name					
-					"%u,"		// gender					  
-					"%u,"		// race						  
-					"%u,"		// class							
-					"%u,"		// `level`					  
-					"%u,"		// deity							
-					"%u,"		// birthday					  
-					"%u,"		// last_login				  
-					"%u,"		// time_played				  
-					"%u,"		// pvp_status				  
-					"%u,"		// level2					  
-					"%u,"		// anon						  
-					"%u,"		// gm						  
-					"%u,"		// intoxication				  
-					"%u,"		// hair_color				  
-					"%u,"		// beard_color				  
-					"%u,"		// eye_color_1				  
-					"%u,"		// eye_color_2				  
-					"%u,"		// hair_style				  
-					"%u,"		// beard							
-					"%u,"		// ability_time_seconds		  
-					"%u,"		// ability_number			  
-					"%u,"		// ability_time_minutes		  
-					"%u,"		// ability_time_hours		  
-					"'%s',"		// title						
-					"'%s',"		// suffix					  
-					"%u,"		// exp						  
-					"%u,"		// points					  
-					"%u,"		// mana						  
-					"%u,"		// cur_hp					  
-					"%u,"		// str						  
-					"%u,"		// sta						  
-					"%u,"		// cha						  
-					"%u,"		// dex						  
-					"%u,"		// `int`							
-					"%u,"		// agi						  
-					"%u,"		// wis						  
-					"%u,"		// face						  
-					"%f,"		// y								
-					"%f,"		// x								
-					"%f,"		// z								
-					"%f,"		// heading					  
-					"%u,"		// pvp2						  
-					"%u,"		// pvp_type					  
-					"%u,"		// autosplit_enabled				
-					"%u,"		// zone_change_count				
-					"%u,"		// drakkin_heritage			  
-					"%u,"		// drakkin_tattoo			  
-					"%u,"		// drakkin_details			  
-					"%i,"		// toxicity	 				  
-					"%u,"		// hunger_level				  
-					"%u,"		// thirst_level				  
-					"%u,"		// ability_up				  
-					"%u,"		// zone_id					  
-					"%u,"		// zone_instance					
-					"%u,"		// leadership_exp_on				
-					"%u,"		// ldon_points_guk			  
-					"%u,"		// ldon_points_mir			  
-					"%u,"		// ldon_points_mmc			  
-					"%u,"		// ldon_points_ruj			  
-					"%u,"		// ldon_points_tak			  
-					"%u,"		// ldon_points_available			
-					"%u,"		// tribute_time_remaining	  
-					"%u,"		// show_helm						
-					"%u,"		// career_tribute_points			
-					"%u,"		// tribute_points			  
-					"%u,"		// tribute_active			  
-					"%u,"		// endurance						
-					"%u,"		// group_leadership_exp		  
-					"%u,"		// raid_leadership_exp		  
-					"%u,"		// group_leadership_points	  
-					"%u,"		// raid_leadership_points	  
-					"%u,"		// air_remaining					
-					"%u,"		// pvp_kills						
-					"%u,"		// pvp_deaths				  
-					"%u,"		// pvp_current_points		  
-					"%u,"		// pvp_career_points				
-					"%u,"		// pvp_best_kill_streak		  
-					"%u,"		// pvp_worst_death_streak	  
-					"%u,"		// pvp_current_kill_streak	  
-					"%u,"		// aa_points_spent			  
-					"%u,"		// aa_exp					  
-					"%u,"		// aa_points						
-					"%u,"		// group_auto_consent		  
-					"%u,"		// raid_auto_consent				
-					"%u,"		// guild_auto_consent		  
+					"%u,"		// id
+					"%u,"		// account_id
+					"'%s',"		// `name`
+					"'%s',"		// last_name
+					"%u,"		// gender
+					"%u,"		// race
+					"%u,"		// class
+					"%u,"		// `level`
+					"%u,"		// deity
+					"%u,"		// birthday
+					"%u,"		// last_login
+					"%u,"		// time_played
+					"%u,"		// pvp_status
+					"%u,"		// level2
+					"%u,"		// anon
+					"%u,"		// gm
+					"%u,"		// intoxication
+					"%u,"		// hair_color
+					"%u,"		// beard_color
+					"%u,"		// eye_color_1
+					"%u,"		// eye_color_2
+					"%u,"		// hair_style
+					"%u,"		// beard
+					"%u,"		// ability_time_seconds
+					"%u,"		// ability_number
+					"%u,"		// ability_time_minutes
+					"%u,"		// ability_time_hours
+					"'%s',"		// title
+					"'%s',"		// suffix
+					"%u,"		// exp
+					"%u,"		// points
+					"%u,"		// mana
+					"%u,"		// cur_hp
+					"%u,"		// str
+					"%u,"		// sta
+					"%u,"		// cha
+					"%u,"		// dex
+					"%u,"		// `int`
+					"%u,"		// agi
+					"%u,"		// wis
+					"%u,"		// face
+					"%f,"		// y
+					"%f,"		// x
+					"%f,"		// z
+					"%f,"		// heading
+					"%u,"		// pvp2
+					"%u,"		// pvp_type
+					"%u,"		// autosplit_enabled
+					"%u,"		// zone_change_count
+					"%u,"		// drakkin_heritage
+					"%u,"		// drakkin_tattoo
+					"%u,"		// drakkin_details
+					"%i,"		// toxicity
+					"%u,"		// hunger_level
+					"%u,"		// thirst_level
+					"%u,"		// ability_up
+					"%u,"		// zone_id
+					"%u,"		// zone_instance
+					"%u,"		// leadership_exp_on
+					"%u,"		// ldon_points_guk
+					"%u,"		// ldon_points_mir
+					"%u,"		// ldon_points_mmc
+					"%u,"		// ldon_points_ruj
+					"%u,"		// ldon_points_tak
+					"%u,"		// ldon_points_available
+					"%u,"		// tribute_time_remaining
+					"%u,"		// show_helm
+					"%u,"		// career_tribute_points
+					"%u,"		// tribute_points
+					"%u,"		// tribute_active
+					"%u,"		// endurance
+					"%u,"		// group_leadership_exp
+					"%u,"		// raid_leadership_exp
+					"%u,"		// group_leadership_points
+					"%u,"		// raid_leadership_points
+					"%u,"		// air_remaining
+					"%u,"		// pvp_kills
+					"%u,"		// pvp_deaths
+					"%u,"		// pvp_current_points
+					"%u,"		// pvp_career_points
+					"%u,"		// pvp_best_kill_streak
+					"%u,"		// pvp_worst_death_streak
+					"%u,"		// pvp_current_kill_streak
+					"%u,"		// aa_points_spent
+					"%u,"		// aa_exp
+					"%u,"		// aa_points
+					"%u,"		// group_auto_consent
+					"%u,"		// raid_auto_consent
+					"%u,"		// guild_auto_consent
 					"%u," 		// RestTimer
 					"%u,"		// First Logon - References online status for EVENT_CONNECT/EVENT_DISCONNECt
 					"%u,"		// Looking for Group
@@ -1198,8 +1198,8 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 					")",
 					character_id,
 					account_id,
-					EscapeString(pp->name).c_str(),
-					EscapeString(pp->last_name).c_str(),
+					Strings::Escape(pp->name).c_str(),
+					Strings::Escape(pp->last_name).c_str(),
 					pp->gender,
 					pp->race,
 					pp->class_,
@@ -1223,8 +1223,8 @@ bool Database::CheckDatabaseConvertPPDeblob(){
 					pp->ability_number,
 					pp->ability_time_minutes,
 					pp->ability_time_hours,
-					EscapeString(pp->title).c_str(),
-					EscapeString(pp->suffix).c_str(),
+					Strings::Escape(pp->title).c_str(),
+					Strings::Escape(pp->suffix).c_str(),
 					pp->exp,
 					pp->points,
 					pp->mana,

common/database_instances.cpp

@@ -18,7 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 #include "../common/global_define.h"
 #include "../common/rulesys.h"
-#include "../common/string_util.h"
+#include "../common/strings.h"
 #include "../common/timer.h"
 #include "../common/repositories/dynamic_zone_members_repository.h"
 #include "../common/repositories/dynamic_zones_repository.h"
@@ -485,7 +485,7 @@ void Database::BuryCorpsesInInstance(uint16 instance_id) {
 void Database::DeleteInstance(uint16 instance_id)
 {
 	std::string query;
-	
+
 	query = StringFormat("DELETE FROM instance_list_player WHERE id=%u", instance_id);
 	QueryDatabase(query);
 
@@ -580,7 +580,7 @@ void Database::PurgeExpiredInstances()
 		instance_ids.emplace_back(row[0]);
 	}
 
-	std::string imploded_instance_ids = implode(",", instance_ids);
+	std::string imploded_instance_ids = Strings::Implode(",", instance_ids);
 
 	QueryDatabase(fmt::format("DELETE FROM instance_list WHERE id IN ({})", imploded_instance_ids));
 	QueryDatabase(fmt::format("DELETE FROM instance_list_player WHERE id IN ({})", imploded_instance_ids));

common/database_schema.h

@@ -189,13 +189,14 @@ namespace DatabaseSchema {
 			"char_create_point_allocations",
 			"damageshieldtypes",
 			"doors",
+			"dynamic_zone_templates",
+			"faction_association",
 			"faction_base_data",
 			"faction_list",
 			"faction_list_mod",
 			"fishing",
 			"forage",
 			"global_loot",
-			"goallists",
 			"graveyard",
 			"grid",
 			"grid_entries",
@@ -224,7 +225,6 @@ namespace DatabaseSchema {
 			"pets_beastlord_data",
 			"pets_equipmentset",
 			"pets_equipmentset_entries",
-			"proximities",
 			"skill_caps",
 			"spawn2",
 			"spawn_conditions",
@@ -318,6 +318,7 @@ namespace DatabaseSchema {
 			"completed_shared_task_activity_state",
 			"completed_shared_task_members",
 			"completed_shared_tasks",
+			"discord_webhooks",
 			"dynamic_zone_members",
 			"dynamic_zones",
 			"eventlog",
@@ -375,7 +376,7 @@ namespace DatabaseSchema {
 			"inventory_versions",
 		};
 	}
-	
+
 	/**
 	 * @description Gets all player bot tables
 	 * @note These tables have no content in the PEQ daily dump

common/discord/discord.cpp

@@ -1,7 +1,7 @@
 #include "discord.h"
 #include "../http/httplib.h"
 #include "../json/json.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../eqemu_logsys.h"
 
 constexpr int MAX_RETRIES = 10;
@@ -21,11 +21,11 @@ void Discord::SendWebhookMessage(const std::string &message, const std::string &
 	}
 
 	// split
-	auto s = SplitString(webhook_url, '/');
+	auto s = Strings::Split(webhook_url, '/');
 
 	// url
 	std::string base_url = fmt::format("{}//{}", s[0], s[2]);
-	std::string endpoint = replace_string(webhook_url, base_url, "");
+	std::string endpoint = Strings::Replace(webhook_url, base_url, "");
 
 	// client
 	httplib::Client cli(base_url.c_str());

common/discord_manager.cpp

@@ -1,7 +1,7 @@
 #include "discord_manager.h"
 #include "../common/discord/discord.h"
 #include "../common/eqemu_logsys.h"
-#include "../common/string_util.h"
+#include "../common/strings.h"
 
 void DiscordManager::QueueWebhookMessage(uint32 webhook_id, const std::string &message)
 {
@@ -22,7 +22,12 @@ void DiscordManager::ProcessMessageQueue()
 	for (auto &q: webhook_message_queue) {
 		LogDiscord("Processing [{}] messages in queue for webhook ID [{}]...", q.second.size(), q.first);
 
-		auto        webhook  = LogSys.discord_webhooks[q.first];
+		if (q.first >= MAX_DISCORD_WEBHOOK_ID) {
+			LogDiscord("Out of bounds webhook ID [{}] max [{}]", q.first, MAX_DISCORD_WEBHOOK_ID);
+			continue;
+		}
+
+		auto        webhook  = LogSys.GetDiscordWebhooks()[q.first];
 		std::string message;
 
 		for (auto &m: q.second) {
@@ -58,8 +63,7 @@ void DiscordManager::ProcessMessageQueue()
 				webhook.webhook_url
 			);
 		}
-
-		webhook_message_queue.erase(q.first);
 	}
+	webhook_message_queue.clear();
 	webhook_queue_lock.unlock();
 }

common/dynamic_zone_base.cpp

@@ -79,6 +79,7 @@ void DynamicZoneBase::LoadRepositoryResult(DynamicZonesRepository::DynamicZoneIn
 	m_max_players        = dz_entry.max_players;
 	m_instance_id        = dz_entry.instance_id;
 	m_type               = static_cast<DynamicZoneType>(dz_entry.type);
+	m_dz_switch_id       = dz_entry.dz_switch_id;
 	m_compass.zone_id    = dz_entry.compass_zone_id;
 	m_compass.x          = dz_entry.compass_x;
 	m_compass.y          = dz_entry.compass_y;
@@ -129,6 +130,7 @@ uint32_t DynamicZoneBase::SaveToDatabase()
 		insert_dz.max_players         = m_max_players;
 		insert_dz.instance_id         = m_instance_id,
 		insert_dz.type                = static_cast<int>(m_type);
+		insert_dz.dz_switch_id        = m_dz_switch_id;
 		insert_dz.compass_zone_id     = m_compass.zone_id;
 		insert_dz.compass_x           = m_compass.x;
 		insert_dz.compass_y           = m_compass.y;
@@ -316,6 +318,17 @@ void DynamicZoneBase::SetZoneInLocation(float x, float y, float z, float heading
 	SetZoneInLocation({ 0, x, y, z, heading }, update_db);
 }
 
+void DynamicZoneBase::SetSwitchID(int dz_switch_id, bool update_db)
+{
+	m_dz_switch_id = dz_switch_id;
+
+	if (update_db)
+	{
+		DynamicZonesRepository::UpdateSwitchID(GetDatabase(), m_id, dz_switch_id);
+		SendServerPacket(CreateServerDzSwitchIDPacket().get());
+	}
+}
+
 void DynamicZoneBase::SetLeader(const DynamicZoneMember& new_leader, bool update_db)
 {
 	m_leader = new_leader;
@@ -403,6 +416,17 @@ std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzLocationPacket(
 	return pack;
 }
 
+std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerDzSwitchIDPacket()
+{
+	constexpr uint32_t pack_size = sizeof(ServerDzSwitchID_Struct);
+	auto pack = std::make_unique<ServerPacket>(ServerOP_DzSetSwitchID, pack_size);
+	auto buf = reinterpret_cast<ServerDzSwitchID_Struct*>(pack->pBuffer);
+	buf->dz_id = GetID();
+	buf->dz_switch_id = GetSwitchID();
+
+	return pack;
+}
+
 std::unique_ptr<ServerPacket> DynamicZoneBase::CreateServerMemberStatusPacket(
 	uint32_t character_id, DynamicZoneMemberStatus status)
 {
@@ -598,3 +622,28 @@ void DynamicZoneBase::LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_
 	cereal::BinaryInputArchive archive(ss);
 	archive(*this);
 }
+
+void DynamicZoneBase::LoadTemplate(const DynamicZoneTemplatesRepository::DynamicZoneTemplates& dz_template)
+{
+	m_zone_id            = dz_template.zone_id;
+	m_zone_version       = dz_template.zone_version;
+	m_name               = dz_template.name;
+	m_min_players        = dz_template.min_players;
+	m_max_players        = dz_template.max_players;
+	m_duration           = std::chrono::seconds(dz_template.duration_seconds);
+	m_dz_switch_id       = dz_template.dz_switch_id;
+	m_compass.zone_id    = dz_template.compass_zone_id;
+	m_compass.x          = dz_template.compass_x;
+	m_compass.y          = dz_template.compass_y;
+	m_compass.z          = dz_template.compass_z;
+	m_safereturn.zone_id = dz_template.return_zone_id;
+	m_safereturn.x       = dz_template.return_x;
+	m_safereturn.y       = dz_template.return_y;
+	m_safereturn.z       = dz_template.return_z;
+	m_safereturn.heading = dz_template.return_h;
+	m_has_zonein         = dz_template.override_zone_in;
+	m_zonein.x           = dz_template.zone_in_x;
+	m_zonein.y           = dz_template.zone_in_y;
+	m_zonein.z           = dz_template.zone_in_z;
+	m_zonein.heading     = dz_template.zone_in_h;
+}

common/dynamic_zone_base.h

@@ -5,6 +5,7 @@
 #include "net/packet.h"
 #include "repositories/dynamic_zones_repository.h"
 #include "repositories/dynamic_zone_members_repository.h"
+#include "repositories/dynamic_zone_templates_repository.h"
 #include <algorithm>
 #include <chrono>
 #include <cstdint>
@@ -74,6 +75,7 @@ public:
 
 	virtual void SetSecondsRemaining(uint32_t seconds_remaining) = 0;
 
+	int GetDuration() const { return static_cast<int>(m_duration.count()); }
 	uint64_t GetExpireTime() const { return std::chrono::system_clock::to_time_t(m_expire_time); }
 	uint32_t GetID() const { return m_id; }
 	uint16_t GetInstanceID() const { return static_cast<uint16_t>(m_instance_id); }
@@ -85,6 +87,7 @@ public:
 	uint16_t GetZoneID() const { return static_cast<uint16_t>(m_zone_id); }
 	uint32_t GetZoneIndex() const { return (m_instance_id << 16) | (m_zone_id & 0xffff); }
 	uint32_t GetZoneVersion() const { return m_zone_version; }
+	int GetSwitchID() const { return m_dz_switch_id; }
 	DynamicZoneType GetType() const { return m_type; }
 	const std::string& GetLeaderName() const { return m_leader.name; }
 	const std::string& GetName() const { return m_name; }
@@ -112,6 +115,7 @@ public:
 	bool IsValid() const { return m_instance_id != 0; }
 	bool IsSameDz(uint32_t zone_id, uint32_t instance_id) const { return zone_id == m_zone_id && instance_id == m_instance_id; }
 	void LoadSerializedDzPacket(char* cereal_data, uint32_t cereal_size);
+	void LoadTemplate(const DynamicZoneTemplatesRepository::DynamicZoneTemplates& dz_template);
 	void RemoveAllMembers();
 	bool RemoveMember(uint32_t character_id);
 	bool RemoveMember(const std::string& character_name);
@@ -127,6 +131,7 @@ public:
 	void SetName(const std::string& name) { m_name = name; }
 	void SetSafeReturn(const DynamicZoneLocation& location, bool update_db = false);
 	void SetSafeReturn(uint32_t zone_id, float x, float y, float z, float heading, bool update_db = false);
+	void SetSwitchID(int dz_switch_id, bool update_db = false);
 	void SetType(DynamicZoneType type) { m_type = type; }
 	void SetUUID(std::string uuid) { m_uuid = std::move(uuid); }
 	void SetZoneInLocation(const DynamicZoneLocation& location, bool update_db = false);
@@ -141,6 +146,7 @@ protected:
 	virtual void ProcessMemberAddRemove(const DynamicZoneMember& member, bool removed);
 	virtual bool ProcessMemberStatusChange(uint32_t member_id, DynamicZoneMemberStatus status);
 	virtual void ProcessRemoveAllMembers(bool silent = false) { m_members.clear(); }
+	virtual void ProcessSetSwitchID(int dz_switch_id) { m_dz_switch_id = dz_switch_id; }
 	virtual bool SendServerPacket(ServerPacket* packet) = 0;
 
 	void AddInternalMember(const DynamicZoneMember& member);
@@ -153,6 +159,7 @@ protected:
 
 	std::unique_ptr<ServerPacket> CreateServerDzCreatePacket(uint16_t origin_zone_id, uint16_t origin_instance_id);
 	std::unique_ptr<ServerPacket> CreateServerDzLocationPacket(uint16_t server_opcode, const DynamicZoneLocation& location);
+	std::unique_ptr<ServerPacket> CreateServerDzSwitchIDPacket();
 	std::unique_ptr<ServerPacket> CreateServerMemberAddRemovePacket(const DynamicZoneMember& member, bool removed);
 	std::unique_ptr<ServerPacket> CreateServerMemberStatusPacket(uint32_t character_id, DynamicZoneMemberStatus status);
 	std::unique_ptr<ServerPacket> CreateServerMemberSwapPacket(const DynamicZoneMember& remove_member, const DynamicZoneMember& add_member);
@@ -164,6 +171,7 @@ protected:
 	uint32_t m_zone_version = 0;
 	uint32_t m_min_players = 0;
 	uint32_t m_max_players = 0;
+	int m_dz_switch_id = 0;
 	bool m_never_expires = false;
 	bool m_has_zonein = false;
 	bool m_has_member_statuses = false;
@@ -190,6 +198,7 @@ public:
 			m_zone_version,
 			m_min_players,
 			m_max_players,
+			m_dz_switch_id,
 			m_never_expires,
 			m_has_zonein,
 			m_has_member_statuses,

common/emu_constants.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu:  Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,12 @@
 */
 
 #include "emu_constants.h"
-#include "languages.h"
-#include "data_verification.h"
 #include "bodytypes.h"
+#include "data_verification.h"
+#include "eqemu_logsys.h"
+#include "eqemu_logsys_log_aliases.h"
+#include "languages.h"
+#include "rulesys.h"
 
 int16 EQ::invtype::GetInvTypeSize(int16 inv_type) {
 	static const int16 local_array[] = {
@@ -117,7 +120,7 @@ EQ::bug::CategoryID EQ::bug::CategoryNameToCategoryID(const char* category_name)
 		return catLoNTCG;
 	if (!strcmp(category_name, "Mercenaries"))
 		return catMercenaries;
-	
+
 	return catOther;
 }
 
@@ -221,7 +224,7 @@ std::string EQ::constants::GetLDoNThemeName(uint32 theme_id)
 		return EQ::constants::GetLDoNThemeMap().find(theme_id)->second;
 	}
 
-	return std::string();	
+	return std::string();
 }
 
 const std::map<int8, std::string>& EQ::constants::GetFlyModeMap()
@@ -321,7 +324,7 @@ const std::map<uint8, std::string>& EQ::constants::GetAccountStatusMap()
 		{ AccountStatus::GMAreas, "GM Areas" },
 		{ AccountStatus::GMCoder, "GM Coder" },
 		{ AccountStatus::GMMgmt, "GM Mgmt" },
-		{ AccountStatus::GMImpossible, "GM Impossible" },	
+		{ AccountStatus::GMImpossible, "GM Impossible" },
 		{ AccountStatus::Max, "GM Max" }
 	};
 
@@ -432,3 +435,81 @@ std::string EQ::constants::GetSpawnAnimationName(uint8 animation_id)
 
 	return std::string();
 }
+
+const std::map<int, std::string>& EQ::constants::GetObjectTypeMap()
+{
+	static const std::map<int, std::string> object_type_map = {
+		{ ObjectTypes::SmallBag, "Small Bag" },
+		{ ObjectTypes::LargeBag, "Large Bag" },
+		{ ObjectTypes::Quiver, "Quiver" },
+		{ ObjectTypes::BeltPouch, "Belt Pouch" },
+		{ ObjectTypes::WristPouch, "Wrist Pouch" },
+		{ ObjectTypes::Backpack, "Backpack" },
+		{ ObjectTypes::SmallChest, "Small Chest" },
+		{ ObjectTypes::LargeChest, "Large Chest" },
+		{ ObjectTypes::Bandolier, "Bandolier" },
+		{ ObjectTypes::Medicine, "Medicine" },
+		{ ObjectTypes::Tinkering, "Tinkering" },
+		{ ObjectTypes::Lexicon, "Lexicon" },
+		{ ObjectTypes::PoisonMaking, "Mortar and Pestle" },
+		{ ObjectTypes::Quest, "Quest" },
+		{ ObjectTypes::MixingBowl, "Mixing Bowl" },
+		{ ObjectTypes::Baking, "Baking" },
+		{ ObjectTypes::Tailoring, "Tailoring" },
+		{ ObjectTypes::Blacksmithing, "Blacksmithing" },
+		{ ObjectTypes::Fletching, "Fletching" },
+		{ ObjectTypes::Brewing, "Brewing" },
+		{ ObjectTypes::JewelryMaking, "Jewelry Making" },
+		{ ObjectTypes::Pottery, "Pottery" },
+		{ ObjectTypes::Kiln, "Kiln" },
+		{ ObjectTypes::KeyMaker, "Key Maker" },
+		{ ObjectTypes::ResearchWIZ, "Lexicon" },
+		{ ObjectTypes::ResearchMAG, "Lexicon" },
+		{ ObjectTypes::ResearchNEC, "Lexicon" },
+		{ ObjectTypes::ResearchENC, "Lexicon" },
+		{ ObjectTypes::Unknown, "Unknown" },
+		{ ObjectTypes::ResearchPractice, "Lexicon" },
+		{ ObjectTypes::Alchemy, "Alchemy" },
+		{ ObjectTypes::HighElfForge, "High Elf Forge" },
+		{ ObjectTypes::DarkElfForge, "Dark Elf Forge" },
+		{ ObjectTypes::OgreForge, "Ogre Forge" },
+		{ ObjectTypes::DwarfForge, "Dwarf Forge" },
+		{ ObjectTypes::GnomeForge, "Gnome Forge" },
+		{ ObjectTypes::BarbarianForge, "Barbarian Forge" },
+		{ ObjectTypes::IksarForge, "Iksar Forge" },
+		{ ObjectTypes::HumanForgeOne, "Human Forge" },
+		{ ObjectTypes::HumanForgeTwo, "Human Forge" },
+		{ ObjectTypes::HalflingTailoringOne, "Halfling Tailoring" },
+		{ ObjectTypes::HalflingTailoringTwo, "Halfling Tailoring" },
+		{ ObjectTypes::EruditeTailoring, "Erudite Tailoring" },
+		{ ObjectTypes::WoodElfTailoring, "Wood Elf Tailoring" },
+		{ ObjectTypes::WoodElfFletching, "Wood Elf Fletching" },
+		{ ObjectTypes::IksarPottery, "Iksar Pottery" },
+		{ ObjectTypes::Fishing, "Fishing" },
+		{ ObjectTypes::TrollForge, "Troll Forge" },
+		{ ObjectTypes::WoodElfForge, "Wood Elf Forge" },
+		{ ObjectTypes::HalflingForge, "Halfling Forge" },
+		{ ObjectTypes::EruditeForge, "Erudite Forge" },
+		{ ObjectTypes::Merchant, "Merchant" },
+		{ ObjectTypes::FroglokForge, "Froglok Forge" },
+		{ ObjectTypes::Augmenter, "Augmenter" },
+		{ ObjectTypes::Churn, "Churn" },
+		{ ObjectTypes::TransformationMold, "Transformation Mold" },
+		{ ObjectTypes::DetransformationMold, "Detransformation Mold" },
+		{ ObjectTypes::Unattuner, "Unattuner" },
+		{ ObjectTypes::TradeskillBag, "Tradeskill Bag" },
+		{ ObjectTypes::CollectibleBag, "Collectible Bag" },
+		{ ObjectTypes::NoDeposit, "No Deposit" }
+	};
+
+	return object_type_map;
+}
+
+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;
+	}
+
+	return std::string();
+}

common/emu_constants.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -32,10 +32,6 @@ namespace EQ
 {
 	using RoF2::IINVALID;
 	using RoF2::INULL;
-	
-	namespace inventory {
-		
-	} /*inventory*/
 
 	namespace invtype {
 		using namespace RoF2::invtype::enum_;
@@ -201,7 +197,7 @@ namespace EQ
 		using RoF2::constants::EXPANSIONS_MASK;
 
 		using RoF2::constants::CHARACTER_CREATION_LIMIT;
-		
+
 		const size_t SAY_LINK_OPENER_SIZE = 1;
 		using RoF2::constants::SAY_LINK_BODY_SIZE;
 		const size_t SAY_LINK_TEXT_SIZE = 256; // this may be varied until it breaks something (tested:374) - the others are constant
@@ -252,6 +248,70 @@ namespace EQ
 			Looting
 		};
 
+		enum ObjectTypes : int {
+			SmallBag,
+			LargeBag,
+			Quiver,
+			BeltPouch,
+			WristPouch,
+			Backpack,
+			SmallChest,
+			LargeChest,
+			Bandolier,
+			Medicine,
+			Tinkering,
+			Lexicon,
+			PoisonMaking,
+			Quest,
+			MixingBowl,
+			Baking,
+			Tailoring,
+			Blacksmithing,
+			Fletching,
+			Brewing,
+			JewelryMaking,
+			Pottery,
+			Kiln,
+			KeyMaker,
+			ResearchWIZ,
+			ResearchMAG,
+			ResearchNEC,
+			ResearchENC,
+			Unknown,
+			ResearchPractice,
+			Alchemy,
+			HighElfForge,
+			DarkElfForge,
+			OgreForge,
+			DwarfForge,
+			GnomeForge,
+			BarbarianForge,
+			IksarForge,
+			HumanForgeOne,
+			HumanForgeTwo,
+			HalflingTailoringOne,
+			HalflingTailoringTwo,
+			EruditeTailoring,
+			WoodElfTailoring,
+			WoodElfFletching,
+			IksarPottery,
+			Fishing,
+			TrollForge,
+			WoodElfForge,
+			HalflingForge,
+			EruditeForge,
+			Merchant,
+			FroglokForge,
+			Augmenter,
+			Churn,
+			TransformationMold,
+			DetransformationMold,
+			Unattuner,
+			TradeskillBag,
+			CollectibleBag,
+			NoDeposit
+		};
+
 		const char *GetStanceName(StanceType stance_type);
 		int ConvertStanceTypeToIndex(StanceType stance_type);
 
@@ -260,7 +320,7 @@ namespace EQ
 
 		extern const std::map<uint32, std::string>& GetLDoNThemeMap();
 		std::string GetLDoNThemeName(uint32 theme_id);
-    
+
 		extern const std::map<int8, std::string>& GetFlyModeMap();
 		std::string GetFlyModeName(int8 flymode_id);
 
@@ -282,6 +342,9 @@ namespace EQ
 		extern const std::map<uint8, std::string>& GetSpawnAnimationMap();
 		std::string GetSpawnAnimationName(uint8 animation_id);
 
+		extern const std::map<int, std::string>& GetObjectTypeMap();
+		std::string GetObjectTypeName(int object_type);
+
 		const int STANCE_TYPE_FIRST = stancePassive;
 		const int STANCE_TYPE_LAST = stanceBurnAE;
 		const int STANCE_TYPE_COUNT = stanceBurnAE;
@@ -291,7 +354,7 @@ namespace EQ
 	namespace profile {
 		using RoF2::profile::BANDOLIERS_SIZE;
 		using RoF2::profile::BANDOLIER_ITEM_COUNT;
-		
+
 		using RoF2::profile::POTION_BELT_SIZE;
 
 		using RoF2::profile::SKILL_ARRAY_SIZE;

common/emu_oplist.h

@@ -71,6 +71,7 @@ N(OP_Camp),
 N(OP_CancelSneakHide),
 N(OP_CancelTask),
 N(OP_CancelTrade),
+N(OP_CashReward),
 N(OP_CastSpell),
 N(OP_ChangeSize),
 N(OP_ChannelMessage),
@@ -303,6 +304,7 @@ N(OP_LockoutTimerInfo),
 N(OP_Login),
 N(OP_LoginAccepted),
 N(OP_LoginComplete),
+N(OP_LoginExpansionPacketData), //added for Rof2 client to send expansion data packet.  Requires login_opcodes_sod.conf to be updated.
 N(OP_LoginUnknown1),
 N(OP_LoginUnknown2),
 N(OP_Logout),

common/eq_constants.h

@@ -1009,4 +1009,11 @@ enum StartZoneIndex {
     SharVahl
 };
 
+enum FVNoDropFlagRule
+{
+	Disabled = 0,
+	Enabled = 1,
+	AdminOnly = 2
+};
+
 #endif /*COMMON_EQ_CONSTANTS_H*/

common/eq_limits.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,7 @@
 	are required to give you total support for your newly bought product;
 	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -26,7 +26,7 @@
 
 static bool global_dictionary_init = false;
 void EQ::InitializeDynamicLookups() {
-	if (global_dictionary_init == true)
+	if (global_dictionary_init)
 		return;
 
 	constants::InitializeDynamicLookups();
@@ -167,7 +167,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			ClientUnknown::INULL, ClientUnknown::INULL, ClientUnknown::INULL,
 			ClientUnknown::INULL
 		),
-		
+
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
@@ -175,7 +175,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
 		ClientUnknown::INULL,
-		
+
 		false,
 		false,
 		false,
@@ -194,7 +194,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			Client62::INULL, Client62::INULL, Client62::INULL,
 			Client62::INULL
 		),
-		
+
 		Client62::INULL,
 		Client62::INULL,
 		Client62::INULL,
@@ -202,7 +202,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		Client62::INULL,
 		Client62::INULL,
 		Client62::INULL,
-		
+
 		false,
 		false,
 		false,
@@ -221,7 +221,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			Titanium::INULL,						Titanium::INULL,						Titanium::INULL,
 			Titanium::invtype::OTHER_SIZE
 		),
-		
+
 		Titanium::invslot::EQUIPMENT_BITMASK,
 		Titanium::invslot::GENERAL_BITMASK,
 		Titanium::invslot::CURSOR_BITMASK,
@@ -229,7 +229,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		Titanium::invslot::CORPSE_BITMASK,
 		Titanium::invbag::SLOT_COUNT,
 		Titanium::invaug::SOCKET_COUNT,
-		
+
 		Titanium::inventory::AllowEmptyBagInBag,
 		Titanium::inventory::AllowClickCastFromBag,
 		Titanium::inventory::ConcatenateInvTypeLimbo,
@@ -248,7 +248,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 			SoF::INULL,							SoF::INULL,							SoF::INULL,
 			SoF::invtype::OTHER_SIZE
 		),
-		
+
 		SoF::invslot::EQUIPMENT_BITMASK,
 		SoF::invslot::GENERAL_BITMASK,
 		SoF::invslot::CURSOR_BITMASK,
@@ -256,7 +256,7 @@ static const EQ::inventory::LookupEntry inventory_static_lookup_entries[EQ::vers
 		SoF::invslot::CORPSE_BITMASK,
 		SoF::invbag::SLOT_COUNT,
 		SoF::invaug::SOCKET_COUNT,
-		
+
 		SoF::inventory::AllowEmptyBagInBag,
 		SoF::inventory::AllowClickCastFromBag,
 		SoF::inventory::ConcatenateInvTypeLimbo,
@@ -763,7 +763,7 @@ void EQ::inventory::InitializeDynamicLookups() {
 	// Notes:
 	// - Currently, there are only 3 known expansions that affect inventory-related settings in the clients..
 	//   -- Expansion::PoR "Prophecy of Ro" - toggles between 24 (set) and 16 (clear) bank slots
-	//   -- Expansion::TBS "The Buried Sea" - toggles slotPowerSource activated (set) and deactivated (clear) 
+	//   -- Expansion::TBS "The Buried Sea" - toggles slotPowerSource activated (set) and deactivated (clear)
 	//   -- Expansion::HoT "House of Thule" - toggles slotGeneral9/slotGeneral10 activated (set) and deactivated (clear)
 	// - Corspe size does not appear to reflect loss of active possessions slots
 	// - Inspect size does not appear to reflect loss of active equipment slots
@@ -772,7 +772,7 @@ void EQ::inventory::InitializeDynamicLookups() {
 	// - General9 and General10 slots are activated by GM flag when expansion bit is (clear)
 	// - Obviously, the client must support the expansion to allow any (set) or override condition
 
-	const uint32 dynamic_check_mask = 
+	const uint32 dynamic_check_mask =
 		(
 			EQ::expansions::bitPoR |
 			EQ::expansions::bitTBS |
@@ -1210,10 +1210,10 @@ void EQ::spells::InitializeDynamicLookups() {
 	if (spells_dictionary_init == true)
 		return;
 	spells_dictionary_init = true;
-	
+
 	if (RuleB(World, UseClientBasedExpansionSettings))
 		return;
-	
+
 	// use static references for now
 }
 
@@ -1239,7 +1239,7 @@ const EQ::spells::LookupEntry* EQ::spells::DynamicGMLookup(versions::ClientVersi
 	client_version = versions::ValidateClientVersion(client_version);
 	if (spells_dynamic_gm_lookup_entries[static_cast<int>(client_version)])
 		return spells_dynamic_gm_lookup_entries[static_cast<int>(client_version)].get();
-	
+
 	return &spells_static_lookup_entries[static_cast<int>(client_version)];
 }
 

common/eq_packet_structs.h

@@ -374,18 +374,18 @@ struct NewZone_Struct {
 /*0684*/	uint16	zone_id;
 /*0686*/	uint16	zone_instance;
 /*0688*/	uint32	unknown688;
-/*0692*/	uint8	unknown692[8];
+/*0692*/	uint8  unknown692[8];
 // Titanium doesn't have a translator, but we can still safely add stuff under here without issues since client memcpy's only what it knows
 // Just wastes some bandwidth sending to tit clients /shrug
-/*0700*/	float	fog_density;
-/*0704*/	uint32	SuspendBuffs;
-/*0708*/	uint32	FastRegenHP;
-/*0712*/	uint32	FastRegenMana;
-/*0716*/	uint32	FastRegenEndurance;
-/*0720*/	uint32	NPCAggroMaxDist;
-/*0724*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, if this value is 0, it prevents you from running off edges that would end up underworld
-/*0728*/	uint32	LavaDamage; // Seen 50
-/*0732*/	uint32	MinLavaDamage; // Seen 10
+/*0700*/	float  fog_density;
+/*0704*/	uint32 suspend_buffs;
+/*0708*/	uint32 fast_regen_hp;
+/*0712*/	uint32 fast_regen_mana;
+/*0716*/	uint32 fast_regen_endurance;
+/*0720*/	uint32 npc_aggro_max_dist;
+/*0724*/	uint32 underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, if this value is 0, it prevents you from running off edges that would end up underworld
+/*0728*/	uint32 lava_damage; // Seen 50
+/*0732*/	uint32 min_lava_damage; // Seen 10
 /*0736*/
 };
 
@@ -2192,11 +2192,19 @@ struct QuestReward_Struct
 	/*068*/
 };
 
+struct CashReward_Struct
+{
+	/*000*/ uint32 copper;
+	/*004*/ uint32 silver;
+	/*008*/ uint32 gold;
+	/*012*/ uint32 platinum;
+};
+
 // Size: 8
 struct Camera_Struct
 {
 	uint32	duration;	// Duration in ms
-	uint32	intensity;	// Between 1023410176 and 1090519040
+	float intensity;
 };
 
 struct ZonePoint_Entry {
@@ -3634,7 +3642,7 @@ struct MerchantList {
 	uint8 probability;
 	std::string bucket_name;
 	std::string bucket_value;
-	uint8 bucket_comparison; 
+	uint8 bucket_comparison;
 };
 
 struct TempMerchantList {
@@ -4998,7 +5006,7 @@ struct DynamicZoneCompassEntry_Struct
 /*000*/ uint16 dz_zone_id;      // target dz id pair
 /*002*/ uint16 dz_instance_id;
 /*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
-/*008*/ uint32 unknown008;
+/*008*/ uint32 dz_switch_id;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;

common/eq_stream.cpp

@@ -23,7 +23,7 @@
 #include "op_codes.h"
 #include "crc16.h"
 #include "platform.h"
-#include "string_util.h"
+#include "strings.h"
 
 #include <string>
 #include <iomanip>
@@ -406,7 +406,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 			if(uint16(SequencedBase + SequencedQueue.size()) != NextOutSeq) {
 				LogNetcode(_L "Pre-OOA Invalid Sequenced queue: BS [{}] + SQ [{}] != NOS [{}]" __L, SequencedBase, SequencedQueue.size(), NextOutSeq);
 			}
-			
+
 			//if the packet they got out of order is between our last acked packet and the last sent packet, then its valid.
 			if (CompareSequence(SequencedBase,seq) != SeqPast && CompareSequence(NextOutSeq,seq) == SeqPast) {
 				Log(Logs::Detail, Logs::Netcode, _L "Received OP_OutOfOrderAck for sequence %d, starting retransmit at the start of our unacked buffer (seq %d, was %d)." __L,
@@ -453,7 +453,7 @@ void EQStream::ProcessPacket(EQProtocolPacket *p)
 				(unsigned long)ntohl(ClientStats->packets_received), (unsigned long)ntohl(ClientStats->packets_sent), (unsigned long)ntohl(ClientStats->last_local_delta),
 				(unsigned long)ntohl(ClientStats->low_delta), (unsigned long)ntohl(ClientStats->average_delta),
 				(unsigned long)ntohl(ClientStats->high_delta), (unsigned long)ntohl(ClientStats->last_remote_delta));
-			
+
 			AdjustRates(ntohl(ClientStats->average_delta));
 
 			if(GetExecutablePlatform() == ExePlatformWorld || GetExecutablePlatform() == ExePlatformZone) {
@@ -951,7 +951,7 @@ EQRawApplicationPacket *p=nullptr;
 			EmuOpcode emu_op = (*OpMgr)->EQToEmu(p->opcode);
 			if (emu_op == OP_Unknown) {
 				// Log(Logs::General, Logs::Client_Server_Packet_Unhandled, "Unknown :: [%s - 0x%04x] [Size: %u] %s", OpcodeManager::EmuToName(p->GetOpcode()), p->opcode, p->Size(), DumpPacketToString(p).c_str());
-			} 
+			}
 			p->SetOpcode(emu_op);
 		}
 	}
@@ -1359,11 +1359,11 @@ void EQStream::AdjustRates(uint32 average_delta)
 			DecayRate=DECAYBASE/average_delta;
 			if (BytesWritten > RateThreshold)
 				BytesWritten = RateThreshold + DecayRate;
-			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, 
+			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L,
 				RateThreshold, DecayRate, average_delta);
 			MRate.unlock();
 		} else {
-			Log(Logs::Detail, Logs::Netcode, _L "Not adjusting data rate because avg delta over max (%d > %d)" __L, 
+			Log(Logs::Detail, Logs::Netcode, _L "Not adjusting data rate because avg delta over max (%d > %d)" __L,
 				average_delta, AVERAGE_DELTA_MAX);
 			AverageDelta = AVERAGE_DELTA_MAX;
 		}
@@ -1374,7 +1374,7 @@ void EQStream::AdjustRates(uint32 average_delta)
 			BytesWritten = 0;
 			RateThreshold=RATEBASE/average_delta;
 			DecayRate=DECAYBASE/average_delta;
-			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L, 
+			Log(Logs::Detail, Logs::Netcode, _L "Adjusting data rate to thresh %d, decay %d based on avg delta %d" __L,
 				RateThreshold, DecayRate, average_delta);
 			MRate.unlock();
 		}

common/eqemu_config.cpp

@@ -100,6 +100,10 @@ void EQEmuConfig::parse_config()
 		WorldHTTPEnabled = true;
 	}
 
+	if (_root["server"].get("disable_config_checks", "false").asString() == "true") {
+		DisableConfigChecks = true;
+	}
+
 	/**
 	 * UCS
 	 */

common/eqemu_config.h

@@ -58,6 +58,7 @@ class EQEmuConfig
 		uint16 WorldHTTPPort;
 		std::string WorldHTTPMimeFile;
 		std::string SharedKey;
+		bool DisableConfigChecks;
 
 		// From <chatserver/>
 		std::string ChatHost;
@@ -130,7 +131,7 @@ class EQEmuConfig
 		void parse_config();
 
 		EQEmuConfig()
-		{			
+		{
 
 		}
 		virtual ~EQEmuConfig() {}
@@ -174,7 +175,7 @@ class EQEmuConfig
 			}
 			catch (std::exception &) {
 				return false;
-			}			
+			}
 			return true;
 		}
 

common/eqemu_logsys.cpp

@@ -21,7 +21,7 @@
 #include "eqemu_logsys.h"
 #include "rulesys.h"
 #include "platform.h"
-#include "string_util.h"
+#include "strings.h"
 #include "misc.h"
 #include "discord/discord.h"
 #include "repositories/discord_webhooks_repository.h"
@@ -91,8 +91,8 @@ namespace Console {
  */
 EQEmuLogSys::EQEmuLogSys()
 {
-	on_log_gmsay_hook   = [](uint16 log_type, const std::string &) {};
-	on_log_console_hook = [](uint16 log_type, const std::string &) {};
+	m_on_log_gmsay_hook   = [](uint16 log_type, const std::string &) {};
+	m_on_log_console_hook = [](uint16 log_type, const std::string &) {};
 }
 
 /**
@@ -105,7 +105,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * Get Executable platform currently running this code (Zone/World/etc)
 	 */
-	log_platform = GetExecutablePlatformInt();
+	m_log_platform = GetExecutablePlatformInt();
 
 	for (int log_category_id = Logs::AA; log_category_id != Logs::MaxCategoryID; log_category_id++) {
 		log_settings[log_category_id].log_to_console      = 0;
@@ -115,7 +115,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 		log_settings[log_category_id].is_category_enabled = 0;
 	}
 
-	file_logs_enabled = false;
+	m_file_logs_enabled = false;
 
 	/**
 	 * Set Defaults
@@ -169,26 +169,26 @@ EQEmuLogSys *EQEmuLogSys::LoadLogSettingsDefaults()
 	/**
 	 * Declare process file names for log writing=
 	 */
-	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformWorld) {
-		platform_file_name = "world";
+	if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformWorld) {
+		m_platform_file_name = "world";
 	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformQueryServ) {
-		platform_file_name = "query_server";
+	else if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformQueryServ) {
+		m_platform_file_name = "query_server";
 	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone) {
-		platform_file_name = "zone";
+	else if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformZone) {
+		m_platform_file_name = "zone";
 	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformUCS) {
-		platform_file_name = "ucs";
+	else if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformUCS) {
+		m_platform_file_name = "ucs";
 	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformLogin) {
-		platform_file_name = "login";
+	else if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformLogin) {
+		m_platform_file_name = "login";
 	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformLaunch) {
-		platform_file_name = "launcher";
+	else if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformLaunch) {
+		m_platform_file_name = "launcher";
 	}
-	else if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformHC) {
-		platform_file_name = "hc";
+	else if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformHC) {
+		m_platform_file_name = "hc";
 	}
 
 	return this;
@@ -243,7 +243,7 @@ void EQEmuLogSys::ProcessLogWrite(
 		std::ofstream crash_log;
 		EQEmuLogSys::MakeDirectory("logs/crashes");
 		crash_log.open(
-			StringFormat("logs/crashes/crash_%s_%i.log", platform_file_name.c_str(), getpid()),
+			StringFormat("logs/crashes/crash_%s_%i.log", m_platform_file_name.c_str(), getpid()),
 			std::ios_base::app | std::ios_base::out
 		);
 		crash_log << time_stamp << " " << message << "\n";
@@ -366,7 +366,7 @@ void EQEmuLogSys::ProcessConsoleMessage(uint16 log_category, const std::string &
 	std::cout << EQEmuLogSys::GetLinuxConsoleColorFromCategory(log_category) << message << LC_RESET << std::endl;
 #endif
 
-	on_log_console_hook(log_category, message);
+	m_on_log_console_hook(log_category, message);
 }
 
 /**
@@ -430,9 +430,9 @@ void EQEmuLogSys::Out(
 	bool log_to_gmsay   = log_settings[log_category].log_to_gmsay > 0 &&
 						  log_settings[log_category].log_to_gmsay >= debug_level &&
 						  log_category != Logs::LogCategory::Netcode &&
-						  (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone ||
-						   EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformWorld);
-	bool log_to_discord = EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone &&
+						  (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformZone ||
+						   EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformWorld);
+	bool log_to_discord = EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformZone &&
 						  log_settings[log_category].log_to_discord > 0 &&
 						  log_settings[log_category].log_to_discord >= debug_level &&
 						  log_settings[log_category].discord_webhook_id > 0 &&
@@ -460,13 +460,13 @@ void EQEmuLogSys::Out(
 		EQEmuLogSys::ProcessConsoleMessage(log_category, output_debug_message);
 	}
 	if (log_to_gmsay) {
-		on_log_gmsay_hook(log_category, message);
+		m_on_log_gmsay_hook(log_category, output_message);
 	}
 	if (log_to_file) {
 		EQEmuLogSys::ProcessLogWrite(log_category, output_debug_message);
 	}
-	if (log_to_discord && on_log_discord_hook) {
-		on_log_discord_hook(log_category, log_settings[log_category].discord_webhook_id, output_message);
+	if (log_to_discord && m_on_log_discord_hook) {
+		m_on_log_discord_hook(log_category, log_settings[log_category].discord_webhook_id, output_message);
 	}
 }
 
@@ -518,23 +518,23 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 	/**
 	 * When loading settings, we must have been given a reason in category based logging to output to a file in order to even create or open one...
 	 */
-	if (!file_logs_enabled) {
+	if (!m_file_logs_enabled) {
 		return;
 	}
 
 	/**
 	 * Zone
 	 */
-	if (EQEmuLogSys::log_platform == EQEmuExePlatform::ExePlatformZone) {
+	if (EQEmuLogSys::m_log_platform == EQEmuExePlatform::ExePlatformZone) {
 		if (!log_name.empty()) {
-			platform_file_name = log_name;
+			m_platform_file_name = log_name;
 		}
 
-		if (platform_file_name.empty()) {
+		if (m_platform_file_name.empty()) {
 			return;
 		}
 
-		LogInfo("Starting File Log [logs/{}_{}.log]", platform_file_name.c_str(), getpid());
+		LogInfo("Starting File Log [logs/{}_{}.log]", m_platform_file_name.c_str(), getpid());
 
 		/**
 		 * Make directory if not exists
@@ -545,7 +545,7 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 		 * Open file pointer
 		 */
 		process_log.open(
-			StringFormat("logs/zone/%s_%i.log", platform_file_name.c_str(), getpid()),
+			StringFormat("logs/zone/%s_%i.log", m_platform_file_name.c_str(), getpid()),
 			std::ios_base::app | std::ios_base::out
 		);
 	}
@@ -554,17 +554,17 @@ void EQEmuLogSys::StartFileLogs(const std::string &log_name)
 		/**
 		 * All other processes
 		 */
-		if (platform_file_name.empty()) {
+		if (m_platform_file_name.empty()) {
 			return;
 		}
 
-		LogInfo("Starting File Log [logs/{}_{}.log]", platform_file_name.c_str(), getpid());
+		LogInfo("Starting File Log [logs/{}_{}.log]", m_platform_file_name.c_str(), getpid());
 
 		/**
 		 * Open file pointer
 		 */
 		process_log.open(
-			StringFormat("logs/%s_%i.log", platform_file_name.c_str(), getpid()),
+			StringFormat("logs/%s_%i.log", m_platform_file_name.c_str(), getpid()),
 			std::ios_base::app | std::ios_base::out
 		);
 	}
@@ -594,6 +594,8 @@ void EQEmuLogSys::EnableConsoleLogging()
 
 EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 {
+	InjectTablesIfNotExist();
+
 	auto categories = LogsysCategoriesRepository::GetWhere(
 		*m_database,
 		"TRUE ORDER BY log_category_id"
@@ -632,7 +634,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 		// If we go through this whole loop and nothing is set to any debug level, there
 		// is no point to create a file or keep anything open
 		if (log_settings[c.log_category_id].log_to_file > 0) {
-			LogSys.file_logs_enabled = true;
+			LogSys.m_file_logs_enabled = true;
 		}
 
 		db_categories.emplace_back(c.log_category_id);
@@ -648,7 +650,7 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 
 			auto new_category = LogsysCategoriesRepository::NewEntity();
 			new_category.log_category_id          = i;
-			new_category.log_category_description = EscapeString(Logs::LogCategoryName[i]);
+			new_category.log_category_description = Strings::Escape(Logs::LogCategoryName[i]);
 			new_category.log_to_console           = log_settings[i].log_to_console;
 			new_category.log_to_gmsay             = log_settings[i].log_to_gmsay;
 			new_category.log_to_file              = log_settings[i].log_to_file;
@@ -660,10 +662,10 @@ EQEmuLogSys *EQEmuLogSys::LoadLogDatabaseSettings()
 
 	LogInfo("Loaded [{}] log categories", categories.size());
 
-	auto webhooks = DiscordWebhooksRepository::All(*m_database);
+	auto webhooks = DiscordWebhooksRepository::GetWhere(*m_database, fmt::format("id < {}", MAX_DISCORD_WEBHOOK_ID));
 	if (!webhooks.empty()) {
 		for (auto &w: webhooks) {
-			discord_webhooks[w.id] = {w.id, w.webhook_name, w.webhook_url};
+			m_discord_webhooks[w.id] = {w.id, w.webhook_name, w.webhook_url};
 		}
 		LogInfo("Loaded [{}] Discord webhooks", webhooks.size());
 	}
@@ -678,3 +680,55 @@ EQEmuLogSys *EQEmuLogSys::SetDatabase(Database *db)
 	return this;
 }
 
+void EQEmuLogSys::InjectTablesIfNotExist()
+{
+	// do not run injections for zone as its unnecessary hits every time a zone boots
+	// other processes less frequently ran can pick up injection
+	if (m_log_platform == EQEmuExePlatform::ExePlatformZone) {
+		return;
+	}
+
+	// inject discord_webhooks
+	if (!m_database->DoesTableExist("discord_webhooks")) {
+		LogInfo("Creating table [discord_webhooks]");
+		m_database->QueryDatabase(
+			SQL(
+				CREATE TABLE discord_webhooks
+				(
+					id INT auto_increment primary key NULL,
+					webhook_name varchar(100) NULL,
+					webhook_url varchar(255) NULL,
+					created_at DATETIME NULL,
+					deleted_at DATETIME NULL
+				) ENGINE=InnoDB
+					DEFAULT CHARSET=utf8mb4
+					COLLATE=utf8mb4_general_ci;
+			)
+		);
+	}
+
+	// inject logsys_categories
+	if (!m_database->DoesTableExist("logsys_categories")) {
+		LogInfo("Creating table [logsys_categories]");
+		m_database->QueryDatabase(
+			SQL(
+				CREATE TABLE `logsys_categories` (
+					`log_category_id` int(11) NOT NULL,
+					`log_category_description` varchar(150) DEFAULT NULL,
+					`log_to_console` smallint(11) DEFAULT 0,
+					`log_to_file` smallint(11) DEFAULT 0,
+					`log_to_gmsay` smallint(11) DEFAULT 0,
+					`log_to_discord` smallint(11) DEFAULT 0,
+					`discord_webhook_id` int(11) DEFAULT 0,
+					PRIMARY KEY (`log_category_id`)
+				) ENGINE=InnoDB DEFAULT CHARSET=latin1
+			)
+		);
+	}
+}
+
+const EQEmuLogSys::DiscordWebhooks *EQEmuLogSys::GetDiscordWebhooks() const
+{
+	return m_discord_webhooks;
+}
+

common/eqemu_logsys.h

@@ -131,6 +131,7 @@ namespace Logs {
 		CombatRecord,
 		Hate,
 		Discord,
+		Faction,
 		MaxCategoryID /* Don't Remove this */
 	};
 
@@ -220,6 +221,7 @@ namespace Logs {
 		"CombatRecord",
 		"Hate",
 		"Discord",
+		"Faction",
 	};
 }
 
@@ -317,26 +319,20 @@ public:
 		std::string webhook_url;
 	};
 
-	DiscordWebhooks discord_webhooks[MAX_DISCORD_WEBHOOK_ID]{};
-
-	bool file_logs_enabled = false;
-
-	int         log_platform = 0;
-	std::string platform_file_name;
-
+	const DiscordWebhooks *GetDiscordWebhooks() const;
 
 	// gmsay
 	uint16 GetGMSayColorFromCategory(uint16 log_category);
 
 	EQEmuLogSys *SetGMSayHandler(std::function<void(uint16 log_type, const std::string &)> f)
 	{
-		on_log_gmsay_hook = f;
+		m_on_log_gmsay_hook = f;
 		return this;
 	}
 
 	EQEmuLogSys *SetDiscordHandler(std::function<void(uint16 log_category, int webhook_id, const std::string &)> f)
 	{
-		on_log_discord_hook = f;
+		m_on_log_discord_hook = f;
 		return this;
 	}
 
@@ -346,7 +342,7 @@ public:
 			uint16 log_type,
 			const std::string &
 		)> f
-	) { on_log_console_hook = f; }
+	) { m_on_log_console_hook = f; }
 	void SilenceConsoleLogging();
 	void EnableConsoleLogging();
 
@@ -357,9 +353,13 @@ private:
 
 	// reference to database
 	Database                                                                      *m_database;
-	std::function<void(uint16 log_category, const std::string &)>                 on_log_gmsay_hook;
-	std::function<void(uint16 log_category, int webhook_id, const std::string &)> on_log_discord_hook;
-	std::function<void(uint16 log_category, const std::string &)>                 on_log_console_hook;
+	std::function<void(uint16 log_category, const std::string &)>                 m_on_log_gmsay_hook;
+	std::function<void(uint16 log_category, int webhook_id, const std::string &)> m_on_log_discord_hook;
+	std::function<void(uint16 log_category, const std::string &)>                 m_on_log_console_hook;
+	DiscordWebhooks                                                               m_discord_webhooks[MAX_DISCORD_WEBHOOK_ID]{};
+	bool                                                                          m_file_logs_enabled = false;
+	int                                                                           m_log_platform      = 0;
+	std::string                                                                   m_platform_file_name;
 
 	std::string FormatOutMessageString(uint16 log_category, const std::string &in_message);
 	std::string GetLinuxConsoleColorFromCategory(uint16 log_category);
@@ -368,6 +368,7 @@ private:
 	void ProcessConsoleMessage(uint16 log_category, const std::string &message);
 	void ProcessLogWrite(uint16 log_category, const std::string &message);
 	bool IsRfc5424LogCategory(uint16 log_category);
+	void InjectTablesIfNotExist();
 };
 
 extern EQEmuLogSys LogSys;

common/eqemu_logsys_log_aliases.h

@@ -736,6 +736,16 @@
         OutF(LogSys, Logs::Detail, Logs::Discord, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
 } while (0)
 
+#define LogFaction(message, ...) do {\
+    if (LogSys.log_settings[Logs::Faction].is_category_enabled == 1)\
+        OutF(LogSys, Logs::General, Logs::Faction, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while(0)
+
+#define LogFactionDetail(message, ...) do {\
+    if (LogSys.log_settings[Logs::Faction].is_category_enabled == 1)\
+        OutF(LogSys, Logs::Detail, Logs::Faction, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
+} while(0)
+
 #define Log(debug_level, log_category, message, ...) do {\
     if (LogSys.log_settings[log_category].is_category_enabled == 1)\
         LogSys.Out(debug_level, log_category, __FILE__, __func__, __LINE__, message, ##__VA_ARGS__);\
@@ -1180,6 +1190,12 @@
 #define LogHateDetail(message, ...) do {\
 } while (0)
 
+#define LogFaction(message, ...) do {\
+} while (0)
+
+#define LogFactionDetail(message, ...) do {\
+} while (0)
+
 #define Log(debug_level, log_category, message, ...) do {\
 } while (0)
 

common/event/task.h

@@ -1,14 +1,14 @@
 #pragma once
+#include <any>
 #include <functional>
 #include <exception>
 #include "event_loop.h"
-#include "../any.h"
 
 namespace EQ {
 	class Task
 	{
 	public:
-		typedef std::function<void(const EQ::Any&)> ResolveFn;
+		typedef std::function<void(const std::any&)> ResolveFn;
 		typedef std::function<void(const std::exception&)> RejectFn;
 		typedef std::function<void()> FinallyFn;
 		typedef std::function<void(ResolveFn, RejectFn)> TaskFn;
@@ -19,7 +19,7 @@ namespace EQ {
 			RejectFn on_catch;
 			FinallyFn on_finally;
 			bool has_result;
-			EQ::Any result;
+			std::any result;
 			bool has_error;
 			std::exception error;
 		};
@@ -63,7 +63,7 @@ namespace EQ {
 			uv_queue_work(EventLoop::Get().Handle(), m_work, [](uv_work_t* req) {
 				TaskBaton *baton = (TaskBaton*)req->data;
 
-				baton->fn([baton](const EQ::Any& result) {
+				baton->fn([baton](const std::any& result) {
 					baton->has_error = false;
 					baton->has_result = true;
 					baton->result = result;

common/event/task_scheduler.h

@@ -60,8 +60,8 @@ namespace EQ
 			}
 			
 			template<typename Fn, typename... Args>
-			auto Enqueue(Fn&& fn, Args&&... args) -> std::future<typename std::result_of<Fn(Args...)>::type> {
-				using return_type = typename std::result_of<Fn(Args...)>::type;
+			auto Enqueue(Fn&& fn, Args&&... args) -> std::future<typename std::invoke_result<Fn, Args...>::type> {
+				using return_type = typename std::invoke_result<Fn, Args...>::type;
 			
 				auto task = std::make_shared<std::packaged_task<return_type()>>(
 					std::bind(std::forward<Fn>(fn), std::forward<Args>(args)...)

common/expedition_lockout_timer.cpp

@@ -19,7 +19,7 @@
  */
 
 #include "expedition_lockout_timer.h"
-#include "../common/string_util.h"
+#include "../common/strings.h"
 #include "../common/rulesys.h"
 #include "../common/util/uuid.h"
 #include <fmt/format.h>

common/faction.h

@@ -75,6 +75,23 @@ struct NPCFaction
 	uint8 temp;
 };
 
+// Faction Associations give a much more live like faction system
+// Basically the primary faction and magnitude of a faction hit will generate the rest of them
+
+// Largest faction I could find quickly was Lord Inquisitor Seru with 9 total hits (8 associations) so 8 + 2 for max for now
+#define MAX_FACTION_ASSOC 10
+
+// this is the ID of a faction association and it's multiplier
+struct FactionAssociationHit {
+	int id;
+	float multiplier;
+};
+
+struct FactionAssociations {
+	// maybe there should be more data here, fine for now
+	FactionAssociationHit hits[MAX_FACTION_ASSOC];
+};
+
 const char *FactionValueToString(FACTION_VALUE faction_value);
 FACTION_VALUE CalculateFaction(FactionMods* fm, int32 tmpCharacter_value);
 #endif

common/guild_base.cpp

@@ -20,7 +20,7 @@
 #include "database.h"
 
 //#include "misc_functions.h"
-#include "string_util.h"
+#include "strings.h"
 #include <cstdlib>
 #include <cstring>
 
@@ -1281,10 +1281,10 @@ bool BaseGuildManager::IsCharacterInGuild(uint32 character_id, uint32 guild_id)
 	if (current_guild_id == GUILD_NONE) {
 		return false;
 	}
-	
+
 	if (guild_id && current_guild_id != guild_id) {
 		return false;
 	}
 
 	return true;
-}
+}

common/inventory_profile.cpp

@@ -25,7 +25,7 @@
 //#include "races.h"
 //#include "rulesys.h"
 //#include "shareddb.h"
-#include "string_util.h"
+#include "strings.h"
 
 #include "../common/light_source.h"
 
@@ -245,7 +245,7 @@ int16 EQ::InventoryProfile::PutItem(int16 slot_id, const ItemInstance& inst)
 		if (temp_slot >= m_lookup->InventoryTypeSize.Bank)
 			return EQ::invslot::SLOT_INVALID;
 	}
-	
+
 	// Clean up item already in slot (if exists)
 	DeleteItem(slot_id);
 
@@ -617,7 +617,7 @@ int EQ::InventoryProfile::CountAugmentEquippedByID(uint32 item_id)
 			quantity += item->CountAugmentByID(item_id);
 		}
 	}
-	
+
 	return quantity;
 }
 
@@ -648,7 +648,7 @@ int EQ::InventoryProfile::CountItemEquippedByID(uint32 item_id)
 			quantity += item->IsStackable() ? item->GetCharges() : 1;
 		}
 	}
-	
+
 	return quantity;
 }
 
@@ -993,7 +993,7 @@ int16 EQ::InventoryProfile::CalcSlotId(int16 slot_id) {
 	//else if (slot_id >= EmuConstants::BANK_BEGIN && slot_id <= EmuConstants::BANK_END)
 	//	parent_slot_id = EmuConstants::BANK_BEGIN + (slot_id - EmuConstants::BANK_BEGIN) / EmuConstants::ITEM_CONTAINER_SIZE;
 	//else if (slot_id >= 3100 && slot_id <= 3179) should be {3031..3110}..where did this range come from!!? (verified db save range)
-	
+
 	if (slot_id >= invbag::GENERAL_BAGS_BEGIN && slot_id <= invbag::GENERAL_BAGS_END) {
 		parent_slot_id = invslot::GENERAL_BEGIN + (slot_id - invbag::GENERAL_BAGS_BEGIN) / invbag::SLOT_COUNT;
 	}
@@ -1231,7 +1231,7 @@ uint8 EQ::InventoryProfile::FindBrightestLightType()
 	for (auto iter = m_worn.begin(); iter != m_worn.end(); ++iter) {
 		if ((iter->first < invslot::EQUIPMENT_BEGIN || iter->first > invslot::EQUIPMENT_END))
 			continue;
-		
+
 		if (iter->first == invslot::slotAmmo)
 			continue;
 
@@ -1369,7 +1369,7 @@ EQ::ItemInstance* EQ::InventoryProfile::_GetItem(const std::map<int16, ItemInsta
 		if (slot_id - EQ::invslot::BANK_BEGIN >= m_lookup->InventoryTypeSize.Bank)
 			return nullptr;
 	}
-	
+
 	auto it = bucket.find(slot_id);
 	if (it != bucket.end()) {
 		return it->second;
@@ -1441,7 +1441,7 @@ int16 EQ::InventoryProfile::_PutItem(int16 slot_id, ItemInstance* inst)
 			result = slot_id;
 		}
 	}
-	
+
 	if (result == INVALID_INDEX) {
 		LogError("InventoryProfile::_PutItem: Invalid slot_id specified ({}) with parent slot id ({})", slot_id, parentSlot);
 		InventoryProfile::MarkDirty(inst); // Slot not found, clean up
@@ -1478,7 +1478,7 @@ int16 EQ::InventoryProfile::_HasItem(std::map<int16, ItemInstance*>& bucket, uin
 			if (inst->GetAugmentItemID(index) == item_id && quantity <= 1)
 				return invslot::SLOT_AUGMENT_GENERIC_RETURN;
 		}
-		
+
 		if (!inst->IsClassBag()) { continue; }
 
 		for (auto bag_iter = inst->_cbegin(); bag_iter != inst->_cend(); ++bag_iter) {
@@ -1509,7 +1509,7 @@ int16 EQ::InventoryProfile::_HasItem(ItemInstQueue& iqueue, uint32 item_id, uint
 	// is sufficient. However, in cases where referential criteria is considered, this can lead
 	// to unintended results. Funtionality should be observed when referencing the return value
 	// of this query
-	
+
 	uint32 quantity_found = 0;
 
 	for (auto iter = iqueue.cbegin(); iter != iqueue.cend(); ++iter) {
@@ -1715,6 +1715,6 @@ int16 EQ::InventoryProfile::_HasItemByLoreGroup(ItemInstQueue& iqueue, uint32 lo
 		// We only check the visible cursor due to lack of queue processing ability (client allows duplicate in limbo)
 		break;
 	}
-	
+
 	return EQ::invslot::SLOT_INVALID;
 }

common/inventory_slot.cpp

@@ -19,7 +19,7 @@
 
 #include "inventory_slot.h"
 #include "textures.h"
-#include "string_util.h"
+#include "strings.h"
 
 
 int8 EQ::inventory::ConvertEquipmentIndexToTextureIndex(int16 slot_index)
@@ -86,7 +86,7 @@ bool EQ::InventorySlot::IsValidSlot() const
 {
 	if (_typeless)
 		return false;
-	
+
 	int16 slot_count = invtype::GetInvTypeSize(_type_index);
 	if (!slot_count || _slot_index < invslot::SLOT_BEGIN || _slot_index >= slot_count)
 		return false;
@@ -136,7 +136,7 @@ bool EQ::InventorySlot::IsWeaponIndex(int16 slot_index)
 {
 	if (slot_index == invslot::slotPrimary || slot_index == invslot::slotSecondary || slot_index == invslot::slotRange)
 		return true;
-	
+
 	return false;
 }
 
@@ -364,7 +364,7 @@ bool EQ::InventorySlot::operator<(const InventorySlot& rhs) const
 {
 	if (Typeless() || rhs.Typeless())
 		return inventory_slot_typeless_lessthan(*this, rhs);
-	
+
 	if (TypeIndex() < rhs.TypeIndex())
 		return true;
 
@@ -384,6 +384,6 @@ bool EQ::operator==(const InventorySlot& lhs, const InventorySlot& rhs)
 {
 	if (lhs.Typeless() || rhs.Typeless())
 		return ((lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex()));
-	
+
 	return ((lhs.TypeIndex() == rhs.TypeIndex()) && (lhs.SlotIndex() == rhs.SlotIndex()) && (lhs.ContainerIndex() == rhs.ContainerIndex()) && (lhs.SocketIndex() == rhs.SocketIndex()));
 }

common/ip_util.cpp

@@ -18,7 +18,17 @@
  *
  */
 
+#include <cstring>
+#include <fmt/format.h>
+#include <csignal>
+#include <vector>
 #include "ip_util.h"
+#include "http/httplib.h"
+#include "http/uri.h"
+#include "eqemu_logsys.h"
+#include "event/event_loop.h"
+#include "net/dns.h"
+#include "event/task_scheduler.h"
 
 /**
  * @param ip
@@ -70,3 +80,148 @@ bool IpUtil::IsIpInPrivateRfc1918(const std::string &ip)
 		IpUtil::IsIpInRange(ip, "192.168.0.0", "255.255.0.0")
 	);
 }
+
+/**
+ * Gets local address - pings google to inspect what interface was used locally
+ * @return
+ */
+std::string IpUtil::GetLocalIPAddress()
+{
+	char               my_ip_address[16];
+	unsigned int       my_port;
+	struct sockaddr_in server_address{};
+	struct sockaddr_in my_address{};
+	int                sockfd;
+
+	// Connect to server
+	if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
+		return "";
+	}
+
+	// Set server_addr
+	memset(&server_address, 0, sizeof(server_address));
+	server_address.sin_family      = AF_INET;
+	server_address.sin_addr.s_addr = inet_addr("172.217.160.99");
+	server_address.sin_port        = htons(80);
+
+	// Connect to server
+	if (connect(sockfd, (struct sockaddr *) &server_address, sizeof(server_address)) < 0) {
+		close(sockfd);
+		return "";
+	}
+
+	// Get my ip address and port
+	memset(&my_address, 0, sizeof(my_address));
+	socklen_t len = sizeof(my_address);
+	getsockname(sockfd, (struct sockaddr *) &my_address, &len);
+	inet_ntop(AF_INET, &my_address.sin_addr, my_ip_address, sizeof(my_ip_address));
+	my_port = ntohs(my_address.sin_port);
+
+	return fmt::format("{}", my_ip_address);
+}
+
+/**
+ * Gets public address
+ * Uses various websites as options to return raw public IP back to the client
+ * @return
+ */
+std::string IpUtil::GetPublicIPAddress()
+{
+	std::vector<std::string> endpoints = {
+		"http://ifconfig.me",
+		"http://api.ipify.org",
+		"http://ipinfo.io/ip",
+		"http://ipecho.net/plain",
+	};
+
+	for (auto &s: endpoints) {
+		// http get request
+		uri u(s);
+
+		httplib::Client r(
+			fmt::format(
+				"{}://{}",
+				u.get_scheme(),
+				u.get_host()
+			).c_str()
+		);
+
+		httplib::Headers headers = {
+			{"Content-type", "text/plain; charset=utf-8"},
+			{"User-Agent",   "curl/7.81.0"}
+		};
+
+		r.set_connection_timeout(1, 0);
+		r.set_read_timeout(1, 0);
+		r.set_write_timeout(1, 0);
+
+		if (auto res = r.Get(fmt::format("/{}", u.get_path()).c_str(), headers)) {
+			if (res->status == 200) {
+				if (res->body.find('.') != std::string::npos) {
+					return res->body;
+				}
+			}
+		}
+	}
+
+	return {};
+}
+
+std::string IpUtil::DNSLookupSync(const std::string &addr, int port)
+{
+	auto task_runner = new EQ::Event::TaskScheduler();
+	auto res         = task_runner->Enqueue(
+		[&]() -> std::string {
+			bool        running = true;
+			std::string ret;
+
+			EQ::Net::DNSLookup(
+				addr, port, false, [&](const std::string &addr) {
+					ret = addr;
+					if (addr.empty()) {
+						ret     = "";
+						running = false;
+					}
+
+					return ret;
+				}
+			);
+
+			std::chrono::steady_clock::time_point begin = std::chrono::steady_clock::now();
+
+			auto &loop = EQ::EventLoop::Get();
+			while (running) {
+				if (!ret.empty()) {
+					running = false;
+				}
+
+				std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
+				if (std::chrono::duration_cast<std::chrono::milliseconds>(end - begin).count() > 1500) {
+					LogInfo(
+						"[DNSLookupSync] Deadline exceeded [{}]",
+						1500
+					);
+					running = false;
+				}
+
+				loop.Process();
+			}
+
+			return ret;
+		}
+	);
+
+	std::string result = res.get();
+	safe_delete(task_runner);
+
+	return result;
+}
+
+bool IpUtil::IsIPAddress(const std::string &ip_address)
+{
+	struct sockaddr_in sa{};
+	int                result = inet_pton(AF_INET, ip_address.c_str(), &(sa.sin_addr));
+	return result != 0;
+}
+
+

common/ip_util.h

@@ -30,7 +30,14 @@ public:
 	static uint32_t IPToUInt(const std::string &ip);
 	static bool IsIpInRange(const std::string &ip, const std::string &network, const std::string &mask);
 	static bool IsIpInPrivateRfc1918(const std::string &ip);
+	static std::string GetLocalIPAddress();
+	static std::string GetPublicIPAddress();
+	static std::string DNSLookupSync(
+		const std::string &addr,
+		int port
+	);
+	static bool IsIPAddress(const std::string &ip_address);
 
 };
 
-#endif //EQEMU_IP_UTIL_H
+#endif //EQEMU_IP_UTIL_H

common/item_instance.cpp

@@ -23,7 +23,7 @@
 //#include "races.h"
 #include "rulesys.h"
 #include "shareddb.h"
-#include "string_util.h"
+#include "strings.h"
 
 //#include "../common/light_source.h"
 

common/md5.cpp

@@ -9,7 +9,7 @@
 */
 #include <string.h> /* for memcpy() */
 #include "../common/md5.h"
-#include "../common/string_util.h"
+#include "../common/strings.h"
 #include "../common/seperator.h"
 
 MD5::MD5() {

common/mysql_request_row.h

@@ -10,8 +10,14 @@
 #include <iterator>
 #include "types.h"
 
-class MySQLRequestRow : public std::iterator<std::input_iterator_tag, MYSQL_ROW>
+class MySQLRequestRow
 {
+public:
+	using iterator_category = std::input_iterator_tag;
+	using value_type = MYSQL_ROW;
+	using difference_type = std::ptrdiff_t;
+	using pointer = MYSQL_ROW*;
+	using reference = MYSQL_ROW&;
 
 private:
 	MYSQL_RES* m_Result;

common/net/console_server.cpp

@@ -1,5 +1,5 @@
 #include "console_server.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include <fmt/format.h>
 
 EQ::Net::ConsoleServer::ConsoleServer(const std::string &addr, int port)
@@ -52,11 +52,11 @@ void EQ::Net::ConsoleServer::ConnectionDisconnected(ConsoleServerConnection *c)
 
 void EQ::Net::ConsoleServer::ProcessCommand(ConsoleServerConnection *c, const std::string &cmd)
 {
-	auto split = SplitString(cmd, ' ');
-	
+	auto split = Strings::Split(cmd, ' ');
+
 	if (split.size() > 0) {
 		auto command = split[0];
-		ToLowerString(command);
+		command = Strings::ToLower(command);
 
 		if (command == "help" || command == "?") {
 			c->SendLine("Commands:");
@@ -70,9 +70,9 @@ void EQ::Net::ConsoleServer::ProcessCommand(ConsoleServerConnection *c, const st
 			c->SendPrompt();
 			return;
 		}
-	
+
 		split.erase(split.begin(), split.begin() + 1);
-		
+
 		auto cmd_def = m_commands.find(command);
 		if (cmd_def != m_commands.end()) {
 			if (c->Admin() >= cmd_def->second.status_required) {

common/net/console_server_connection.cpp

@@ -116,43 +116,42 @@ bool EQ::Net::ConsoleServerConnection::SendChannelMessage(const ServerChannelMes
 	}
 
 	switch (scm->chan_num) {
-		case 4: {
-			if (RuleB(Chat, ServerWideAuction)) {
-				QueueMessage(fmt::format("{0} auctions, '{1}'", scm->from, scm->message));
-				break;
-			} else { // I think we want default action in this case?
-				return false;
-			}
-		}
-
-		case 5: {
-			if (RuleB(Chat, ServerWideOOC)) {
-				QueueMessage(fmt::format("{0} says ooc, '{1}'", scm->from, scm->message));
-				break;
-			} else { // I think we want default action in this case?
-				return false;
-			}
-		}
-
-		case 6: {
-			QueueMessage(fmt::format("{0} BROADCASTS, '{1}'", scm->from, scm->message));
+		case ChatChannel_Guild: {
+			QueueMessage(fmt::format("{} tells the guild [{}], '{}'", scm->from, scm->guilddbid, scm->message));
 			break;
 		}
-
-		case 7: {
-			QueueMessage(fmt::format("[{0}] tells you, '{1}'", scm->from, scm->message));
+		case ChatChannel_Auction: {
+			if (RuleB(Chat, ServerWideAuction)) {
+				QueueMessage(fmt::format("{} auctions, '{}'", scm->from, scm->message));
+				break;
+			} else { // I think we want default action in this case?
+				return false;
+			}
+		}
+		case ChatChannel_OOC: {
+			if (RuleB(Chat, ServerWideOOC)) {
+				QueueMessage(fmt::format("{} says ooc, '{}'", scm->from, scm->message));
+				break;
+			} else { // I think we want default action in this case?
+				return false;
+			}
+		}
+		case ChatChannel_Broadcast: {
+			QueueMessage(fmt::format("{} BROADCASTS, '{}'", scm->from, scm->message));
+			break;
+		}
+		case ChatChannel_Tell: {
+			QueueMessage(fmt::format("[{}] tells {}, '{}'", scm->from, scm->to, scm->message));
 			if (onTell) {
 				onTell();
 			}
 
 			break;
 		}
-		
-		case 11: {
-			QueueMessage(fmt::format("{0} GMSAYS, '{1}'", scm->from, scm->message));
+		case ChatChannel_GMSAY: {
+			QueueMessage(fmt::format("{} GMSAYS, '{}'", scm->from, scm->message));
 			break;
 		}
-
 		default: {
 			return false;
 		}

common/net/daybreak_connection.cpp

@@ -1394,7 +1394,7 @@ void EQ::Net::DaybreakConnection::InternalQueuePacket(Packet &p, int stream_id,
 		first_header.total_size = (uint32_t)HostToNetwork((uint32_t)length);
 
 		size_t used = 0;
-		size_t sublen = m_max_packet_size - m_crc_bytes - DaybreakReliableFragmentHeader::size();
+		size_t sublen = m_max_packet_size - m_crc_bytes - DaybreakReliableFragmentHeader::size() - 1; // -1 for compress flag
 		DynamicPacket first_packet;
 		first_packet.PutSerialize(0, first_header);
 		first_packet.PutData(DaybreakReliableFragmentHeader::size(), (char*)p.Data() + used, sublen);

common/patches/rof.cpp

@@ -11,7 +11,7 @@
 	are required to give you total support for your newly bought product;
 	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 	A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -28,7 +28,7 @@
 
 #include "../eq_packet_structs.h"
 #include "../misc_functions.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../inventory_profile.h"
 #include "rof_structs.h"
 #include "../rulesys.h"
@@ -52,13 +52,13 @@ namespace RoF
 	static inline structs::InventorySlot_Struct ServerToRoFCorpseSlot(uint32 server_corpse_slot);
 	static inline uint32 ServerToRoFCorpseMainSlot(uint32 server_corpse_slot);
 	static inline structs::TypelessInventorySlot_Struct ServerToRoFTypelessSlot(uint32 server_slot, int16 server_type);
-	
+
 	// client to server inventory location converters
 	static inline uint32 RoFToServerSlot(structs::InventorySlot_Struct rof_slot);
 	static inline uint32 RoFToServerCorpseSlot(structs::InventorySlot_Struct rof_corpse_slot);
 	static inline uint32 RoFToServerCorpseMainSlot(uint32 rof_corpse_slot);
 	static inline uint32 RoFToServerTypelessSlot(structs::TypelessInventorySlot_Struct rof_slot, int16 rof_type);
-	
+
 	// server to client say link converter
 	static inline void ServerToRoFSayLink(std::string& rofSayLink, const std::string& serverSayLink);
 
@@ -736,30 +736,6 @@ namespace RoF
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzCompass)
-	{
-		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
-			sizeof(structs::DynamicZoneCompass_Struct) +
-			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
-		);
-
-		OUT(client_id);
-		OUT(count);
-
-		for (uint32 i = 0; i < emu->count; ++i)
-		{
-			OUT(entries[i].dz_zone_id);
-			OUT(entries[i].dz_instance_id);
-			OUT(entries[i].dz_type);
-			OUT(entries[i].x);
-			OUT(entries[i].y);
-			OUT(entries[i].z);
-		}
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_DzExpeditionEndsWarning)
 	{
 		ENCODE_LENGTH_EXACT(ExpeditionExpireWarning);
@@ -1558,7 +1534,7 @@ namespace RoF
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -1838,10 +1814,10 @@ namespace RoF
 		OUT_str(zone_short_name2);
 		OUT(zone_id);
 		OUT(zone_instance);
-		OUT(SuspendBuffs);
-		OUT(FastRegenHP);
-		OUT(FastRegenMana);
-		OUT(FastRegenEndurance);
+		OUT(suspend_buffs);
+		OUT(fast_regen_hp);
+		OUT(fast_regen_mana);
+		OUT(fast_regen_endurance);
 		OUT(underworld_teleport_index);
 
 		eq->FogDensity = emu->fog_density;
@@ -1849,8 +1825,8 @@ namespace RoF
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown800 = -1;
 		eq->unknown844 = 600;
-		OUT(LavaDamage);
-		OUT(MinLavaDamage);
+		OUT(lava_damage);
+		OUT(min_lava_damage);
 		eq->unknown888 = 1;
 		eq->unknown889 = 0;
 		eq->unknown890 = 1;
@@ -5188,7 +5164,7 @@ namespace RoF
 	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type)
 	{
 		const EQ::ItemData *item = inst->GetUnscaledItem();
-		
+
 		RoF::structs::ItemSerializationHeader hdr;
 
 		//sprintf(hdr.unknown000, "06e0002Y1W00");
@@ -5207,7 +5183,7 @@ namespace RoF
 			slot_id = ServerToRoFSlot(slot_id_in);
 			break;
 		}
-		
+
 		hdr.slot_type = (inst->GetMerchantSlot() ? invtype::typeMerchant : slot_id.Type);
 		hdr.main_slot = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : slot_id.Slot);
 		hdr.sub_slot = (inst->GetMerchantSlot() ? 0xffff : slot_id.SubIndex);
@@ -5295,7 +5271,7 @@ namespace RoF
 		ob.write("\0", 1);
 
 		ob.write("\0", 1);
-		
+
 		RoF::structs::ItemBodyStruct ibs;
 		memset(&ibs, 0, sizeof(RoF::structs::ItemBodyStruct));
 
@@ -5608,7 +5584,7 @@ namespace RoF
 		iqbs.unknown28 = 0;
 		iqbs.unknown30 = 0;
 		iqbs.unknown39 = 1;
-		
+
 		ob.write((const char*)&iqbs, sizeof(RoF::structs::ItemQuaternaryBodyStruct));
 
 		EQ::OutBuffer::pos_type count_pos = ob.tellp();
@@ -5776,7 +5752,7 @@ namespace RoF
 	static inline uint32 ServerToRoFCorpseMainSlot(uint32 server_corpse_slot)
 	{
 		uint32 RoFSlot = invslot::SLOT_INVALID;
-		
+
 		if (server_corpse_slot <= EQ::invslot::CORPSE_END && server_corpse_slot >= EQ::invslot::CORPSE_BEGIN) {
 			RoFSlot = server_corpse_slot;
 		}
@@ -6123,7 +6099,7 @@ namespace RoF
 			return;
 		}
 
-		auto segments = SplitString(serverSayLink, '\x12');
+		auto segments = Strings::Split(serverSayLink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
@@ -6162,7 +6138,7 @@ namespace RoF
 			return;
 		}
 
-		auto segments = SplitString(rofSayLink, '\x12');
+		auto segments = Strings::Split(rofSayLink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {

common/patches/rof2.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 
 #include "../eq_packet_structs.h"
 #include "../misc_functions.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../inventory_profile.h"
 #include "rof2_structs.h"
 #include "../rulesys.h"
@@ -53,13 +53,13 @@ namespace RoF2
 	static inline structs::InventorySlot_Struct ServerToRoF2CorpseSlot(uint32 server_corpse_slot);
 	static inline uint32 ServerToRoF2CorpseMainSlot(uint32 server_corpse_slot);
 	static inline structs::TypelessInventorySlot_Struct ServerToRoF2TypelessSlot(uint32 server_slot, int16 server_type);
-	
+
 	// client to server inventory location converters
 	static inline uint32 RoF2ToServerSlot(structs::InventorySlot_Struct rof2_slot);
 	static inline uint32 RoF2ToServerCorpseSlot(structs::InventorySlot_Struct rof2_corpse_slot);
 	static inline uint32 RoF2ToServerCorpseMainSlot(uint32 rof2_corpse_slot);
 	static inline uint32 RoF2ToServerTypelessSlot(structs::TypelessInventorySlot_Struct rof2_slot, int16 rof2_type);
-	
+
 	// server to client say link converter
 	static inline void ServerToRoF2SayLink(std::string &rof2_saylink, const std::string &server_saylink);
 
@@ -785,30 +785,6 @@ namespace RoF2
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzCompass)
-	{
-		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
-			sizeof(structs::DynamicZoneCompass_Struct) +
-			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
-		);
-
-		OUT(client_id);
-		OUT(count);
-
-		for (uint32 i = 0; i < emu->count; ++i)
-		{
-			OUT(entries[i].dz_zone_id);
-			OUT(entries[i].dz_instance_id);
-			OUT(entries[i].dz_type);
-			OUT(entries[i].x);
-			OUT(entries[i].y);
-			OUT(entries[i].z);
-		}
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_DzExpeditionEndsWarning)
 	{
 		ENCODE_LENGTH_EXACT(ExpeditionExpireWarning);
@@ -1887,13 +1863,13 @@ namespace RoF2
 		OUT_str(zone_short_name2);
 		OUT(zone_id);
 		OUT(zone_instance);
-		OUT(SuspendBuffs);
-		OUT(FastRegenHP);
-		OUT(FastRegenMana);
-		OUT(FastRegenEndurance);
+		OUT(suspend_buffs);
+		OUT(fast_regen_hp);
+		OUT(fast_regen_mana);
+		OUT(fast_regen_endurance);
 		OUT(underworld_teleport_index);
 
-		eq->FogDensity = emu->fog_density;
+		eq->fog_density = emu->fog_density;
 
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->ZoneTimeZone = 0;
@@ -1905,22 +1881,22 @@ namespace RoF2
 		eq->SkyRelated2 = -1;
 		eq->NPCAggroMaxDist = 600;
 		eq->FilterID = 2008; // Guild Lobby observed value
-		OUT(LavaDamage);
-		OUT(MinLavaDamage);
-		eq->bDisallowManaStone = 1;
-		eq->bNoBind = 0;
-		eq->bNoAttack = 0;
-		eq->bNoCallOfHero = 0;
-		eq->bNoFlux = 0;
-		eq->bNoFear = 0;
-		eq->fall_damage = 0;	// 0 = Fall Damage on, 1 = Fall Damage off
-		eq->unknown895 = 0;
-		eq->CanPlaceCampsite = 2;
-		eq->CanPlaceGuildBanner = 2;
-		eq->FishingRelated = -1;	// Set from PoK Example
-		eq->ForageRelated = -1;	// Set from PoK Example
-		eq->bNoLevitate = 0;
-		eq->Blooming = 1.0;	// Set from PoK Example
+		OUT(lava_damage);
+		OUT(min_lava_damage);
+		eq->bDisallowManaStone     = 1;
+		eq->bNoBind                = 0;
+		eq->bNoAttack              = 0;
+		eq->bNoCallOfHero          = 0;
+		eq->bNoFlux                = 0;
+		eq->bNoFear                = 0;
+		eq->fall_damage            = 0;	// 0 = Fall Damage on, 1 = Fall Damage off
+		eq->unknown895             = 0;
+		eq->can_place_campsite     = 2;
+		eq->can_place_guild_banner = 2;
+		eq->fishing_related        = -1;	// Set from PoK Example
+		eq->forage_related         = -1;	// Set from PoK Example
+		eq->b_no_levitate          = 0;
+		eq->blooming               = 1.0;	// Set from PoK Example
 
 		FINISH_ENCODE();
 	}
@@ -2894,12 +2870,12 @@ namespace RoF2
 		EQApplicationPacket *inapp = *p;
 		*p = nullptr;
 		AARankInfo_Struct *emu = (AARankInfo_Struct*)inapp->pBuffer;
-		
+
 		// the structs::SendAA_Struct includes enough space for 1 prereq which is the min even if it has no prereqs
 		auto prereq_size = emu->total_prereqs > 1 ? (emu->total_prereqs - 1) * 8 : 0;
 		auto outapp = new EQApplicationPacket(OP_SendAATable, sizeof(structs::SendAA_Struct) + emu->total_effects * sizeof(structs::AA_Ability) + prereq_size);
 		inapp->SetReadPosition(sizeof(AARankInfo_Struct)+emu->total_effects * sizeof(AARankEffect_Struct));
-		
+
 
 		std::vector<int32> skill;
 		std::vector<int32> points;
@@ -2962,7 +2938,7 @@ namespace RoF2
 			outapp->WriteUInt32(inapp->ReadUInt32()); // base2
 			outapp->WriteUInt32(inapp->ReadUInt32()); // slot
  		}
-			
+
 		dest->FastQueuePacket(&outapp);
 		delete inapp;
 	}
@@ -5062,11 +5038,11 @@ namespace RoF2
 		SETUP_DIRECT_DECODE(MoveItem_Struct, structs::MoveItem_Struct);
 
 		Log(Logs::Moderate, Logs::Netcode, "RoF2::DECODE(OP_MoveItem)");
-		
+
 		emu->from_slot = RoF2ToServerSlot(eq->from_slot);
 		emu->to_slot = RoF2ToServerSlot(eq->to_slot);
 		IN(number_in_stack);
-		
+
 		//LogNetcode("[RoF2] MoveItem Slot from [{}] to [{}], Number [{}]", emu->from_slot, emu->to_slot, emu->number_in_stack);
 
 		FINISH_DIRECT_DECODE();
@@ -5443,7 +5419,7 @@ namespace RoF2
 	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth, ItemPacketType packet_type)
 	{
 		const EQ::ItemData *item = inst->GetUnscaledItem();
-		
+
 		RoF2::structs::ItemSerializationHeader hdr;
 
 		//sprintf(hdr.unknown000, "06e0002Y1W00");
@@ -5462,7 +5438,7 @@ namespace RoF2
 			slot_id = ServerToRoF2Slot(slot_id_in);
 			break;
 		}
-		
+
 		hdr.slot_type = (inst->GetMerchantSlot() ? invtype::typeMerchant : slot_id.Type);
 		hdr.main_slot = (inst->GetMerchantSlot() ? inst->GetMerchantSlot() : slot_id.Slot);
 		hdr.sub_slot = (inst->GetMerchantSlot() ? 0xffff : slot_id.SubIndex);
@@ -5550,7 +5526,7 @@ namespace RoF2
 		ob.write("\0", 1);
 
 		ob.write("\0", 1);
-		
+
 		RoF2::structs::ItemBodyStruct ibs;
 		memset(&ibs, 0, sizeof(RoF2::structs::ItemBodyStruct));
 
@@ -5873,7 +5849,7 @@ namespace RoF2
 		iqbs.unknown37a = 0;	// (guessed position) New to RoF2
 		iqbs.unknown38 = 0;
 		iqbs.unknown39 = 1;
-		
+
 		ob.write((const char*)&iqbs, sizeof(RoF2::structs::ItemQuaternaryBodyStruct));
 
 		EQ::OutBuffer::pos_type count_pos = ob.tellp();
@@ -6073,7 +6049,7 @@ namespace RoF2
 
 		uint32 server_slot = EQ::invslot::SLOT_INVALID;
 		uint32 temp_slot = invslot::SLOT_INVALID;
-		
+
 		switch (rof2_slot.Type) {
 		case invtype::typePossessions: {
 			if (rof2_slot.Slot >= invslot::POSSESSIONS_BEGIN && rof2_slot.Slot <= invslot::POSSESSIONS_END) {
@@ -6188,11 +6164,11 @@ namespace RoF2
 	static inline uint32 RoF2ToServerCorpseSlot(structs::InventorySlot_Struct rof2_corpse_slot)
 	{
 		uint32 ServerSlot = EQ::invslot::SLOT_INVALID;
-		
+
 		if (rof2_corpse_slot.Type != invtype::typeCorpse || rof2_corpse_slot.SubIndex != invbag::SLOT_INVALID || rof2_corpse_slot.AugIndex != invaug::SOCKET_INVALID) {
 			ServerSlot = EQ::invslot::SLOT_INVALID;
 		}
-		
+
 		else {
 			ServerSlot = RoF2ToServerCorpseMainSlot(rof2_corpse_slot.Slot);
 		}
@@ -6346,7 +6322,7 @@ namespace RoF2
 			return;
 		}
 
-		auto segments = SplitString(server_saylink, '\x12');
+		auto segments = Strings::Split(server_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
@@ -6378,7 +6354,7 @@ namespace RoF2
 			return;
 		}
 
-		auto segments = SplitString(rof2_saylink, '\x12');
+		auto segments = Strings::Split(rof2_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {

common/patches/rof2_limits.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "rof2_limits.h"
 
-#include "../string_util.h"
+#include "../strings.h"
 
 
 int16 RoF2::invtype::GetInvTypeSize(int16 inv_type)

common/patches/rof2_ops.h

@@ -59,7 +59,6 @@ E(OP_DeleteItem)
 E(OP_DeleteSpawn)
 E(OP_DisciplineUpdate)
 E(OP_DzChooseZone)
-E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
 E(OP_DzExpeditionInvite)

common/patches/rof2_structs.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -620,40 +620,40 @@ struct NewZone_Struct {
 	/*0800*/	int32	SkyRelated2;			//seen -1 -- maybe some default sky time?
 	/*0804*/	char	WeatherString2[32];		//
 	/*0836*/	float	WeatherChangeTime;		// not sure :P
-	/*0840*/	uint32	Climate;
-	/*0844*/	int32	NPCAggroMaxDist;		//seen 600
-	/*0848*/	int32	FilterID;				//seen 2008 -- maybe zone guide related?
-	/*0852*/	uint16	zone_id;				// this might just be instance ID got 1736 for time
-	/*0854*/	uint16	zone_instance;
-	/*0856*/	uint32	scriptNPCReceivedanItem;
-	/*0860*/	uint32	bCheck;					// padded bool
-	/*0864*/	uint32	scriptIDSomething;
-	/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
-	/*0872*/	uint32	scriptIDSomething3;
-	/*0876*/	uint32	SuspendBuffs;			// padded bool
-	/*0880*/	uint32	LavaDamage;				// LavaDamage value
-	/*0884*/	uint32	MinLavaDamage;			// min cap after resist calcs
-	/*0888*/	uint8	bDisallowManaStone;		// can't use manastone in this zone
-	/*0889*/	uint8	bNoBind;				// can't bind even if outdoor says we can!
-	/*0890*/	uint8	bNoAttack;				// non-attack zone
-	/*0891*/	uint8	bNoCallOfHero;			// coth line disabled
-	/*0892*/	uint8	bNoFlux;				// gflux no worky
-	/*0893*/	uint8	bNoFear;				// fear spells no worky
-	/*0894*/	uint8	fall_damage;			// 0 = Fall Damage on, 1 = Fall Damage off MQ2 calls bNoEncumber
-	/*0895*/	uint8	unknown895;				// padding
-	/*0896*/	uint32	FastRegenHP;			// percentage I think?
-	/*0900*/	uint32	FastRegenMana;			// percentage I think?
-	/*0904*/	uint32	FastRegenEndurance;		// percentage I think?
-	/*0908*/	uint32	CanPlaceCampsite;		// 0 = no, 1 = can place, 2 = place and goto
-	/*0912*/	uint32	CanPlaceGuildBanner;	// ^
-	/*0916*/	float	FogDensity;				// Most zones have this set to 0.33 Blightfire had 0.16
-	/*0920*/	uint32	bAdjustGamma;			// padded bool
-	/*0924*/	uint32	TimeStringID;			// Seen 0
-	/*0928*/	uint32	bNoMercenaries;			// padded bool
-	/*0932*/	int32	FishingRelated;			// Seen -1 idk
-	/*0936*/	int32	ForageRelated;			// Seen -1 idk
-	/*0940*/	uint32	bNoLevitate;			// padded bool
-	/*0944*/	float	Blooming;				// Seen 1.0 in PoK, and 0.25 in Guild Lobby
+	/*0840*/	uint32 Climate;
+	/*0844*/	int32  NPCAggroMaxDist;		//seen 600
+	/*0848*/	int32  FilterID;				//seen 2008 -- maybe zone guide related?
+	/*0852*/	uint16 zone_id;				// this might just be instance ID got 1736 for time
+	/*0854*/	uint16 zone_instance;
+	/*0856*/	uint32 scriptNPCReceivedanItem;
+	/*0860*/	uint32 bCheck;					// padded bool
+	/*0864*/	uint32 scriptIDSomething;
+	/*0868*/	uint32 underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+	/*0872*/	uint32 scriptIDSomething3;
+	/*0876*/	uint32 suspend_buffs;			// padded bool
+	/*0880*/	uint32 lava_damage;				// lava_damage value
+	/*0884*/	uint32 min_lava_damage;			// min cap after resist calcs
+	/*0888*/	uint8  bDisallowManaStone;		// can't use manastone in this zone
+	/*0889*/	uint8  bNoBind;				// can't bind even if outdoor says we can!
+	/*0890*/	uint8  bNoAttack;				// non-attack zone
+	/*0891*/	uint8  bNoCallOfHero;			// coth line disabled
+	/*0892*/	uint8  bNoFlux;				// gflux no worky
+	/*0893*/	uint8  bNoFear;				// fear spells no worky
+	/*0894*/	uint8  fall_damage;			// 0 = Fall Damage on, 1 = Fall Damage off MQ2 calls bNoEncumber
+	/*0895*/	uint8  unknown895;				// padding
+	/*0896*/	uint32 fast_regen_hp;			// percentage I think?
+	/*0900*/	uint32 fast_regen_mana;			// percentage I think?
+	/*0904*/	uint32 fast_regen_endurance;		// percentage I think?
+	/*0908*/	uint32 can_place_campsite;		// 0 = no, 1 = can place, 2 = place and goto
+	/*0912*/	uint32 can_place_guild_banner;	// ^
+	/*0916*/	float  fog_density;				// Most zones have this set to 0.33 Blightfire had 0.16
+	/*0920*/	uint32 b_adjust_gamma;			// padded bool
+	/*0924*/	uint32 time_string_id;			// Seen 0
+	/*0928*/	uint32 b_no_mercenaries;			// padded bool
+	/*0932*/	int32  fishing_related;			// Seen -1 idk
+	/*0936*/	int32  forage_related;			// Seen -1 idk
+	/*0940*/	uint32 b_no_levitate;			// padded bool
+	/*0944*/	float  blooming;				// Seen 1.0 in PoK, and 0.25 in Guild Lobby
 	/*0948*/
 };
 
@@ -3476,7 +3476,7 @@ struct TraderClick_Struct{
 	/*000*/	uint32 Code;
 	/*004*/	uint32 TraderID;
 	/*008*/	uint32 Approval;
-	/*012*/	
+	/*012*/
 };
 
 struct FormattedMessage_Struct{
@@ -4989,7 +4989,7 @@ struct DynamicZoneCompassEntry_Struct
 /*000*/ uint16 dz_zone_id;      // target dz id pair
 /*002*/ uint16 dz_instance_id;
 /*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
-/*008*/ uint32 unknown008;
+/*008*/ uint32 dz_switch_id;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;

common/patches/rof_limits.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "rof_limits.h"
 
-#include "../string_util.h"
+#include "../strings.h"
 
 
 int16 RoF::invtype::GetInvTypeSize(int16 inv_type)

common/patches/rof_ops.h

@@ -45,7 +45,6 @@ E(OP_DeleteItem)
 E(OP_DeleteSpawn)
 E(OP_DisciplineUpdate)
 E(OP_DzChooseZone)
-E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
 E(OP_DzExpeditionInvite)

common/patches/rof_structs.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -571,39 +571,39 @@ struct NewZone_Struct {
 /*0704*/	char	zone_short_name2[96];	//zone file name? excludes instance number which can be in previous version.
 /*0800*/	int32	unknown800;	//seen -1
 /*0804*/	char	unknown804[40]; //
-/*0844*/	int32	unknown844;	//seen 600
-/*0848*/	int32	unknown848;
-/*0852*/	uint16	zone_id;
-/*0854*/	uint16	zone_instance;
-/*0856*/	uint32	scriptNPCReceivedanItem;
-/*0860*/	uint32	bCheck;					// padded bool
-/*0864*/	uint32	scriptIDSomething;
-/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
-/*0872*/	uint32	scriptIDSomething3;
-/*0876*/	uint32	SuspendBuffs;
-/*0880*/	uint32	LavaDamage;		// Seen 50
-/*0884*/	uint32	MinLavaDamage;		// Seen 10
-/*0888*/	uint8	unknown888;		// Seen 1
-/*0889*/	uint8	unknown889;		// Seen 0 (POK) or 1 (rujj)
-/*0890*/	uint8	unknown890;		// Seen 1
-/*0891*/	uint8	unknown891;		// Seen 0
-/*0892*/	uint8	unknown892;		// Seen 0
-/*0893*/	uint8	unknown893;		// Seen 0 - 00
-/*0894*/	uint8	fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
-/*0895*/	uint8	unknown895;		// Seen 0 - 00
-/*0896*/	uint32	FastRegenHP;		// Seen 180
-/*0900*/	uint32	FastRegenMana;		// Seen 180
-/*0904*/	uint32	FastRegenEndurance;		// Seen 180
-/*0908*/	uint32	unknown908;		// Seen 2
-/*0912*/	uint32	unknown912;		// Seen 2
-/*0916*/	float	FogDensity;		// Most zones have this set to 0.33 Blightfire had 0.16
-/*0920*/	uint32	unknown920;		// Seen 0
-/*0924*/	uint32	unknown924;		// Seen 0
-/*0928*/	uint32	unknown928;		// Seen 0
+/*0844*/	int32  unknown844;	//seen 600
+/*0848*/	int32  unknown848;
+/*0852*/	uint16 zone_id;
+/*0854*/	uint16 zone_instance;
+/*0856*/	uint32 scriptNPCReceivedanItem;
+/*0860*/	uint32 bCheck;					// padded bool
+/*0864*/	uint32 scriptIDSomething;
+/*0868*/	uint32 underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0872*/	uint32 scriptIDSomething3;
+/*0876*/	uint32 suspend_buffs;
+/*0880*/	uint32 lava_damage;		// Seen 50
+/*0884*/	uint32 min_lava_damage;		// Seen 10
+/*0888*/	uint8  unknown888;		// Seen 1
+/*0889*/	uint8  unknown889;		// Seen 0 (POK) or 1 (rujj)
+/*0890*/	uint8  unknown890;		// Seen 1
+/*0891*/	uint8  unknown891;		// Seen 0
+/*0892*/	uint8  unknown892;		// Seen 0
+/*0893*/	uint8  unknown893;		// Seen 0 - 00
+/*0894*/	uint8  fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
+/*0895*/	uint8  unknown895;		// Seen 0 - 00
+/*0896*/	uint32 fast_regen_hp;		// Seen 180
+/*0900*/	uint32 fast_regen_mana;		// Seen 180
+/*0904*/	uint32 fast_regen_endurance;		// Seen 180
+/*0908*/	uint32 unknown908;		// Seen 2
+/*0912*/	uint32 unknown912;		// Seen 2
+/*0916*/	float  FogDensity;		// Most zones have this set to 0.33 Blightfire had 0.16
+/*0920*/	uint32 unknown920;		// Seen 0
+/*0924*/	uint32 unknown924;		// Seen 0
+/*0928*/	uint32 unknown928;		// Seen 0
 /*0932*/	int32  unknown932;		// Seen -1
 /*0936*/	int32  unknown936;		// Seen -1
-/*0940*/	uint32  unknown940;		// Seen 0
-/*0944*/	float   unknown944;		// Seen 1.0
+/*0940*/	uint32 unknown940;		// Seen 0
+/*0944*/	float  unknown944;		// Seen 1.0
 /*0948*/
 };
 
@@ -4921,7 +4921,7 @@ struct DynamicZoneCompassEntry_Struct
 /*000*/ uint16 dz_zone_id;      // target dz id pair
 /*002*/ uint16 dz_instance_id;
 /*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
-/*008*/ uint32 unknown008;
+/*008*/ uint32 dz_switch_id;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;

common/patches/sod.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 
 #include "../eq_packet_structs.h"
 #include "../misc_functions.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../item_instance.h"
 #include "sod_structs.h"
 #include "../rulesys.h"
@@ -407,7 +407,7 @@ namespace SoD
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -509,30 +509,6 @@ namespace SoD
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzCompass)
-	{
-		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
-			sizeof(structs::DynamicZoneCompass_Struct) +
-			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
-		);
-
-		OUT(client_id);
-		OUT(count);
-
-		for (uint32 i = 0; i < emu->count; ++i)
-		{
-			OUT(entries[i].dz_zone_id);
-			OUT(entries[i].dz_instance_id);
-			OUT(entries[i].dz_type);
-			OUT(entries[i].x);
-			OUT(entries[i].y);
-			OUT(entries[i].z);
-		}
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_DzExpeditionEndsWarning)
 	{
 		ENCODE_LENGTH_EXACT(ExpeditionExpireWarning);
@@ -1089,7 +1065,7 @@ namespace SoD
 
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
-		
+
 		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
 
 		EQ::OutBuffer ob;
@@ -1106,7 +1082,7 @@ namespace SoD
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -1365,17 +1341,17 @@ namespace SoD
 		OUT_str(zone_short_name2);
 		OUT(zone_id);
 		OUT(zone_instance);
-		OUT(SuspendBuffs);
-		OUT(FastRegenHP);
-		OUT(FastRegenMana);
-		OUT(FastRegenEndurance);
+		OUT(suspend_buffs);
+		OUT(fast_regen_hp);
+		OUT(fast_regen_mana);
+		OUT(fast_regen_endurance);
 		OUT(underworld_teleport_index);
 
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown800 = -1;
 		eq->unknown844 = 600;
-		OUT(LavaDamage);
-		OUT(MinLavaDamage);
+		OUT(lava_damage);
+		OUT(min_lava_damage);
 		eq->unknown888 = 1;
 		eq->unknown889 = 0;
 		eq->unknown890 = 1;
@@ -1385,8 +1361,8 @@ namespace SoD
 		eq->fall_damage = 0;	// 0 = Fall Damage on, 1 = Fall Damage off
 		eq->unknown895 = 0;
 		eq->unknown908 = 2;
-		eq->unknown912 = 2;
-		eq->FogDensity = emu->fog_density;
+		eq->unknown912  = 2;
+		eq->fog_density = emu->fog_density;
 
 		FINISH_ENCODE();
 	}
@@ -3538,7 +3514,7 @@ namespace SoD
 	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth)
 	{
 		const EQ::ItemData *item = inst->GetUnscaledItem();
-		
+
 		SoD::structs::ItemSerializationHeader hdr;
 
 		hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 254) ? 0xFFFFFFFF : inst->GetCharges()) : 1);
@@ -3849,7 +3825,7 @@ namespace SoD
 		iqbs.HealAmt = item->HealAmt;
 		iqbs.SpellDmg = item->SpellDmg;
 		iqbs.Clairvoyance = item->Clairvoyance;
-		
+
 		ob.write((const char*)&iqbs, sizeof(SoD::structs::ItemQuaternaryBodyStruct));
 
 		EQ::OutBuffer::pos_type count_pos = ob.tellp();
@@ -4061,7 +4037,7 @@ namespace SoD
 			return;
 		}
 
-		auto segments = SplitString(server_saylink, '\x12');
+		auto segments = Strings::Split(server_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
@@ -4101,7 +4077,7 @@ namespace SoD
 			return;
 		}
 
-		auto segments = SplitString(sod_saylink, '\x12');
+		auto segments = Strings::Split(sod_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {

common/patches/sod_limits.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "sod_limits.h"
 
-#include "../string_util.h"
+#include "../strings.h"
 
 
 int16 SoD::invtype::GetInvTypeSize(int16 inv_type)

common/patches/sod_ops.h

@@ -36,7 +36,6 @@ E(OP_Damage)
 E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DzChooseZone)
-E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
 E(OP_DzExpeditionInvite)

common/patches/sod_structs.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -440,35 +440,35 @@ struct NewZone_Struct {
 /*0704*/	char	zone_short_name2[96];	//zone file name? excludes instance number which can be in previous version.
 /*0800*/	int32	unknown800;	//seen -1
 /*0804*/	char	unknown804[40]; //
-/*0844*/	int32	unknown844;	//seen 600
-/*0848*/	int32	unknown848;
-/*0852*/	uint16	zone_id;
-/*0854*/	uint16	zone_instance;
-/*0856*/	uint32	scriptNPCReceivedanItem;
-/*0860*/	uint32	bCheck;					// padded bool
-/*0864*/	uint32	scriptIDSomething;
-/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
-/*0872*/	uint32	scriptIDSomething3;
-/*0876*/	uint32	SuspendBuffs;
-/*0880*/	uint32	LavaDamage;	//seen 50
-/*0884*/	uint32	MinLavaDamage;	//seen 10
-/*0888*/	uint8	unknown888;	//seen 1
-/*0889*/	uint8	unknown889;	//seen 0 (POK) or 1 (rujj)
-/*0890*/	uint8	unknown890;	//seen 1
-/*0891*/	uint8	unknown891;	//seen 0
-/*0892*/	uint8	unknown892;	//seen 0
-/*0893*/	uint8	unknown893;	//seen 0 - 00
-/*0894*/	uint8	fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
-/*0895*/	uint8	unknown895;	//seen 0 - 00
-/*0896*/	uint32	FastRegenHP;	//seen 180
-/*0900*/	uint32	FastRegenMana;	//seen 180
-/*0904*/	uint32	FastRegenEndurance;	//seen 180
-/*0908*/	uint32	unknown908;	//seen 2
-/*0912*/	uint32	unknown912;	//seen 2
-/*0916*/	float   FogDensity;	//Of about 10 or so zones tested, all but one have this set to 0.33 Blightfire had 0.16
-/*0920*/	uint32	unknown920;	//seen 0
-/*0924*/	uint32	unknown924;	//seen 0
-/*0928*/	uint32	unknown928;	//seen 0
+/*0844*/	int32  unknown844;	//seen 600
+/*0848*/	int32  unknown848;
+/*0852*/	uint16 zone_id;
+/*0854*/	uint16 zone_instance;
+/*0856*/	uint32 scriptNPCReceivedanItem;
+/*0860*/	uint32 bCheck;					// padded bool
+/*0864*/	uint32 scriptIDSomething;
+/*0868*/	uint32 underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0872*/	uint32 scriptIDSomething3;
+/*0876*/	uint32 suspend_buffs;
+/*0880*/	uint32 lava_damage;	//seen 50
+/*0884*/	uint32 min_lava_damage;	//seen 10
+/*0888*/	uint8  unknown888;	//seen 1
+/*0889*/	uint8  unknown889;	//seen 0 (POK) or 1 (rujj)
+/*0890*/	uint8  unknown890;	//seen 1
+/*0891*/	uint8  unknown891;	//seen 0
+/*0892*/	uint8  unknown892;	//seen 0
+/*0893*/	uint8  unknown893;	//seen 0 - 00
+/*0894*/	uint8  fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
+/*0895*/	uint8  unknown895;	//seen 0 - 00
+/*0896*/	uint32 fast_regen_hp;	//seen 180
+/*0900*/	uint32 fast_regen_mana;	//seen 180
+/*0904*/	uint32 fast_regen_endurance;	//seen 180
+/*0908*/	uint32 unknown908;	//seen 2
+/*0912*/	uint32 unknown912;	//seen 2
+/*0916*/	float  fog_density;	//Of about 10 or so zones tested, all but one have this set to 0.33 Blightfire had 0.16
+/*0920*/	uint32 unknown920;	//seen 0
+/*0924*/	uint32 unknown924;	//seen 0
+/*0928*/	uint32 unknown928;	//seen 0
 /*0932*/
 };
 
@@ -4276,7 +4276,7 @@ struct DynamicZoneCompassEntry_Struct
 /*000*/ uint16 dz_zone_id;      // target dz id pair
 /*002*/ uint16 dz_instance_id;
 /*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
-/*008*/ uint32 unknown008;
+/*008*/ uint32 dz_switch_id;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;

common/patches/sof.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 
 #include "../eq_packet_structs.h"
 #include "../misc_functions.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../item_instance.h"
 #include "sof_structs.h"
 #include "../rulesys.h"
@@ -387,7 +387,7 @@ namespace SoF
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -497,30 +497,6 @@ namespace SoF
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzCompass)
-	{
-		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
-			sizeof(structs::DynamicZoneCompass_Struct) +
-			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
-		);
-
-		OUT(client_id);
-		OUT(count);
-
-		for (uint32 i = 0; i < emu->count; ++i)
-		{
-			OUT(entries[i].dz_zone_id);
-			OUT(entries[i].dz_instance_id);
-			OUT(entries[i].dz_type);
-			OUT(entries[i].x);
-			OUT(entries[i].y);
-			OUT(entries[i].z);
-		}
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_DzExpeditionEndsWarning)
 	{
 		ENCODE_LENGTH_EXACT(ExpeditionExpireWarning);
@@ -885,7 +861,7 @@ namespace SoF
 
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
-		
+
 		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
 
 		EQ::OutBuffer ob;
@@ -902,7 +878,7 @@ namespace SoF
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -1043,17 +1019,17 @@ namespace SoF
 		OUT_str(zone_short_name2);
 		OUT(zone_id);
 		OUT(zone_instance);
-		OUT(SuspendBuffs);
-		OUT(FastRegenHP);
-		OUT(FastRegenMana);
-		OUT(FastRegenEndurance);
+		OUT(suspend_buffs);
+		OUT(fast_regen_hp);
+		OUT(fast_regen_mana);
+		OUT(fast_regen_endurance);
 		OUT(underworld_teleport_index);
 
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown796 = -1;
 		eq->unknown840 = 600;
-		OUT(LavaDamage);
-		OUT(MinLavaDamage);
+		OUT(lava_damage);
+		OUT(min_lava_damage);
 		eq->unknown884 = 1;
 		eq->unknown885 = 0;
 		eq->unknown886 = 1;
@@ -2936,7 +2912,7 @@ namespace SoF
 	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth)
 	{
 		const EQ::ItemData *item = inst->GetUnscaledItem();
-		
+
 		SoF::structs::ItemSerializationHeader hdr;
 
 		hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 254) ? 0xFFFFFFFF : inst->GetCharges()) : 1);
@@ -3245,7 +3221,7 @@ namespace SoF
 		iqbs.HeroicSVCorrup = item->HeroicSVCorrup;
 		iqbs.HealAmt = item->HealAmt;
 		iqbs.SpellDmg = item->SpellDmg;
-		
+
 		ob.write((const char*)&iqbs, sizeof(SoF::structs::ItemQuaternaryBodyStruct));
 
 		EQ::OutBuffer::pos_type count_pos = ob.tellp();
@@ -3354,7 +3330,7 @@ namespace SoF
 	static inline uint32 ServerToSoFCorpseSlot(uint32 server_corpse_slot)
 	{
 		uint32 SoFSlot = invslot::SLOT_INVALID;
-		
+
 		if (server_corpse_slot <= EQ::invslot::slotGeneral8 && server_corpse_slot >= EQ::invslot::slotGeneral1) {
 			SoFSlot = server_corpse_slot;
 		}
@@ -3465,7 +3441,7 @@ namespace SoF
 			return;
 		}
 
-		auto segments = SplitString(server_saylink, '\x12');
+		auto segments = Strings::Split(server_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
@@ -3505,7 +3481,7 @@ namespace SoF
 			return;
 		}
 
-		auto segments = SplitString(sof_saylink, '\x12');
+		auto segments = Strings::Split(sof_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {

common/patches/sof_limits.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "sof_limits.h"
 
-#include "../string_util.h"
+#include "../strings.h"
 
 
 int16 SoF::invtype::GetInvTypeSize(int16 inv_type)

common/patches/sof_ops.h

@@ -37,7 +37,6 @@ E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DeleteSpawn)
 E(OP_DzChooseZone)
-E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
 E(OP_DzExpeditionInvite)

common/patches/sof_structs.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -444,31 +444,31 @@ struct NewZone_Struct {
 /*0700*/	char	zone_short_name2[96];	//zone file name? excludes instance number which can be in previous version.
 /*0796*/	int32	unknown796;	//seen -1
 /*0800*/	char	unknown800[40]; //
-/*0840*/	int32	unknown840;	//seen 600
-/*0844*/	int32	unknown844;
-/*0848*/	uint16	zone_id;
-/*0850*/	uint16	zone_instance;
-/*0852*/	uint32	scriptNPCReceivedanItem;
-/*0856*/	uint32	bCheck;					// padded bool
-/*0860*/	uint32	scriptIDSomething;
-/*0864*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
-/*0868*/	uint32	scriptIDSomething3;
-/*0872*/	uint32	SuspendBuffs;
-/*0876*/	uint32	LavaDamage;	//seen 50
-/*0880*/	uint32	MinLavaDamage;	//seen 10
-/*0884*/	uint8	unknown884;	//seen 1
-/*0885*/	uint8	unknown885;	//seen 0 (POK) or 1 (rujj)
-/*0886*/	uint8	unknown886;	//seen 1
-/*0887*/	uint8	unknown887;	//seen 0
-/*0888*/	uint8	unknown888;	//seen 0
-/*0893*/	uint8	unknown889;	//seen 0 - 00
-/*0894*/	uint8	fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
-/*0895*/	uint8	unknown891;	//seen 0 - 00
-/*0892*/	uint32	FastRegenHP;	//seen 180
-/*0896*/	uint32	FastRegenMana;	//seen 180
-/*0900*/	uint32	FastRegenEndurance;	//seen 180
-/*0904*/	uint32	unknown904;	//seen 2
-/*0908*/	uint32	unknown908;	//seen 2
+/*0840*/	int32  unknown840;	//seen 600
+/*0844*/	int32  unknown844;
+/*0848*/	uint16 zone_id;
+/*0850*/	uint16 zone_instance;
+/*0852*/	uint32 scriptNPCReceivedanItem;
+/*0856*/	uint32 bCheck;					// padded bool
+/*0860*/	uint32 scriptIDSomething;
+/*0864*/	uint32 underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0868*/	uint32 scriptIDSomething3;
+/*0872*/	uint32 suspend_buffs;
+/*0876*/	uint32 lava_damage;	//seen 50
+/*0880*/	uint32 min_lava_damage;	//seen 10
+/*0884*/	uint8  unknown884;	//seen 1
+/*0885*/	uint8  unknown885;	//seen 0 (POK) or 1 (rujj)
+/*0886*/	uint8  unknown886;	//seen 1
+/*0887*/	uint8  unknown887;	//seen 0
+/*0888*/	uint8  unknown888;	//seen 0
+/*0893*/	uint8  unknown889;	//seen 0 - 00
+/*0894*/	uint8  fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
+/*0895*/	uint8  unknown891;	//seen 0 - 00
+/*0892*/	uint32 fast_regen_hp;	//seen 180
+/*0896*/	uint32 fast_regen_mana;	//seen 180
+/*0900*/	uint32 fast_regen_endurance;	//seen 180
+/*0904*/	uint32 unknown904;	//seen 2
+/*0908*/	uint32 unknown908;	//seen 2
 /*0912*/
 };
 
@@ -4186,7 +4186,7 @@ struct DynamicZoneCompassEntry_Struct
 /*000*/ uint16 dz_zone_id;      // target dz id pair
 /*002*/ uint16 dz_instance_id;
 /*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
-/*008*/ uint32 unknown008;
+/*008*/ uint32 dz_switch_id;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;

common/patches/titanium.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
 
 #include "../eq_packet_structs.h"
 #include "../misc_functions.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../item_instance.h"
 #include "titanium_structs.h"
 
@@ -338,13 +338,13 @@ namespace Titanium
 			SerializeItem(ob, (const EQ::ItemInstance*)eq->inst, ServerToTitaniumSlot(eq->slot_id), 0);
 			if (ob.tellp() == last_pos)
 				LogNetcode("Titanium::ENCODE(OP_CharInventory) Serialization failed on item slot [{}] during OP_CharInventory.  Item skipped", eq->slot_id);
-			
+
 			last_pos = ob.tellp();
 		}
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -440,30 +440,6 @@ namespace Titanium
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzCompass)
-	{
-		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
-			sizeof(structs::DynamicZoneCompass_Struct) +
-			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
-		);
-
-		OUT(client_id);
-		OUT(count);
-
-		for (uint32 i = 0; i < emu->count; ++i)
-		{
-			OUT(entries[i].dz_zone_id);
-			OUT(entries[i].dz_instance_id);
-			OUT(entries[i].dz_type);
-			OUT(entries[i].x);
-			OUT(entries[i].y);
-			OUT(entries[i].z);
-		}
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_DzExpeditionEndsWarning)
 	{
 		ENCODE_LENGTH_EXACT(ExpeditionExpireWarning);
@@ -861,7 +837,7 @@ namespace Titanium
 
 		//store away the emu struct
 		uchar* __emu_buffer = in->pBuffer;
-		
+
 		EQ::InternalSerializedItem_Struct* int_struct = (EQ::InternalSerializedItem_Struct*)(&__emu_buffer[4]);
 
 		EQ::OutBuffer ob;
@@ -878,7 +854,7 @@ namespace Titanium
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -2845,7 +2821,7 @@ namespace Titanium
 			return;
 		}
 
-		auto segments = SplitString(server_saylink, '\x12');
+		auto segments = Strings::Split(server_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
@@ -2885,7 +2861,7 @@ namespace Titanium
 			return;
 		}
 
-		auto segments = SplitString(titanium_saylink, '\x12');
+		auto segments = Strings::Split(titanium_saylink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {

common/patches/titanium_limits.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "titanium_limits.h"
 
-#include "../string_util.h"
+#include "../strings.h"
 
 
 int16 Titanium::invtype::GetInvTypeSize(int16 inv_type)

common/patches/titanium_ops.h

@@ -33,7 +33,6 @@ E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DeleteSpawn)
 E(OP_DzChooseZone)
-E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
 E(OP_DzExpeditionInvite)

common/patches/titanium_structs.h

@@ -3396,7 +3396,7 @@ struct DynamicZoneCompassEntry_Struct
 /*000*/ uint16 dz_zone_id;      // target dz id pair
 /*002*/ uint16 dz_instance_id;
 /*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
-/*008*/ uint32 unknown008;
+/*008*/ uint32 dz_switch_id;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;

common/patches/uf.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,7 @@
 
 #include "../eq_packet_structs.h"
 #include "../misc_functions.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "../item_instance.h"
 #include "uf_structs.h"
 #include "../rulesys.h"
@@ -527,7 +527,7 @@ namespace UF
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -639,30 +639,6 @@ namespace UF
 		FINISH_ENCODE();
 	}
 
-	ENCODE(OP_DzCompass)
-	{
-		SETUP_VAR_ENCODE(DynamicZoneCompass_Struct);
-		ALLOC_VAR_ENCODE(structs::DynamicZoneCompass_Struct,
-			sizeof(structs::DynamicZoneCompass_Struct) +
-			sizeof(structs::DynamicZoneCompassEntry_Struct) * emu->count
-		);
-
-		OUT(client_id);
-		OUT(count);
-
-		for (uint32 i = 0; i < emu->count; ++i)
-		{
-			OUT(entries[i].dz_zone_id);
-			OUT(entries[i].dz_instance_id);
-			OUT(entries[i].dz_type);
-			OUT(entries[i].x);
-			OUT(entries[i].y);
-			OUT(entries[i].z);
-		}
-
-		FINISH_ENCODE();
-	}
-
 	ENCODE(OP_DzExpeditionEndsWarning)
 	{
 		ENCODE_LENGTH_EXACT(ExpeditionExpireWarning);
@@ -1314,7 +1290,7 @@ namespace UF
 
 		in->size = ob.size();
 		in->pBuffer = ob.detach();
-		
+
 		delete[] __emu_buffer;
 
 		dest->FastQueuePacket(&in, ack_req);
@@ -1589,19 +1565,19 @@ namespace UF
 		OUT_str(zone_short_name2);
 		OUT(zone_id);
 		OUT(zone_instance);
-		OUT(SuspendBuffs);
-		OUT(FastRegenHP);
-		OUT(FastRegenMana);
-		OUT(FastRegenEndurance);
+		OUT(suspend_buffs);
+		OUT(fast_regen_hp);
+		OUT(fast_regen_mana);
+		OUT(fast_regen_endurance);
 		OUT(underworld_teleport_index);
 
-		eq->FogDensity = emu->fog_density;
+		eq->fog_density = emu->fog_density;
 
 		/*fill in some unknowns with observed values, hopefully it will help */
 		eq->unknown800 = -1;
 		eq->unknown844 = 600;
-		OUT(LavaDamage);
-		OUT(MinLavaDamage);
+		OUT(lava_damage);
+		OUT(min_lava_damage);
 		eq->unknown888 = 1;
 		eq->unknown889 = 0;
 		eq->unknown890 = 1;
@@ -1741,7 +1717,7 @@ namespace UF
 		OUT(WIS);
 		OUT(face);
 		//	OUT(unknown02264[47]);
-		
+
 		if (spells::SPELLBOOK_SIZE <= EQ::spells::SPELLBOOK_SIZE) {
 			for (uint32 r = 0; r < spells::SPELLBOOK_SIZE; r++) {
 				if (emu->spell_book[r] <= spells::SPELL_ID_MAX)
@@ -2122,7 +2098,7 @@ namespace UF
 		eq->aa_expansion = emu->expansion;
 		eq->special_category = emu->category;
 		eq->total_abilities = emu->total_effects;
-		
+
 		for(auto i = 0; i < eq->total_abilities; ++i) {
 			eq->abilities[i].skill_id = inapp->ReadUInt32();
 			eq->abilities[i].base_value = inapp->ReadUInt32();
@@ -3835,7 +3811,7 @@ namespace UF
 	void SerializeItem(EQ::OutBuffer& ob, const EQ::ItemInstance *inst, int16 slot_id_in, uint8 depth)
 	{
 		const EQ::ItemData *item = inst->GetUnscaledItem();
-		
+
 		UF::structs::ItemSerializationHeader hdr;
 
 		hdr.stacksize = (inst->IsStackable() ? ((inst->GetCharges() > 1000) ? 0xFFFFFFFF : inst->GetCharges()) : 1);
@@ -4420,7 +4396,7 @@ namespace UF
 			return;
 		}
 
-		auto segments = SplitString(serverSayLink, '\x12');
+		auto segments = Strings::Split(serverSayLink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {
@@ -4460,7 +4436,7 @@ namespace UF
 			return;
 		}
 
-		auto segments = SplitString(ufSayLink, '\x12');
+		auto segments = Strings::Split(ufSayLink, '\x12');
 
 		for (size_t segment_iter = 0; segment_iter < segments.size(); ++segment_iter) {
 			if (segment_iter & 1) {

common/patches/uf_limits.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 #include "uf_limits.h"
 
-#include "../string_util.h"
+#include "../strings.h"
 
 
 int16 UF::invtype::GetInvTypeSize(int16 inv_type)

common/patches/uf_ops.h

@@ -39,7 +39,6 @@ E(OP_DeleteCharge)
 E(OP_DeleteItem)
 E(OP_DisciplineUpdate)
 E(OP_DzChooseZone)
-E(OP_DzCompass)
 E(OP_DzExpeditionEndsWarning)
 E(OP_DzExpeditionInfo)
 E(OP_DzExpeditionInvite)

common/patches/uf_structs.h

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2016 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -440,35 +440,35 @@ struct NewZone_Struct {
 /*0704*/	char	zone_short_name2[96];	//zone file name? excludes instance number which can be in previous version.
 /*0800*/	int32	unknown800;	//seen -1
 /*0804*/	char	unknown804[40]; //
-/*0844*/	int32	unknown844;	//seen 600
-/*0848*/	int32	unknown848;
-/*0852*/	uint16	zone_id;
-/*0854*/	uint16	zone_instance;
-/*0856*/	uint32	scriptNPCReceivedanItem;
-/*0860*/	uint32	bCheck;					// padded bool
-/*0864*/	uint32	scriptIDSomething;
-/*0868*/	uint32	underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
-/*0872*/	uint32	scriptIDSomething3;
-/*0876*/	uint32	SuspendBuffs;
-/*0880*/	uint32	LavaDamage;	//seen 50
-/*0884*/	uint32	MinLavaDamage;	//seen 10
-/*0888*/	uint8	unknown888;	//seen 1
-/*0889*/	uint8	unknown889;	//seen 0 (POK) or 1 (rujj)
-/*0890*/	uint8	unknown890;	//seen 1
-/*0891*/	uint8	unknown891;	//seen 0
-/*0892*/	uint8	unknown892;	//seen 0
-/*0893*/	uint8	unknown893;	//seen 0 - 00
-/*0894*/	uint8	fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
-/*0895*/	uint8	unknown895;	//seen 0 - 00
-/*0896*/	uint32	FastRegenHP;	//seen 180
-/*0900*/	uint32	FastRegenMana;	//seen 180
-/*0904*/	uint32	FastRegenEndurance;	//seen 180
-/*0908*/	uint32	unknown908;	//seen 2
-/*0912*/	uint32	unknown912;	//seen 2
-/*0916*/	float	FogDensity;	//Of about 10 or so zones tested, all but one have this set to 0.33 Blightfire had 0.16
-/*0920*/	uint32	unknown920;	//seen 0
-/*0924*/	uint32	unknown924;	//seen 0
-/*0928*/	uint32	unknown928;	//seen 0
+/*0844*/	int32  unknown844;	//seen 600
+/*0848*/	int32  unknown848;
+/*0852*/	uint16 zone_id;
+/*0854*/	uint16 zone_instance;
+/*0856*/	uint32 scriptNPCReceivedanItem;
+/*0860*/	uint32 bCheck;					// padded bool
+/*0864*/	uint32 scriptIDSomething;
+/*0868*/	uint32 underworld_teleport_index; // > 0 teleports w/ zone point index, invalid succors, -1 affects some collisions
+/*0872*/	uint32 scriptIDSomething3;
+/*0876*/	uint32 suspend_buffs;
+/*0880*/	uint32 lava_damage;	//seen 50
+/*0884*/	uint32 min_lava_damage;	//seen 10
+/*0888*/	uint8  unknown888;	//seen 1
+/*0889*/	uint8  unknown889;	//seen 0 (POK) or 1 (rujj)
+/*0890*/	uint8  unknown890;	//seen 1
+/*0891*/	uint8  unknown891;	//seen 0
+/*0892*/	uint8  unknown892;	//seen 0
+/*0893*/	uint8  unknown893;	//seen 0 - 00
+/*0894*/	uint8  fall_damage;	// 0 = Fall Damage on, 1 = Fall Damage off
+/*0895*/	uint8  unknown895;	//seen 0 - 00
+/*0896*/	uint32 fast_regen_hp;	//seen 180
+/*0900*/	uint32 fast_regen_mana;	//seen 180
+/*0904*/	uint32 fast_regen_endurance;	//seen 180
+/*0908*/	uint32 unknown908;	//seen 2
+/*0912*/	uint32 unknown912;	//seen 2
+/*0916*/	float  fog_density;	//Of about 10 or so zones tested, all but one have this set to 0.33 Blightfire had 0.16
+/*0920*/	uint32 unknown920;	//seen 0
+/*0924*/	uint32 unknown924;	//seen 0
+/*0928*/	uint32 unknown928;	//seen 0
 /*0932*/	uint8  unknown932[12];
 };
 
@@ -3997,7 +3997,7 @@ struct ItemSerializationHeaderFinish
 {
 	uint16 ornamentIcon;
 	/*060*/	uint8 unknown060; //0
-	/*061*/	uint8 unknown061; //0 - 
+	/*061*/	uint8 unknown061; //0 -
 	/*062*/	uint8 isCopied; // New to Underfoot // Copied flag on item
 	/*063*/	uint8 ItemClass; //0, 1, or 2
 };
@@ -4357,7 +4357,7 @@ struct DynamicZoneCompassEntry_Struct
 /*000*/ uint16 dz_zone_id;      // target dz id pair
 /*002*/ uint16 dz_instance_id;
 /*004*/ uint32 dz_type;         // 1: Expedition, 2: Tutorial (purple), 3: Task, 4: Mission, 5: Quest (green)
-/*008*/ uint32 unknown008;
+/*008*/ uint32 dz_switch_id;
 /*012*/ float y;
 /*016*/ float x;
 /*020*/ float z;

common/profanity_manager.cpp

@@ -1,5 +1,5 @@
 /*	EQEMu: Everquest Server Emulator
-	
+
 	Copyright (C) 2001-2019 EQEMu Development Team (http://eqemulator.net)
 
 	This program is free software; you can redistribute it and/or modify
@@ -11,7 +11,7 @@
 	are required to give you total support for your newly bought product;
 	without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 	A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-	
+
 	You should have received a copy of the GNU General Public License
 	along with this program; if not, write to the Free Software
 	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
@@ -19,7 +19,7 @@
 
 #include "profanity_manager.h"
 #include "dbcore.h"
-#include "string_util.h"
+#include "strings.h"
 
 #include <ctype.h>
 #include <cstring>
@@ -66,7 +66,7 @@ bool EQ::ProfanityManager::AddProfanity(DBcore *db, std::string profanity) {
 		return false;
 	}
 
-	std::string entry = str_tolower(profanity);
+	std::string entry = Strings::ToLower(profanity);
 
 	if (check_for_existing_entry(entry)) {
 		return true;
@@ -98,7 +98,7 @@ bool EQ::ProfanityManager::RemoveProfanity(DBcore *db, std::string profanity) {
 		return false;
 	}
 
-	std::string entry = str_tolower(profanity);
+	std::string entry = Strings::ToLower(profanity);
 
 	if (!check_for_existing_entry(entry)) {
 		return true;
@@ -126,13 +126,13 @@ void EQ::ProfanityManager::RedactMessage(char *message) {
 		return;
 	}
 
-	std::string test_message = str_tolower(message);
+	std::string test_message = Strings::ToLower(message);
 	// hard-coded max length based on channel message buffer size (4096 bytes)..
 	// ..will need to change or remove if other sources are used for redaction
 	if (test_message.length() < REDACTION_LENGTH_MIN || test_message.length() >= 4096) {
 		return;
 	}
-	
+
 	for (const auto &iter : profanity_list) { // consider adding textlink checks if it becomes an issue
 		size_t pos = 0;
 		size_t start_pos = 0;
@@ -162,7 +162,7 @@ void EQ::ProfanityManager::RedactMessage(std::string &message) {
 		return;
 	}
 
-	std::string test_message = str_tolower(message);
+	std::string test_message = Strings::ToLower(message);
 
 	for (const auto &iter : profanity_list) {
 		size_t pos = 0;
@@ -194,7 +194,7 @@ bool EQ::ProfanityManager::ContainsCensoredLanguage(const std::string &message)
 		return false;
 	}
 
-	std::string test_message = str_tolower(message);
+	std::string test_message = Strings::ToLower(message);
 
 	for (const auto &iter : profanity_list) {
 		if (test_message.find(iter) != std::string::npos) {
@@ -227,8 +227,8 @@ bool EQ::ProfanityManager::load_database_entries(DBcore *db) {
 	}
 
 	for (auto row : results) {
-		std::string entry = str_tolower(row[0]);
-		if (entry.length() >= REDACTION_LENGTH_MIN) {	
+		std::string entry = Strings::ToLower(row[0]);
+		if (entry.length() >= REDACTION_LENGTH_MIN) {
 			if (!check_for_existing_entry(entry)) {
 				profanity_list.push_back(entry);
 			}
@@ -265,6 +265,6 @@ bool EQ::ProfanityManager::check_for_existing_entry(std::string profanity) {
 			return true;
 		}
 	}
-	
+
 	return false;
 }

common/ptimer.cpp

@@ -21,7 +21,7 @@
 #include "timer.h"
 #include "ptimer.h"
 #include "database.h"
-#include "string_util.h"
+#include "strings.h"
 
 #ifdef _WINDOWS
 	#include <winsock2.h>

common/repositories/aa_ability_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_AA_ABILITY_REPOSITORY_H
 #define EQEMU_AA_ABILITY_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_aa_ability_repository.h"
 
 class AaAbilityRepository: public BaseAaAbilityRepository {

common/repositories/aa_rank_effects_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_AA_RANK_EFFECTS_REPOSITORY_H
 #define EQEMU_AA_RANK_EFFECTS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_aa_rank_effects_repository.h"
 
 class AaRankEffectsRepository: public BaseAaRankEffectsRepository {

common/repositories/aa_rank_prereqs_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_AA_RANK_PREREQS_REPOSITORY_H
 #define EQEMU_AA_RANK_PREREQS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_aa_rank_prereqs_repository.h"
 
 class AaRankPrereqsRepository: public BaseAaRankPrereqsRepository {

common/repositories/aa_ranks_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_AA_RANKS_REPOSITORY_H
 #define EQEMU_AA_RANKS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_aa_ranks_repository.h"
 
 class AaRanksRepository: public BaseAaRanksRepository {

common/repositories/account_flags_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ACCOUNT_FLAGS_REPOSITORY_H
 #define EQEMU_ACCOUNT_FLAGS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_account_flags_repository.h"
 
 class AccountFlagsRepository: public BaseAccountFlagsRepository {

common/repositories/account_ip_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ACCOUNT_IP_REPOSITORY_H
 #define EQEMU_ACCOUNT_IP_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_account_ip_repository.h"
 
 class AccountIpRepository: public BaseAccountIpRepository {

common/repositories/account_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ACCOUNT_REPOSITORY_H
 #define EQEMU_ACCOUNT_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_account_repository.h"
 
 class AccountRepository: public BaseAccountRepository {

common/repositories/account_rewards_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ACCOUNT_REWARDS_REPOSITORY_H
 #define EQEMU_ACCOUNT_REWARDS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_account_rewards_repository.h"
 
 class AccountRewardsRepository: public BaseAccountRewardsRepository {

common/repositories/adventure_details_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ADVENTURE_DETAILS_REPOSITORY_H
 #define EQEMU_ADVENTURE_DETAILS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_adventure_details_repository.h"
 
 class AdventureDetailsRepository: public BaseAdventureDetailsRepository {

common/repositories/adventure_members_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ADVENTURE_MEMBERS_REPOSITORY_H
 #define EQEMU_ADVENTURE_MEMBERS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_adventure_members_repository.h"
 
 class AdventureMembersRepository: public BaseAdventureMembersRepository {

common/repositories/adventure_stats_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ADVENTURE_STATS_REPOSITORY_H
 #define EQEMU_ADVENTURE_STATS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_adventure_stats_repository.h"
 
 class AdventureStatsRepository: public BaseAdventureStatsRepository {

common/repositories/adventure_template_entry_flavor_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H
 #define EQEMU_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_adventure_template_entry_flavor_repository.h"
 
 class AdventureTemplateEntryFlavorRepository: public BaseAdventureTemplateEntryFlavorRepository {

common/repositories/adventure_template_entry_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ADVENTURE_TEMPLATE_ENTRY_REPOSITORY_H
 #define EQEMU_ADVENTURE_TEMPLATE_ENTRY_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_adventure_template_entry_repository.h"
 
 class AdventureTemplateEntryRepository: public BaseAdventureTemplateEntryRepository {

common/repositories/adventure_template_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ADVENTURE_TEMPLATE_REPOSITORY_H
 #define EQEMU_ADVENTURE_TEMPLATE_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_adventure_template_repository.h"
 
 class AdventureTemplateRepository: public BaseAdventureTemplateRepository {

common/repositories/alternate_currency_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_ALTERNATE_CURRENCY_REPOSITORY_H
 #define EQEMU_ALTERNATE_CURRENCY_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_alternate_currency_repository.h"
 
 class AlternateCurrencyRepository: public BaseAlternateCurrencyRepository {

common/repositories/auras_repository.h

@@ -1,28 +1,8 @@
-/**
- * EQEmulator: Everquest Server Emulator
- * Copyright (C) 2001-2020 EQEmulator Development Team (https://github.com/EQEmu/Server)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY except by those people which sell it, which
- * are required to give you total support for your newly bought product;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
 #ifndef EQEMU_AURAS_REPOSITORY_H
 #define EQEMU_AURAS_REPOSITORY_H
 
 #include "../database.h"
-#include "../string_util.h"
+#include "../strings.h"
 #include "base/base_auras_repository.h"
 
 class AurasRepository: public BaseAurasRepository {

common/repositories/base/base_aa_ability_repository.h

@@ -13,26 +13,26 @@
 #define EQEMU_BASE_AA_ABILITY_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAaAbilityRepository {
 public:
 	struct AaAbility {
-		int         id;
+		uint32_t    id;
 		std::string name;
-		int         category;
-		int         classes;
-		int         races;
-		int         drakkin_heritage;
-		int         deities;
-		int         status;
-		int         type;
-		int         charges;
-		int         grant_only;
-		int         first_rank_id;
-		int         enabled;
-		int         reset_on_death;
+		int32_t     category;
+		int32_t     classes;
+		int32_t     races;
+		int32_t     drakkin_heritage;
+		int32_t     deities;
+		int32_t     status;
+		int32_t     type;
+		int32_t     charges;
+		int8_t      grant_only;
+		int32_t     first_rank_id;
+		uint8_t     enabled;
+		int8_t      reset_on_death;
 	};
 
 	static std::string PrimaryKey()
@@ -82,12 +82,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -115,27 +115,27 @@ public:
 
 	static AaAbility NewEntity()
 	{
-		AaAbility entry{};
+		AaAbility e{};
 
-		entry.id               = 0;
-		entry.name             = "";
-		entry.category         = -1;
-		entry.classes          = 131070;
-		entry.races            = 65535;
-		entry.drakkin_heritage = 127;
-		entry.deities          = 131071;
-		entry.status           = 0;
-		entry.type             = 0;
-		entry.charges          = 0;
-		entry.grant_only       = 0;
-		entry.first_rank_id    = -1;
-		entry.enabled          = 1;
-		entry.reset_on_death   = 0;
+		e.id               = 0;
+		e.name             = "";
+		e.category         = -1;
+		e.classes          = 131070;
+		e.races            = 65535;
+		e.drakkin_heritage = 127;
+		e.deities          = 131071;
+		e.status           = 0;
+		e.type             = 0;
+		e.charges          = 0;
+		e.grant_only       = 0;
+		e.first_rank_id    = -1;
+		e.enabled          = 1;
+		e.reset_on_death   = 0;
 
-		return entry;
+		return e;
 	}
 
-	static AaAbility GetAaAbilityEntry(
+	static AaAbility GetAaAbility(
 		const std::vector<AaAbility> &aa_abilitys,
 		int aa_ability_id
 	)
@@ -164,24 +164,24 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AaAbility entry{};
+			AaAbility e{};
 
-			entry.id               = atoi(row[0]);
-			entry.name             = row[1] ? row[1] : "";
-			entry.category         = atoi(row[2]);
-			entry.classes          = atoi(row[3]);
-			entry.races            = atoi(row[4]);
-			entry.drakkin_heritage = atoi(row[5]);
-			entry.deities          = atoi(row[6]);
-			entry.status           = atoi(row[7]);
-			entry.type             = atoi(row[8]);
-			entry.charges          = atoi(row[9]);
-			entry.grant_only       = atoi(row[10]);
-			entry.first_rank_id    = atoi(row[11]);
-			entry.enabled          = atoi(row[12]);
-			entry.reset_on_death   = atoi(row[13]);
+			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.name             = row[1] ? row[1] : "";
+			e.category         = static_cast<int32_t>(atoi(row[2]));
+			e.classes          = static_cast<int32_t>(atoi(row[3]));
+			e.races            = static_cast<int32_t>(atoi(row[4]));
+			e.drakkin_heritage = static_cast<int32_t>(atoi(row[5]));
+			e.deities          = static_cast<int32_t>(atoi(row[6]));
+			e.status           = static_cast<int32_t>(atoi(row[7]));
+			e.type             = static_cast<int32_t>(atoi(row[8]));
+			e.charges          = static_cast<int32_t>(atoi(row[9]));
+			e.grant_only       = static_cast<int8_t>(atoi(row[10]));
+			e.first_rank_id    = static_cast<int32_t>(atoi(row[11]));
+			e.enabled          = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.reset_on_death   = static_cast<int8_t>(atoi(row[13]));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -206,35 +206,35 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AaAbility aa_ability_entry
+		const AaAbility &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(aa_ability_entry.id));
-		update_values.push_back(columns[1] + " = '" + EscapeString(aa_ability_entry.name) + "'");
-		update_values.push_back(columns[2] + " = " + std::to_string(aa_ability_entry.category));
-		update_values.push_back(columns[3] + " = " + std::to_string(aa_ability_entry.classes));
-		update_values.push_back(columns[4] + " = " + std::to_string(aa_ability_entry.races));
-		update_values.push_back(columns[5] + " = " + std::to_string(aa_ability_entry.drakkin_heritage));
-		update_values.push_back(columns[6] + " = " + std::to_string(aa_ability_entry.deities));
-		update_values.push_back(columns[7] + " = " + std::to_string(aa_ability_entry.status));
-		update_values.push_back(columns[8] + " = " + std::to_string(aa_ability_entry.type));
-		update_values.push_back(columns[9] + " = " + std::to_string(aa_ability_entry.charges));
-		update_values.push_back(columns[10] + " = " + std::to_string(aa_ability_entry.grant_only));
-		update_values.push_back(columns[11] + " = " + std::to_string(aa_ability_entry.first_rank_id));
-		update_values.push_back(columns[12] + " = " + std::to_string(aa_ability_entry.enabled));
-		update_values.push_back(columns[13] + " = " + std::to_string(aa_ability_entry.reset_on_death));
+		v.push_back(columns[0] + " = " + std::to_string(e.id));
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
+		v.push_back(columns[2] + " = " + std::to_string(e.category));
+		v.push_back(columns[3] + " = " + std::to_string(e.classes));
+		v.push_back(columns[4] + " = " + std::to_string(e.races));
+		v.push_back(columns[5] + " = " + std::to_string(e.drakkin_heritage));
+		v.push_back(columns[6] + " = " + std::to_string(e.deities));
+		v.push_back(columns[7] + " = " + std::to_string(e.status));
+		v.push_back(columns[8] + " = " + std::to_string(e.type));
+		v.push_back(columns[9] + " = " + std::to_string(e.charges));
+		v.push_back(columns[10] + " = " + std::to_string(e.grant_only));
+		v.push_back(columns[11] + " = " + std::to_string(e.first_rank_id));
+		v.push_back(columns[12] + " = " + std::to_string(e.enabled));
+		v.push_back(columns[13] + " = " + std::to_string(e.reset_on_death));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				aa_ability_entry.id
+				e.id
 			)
 		);
 
@@ -243,79 +243,79 @@ public:
 
 	static AaAbility InsertOne(
 		Database& db,
-		AaAbility aa_ability_entry
+		AaAbility e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(aa_ability_entry.id));
-		insert_values.push_back("'" + EscapeString(aa_ability_entry.name) + "'");
-		insert_values.push_back(std::to_string(aa_ability_entry.category));
-		insert_values.push_back(std::to_string(aa_ability_entry.classes));
-		insert_values.push_back(std::to_string(aa_ability_entry.races));
-		insert_values.push_back(std::to_string(aa_ability_entry.drakkin_heritage));
-		insert_values.push_back(std::to_string(aa_ability_entry.deities));
-		insert_values.push_back(std::to_string(aa_ability_entry.status));
-		insert_values.push_back(std::to_string(aa_ability_entry.type));
-		insert_values.push_back(std::to_string(aa_ability_entry.charges));
-		insert_values.push_back(std::to_string(aa_ability_entry.grant_only));
-		insert_values.push_back(std::to_string(aa_ability_entry.first_rank_id));
-		insert_values.push_back(std::to_string(aa_ability_entry.enabled));
-		insert_values.push_back(std::to_string(aa_ability_entry.reset_on_death));
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back(std::to_string(e.category));
+		v.push_back(std::to_string(e.classes));
+		v.push_back(std::to_string(e.races));
+		v.push_back(std::to_string(e.drakkin_heritage));
+		v.push_back(std::to_string(e.deities));
+		v.push_back(std::to_string(e.status));
+		v.push_back(std::to_string(e.type));
+		v.push_back(std::to_string(e.charges));
+		v.push_back(std::to_string(e.grant_only));
+		v.push_back(std::to_string(e.first_rank_id));
+		v.push_back(std::to_string(e.enabled));
+		v.push_back(std::to_string(e.reset_on_death));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			aa_ability_entry.id = results.LastInsertedID();
-			return aa_ability_entry;
+			e.id = results.LastInsertedID();
+			return e;
 		}
 
-		aa_ability_entry = NewEntity();
+		e = NewEntity();
 
-		return aa_ability_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AaAbility> aa_ability_entries
+		const std::vector<AaAbility> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &aa_ability_entry: aa_ability_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(aa_ability_entry.id));
-			insert_values.push_back("'" + EscapeString(aa_ability_entry.name) + "'");
-			insert_values.push_back(std::to_string(aa_ability_entry.category));
-			insert_values.push_back(std::to_string(aa_ability_entry.classes));
-			insert_values.push_back(std::to_string(aa_ability_entry.races));
-			insert_values.push_back(std::to_string(aa_ability_entry.drakkin_heritage));
-			insert_values.push_back(std::to_string(aa_ability_entry.deities));
-			insert_values.push_back(std::to_string(aa_ability_entry.status));
-			insert_values.push_back(std::to_string(aa_ability_entry.type));
-			insert_values.push_back(std::to_string(aa_ability_entry.charges));
-			insert_values.push_back(std::to_string(aa_ability_entry.grant_only));
-			insert_values.push_back(std::to_string(aa_ability_entry.first_rank_id));
-			insert_values.push_back(std::to_string(aa_ability_entry.enabled));
-			insert_values.push_back(std::to_string(aa_ability_entry.reset_on_death));
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back(std::to_string(e.category));
+			v.push_back(std::to_string(e.classes));
+			v.push_back(std::to_string(e.races));
+			v.push_back(std::to_string(e.drakkin_heritage));
+			v.push_back(std::to_string(e.deities));
+			v.push_back(std::to_string(e.status));
+			v.push_back(std::to_string(e.type));
+			v.push_back(std::to_string(e.charges));
+			v.push_back(std::to_string(e.grant_only));
+			v.push_back(std::to_string(e.first_rank_id));
+			v.push_back(std::to_string(e.enabled));
+			v.push_back(std::to_string(e.reset_on_death));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -336,30 +336,30 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaAbility entry{};
+			AaAbility e{};
 
-			entry.id               = atoi(row[0]);
-			entry.name             = row[1] ? row[1] : "";
-			entry.category         = atoi(row[2]);
-			entry.classes          = atoi(row[3]);
-			entry.races            = atoi(row[4]);
-			entry.drakkin_heritage = atoi(row[5]);
-			entry.deities          = atoi(row[6]);
-			entry.status           = atoi(row[7]);
-			entry.type             = atoi(row[8]);
-			entry.charges          = atoi(row[9]);
-			entry.grant_only       = atoi(row[10]);
-			entry.first_rank_id    = atoi(row[11]);
-			entry.enabled          = atoi(row[12]);
-			entry.reset_on_death   = atoi(row[13]);
+			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.name             = row[1] ? row[1] : "";
+			e.category         = static_cast<int32_t>(atoi(row[2]));
+			e.classes          = static_cast<int32_t>(atoi(row[3]));
+			e.races            = static_cast<int32_t>(atoi(row[4]));
+			e.drakkin_heritage = static_cast<int32_t>(atoi(row[5]));
+			e.deities          = static_cast<int32_t>(atoi(row[6]));
+			e.status           = static_cast<int32_t>(atoi(row[7]));
+			e.type             = static_cast<int32_t>(atoi(row[8]));
+			e.charges          = static_cast<int32_t>(atoi(row[9]));
+			e.grant_only       = static_cast<int8_t>(atoi(row[10]));
+			e.first_rank_id    = static_cast<int32_t>(atoi(row[11]));
+			e.enabled          = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.reset_on_death   = static_cast<int8_t>(atoi(row[13]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AaAbility> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AaAbility> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AaAbility> all_entries;
 
@@ -374,30 +374,30 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaAbility entry{};
+			AaAbility e{};
 
-			entry.id               = atoi(row[0]);
-			entry.name             = row[1] ? row[1] : "";
-			entry.category         = atoi(row[2]);
-			entry.classes          = atoi(row[3]);
-			entry.races            = atoi(row[4]);
-			entry.drakkin_heritage = atoi(row[5]);
-			entry.deities          = atoi(row[6]);
-			entry.status           = atoi(row[7]);
-			entry.type             = atoi(row[8]);
-			entry.charges          = atoi(row[9]);
-			entry.grant_only       = atoi(row[10]);
-			entry.first_rank_id    = atoi(row[11]);
-			entry.enabled          = atoi(row[12]);
-			entry.reset_on_death   = atoi(row[13]);
+			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.name             = row[1] ? row[1] : "";
+			e.category         = static_cast<int32_t>(atoi(row[2]));
+			e.classes          = static_cast<int32_t>(atoi(row[3]));
+			e.races            = static_cast<int32_t>(atoi(row[4]));
+			e.drakkin_heritage = static_cast<int32_t>(atoi(row[5]));
+			e.deities          = static_cast<int32_t>(atoi(row[6]));
+			e.status           = static_cast<int32_t>(atoi(row[7]));
+			e.type             = static_cast<int32_t>(atoi(row[8]));
+			e.charges          = static_cast<int32_t>(atoi(row[9]));
+			e.grant_only       = static_cast<int8_t>(atoi(row[10]));
+			e.first_rank_id    = static_cast<int32_t>(atoi(row[11]));
+			e.enabled          = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.reset_on_death   = static_cast<int8_t>(atoi(row[13]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -422,6 +422,32 @@ public:
 		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_AA_ABILITY_REPOSITORY_H

common/repositories/base/base_aa_rank_effects_repository.h

@@ -13,17 +13,17 @@
 #define EQEMU_BASE_AA_RANK_EFFECTS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAaRankEffectsRepository {
 public:
 	struct AaRankEffects {
-		int rank_id;
-		int slot;
-		int effect_id;
-		int base1;
-		int base2;
+		uint32_t rank_id;
+		uint32_t slot;
+		int32_t  effect_id;
+		int32_t  base1;
+		int32_t  base2;
 	};
 
 	static std::string PrimaryKey()
@@ -55,12 +55,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -88,18 +88,18 @@ public:
 
 	static AaRankEffects NewEntity()
 	{
-		AaRankEffects entry{};
+		AaRankEffects e{};
 
-		entry.rank_id   = 0;
-		entry.slot      = 1;
-		entry.effect_id = 0;
-		entry.base1     = 0;
-		entry.base2     = 0;
+		e.rank_id   = 0;
+		e.slot      = 1;
+		e.effect_id = 0;
+		e.base1     = 0;
+		e.base2     = 0;
 
-		return entry;
+		return e;
 	}
 
-	static AaRankEffects GetAaRankEffectsEntry(
+	static AaRankEffects GetAaRankEffects(
 		const std::vector<AaRankEffects> &aa_rank_effectss,
 		int aa_rank_effects_id
 	)
@@ -128,15 +128,15 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AaRankEffects entry{};
+			AaRankEffects e{};
 
-			entry.rank_id   = atoi(row[0]);
-			entry.slot      = atoi(row[1]);
-			entry.effect_id = atoi(row[2]);
-			entry.base1     = atoi(row[3]);
-			entry.base2     = atoi(row[4]);
+			e.rank_id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.slot      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.effect_id = static_cast<int32_t>(atoi(row[2]));
+			e.base1     = static_cast<int32_t>(atoi(row[3]));
+			e.base2     = static_cast<int32_t>(atoi(row[4]));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -161,26 +161,26 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AaRankEffects aa_rank_effects_entry
+		const AaRankEffects &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(aa_rank_effects_entry.rank_id));
-		update_values.push_back(columns[1] + " = " + std::to_string(aa_rank_effects_entry.slot));
-		update_values.push_back(columns[2] + " = " + std::to_string(aa_rank_effects_entry.effect_id));
-		update_values.push_back(columns[3] + " = " + std::to_string(aa_rank_effects_entry.base1));
-		update_values.push_back(columns[4] + " = " + std::to_string(aa_rank_effects_entry.base2));
+		v.push_back(columns[0] + " = " + std::to_string(e.rank_id));
+		v.push_back(columns[1] + " = " + std::to_string(e.slot));
+		v.push_back(columns[2] + " = " + std::to_string(e.effect_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.base1));
+		v.push_back(columns[4] + " = " + std::to_string(e.base2));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				aa_rank_effects_entry.rank_id
+				e.rank_id
 			)
 		);
 
@@ -189,61 +189,61 @@ public:
 
 	static AaRankEffects InsertOne(
 		Database& db,
-		AaRankEffects aa_rank_effects_entry
+		AaRankEffects e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(aa_rank_effects_entry.rank_id));
-		insert_values.push_back(std::to_string(aa_rank_effects_entry.slot));
-		insert_values.push_back(std::to_string(aa_rank_effects_entry.effect_id));
-		insert_values.push_back(std::to_string(aa_rank_effects_entry.base1));
-		insert_values.push_back(std::to_string(aa_rank_effects_entry.base2));
+		v.push_back(std::to_string(e.rank_id));
+		v.push_back(std::to_string(e.slot));
+		v.push_back(std::to_string(e.effect_id));
+		v.push_back(std::to_string(e.base1));
+		v.push_back(std::to_string(e.base2));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			aa_rank_effects_entry.rank_id = results.LastInsertedID();
-			return aa_rank_effects_entry;
+			e.rank_id = results.LastInsertedID();
+			return e;
 		}
 
-		aa_rank_effects_entry = NewEntity();
+		e = NewEntity();
 
-		return aa_rank_effects_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AaRankEffects> aa_rank_effects_entries
+		const std::vector<AaRankEffects> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &aa_rank_effects_entry: aa_rank_effects_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(aa_rank_effects_entry.rank_id));
-			insert_values.push_back(std::to_string(aa_rank_effects_entry.slot));
-			insert_values.push_back(std::to_string(aa_rank_effects_entry.effect_id));
-			insert_values.push_back(std::to_string(aa_rank_effects_entry.base1));
-			insert_values.push_back(std::to_string(aa_rank_effects_entry.base2));
+			v.push_back(std::to_string(e.rank_id));
+			v.push_back(std::to_string(e.slot));
+			v.push_back(std::to_string(e.effect_id));
+			v.push_back(std::to_string(e.base1));
+			v.push_back(std::to_string(e.base2));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -264,21 +264,21 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaRankEffects entry{};
+			AaRankEffects e{};
 
-			entry.rank_id   = atoi(row[0]);
-			entry.slot      = atoi(row[1]);
-			entry.effect_id = atoi(row[2]);
-			entry.base1     = atoi(row[3]);
-			entry.base2     = atoi(row[4]);
+			e.rank_id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.slot      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.effect_id = static_cast<int32_t>(atoi(row[2]));
+			e.base1     = static_cast<int32_t>(atoi(row[3]));
+			e.base2     = static_cast<int32_t>(atoi(row[4]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AaRankEffects> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AaRankEffects> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AaRankEffects> all_entries;
 
@@ -293,21 +293,21 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaRankEffects entry{};
+			AaRankEffects e{};
 
-			entry.rank_id   = atoi(row[0]);
-			entry.slot      = atoi(row[1]);
-			entry.effect_id = atoi(row[2]);
-			entry.base1     = atoi(row[3]);
-			entry.base2     = atoi(row[4]);
+			e.rank_id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.slot      = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.effect_id = static_cast<int32_t>(atoi(row[2]));
+			e.base1     = static_cast<int32_t>(atoi(row[3]));
+			e.base2     = static_cast<int32_t>(atoi(row[4]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -332,6 +332,32 @@ public:
 		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_AA_RANK_EFFECTS_REPOSITORY_H

common/repositories/base/base_aa_rank_prereqs_repository.h

@@ -13,15 +13,15 @@
 #define EQEMU_BASE_AA_RANK_PREREQS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAaRankPrereqsRepository {
 public:
 	struct AaRankPrereqs {
-		int rank_id;
-		int aa_id;
-		int points;
+		uint32_t rank_id;
+		int32_t  aa_id;
+		int32_t  points;
 	};
 
 	static std::string PrimaryKey()
@@ -49,12 +49,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -82,16 +82,16 @@ public:
 
 	static AaRankPrereqs NewEntity()
 	{
-		AaRankPrereqs entry{};
+		AaRankPrereqs e{};
 
-		entry.rank_id = 0;
-		entry.aa_id   = 0;
-		entry.points  = 0;
+		e.rank_id = 0;
+		e.aa_id   = 0;
+		e.points  = 0;
 
-		return entry;
+		return e;
 	}
 
-	static AaRankPrereqs GetAaRankPrereqsEntry(
+	static AaRankPrereqs GetAaRankPrereqs(
 		const std::vector<AaRankPrereqs> &aa_rank_prereqss,
 		int aa_rank_prereqs_id
 	)
@@ -120,13 +120,13 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AaRankPrereqs entry{};
+			AaRankPrereqs e{};
 
-			entry.rank_id = atoi(row[0]);
-			entry.aa_id   = atoi(row[1]);
-			entry.points  = atoi(row[2]);
+			e.rank_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.aa_id   = static_cast<int32_t>(atoi(row[1]));
+			e.points  = static_cast<int32_t>(atoi(row[2]));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -151,24 +151,24 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AaRankPrereqs aa_rank_prereqs_entry
+		const AaRankPrereqs &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(aa_rank_prereqs_entry.rank_id));
-		update_values.push_back(columns[1] + " = " + std::to_string(aa_rank_prereqs_entry.aa_id));
-		update_values.push_back(columns[2] + " = " + std::to_string(aa_rank_prereqs_entry.points));
+		v.push_back(columns[0] + " = " + std::to_string(e.rank_id));
+		v.push_back(columns[1] + " = " + std::to_string(e.aa_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.points));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				aa_rank_prereqs_entry.rank_id
+				e.rank_id
 			)
 		);
 
@@ -177,57 +177,57 @@ public:
 
 	static AaRankPrereqs InsertOne(
 		Database& db,
-		AaRankPrereqs aa_rank_prereqs_entry
+		AaRankPrereqs e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(aa_rank_prereqs_entry.rank_id));
-		insert_values.push_back(std::to_string(aa_rank_prereqs_entry.aa_id));
-		insert_values.push_back(std::to_string(aa_rank_prereqs_entry.points));
+		v.push_back(std::to_string(e.rank_id));
+		v.push_back(std::to_string(e.aa_id));
+		v.push_back(std::to_string(e.points));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			aa_rank_prereqs_entry.rank_id = results.LastInsertedID();
-			return aa_rank_prereqs_entry;
+			e.rank_id = results.LastInsertedID();
+			return e;
 		}
 
-		aa_rank_prereqs_entry = NewEntity();
+		e = NewEntity();
 
-		return aa_rank_prereqs_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AaRankPrereqs> aa_rank_prereqs_entries
+		const std::vector<AaRankPrereqs> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &aa_rank_prereqs_entry: aa_rank_prereqs_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(aa_rank_prereqs_entry.rank_id));
-			insert_values.push_back(std::to_string(aa_rank_prereqs_entry.aa_id));
-			insert_values.push_back(std::to_string(aa_rank_prereqs_entry.points));
+			v.push_back(std::to_string(e.rank_id));
+			v.push_back(std::to_string(e.aa_id));
+			v.push_back(std::to_string(e.points));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -248,19 +248,19 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaRankPrereqs entry{};
+			AaRankPrereqs e{};
 
-			entry.rank_id = atoi(row[0]);
-			entry.aa_id   = atoi(row[1]);
-			entry.points  = atoi(row[2]);
+			e.rank_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.aa_id   = static_cast<int32_t>(atoi(row[1]));
+			e.points  = static_cast<int32_t>(atoi(row[2]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AaRankPrereqs> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AaRankPrereqs> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AaRankPrereqs> all_entries;
 
@@ -275,19 +275,19 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaRankPrereqs entry{};
+			AaRankPrereqs e{};
 
-			entry.rank_id = atoi(row[0]);
-			entry.aa_id   = atoi(row[1]);
-			entry.points  = atoi(row[2]);
+			e.rank_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.aa_id   = static_cast<int32_t>(atoi(row[1]));
+			e.points  = static_cast<int32_t>(atoi(row[2]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -312,6 +312,32 @@ public:
 		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_AA_RANK_PREREQS_REPOSITORY_H

common/repositories/base/base_aa_ranks_repository.h

@@ -13,25 +13,25 @@
 #define EQEMU_BASE_AA_RANKS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAaRanksRepository {
 public:
 	struct AaRanks {
-		int id;
-		int upper_hotkey_sid;
-		int lower_hotkey_sid;
-		int title_sid;
-		int desc_sid;
-		int cost;
-		int level_req;
-		int spell;
-		int spell_type;
-		int recast_time;
-		int expansion;
-		int prev_id;
-		int next_id;
+		uint32_t id;
+		int32_t  upper_hotkey_sid;
+		int32_t  lower_hotkey_sid;
+		int32_t  title_sid;
+		int32_t  desc_sid;
+		int32_t  cost;
+		int32_t  level_req;
+		int32_t  spell;
+		int32_t  spell_type;
+		int32_t  recast_time;
+		int32_t  expansion;
+		int32_t  prev_id;
+		int32_t  next_id;
 	};
 
 	static std::string PrimaryKey()
@@ -79,12 +79,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -112,26 +112,26 @@ public:
 
 	static AaRanks NewEntity()
 	{
-		AaRanks entry{};
+		AaRanks e{};
 
-		entry.id               = 0;
-		entry.upper_hotkey_sid = -1;
-		entry.lower_hotkey_sid = -1;
-		entry.title_sid        = -1;
-		entry.desc_sid         = -1;
-		entry.cost             = 1;
-		entry.level_req        = 51;
-		entry.spell            = -1;
-		entry.spell_type       = 0;
-		entry.recast_time      = 0;
-		entry.expansion        = 0;
-		entry.prev_id          = -1;
-		entry.next_id          = -1;
+		e.id               = 0;
+		e.upper_hotkey_sid = -1;
+		e.lower_hotkey_sid = -1;
+		e.title_sid        = -1;
+		e.desc_sid         = -1;
+		e.cost             = 1;
+		e.level_req        = 51;
+		e.spell            = -1;
+		e.spell_type       = 0;
+		e.recast_time      = 0;
+		e.expansion        = 0;
+		e.prev_id          = -1;
+		e.next_id          = -1;
 
-		return entry;
+		return e;
 	}
 
-	static AaRanks GetAaRanksEntry(
+	static AaRanks GetAaRanks(
 		const std::vector<AaRanks> &aa_rankss,
 		int aa_ranks_id
 	)
@@ -160,23 +160,23 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AaRanks entry{};
+			AaRanks e{};
 
-			entry.id               = atoi(row[0]);
-			entry.upper_hotkey_sid = atoi(row[1]);
-			entry.lower_hotkey_sid = atoi(row[2]);
-			entry.title_sid        = atoi(row[3]);
-			entry.desc_sid         = atoi(row[4]);
-			entry.cost             = atoi(row[5]);
-			entry.level_req        = atoi(row[6]);
-			entry.spell            = atoi(row[7]);
-			entry.spell_type       = atoi(row[8]);
-			entry.recast_time      = atoi(row[9]);
-			entry.expansion        = atoi(row[10]);
-			entry.prev_id          = atoi(row[11]);
-			entry.next_id          = atoi(row[12]);
+			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.upper_hotkey_sid = static_cast<int32_t>(atoi(row[1]));
+			e.lower_hotkey_sid = static_cast<int32_t>(atoi(row[2]));
+			e.title_sid        = static_cast<int32_t>(atoi(row[3]));
+			e.desc_sid         = static_cast<int32_t>(atoi(row[4]));
+			e.cost             = static_cast<int32_t>(atoi(row[5]));
+			e.level_req        = static_cast<int32_t>(atoi(row[6]));
+			e.spell            = static_cast<int32_t>(atoi(row[7]));
+			e.spell_type       = static_cast<int32_t>(atoi(row[8]));
+			e.recast_time      = static_cast<int32_t>(atoi(row[9]));
+			e.expansion        = static_cast<int32_t>(atoi(row[10]));
+			e.prev_id          = static_cast<int32_t>(atoi(row[11]));
+			e.next_id          = static_cast<int32_t>(atoi(row[12]));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -201,34 +201,34 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AaRanks aa_ranks_entry
+		const AaRanks &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(aa_ranks_entry.id));
-		update_values.push_back(columns[1] + " = " + std::to_string(aa_ranks_entry.upper_hotkey_sid));
-		update_values.push_back(columns[2] + " = " + std::to_string(aa_ranks_entry.lower_hotkey_sid));
-		update_values.push_back(columns[3] + " = " + std::to_string(aa_ranks_entry.title_sid));
-		update_values.push_back(columns[4] + " = " + std::to_string(aa_ranks_entry.desc_sid));
-		update_values.push_back(columns[5] + " = " + std::to_string(aa_ranks_entry.cost));
-		update_values.push_back(columns[6] + " = " + std::to_string(aa_ranks_entry.level_req));
-		update_values.push_back(columns[7] + " = " + std::to_string(aa_ranks_entry.spell));
-		update_values.push_back(columns[8] + " = " + std::to_string(aa_ranks_entry.spell_type));
-		update_values.push_back(columns[9] + " = " + std::to_string(aa_ranks_entry.recast_time));
-		update_values.push_back(columns[10] + " = " + std::to_string(aa_ranks_entry.expansion));
-		update_values.push_back(columns[11] + " = " + std::to_string(aa_ranks_entry.prev_id));
-		update_values.push_back(columns[12] + " = " + std::to_string(aa_ranks_entry.next_id));
+		v.push_back(columns[0] + " = " + std::to_string(e.id));
+		v.push_back(columns[1] + " = " + std::to_string(e.upper_hotkey_sid));
+		v.push_back(columns[2] + " = " + std::to_string(e.lower_hotkey_sid));
+		v.push_back(columns[3] + " = " + std::to_string(e.title_sid));
+		v.push_back(columns[4] + " = " + std::to_string(e.desc_sid));
+		v.push_back(columns[5] + " = " + std::to_string(e.cost));
+		v.push_back(columns[6] + " = " + std::to_string(e.level_req));
+		v.push_back(columns[7] + " = " + std::to_string(e.spell));
+		v.push_back(columns[8] + " = " + std::to_string(e.spell_type));
+		v.push_back(columns[9] + " = " + std::to_string(e.recast_time));
+		v.push_back(columns[10] + " = " + std::to_string(e.expansion));
+		v.push_back(columns[11] + " = " + std::to_string(e.prev_id));
+		v.push_back(columns[12] + " = " + std::to_string(e.next_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				aa_ranks_entry.id
+				e.id
 			)
 		);
 
@@ -237,77 +237,77 @@ public:
 
 	static AaRanks InsertOne(
 		Database& db,
-		AaRanks aa_ranks_entry
+		AaRanks e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(aa_ranks_entry.id));
-		insert_values.push_back(std::to_string(aa_ranks_entry.upper_hotkey_sid));
-		insert_values.push_back(std::to_string(aa_ranks_entry.lower_hotkey_sid));
-		insert_values.push_back(std::to_string(aa_ranks_entry.title_sid));
-		insert_values.push_back(std::to_string(aa_ranks_entry.desc_sid));
-		insert_values.push_back(std::to_string(aa_ranks_entry.cost));
-		insert_values.push_back(std::to_string(aa_ranks_entry.level_req));
-		insert_values.push_back(std::to_string(aa_ranks_entry.spell));
-		insert_values.push_back(std::to_string(aa_ranks_entry.spell_type));
-		insert_values.push_back(std::to_string(aa_ranks_entry.recast_time));
-		insert_values.push_back(std::to_string(aa_ranks_entry.expansion));
-		insert_values.push_back(std::to_string(aa_ranks_entry.prev_id));
-		insert_values.push_back(std::to_string(aa_ranks_entry.next_id));
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.upper_hotkey_sid));
+		v.push_back(std::to_string(e.lower_hotkey_sid));
+		v.push_back(std::to_string(e.title_sid));
+		v.push_back(std::to_string(e.desc_sid));
+		v.push_back(std::to_string(e.cost));
+		v.push_back(std::to_string(e.level_req));
+		v.push_back(std::to_string(e.spell));
+		v.push_back(std::to_string(e.spell_type));
+		v.push_back(std::to_string(e.recast_time));
+		v.push_back(std::to_string(e.expansion));
+		v.push_back(std::to_string(e.prev_id));
+		v.push_back(std::to_string(e.next_id));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			aa_ranks_entry.id = results.LastInsertedID();
-			return aa_ranks_entry;
+			e.id = results.LastInsertedID();
+			return e;
 		}
 
-		aa_ranks_entry = NewEntity();
+		e = NewEntity();
 
-		return aa_ranks_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AaRanks> aa_ranks_entries
+		const std::vector<AaRanks> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &aa_ranks_entry: aa_ranks_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(aa_ranks_entry.id));
-			insert_values.push_back(std::to_string(aa_ranks_entry.upper_hotkey_sid));
-			insert_values.push_back(std::to_string(aa_ranks_entry.lower_hotkey_sid));
-			insert_values.push_back(std::to_string(aa_ranks_entry.title_sid));
-			insert_values.push_back(std::to_string(aa_ranks_entry.desc_sid));
-			insert_values.push_back(std::to_string(aa_ranks_entry.cost));
-			insert_values.push_back(std::to_string(aa_ranks_entry.level_req));
-			insert_values.push_back(std::to_string(aa_ranks_entry.spell));
-			insert_values.push_back(std::to_string(aa_ranks_entry.spell_type));
-			insert_values.push_back(std::to_string(aa_ranks_entry.recast_time));
-			insert_values.push_back(std::to_string(aa_ranks_entry.expansion));
-			insert_values.push_back(std::to_string(aa_ranks_entry.prev_id));
-			insert_values.push_back(std::to_string(aa_ranks_entry.next_id));
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.upper_hotkey_sid));
+			v.push_back(std::to_string(e.lower_hotkey_sid));
+			v.push_back(std::to_string(e.title_sid));
+			v.push_back(std::to_string(e.desc_sid));
+			v.push_back(std::to_string(e.cost));
+			v.push_back(std::to_string(e.level_req));
+			v.push_back(std::to_string(e.spell));
+			v.push_back(std::to_string(e.spell_type));
+			v.push_back(std::to_string(e.recast_time));
+			v.push_back(std::to_string(e.expansion));
+			v.push_back(std::to_string(e.prev_id));
+			v.push_back(std::to_string(e.next_id));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -328,29 +328,29 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaRanks entry{};
+			AaRanks e{};
 
-			entry.id               = atoi(row[0]);
-			entry.upper_hotkey_sid = atoi(row[1]);
-			entry.lower_hotkey_sid = atoi(row[2]);
-			entry.title_sid        = atoi(row[3]);
-			entry.desc_sid         = atoi(row[4]);
-			entry.cost             = atoi(row[5]);
-			entry.level_req        = atoi(row[6]);
-			entry.spell            = atoi(row[7]);
-			entry.spell_type       = atoi(row[8]);
-			entry.recast_time      = atoi(row[9]);
-			entry.expansion        = atoi(row[10]);
-			entry.prev_id          = atoi(row[11]);
-			entry.next_id          = atoi(row[12]);
+			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.upper_hotkey_sid = static_cast<int32_t>(atoi(row[1]));
+			e.lower_hotkey_sid = static_cast<int32_t>(atoi(row[2]));
+			e.title_sid        = static_cast<int32_t>(atoi(row[3]));
+			e.desc_sid         = static_cast<int32_t>(atoi(row[4]));
+			e.cost             = static_cast<int32_t>(atoi(row[5]));
+			e.level_req        = static_cast<int32_t>(atoi(row[6]));
+			e.spell            = static_cast<int32_t>(atoi(row[7]));
+			e.spell_type       = static_cast<int32_t>(atoi(row[8]));
+			e.recast_time      = static_cast<int32_t>(atoi(row[9]));
+			e.expansion        = static_cast<int32_t>(atoi(row[10]));
+			e.prev_id          = static_cast<int32_t>(atoi(row[11]));
+			e.next_id          = static_cast<int32_t>(atoi(row[12]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AaRanks> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AaRanks> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AaRanks> all_entries;
 
@@ -365,29 +365,29 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AaRanks entry{};
+			AaRanks e{};
 
-			entry.id               = atoi(row[0]);
-			entry.upper_hotkey_sid = atoi(row[1]);
-			entry.lower_hotkey_sid = atoi(row[2]);
-			entry.title_sid        = atoi(row[3]);
-			entry.desc_sid         = atoi(row[4]);
-			entry.cost             = atoi(row[5]);
-			entry.level_req        = atoi(row[6]);
-			entry.spell            = atoi(row[7]);
-			entry.spell_type       = atoi(row[8]);
-			entry.recast_time      = atoi(row[9]);
-			entry.expansion        = atoi(row[10]);
-			entry.prev_id          = atoi(row[11]);
-			entry.next_id          = atoi(row[12]);
+			e.id               = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.upper_hotkey_sid = static_cast<int32_t>(atoi(row[1]));
+			e.lower_hotkey_sid = static_cast<int32_t>(atoi(row[2]));
+			e.title_sid        = static_cast<int32_t>(atoi(row[3]));
+			e.desc_sid         = static_cast<int32_t>(atoi(row[4]));
+			e.cost             = static_cast<int32_t>(atoi(row[5]));
+			e.level_req        = static_cast<int32_t>(atoi(row[6]));
+			e.spell            = static_cast<int32_t>(atoi(row[7]));
+			e.spell_type       = static_cast<int32_t>(atoi(row[8]));
+			e.recast_time      = static_cast<int32_t>(atoi(row[9]));
+			e.expansion        = static_cast<int32_t>(atoi(row[10]));
+			e.prev_id          = static_cast<int32_t>(atoi(row[11]));
+			e.next_id          = static_cast<int32_t>(atoi(row[12]));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -412,6 +412,32 @@ public:
 		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_AA_RANKS_REPOSITORY_H

common/repositories/base/base_account_flags_repository.h

@@ -13,13 +13,13 @@
 #define EQEMU_BASE_ACCOUNT_FLAGS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAccountFlagsRepository {
 public:
 	struct AccountFlags {
-		int         p_accid;
+		uint32_t    p_accid;
 		std::string p_flag;
 		std::string p_value;
 	};
@@ -49,12 +49,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -82,16 +82,16 @@ public:
 
 	static AccountFlags NewEntity()
 	{
-		AccountFlags entry{};
+		AccountFlags e{};
 
-		entry.p_accid = 0;
-		entry.p_flag  = "";
-		entry.p_value = "";
+		e.p_accid = 0;
+		e.p_flag  = "";
+		e.p_value = "";
 
-		return entry;
+		return e;
 	}
 
-	static AccountFlags GetAccountFlagsEntry(
+	static AccountFlags GetAccountFlags(
 		const std::vector<AccountFlags> &account_flagss,
 		int account_flags_id
 	)
@@ -120,13 +120,13 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AccountFlags entry{};
+			AccountFlags e{};
 
-			entry.p_accid = atoi(row[0]);
-			entry.p_flag  = row[1] ? row[1] : "";
-			entry.p_value = row[2] ? row[2] : "";
+			e.p_accid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.p_flag  = row[1] ? row[1] : "";
+			e.p_value = row[2] ? row[2] : "";
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -151,24 +151,24 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AccountFlags account_flags_entry
+		const AccountFlags &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(account_flags_entry.p_accid));
-		update_values.push_back(columns[1] + " = '" + EscapeString(account_flags_entry.p_flag) + "'");
-		update_values.push_back(columns[2] + " = '" + EscapeString(account_flags_entry.p_value) + "'");
+		v.push_back(columns[0] + " = " + std::to_string(e.p_accid));
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.p_flag) + "'");
+		v.push_back(columns[2] + " = '" + Strings::Escape(e.p_value) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				account_flags_entry.p_accid
+				e.p_accid
 			)
 		);
 
@@ -177,57 +177,57 @@ public:
 
 	static AccountFlags InsertOne(
 		Database& db,
-		AccountFlags account_flags_entry
+		AccountFlags e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(account_flags_entry.p_accid));
-		insert_values.push_back("'" + EscapeString(account_flags_entry.p_flag) + "'");
-		insert_values.push_back("'" + EscapeString(account_flags_entry.p_value) + "'");
+		v.push_back(std::to_string(e.p_accid));
+		v.push_back("'" + Strings::Escape(e.p_flag) + "'");
+		v.push_back("'" + Strings::Escape(e.p_value) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			account_flags_entry.p_accid = results.LastInsertedID();
-			return account_flags_entry;
+			e.p_accid = results.LastInsertedID();
+			return e;
 		}
 
-		account_flags_entry = NewEntity();
+		e = NewEntity();
 
-		return account_flags_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AccountFlags> account_flags_entries
+		const std::vector<AccountFlags> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &account_flags_entry: account_flags_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(account_flags_entry.p_accid));
-			insert_values.push_back("'" + EscapeString(account_flags_entry.p_flag) + "'");
-			insert_values.push_back("'" + EscapeString(account_flags_entry.p_value) + "'");
+			v.push_back(std::to_string(e.p_accid));
+			v.push_back("'" + Strings::Escape(e.p_flag) + "'");
+			v.push_back("'" + Strings::Escape(e.p_value) + "'");
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -248,19 +248,19 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AccountFlags entry{};
+			AccountFlags e{};
 
-			entry.p_accid = atoi(row[0]);
-			entry.p_flag  = row[1] ? row[1] : "";
-			entry.p_value = row[2] ? row[2] : "";
+			e.p_accid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.p_flag  = row[1] ? row[1] : "";
+			e.p_value = row[2] ? row[2] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AccountFlags> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AccountFlags> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AccountFlags> all_entries;
 
@@ -275,19 +275,19 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AccountFlags entry{};
+			AccountFlags e{};
 
-			entry.p_accid = atoi(row[0]);
-			entry.p_flag  = row[1] ? row[1] : "";
-			entry.p_value = row[2] ? row[2] : "";
+			e.p_accid = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.p_flag  = row[1] ? row[1] : "";
+			e.p_value = row[2] ? row[2] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -312,6 +312,32 @@ public:
 		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_ACCOUNT_FLAGS_REPOSITORY_H

common/repositories/base/base_account_ip_repository.h

@@ -13,15 +13,15 @@
 #define EQEMU_BASE_ACCOUNT_IP_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAccountIpRepository {
 public:
 	struct AccountIp {
-		int         accid;
+		int32_t     accid;
 		std::string ip;
-		int         count;
+		int32_t     count;
 		std::string lastused;
 	};
 
@@ -52,12 +52,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -85,17 +85,17 @@ public:
 
 	static AccountIp NewEntity()
 	{
-		AccountIp entry{};
+		AccountIp e{};
 
-		entry.accid    = 0;
-		entry.ip       = "";
-		entry.count    = 1;
-		entry.lastused = std::time(nullptr);
+		e.accid    = 0;
+		e.ip       = "";
+		e.count    = 1;
+		e.lastused = std::time(nullptr);
 
-		return entry;
+		return e;
 	}
 
-	static AccountIp GetAccountIpEntry(
+	static AccountIp GetAccountIp(
 		const std::vector<AccountIp> &account_ips,
 		int account_ip_id
 	)
@@ -124,14 +124,14 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AccountIp entry{};
+			AccountIp e{};
 
-			entry.accid    = atoi(row[0]);
-			entry.ip       = row[1] ? row[1] : "";
-			entry.count    = atoi(row[2]);
-			entry.lastused = row[3] ? row[3] : "";
+			e.accid    = static_cast<int32_t>(atoi(row[0]));
+			e.ip       = row[1] ? row[1] : "";
+			e.count    = static_cast<int32_t>(atoi(row[2]));
+			e.lastused = row[3] ? row[3] : "";
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -156,25 +156,25 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AccountIp account_ip_entry
+		const AccountIp &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(account_ip_entry.accid));
-		update_values.push_back(columns[1] + " = '" + EscapeString(account_ip_entry.ip) + "'");
-		update_values.push_back(columns[2] + " = " + std::to_string(account_ip_entry.count));
-		update_values.push_back(columns[3] + " = '" + EscapeString(account_ip_entry.lastused) + "'");
+		v.push_back(columns[0] + " = " + std::to_string(e.accid));
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.ip) + "'");
+		v.push_back(columns[2] + " = " + std::to_string(e.count));
+		v.push_back(columns[3] + " = '" + Strings::Escape(e.lastused) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				account_ip_entry.accid
+				e.accid
 			)
 		);
 
@@ -183,59 +183,59 @@ public:
 
 	static AccountIp InsertOne(
 		Database& db,
-		AccountIp account_ip_entry
+		AccountIp e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(account_ip_entry.accid));
-		insert_values.push_back("'" + EscapeString(account_ip_entry.ip) + "'");
-		insert_values.push_back(std::to_string(account_ip_entry.count));
-		insert_values.push_back("'" + EscapeString(account_ip_entry.lastused) + "'");
+		v.push_back(std::to_string(e.accid));
+		v.push_back("'" + Strings::Escape(e.ip) + "'");
+		v.push_back(std::to_string(e.count));
+		v.push_back("'" + Strings::Escape(e.lastused) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			account_ip_entry.accid = results.LastInsertedID();
-			return account_ip_entry;
+			e.accid = results.LastInsertedID();
+			return e;
 		}
 
-		account_ip_entry = NewEntity();
+		e = NewEntity();
 
-		return account_ip_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AccountIp> account_ip_entries
+		const std::vector<AccountIp> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &account_ip_entry: account_ip_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(account_ip_entry.accid));
-			insert_values.push_back("'" + EscapeString(account_ip_entry.ip) + "'");
-			insert_values.push_back(std::to_string(account_ip_entry.count));
-			insert_values.push_back("'" + EscapeString(account_ip_entry.lastused) + "'");
+			v.push_back(std::to_string(e.accid));
+			v.push_back("'" + Strings::Escape(e.ip) + "'");
+			v.push_back(std::to_string(e.count));
+			v.push_back("'" + Strings::Escape(e.lastused) + "'");
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -256,20 +256,20 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AccountIp entry{};
+			AccountIp e{};
 
-			entry.accid    = atoi(row[0]);
-			entry.ip       = row[1] ? row[1] : "";
-			entry.count    = atoi(row[2]);
-			entry.lastused = row[3] ? row[3] : "";
+			e.accid    = static_cast<int32_t>(atoi(row[0]));
+			e.ip       = row[1] ? row[1] : "";
+			e.count    = static_cast<int32_t>(atoi(row[2]));
+			e.lastused = row[3] ? row[3] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AccountIp> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AccountIp> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AccountIp> all_entries;
 
@@ -284,20 +284,20 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AccountIp entry{};
+			AccountIp e{};
 
-			entry.accid    = atoi(row[0]);
-			entry.ip       = row[1] ? row[1] : "";
-			entry.count    = atoi(row[2]);
-			entry.lastused = row[3] ? row[3] : "";
+			e.accid    = static_cast<int32_t>(atoi(row[0]));
+			e.ip       = row[1] ? row[1] : "";
+			e.count    = static_cast<int32_t>(atoi(row[2]));
+			e.lastused = row[3] ? row[3] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -322,6 +322,32 @@ public:
 		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_ACCOUNT_IP_REPOSITORY_H

common/repositories/base/base_account_repository.h

@@ -13,29 +13,31 @@
 #define EQEMU_BASE_ACCOUNT_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAccountRepository {
 public:
 	struct Account {
-		int         id;
+		int32_t     id;
 		std::string name;
 		std::string charname;
-		int         sharedplat;
+		uint32_t    sharedplat;
 		std::string password;
-		int         status;
+		int32_t     status;
 		std::string ls_id;
-		int         lsaccount_id;
-		int         gmspeed;
-		int         revoked;
-		int         karma;
+		uint32_t    lsaccount_id;
+		uint8_t     gmspeed;
+		int8_t      invulnerable;
+		int8_t      flymode;
+		int8_t      ignore_tells;
+		uint8_t     revoked;
+		uint32_t    karma;
 		std::string minilogin_ip;
-		int         hideme;
-		int         rulesflag;
+		int8_t      hideme;
+		uint8_t     rulesflag;
 		time_t      suspendeduntil;
-		int         time_creation;
-		int         expansion;
+		uint32_t    time_creation;
 		std::string ban_reason;
 		std::string suspend_reason;
 		std::string crc_eqgame;
@@ -60,6 +62,9 @@ public:
 			"ls_id",
 			"lsaccount_id",
 			"gmspeed",
+			"invulnerable",
+			"flymode",
+			"ignore_tells",
 			"revoked",
 			"karma",
 			"minilogin_ip",
@@ -67,7 +72,6 @@ public:
 			"rulesflag",
 			"suspendeduntil",
 			"time_creation",
-			"expansion",
 			"ban_reason",
 			"suspend_reason",
 			"crc_eqgame",
@@ -88,6 +92,9 @@ public:
 			"ls_id",
 			"lsaccount_id",
 			"gmspeed",
+			"invulnerable",
+			"flymode",
+			"ignore_tells",
 			"revoked",
 			"karma",
 			"minilogin_ip",
@@ -95,7 +102,6 @@ public:
 			"rulesflag",
 			"UNIX_TIMESTAMP(suspendeduntil)",
 			"time_creation",
-			"expansion",
 			"ban_reason",
 			"suspend_reason",
 			"crc_eqgame",
@@ -106,12 +112,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -139,35 +145,37 @@ public:
 
 	static Account NewEntity()
 	{
-		Account entry{};
+		Account e{};
 
-		entry.id             = 0;
-		entry.name           = "";
-		entry.charname       = "";
-		entry.sharedplat     = 0;
-		entry.password       = "";
-		entry.status         = 0;
-		entry.ls_id          = "eqemu";
-		entry.lsaccount_id   = 0;
-		entry.gmspeed        = 0;
-		entry.revoked        = 0;
-		entry.karma          = 0;
-		entry.minilogin_ip   = "";
-		entry.hideme         = 0;
-		entry.rulesflag      = 0;
-		entry.suspendeduntil = 0;
-		entry.time_creation  = 0;
-		entry.expansion      = 0;
-		entry.ban_reason     = "";
-		entry.suspend_reason = "";
-		entry.crc_eqgame     = "";
-		entry.crc_skillcaps  = "";
-		entry.crc_basedata   = "";
+		e.id             = 0;
+		e.name           = "";
+		e.charname       = "";
+		e.sharedplat     = 0;
+		e.password       = "";
+		e.status         = 0;
+		e.ls_id          = "eqemu";
+		e.lsaccount_id   = 0;
+		e.gmspeed        = 0;
+		e.invulnerable   = 0;
+		e.flymode        = 0;
+		e.ignore_tells   = 0;
+		e.revoked        = 0;
+		e.karma          = 0;
+		e.minilogin_ip   = "";
+		e.hideme         = 0;
+		e.rulesflag      = 0;
+		e.suspendeduntil = 0;
+		e.time_creation  = 0;
+		e.ban_reason     = "";
+		e.suspend_reason = "";
+		e.crc_eqgame     = "";
+		e.crc_skillcaps  = "";
+		e.crc_basedata   = "";
 
-		return entry;
+		return e;
 	}
 
-	static Account GetAccountEntry(
+	static Account GetAccount(
 		const std::vector<Account> &accounts,
 		int account_id
 	)
@@ -196,32 +204,34 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			Account entry{};
+			Account e{};
 
-			entry.id             = atoi(row[0]);
-			entry.name           = row[1] ? row[1] : "";
-			entry.charname       = row[2] ? row[2] : "";
-			entry.sharedplat     = atoi(row[3]);
-			entry.password       = row[4] ? row[4] : "";
-			entry.status         = atoi(row[5]);
-			entry.ls_id          = row[6] ? row[6] : "";
-			entry.lsaccount_id   = atoi(row[7]);
-			entry.gmspeed        = atoi(row[8]);
-			entry.revoked        = atoi(row[9]);
-			entry.karma          = atoi(row[10]);
-			entry.minilogin_ip   = row[11] ? row[11] : "";
-			entry.hideme         = atoi(row[12]);
-			entry.rulesflag      = atoi(row[13]);
-			entry.suspendeduntil = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
-			entry.time_creation  = atoi(row[15]);
-			entry.expansion      = atoi(row[16]);
-			entry.ban_reason     = row[17] ? row[17] : "";
-			entry.suspend_reason = row[18] ? row[18] : "";
-			entry.crc_eqgame     = row[19] ? row[19] : "";
-			entry.crc_skillcaps  = row[20] ? row[20] : "";
-			entry.crc_basedata   = row[21] ? row[21] : "";
+			e.id             = static_cast<int32_t>(atoi(row[0]));
+			e.name           = row[1] ? row[1] : "";
+			e.charname       = row[2] ? row[2] : "";
+			e.sharedplat     = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.password       = row[4] ? row[4] : "";
+			e.status         = static_cast<int32_t>(atoi(row[5]));
+			e.ls_id          = row[6] ? row[6] : "";
+			e.lsaccount_id   = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.gmspeed        = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
+			e.invulnerable   = static_cast<int8_t>(atoi(row[9]));
+			e.flymode        = static_cast<int8_t>(atoi(row[10]));
+			e.ignore_tells   = static_cast<int8_t>(atoi(row[11]));
+			e.revoked        = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.karma          = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
+			e.minilogin_ip   = row[14] ? row[14] : "";
+			e.hideme         = static_cast<int8_t>(atoi(row[15]));
+			e.rulesflag      = static_cast<uint8_t>(strtoul(row[16], nullptr, 10));
+			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
+			e.time_creation  = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
+			e.ban_reason     = row[19] ? row[19] : "";
+			e.suspend_reason = row[20] ? row[20] : "";
+			e.crc_eqgame     = row[21] ? row[21] : "";
+			e.crc_skillcaps  = row[22] ? row[22] : "";
+			e.crc_basedata   = row[23] ? row[23] : "";
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -246,42 +256,44 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		Account account_entry
+		const Account &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[1] + " = '" + EscapeString(account_entry.name) + "'");
-		update_values.push_back(columns[2] + " = '" + EscapeString(account_entry.charname) + "'");
-		update_values.push_back(columns[3] + " = " + std::to_string(account_entry.sharedplat));
-		update_values.push_back(columns[4] + " = '" + EscapeString(account_entry.password) + "'");
-		update_values.push_back(columns[5] + " = " + std::to_string(account_entry.status));
-		update_values.push_back(columns[6] + " = '" + EscapeString(account_entry.ls_id) + "'");
-		update_values.push_back(columns[7] + " = " + std::to_string(account_entry.lsaccount_id));
-		update_values.push_back(columns[8] + " = " + std::to_string(account_entry.gmspeed));
-		update_values.push_back(columns[9] + " = " + std::to_string(account_entry.revoked));
-		update_values.push_back(columns[10] + " = " + std::to_string(account_entry.karma));
-		update_values.push_back(columns[11] + " = '" + EscapeString(account_entry.minilogin_ip) + "'");
-		update_values.push_back(columns[12] + " = " + std::to_string(account_entry.hideme));
-		update_values.push_back(columns[13] + " = " + std::to_string(account_entry.rulesflag));
-		update_values.push_back(columns[14] + " = FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")");
-		update_values.push_back(columns[15] + " = " + std::to_string(account_entry.time_creation));
-		update_values.push_back(columns[16] + " = " + std::to_string(account_entry.expansion));
-		update_values.push_back(columns[17] + " = '" + EscapeString(account_entry.ban_reason) + "'");
-		update_values.push_back(columns[18] + " = '" + EscapeString(account_entry.suspend_reason) + "'");
-		update_values.push_back(columns[19] + " = '" + EscapeString(account_entry.crc_eqgame) + "'");
-		update_values.push_back(columns[20] + " = '" + EscapeString(account_entry.crc_skillcaps) + "'");
-		update_values.push_back(columns[21] + " = '" + EscapeString(account_entry.crc_basedata) + "'");
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.name) + "'");
+		v.push_back(columns[2] + " = '" + Strings::Escape(e.charname) + "'");
+		v.push_back(columns[3] + " = " + std::to_string(e.sharedplat));
+		v.push_back(columns[4] + " = '" + Strings::Escape(e.password) + "'");
+		v.push_back(columns[5] + " = " + std::to_string(e.status));
+		v.push_back(columns[6] + " = '" + Strings::Escape(e.ls_id) + "'");
+		v.push_back(columns[7] + " = " + std::to_string(e.lsaccount_id));
+		v.push_back(columns[8] + " = " + std::to_string(e.gmspeed));
+		v.push_back(columns[9] + " = " + std::to_string(e.invulnerable));
+		v.push_back(columns[10] + " = " + std::to_string(e.flymode));
+		v.push_back(columns[11] + " = " + std::to_string(e.ignore_tells));
+		v.push_back(columns[12] + " = " + std::to_string(e.revoked));
+		v.push_back(columns[13] + " = " + std::to_string(e.karma));
+		v.push_back(columns[14] + " = '" + Strings::Escape(e.minilogin_ip) + "'");
+		v.push_back(columns[15] + " = " + std::to_string(e.hideme));
+		v.push_back(columns[16] + " = " + std::to_string(e.rulesflag));
+		v.push_back(columns[17] + " = FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
+		v.push_back(columns[18] + " = " + std::to_string(e.time_creation));
+		v.push_back(columns[19] + " = '" + Strings::Escape(e.ban_reason) + "'");
+		v.push_back(columns[20] + " = '" + Strings::Escape(e.suspend_reason) + "'");
+		v.push_back(columns[21] + " = '" + Strings::Escape(e.crc_eqgame) + "'");
+		v.push_back(columns[22] + " = '" + Strings::Escape(e.crc_skillcaps) + "'");
+		v.push_back(columns[23] + " = '" + Strings::Escape(e.crc_basedata) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				account_entry.id
+				e.id
 			)
 		);
 
@@ -290,95 +302,99 @@ public:
 
 	static Account InsertOne(
 		Database& db,
-		Account account_entry
+		Account e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(account_entry.id));
-		insert_values.push_back("'" + EscapeString(account_entry.name) + "'");
-		insert_values.push_back("'" + EscapeString(account_entry.charname) + "'");
-		insert_values.push_back(std::to_string(account_entry.sharedplat));
-		insert_values.push_back("'" + EscapeString(account_entry.password) + "'");
-		insert_values.push_back(std::to_string(account_entry.status));
-		insert_values.push_back("'" + EscapeString(account_entry.ls_id) + "'");
-		insert_values.push_back(std::to_string(account_entry.lsaccount_id));
-		insert_values.push_back(std::to_string(account_entry.gmspeed));
-		insert_values.push_back(std::to_string(account_entry.revoked));
-		insert_values.push_back(std::to_string(account_entry.karma));
-		insert_values.push_back("'" + EscapeString(account_entry.minilogin_ip) + "'");
-		insert_values.push_back(std::to_string(account_entry.hideme));
-		insert_values.push_back(std::to_string(account_entry.rulesflag));
-		insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")");
-		insert_values.push_back(std::to_string(account_entry.time_creation));
-		insert_values.push_back(std::to_string(account_entry.expansion));
-		insert_values.push_back("'" + EscapeString(account_entry.ban_reason) + "'");
-		insert_values.push_back("'" + EscapeString(account_entry.suspend_reason) + "'");
-		insert_values.push_back("'" + EscapeString(account_entry.crc_eqgame) + "'");
-		insert_values.push_back("'" + EscapeString(account_entry.crc_skillcaps) + "'");
-		insert_values.push_back("'" + EscapeString(account_entry.crc_basedata) + "'");
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.name) + "'");
+		v.push_back("'" + Strings::Escape(e.charname) + "'");
+		v.push_back(std::to_string(e.sharedplat));
+		v.push_back("'" + Strings::Escape(e.password) + "'");
+		v.push_back(std::to_string(e.status));
+		v.push_back("'" + Strings::Escape(e.ls_id) + "'");
+		v.push_back(std::to_string(e.lsaccount_id));
+		v.push_back(std::to_string(e.gmspeed));
+		v.push_back(std::to_string(e.invulnerable));
+		v.push_back(std::to_string(e.flymode));
+		v.push_back(std::to_string(e.ignore_tells));
+		v.push_back(std::to_string(e.revoked));
+		v.push_back(std::to_string(e.karma));
+		v.push_back("'" + Strings::Escape(e.minilogin_ip) + "'");
+		v.push_back(std::to_string(e.hideme));
+		v.push_back(std::to_string(e.rulesflag));
+		v.push_back("FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
+		v.push_back(std::to_string(e.time_creation));
+		v.push_back("'" + Strings::Escape(e.ban_reason) + "'");
+		v.push_back("'" + Strings::Escape(e.suspend_reason) + "'");
+		v.push_back("'" + Strings::Escape(e.crc_eqgame) + "'");
+		v.push_back("'" + Strings::Escape(e.crc_skillcaps) + "'");
+		v.push_back("'" + Strings::Escape(e.crc_basedata) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			account_entry.id = results.LastInsertedID();
-			return account_entry;
+			e.id = results.LastInsertedID();
+			return e;
 		}
 
-		account_entry = NewEntity();
+		e = NewEntity();
 
-		return account_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<Account> account_entries
+		const std::vector<Account> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &account_entry: account_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(account_entry.id));
-			insert_values.push_back("'" + EscapeString(account_entry.name) + "'");
-			insert_values.push_back("'" + EscapeString(account_entry.charname) + "'");
-			insert_values.push_back(std::to_string(account_entry.sharedplat));
-			insert_values.push_back("'" + EscapeString(account_entry.password) + "'");
-			insert_values.push_back(std::to_string(account_entry.status));
-			insert_values.push_back("'" + EscapeString(account_entry.ls_id) + "'");
-			insert_values.push_back(std::to_string(account_entry.lsaccount_id));
-			insert_values.push_back(std::to_string(account_entry.gmspeed));
-			insert_values.push_back(std::to_string(account_entry.revoked));
-			insert_values.push_back(std::to_string(account_entry.karma));
-			insert_values.push_back("'" + EscapeString(account_entry.minilogin_ip) + "'");
-			insert_values.push_back(std::to_string(account_entry.hideme));
-			insert_values.push_back(std::to_string(account_entry.rulesflag));
-			insert_values.push_back("FROM_UNIXTIME(" + (account_entry.suspendeduntil > 0 ? std::to_string(account_entry.suspendeduntil) : "null") + ")");
-			insert_values.push_back(std::to_string(account_entry.time_creation));
-			insert_values.push_back(std::to_string(account_entry.expansion));
-			insert_values.push_back("'" + EscapeString(account_entry.ban_reason) + "'");
-			insert_values.push_back("'" + EscapeString(account_entry.suspend_reason) + "'");
-			insert_values.push_back("'" + EscapeString(account_entry.crc_eqgame) + "'");
-			insert_values.push_back("'" + EscapeString(account_entry.crc_skillcaps) + "'");
-			insert_values.push_back("'" + EscapeString(account_entry.crc_basedata) + "'");
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.name) + "'");
+			v.push_back("'" + Strings::Escape(e.charname) + "'");
+			v.push_back(std::to_string(e.sharedplat));
+			v.push_back("'" + Strings::Escape(e.password) + "'");
+			v.push_back(std::to_string(e.status));
+			v.push_back("'" + Strings::Escape(e.ls_id) + "'");
+			v.push_back(std::to_string(e.lsaccount_id));
+			v.push_back(std::to_string(e.gmspeed));
+			v.push_back(std::to_string(e.invulnerable));
+			v.push_back(std::to_string(e.flymode));
+			v.push_back(std::to_string(e.ignore_tells));
+			v.push_back(std::to_string(e.revoked));
+			v.push_back(std::to_string(e.karma));
+			v.push_back("'" + Strings::Escape(e.minilogin_ip) + "'");
+			v.push_back(std::to_string(e.hideme));
+			v.push_back(std::to_string(e.rulesflag));
+			v.push_back("FROM_UNIXTIME(" + (e.suspendeduntil > 0 ? std::to_string(e.suspendeduntil) : "null") + ")");
+			v.push_back(std::to_string(e.time_creation));
+			v.push_back("'" + Strings::Escape(e.ban_reason) + "'");
+			v.push_back("'" + Strings::Escape(e.suspend_reason) + "'");
+			v.push_back("'" + Strings::Escape(e.crc_eqgame) + "'");
+			v.push_back("'" + Strings::Escape(e.crc_skillcaps) + "'");
+			v.push_back("'" + Strings::Escape(e.crc_basedata) + "'");
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -399,38 +415,40 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			Account entry{};
+			Account e{};
 
-			entry.id             = atoi(row[0]);
-			entry.name           = row[1] ? row[1] : "";
-			entry.charname       = row[2] ? row[2] : "";
-			entry.sharedplat     = atoi(row[3]);
-			entry.password       = row[4] ? row[4] : "";
-			entry.status         = atoi(row[5]);
-			entry.ls_id          = row[6] ? row[6] : "";
-			entry.lsaccount_id   = atoi(row[7]);
-			entry.gmspeed        = atoi(row[8]);
-			entry.revoked        = atoi(row[9]);
-			entry.karma          = atoi(row[10]);
-			entry.minilogin_ip   = row[11] ? row[11] : "";
-			entry.hideme         = atoi(row[12]);
-			entry.rulesflag      = atoi(row[13]);
-			entry.suspendeduntil = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
-			entry.time_creation  = atoi(row[15]);
-			entry.expansion      = atoi(row[16]);
-			entry.ban_reason     = row[17] ? row[17] : "";
-			entry.suspend_reason = row[18] ? row[18] : "";
-			entry.crc_eqgame     = row[19] ? row[19] : "";
-			entry.crc_skillcaps  = row[20] ? row[20] : "";
-			entry.crc_basedata   = row[21] ? row[21] : "";
+			e.id             = static_cast<int32_t>(atoi(row[0]));
+			e.name           = row[1] ? row[1] : "";
+			e.charname       = row[2] ? row[2] : "";
+			e.sharedplat     = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.password       = row[4] ? row[4] : "";
+			e.status         = static_cast<int32_t>(atoi(row[5]));
+			e.ls_id          = row[6] ? row[6] : "";
+			e.lsaccount_id   = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.gmspeed        = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
+			e.invulnerable   = static_cast<int8_t>(atoi(row[9]));
+			e.flymode        = static_cast<int8_t>(atoi(row[10]));
+			e.ignore_tells   = static_cast<int8_t>(atoi(row[11]));
+			e.revoked        = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.karma          = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
+			e.minilogin_ip   = row[14] ? row[14] : "";
+			e.hideme         = static_cast<int8_t>(atoi(row[15]));
+			e.rulesflag      = static_cast<uint8_t>(strtoul(row[16], nullptr, 10));
+			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
+			e.time_creation  = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
+			e.ban_reason     = row[19] ? row[19] : "";
+			e.suspend_reason = row[20] ? row[20] : "";
+			e.crc_eqgame     = row[21] ? row[21] : "";
+			e.crc_skillcaps  = row[22] ? row[22] : "";
+			e.crc_basedata   = row[23] ? row[23] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<Account> GetWhere(Database& db, std::string where_filter)
+	static std::vector<Account> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<Account> all_entries;
 
@@ -445,38 +463,40 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			Account entry{};
+			Account e{};
 
-			entry.id             = atoi(row[0]);
-			entry.name           = row[1] ? row[1] : "";
-			entry.charname       = row[2] ? row[2] : "";
-			entry.sharedplat     = atoi(row[3]);
-			entry.password       = row[4] ? row[4] : "";
-			entry.status         = atoi(row[5]);
-			entry.ls_id          = row[6] ? row[6] : "";
-			entry.lsaccount_id   = atoi(row[7]);
-			entry.gmspeed        = atoi(row[8]);
-			entry.revoked        = atoi(row[9]);
-			entry.karma          = atoi(row[10]);
-			entry.minilogin_ip   = row[11] ? row[11] : "";
-			entry.hideme         = atoi(row[12]);
-			entry.rulesflag      = atoi(row[13]);
-			entry.suspendeduntil = strtoll(row[14] ? row[14] : "-1", nullptr, 10);
-			entry.time_creation  = atoi(row[15]);
-			entry.expansion      = atoi(row[16]);
-			entry.ban_reason     = row[17] ? row[17] : "";
-			entry.suspend_reason = row[18] ? row[18] : "";
-			entry.crc_eqgame     = row[19] ? row[19] : "";
-			entry.crc_skillcaps  = row[20] ? row[20] : "";
-			entry.crc_basedata   = row[21] ? row[21] : "";
+			e.id             = static_cast<int32_t>(atoi(row[0]));
+			e.name           = row[1] ? row[1] : "";
+			e.charname       = row[2] ? row[2] : "";
+			e.sharedplat     = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.password       = row[4] ? row[4] : "";
+			e.status         = static_cast<int32_t>(atoi(row[5]));
+			e.ls_id          = row[6] ? row[6] : "";
+			e.lsaccount_id   = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.gmspeed        = static_cast<uint8_t>(strtoul(row[8], nullptr, 10));
+			e.invulnerable   = static_cast<int8_t>(atoi(row[9]));
+			e.flymode        = static_cast<int8_t>(atoi(row[10]));
+			e.ignore_tells   = static_cast<int8_t>(atoi(row[11]));
+			e.revoked        = static_cast<uint8_t>(strtoul(row[12], nullptr, 10));
+			e.karma          = static_cast<uint32_t>(strtoul(row[13], nullptr, 10));
+			e.minilogin_ip   = row[14] ? row[14] : "";
+			e.hideme         = static_cast<int8_t>(atoi(row[15]));
+			e.rulesflag      = static_cast<uint8_t>(strtoul(row[16], nullptr, 10));
+			e.suspendeduntil = strtoll(row[17] ? row[17] : "-1", nullptr, 10);
+			e.time_creation  = static_cast<uint32_t>(strtoul(row[18], nullptr, 10));
+			e.ban_reason     = row[19] ? row[19] : "";
+			e.suspend_reason = row[20] ? row[20] : "";
+			e.crc_eqgame     = row[21] ? row[21] : "";
+			e.crc_skillcaps  = row[22] ? row[22] : "";
+			e.crc_basedata   = row[23] ? row[23] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -501,6 +521,32 @@ public:
 		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_ACCOUNT_REPOSITORY_H

common/repositories/base/base_account_rewards_repository.h

@@ -13,15 +13,15 @@
 #define EQEMU_BASE_ACCOUNT_REWARDS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAccountRewardsRepository {
 public:
 	struct AccountRewards {
-		int account_id;
-		int reward_id;
-		int amount;
+		uint32_t account_id;
+		uint32_t reward_id;
+		uint32_t amount;
 	};
 
 	static std::string PrimaryKey()
@@ -49,12 +49,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -82,16 +82,16 @@ public:
 
 	static AccountRewards NewEntity()
 	{
-		AccountRewards entry{};
+		AccountRewards e{};
 
-		entry.account_id = 0;
-		entry.reward_id  = 0;
-		entry.amount     = 0;
+		e.account_id = 0;
+		e.reward_id  = 0;
+		e.amount     = 0;
 
-		return entry;
+		return e;
 	}
 
-	static AccountRewards GetAccountRewardsEntry(
+	static AccountRewards GetAccountRewards(
 		const std::vector<AccountRewards> &account_rewardss,
 		int account_rewards_id
 	)
@@ -120,13 +120,13 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AccountRewards entry{};
+			AccountRewards e{};
 
-			entry.account_id = atoi(row[0]);
-			entry.reward_id  = atoi(row[1]);
-			entry.amount     = atoi(row[2]);
+			e.account_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.reward_id  = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.amount     = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -151,24 +151,24 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AccountRewards account_rewards_entry
+		const AccountRewards &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(account_rewards_entry.account_id));
-		update_values.push_back(columns[1] + " = " + std::to_string(account_rewards_entry.reward_id));
-		update_values.push_back(columns[2] + " = " + std::to_string(account_rewards_entry.amount));
+		v.push_back(columns[0] + " = " + std::to_string(e.account_id));
+		v.push_back(columns[1] + " = " + std::to_string(e.reward_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.amount));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				account_rewards_entry.account_id
+				e.account_id
 			)
 		);
 
@@ -177,57 +177,57 @@ public:
 
 	static AccountRewards InsertOne(
 		Database& db,
-		AccountRewards account_rewards_entry
+		AccountRewards e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(account_rewards_entry.account_id));
-		insert_values.push_back(std::to_string(account_rewards_entry.reward_id));
-		insert_values.push_back(std::to_string(account_rewards_entry.amount));
+		v.push_back(std::to_string(e.account_id));
+		v.push_back(std::to_string(e.reward_id));
+		v.push_back(std::to_string(e.amount));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			account_rewards_entry.account_id = results.LastInsertedID();
-			return account_rewards_entry;
+			e.account_id = results.LastInsertedID();
+			return e;
 		}
 
-		account_rewards_entry = NewEntity();
+		e = NewEntity();
 
-		return account_rewards_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AccountRewards> account_rewards_entries
+		const std::vector<AccountRewards> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &account_rewards_entry: account_rewards_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(account_rewards_entry.account_id));
-			insert_values.push_back(std::to_string(account_rewards_entry.reward_id));
-			insert_values.push_back(std::to_string(account_rewards_entry.amount));
+			v.push_back(std::to_string(e.account_id));
+			v.push_back(std::to_string(e.reward_id));
+			v.push_back(std::to_string(e.amount));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -248,19 +248,19 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AccountRewards entry{};
+			AccountRewards e{};
 
-			entry.account_id = atoi(row[0]);
-			entry.reward_id  = atoi(row[1]);
-			entry.amount     = atoi(row[2]);
+			e.account_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.reward_id  = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.amount     = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AccountRewards> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AccountRewards> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AccountRewards> all_entries;
 
@@ -275,19 +275,19 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AccountRewards entry{};
+			AccountRewards e{};
 
-			entry.account_id = atoi(row[0]);
-			entry.reward_id  = atoi(row[1]);
-			entry.amount     = atoi(row[2]);
+			e.account_id = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.reward_id  = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.amount     = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -312,6 +312,32 @@ public:
 		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_ACCOUNT_REWARDS_REPOSITORY_H

common/repositories/base/base_adventure_details_repository.h

@@ -13,21 +13,21 @@
 #define EQEMU_BASE_ADVENTURE_DETAILS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAdventureDetailsRepository {
 public:
 	struct AdventureDetails {
-		int id;
-		int adventure_id;
-		int instance_id;
-		int count;
-		int assassinate_count;
-		int status;
-		int time_created;
-		int time_zoned;
-		int time_completed;
+		uint32_t id;
+		uint16_t adventure_id;
+		int32_t  instance_id;
+		uint16_t count;
+		uint16_t assassinate_count;
+		uint8_t  status;
+		uint32_t time_created;
+		uint32_t time_zoned;
+		uint32_t time_completed;
 	};
 
 	static std::string PrimaryKey()
@@ -67,12 +67,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -100,22 +100,22 @@ public:
 
 	static AdventureDetails NewEntity()
 	{
-		AdventureDetails entry{};
+		AdventureDetails e{};
 
-		entry.id                = 0;
-		entry.adventure_id      = 0;
-		entry.instance_id       = -1;
-		entry.count             = 0;
-		entry.assassinate_count = 0;
-		entry.status            = 0;
-		entry.time_created      = 0;
-		entry.time_zoned        = 0;
-		entry.time_completed    = 0;
+		e.id                = 0;
+		e.adventure_id      = 0;
+		e.instance_id       = -1;
+		e.count             = 0;
+		e.assassinate_count = 0;
+		e.status            = 0;
+		e.time_created      = 0;
+		e.time_zoned        = 0;
+		e.time_completed    = 0;
 
-		return entry;
+		return e;
 	}
 
-	static AdventureDetails GetAdventureDetailsEntry(
+	static AdventureDetails GetAdventureDetails(
 		const std::vector<AdventureDetails> &adventure_detailss,
 		int adventure_details_id
 	)
@@ -144,19 +144,19 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AdventureDetails entry{};
+			AdventureDetails e{};
 
-			entry.id                = atoi(row[0]);
-			entry.adventure_id      = atoi(row[1]);
-			entry.instance_id       = atoi(row[2]);
-			entry.count             = atoi(row[3]);
-			entry.assassinate_count = atoi(row[4]);
-			entry.status            = atoi(row[5]);
-			entry.time_created      = atoi(row[6]);
-			entry.time_zoned        = atoi(row[7]);
-			entry.time_completed    = atoi(row[8]);
+			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.adventure_id      = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
+			e.instance_id       = static_cast<int32_t>(atoi(row[2]));
+			e.count             = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
+			e.assassinate_count = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
+			e.status            = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
+			e.time_created      = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+			e.time_zoned        = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.time_completed    = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -181,29 +181,29 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AdventureDetails adventure_details_entry
+		const AdventureDetails &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[1] + " = " + std::to_string(adventure_details_entry.adventure_id));
-		update_values.push_back(columns[2] + " = " + std::to_string(adventure_details_entry.instance_id));
-		update_values.push_back(columns[3] + " = " + std::to_string(adventure_details_entry.count));
-		update_values.push_back(columns[4] + " = " + std::to_string(adventure_details_entry.assassinate_count));
-		update_values.push_back(columns[5] + " = " + std::to_string(adventure_details_entry.status));
-		update_values.push_back(columns[6] + " = " + std::to_string(adventure_details_entry.time_created));
-		update_values.push_back(columns[7] + " = " + std::to_string(adventure_details_entry.time_zoned));
-		update_values.push_back(columns[8] + " = " + std::to_string(adventure_details_entry.time_completed));
+		v.push_back(columns[1] + " = " + std::to_string(e.adventure_id));
+		v.push_back(columns[2] + " = " + std::to_string(e.instance_id));
+		v.push_back(columns[3] + " = " + std::to_string(e.count));
+		v.push_back(columns[4] + " = " + std::to_string(e.assassinate_count));
+		v.push_back(columns[5] + " = " + std::to_string(e.status));
+		v.push_back(columns[6] + " = " + std::to_string(e.time_created));
+		v.push_back(columns[7] + " = " + std::to_string(e.time_zoned));
+		v.push_back(columns[8] + " = " + std::to_string(e.time_completed));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				adventure_details_entry.id
+				e.id
 			)
 		);
 
@@ -212,69 +212,69 @@ public:
 
 	static AdventureDetails InsertOne(
 		Database& db,
-		AdventureDetails adventure_details_entry
+		AdventureDetails e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(adventure_details_entry.id));
-		insert_values.push_back(std::to_string(adventure_details_entry.adventure_id));
-		insert_values.push_back(std::to_string(adventure_details_entry.instance_id));
-		insert_values.push_back(std::to_string(adventure_details_entry.count));
-		insert_values.push_back(std::to_string(adventure_details_entry.assassinate_count));
-		insert_values.push_back(std::to_string(adventure_details_entry.status));
-		insert_values.push_back(std::to_string(adventure_details_entry.time_created));
-		insert_values.push_back(std::to_string(adventure_details_entry.time_zoned));
-		insert_values.push_back(std::to_string(adventure_details_entry.time_completed));
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.adventure_id));
+		v.push_back(std::to_string(e.instance_id));
+		v.push_back(std::to_string(e.count));
+		v.push_back(std::to_string(e.assassinate_count));
+		v.push_back(std::to_string(e.status));
+		v.push_back(std::to_string(e.time_created));
+		v.push_back(std::to_string(e.time_zoned));
+		v.push_back(std::to_string(e.time_completed));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			adventure_details_entry.id = results.LastInsertedID();
-			return adventure_details_entry;
+			e.id = results.LastInsertedID();
+			return e;
 		}
 
-		adventure_details_entry = NewEntity();
+		e = NewEntity();
 
-		return adventure_details_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AdventureDetails> adventure_details_entries
+		const std::vector<AdventureDetails> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &adventure_details_entry: adventure_details_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(adventure_details_entry.id));
-			insert_values.push_back(std::to_string(adventure_details_entry.adventure_id));
-			insert_values.push_back(std::to_string(adventure_details_entry.instance_id));
-			insert_values.push_back(std::to_string(adventure_details_entry.count));
-			insert_values.push_back(std::to_string(adventure_details_entry.assassinate_count));
-			insert_values.push_back(std::to_string(adventure_details_entry.status));
-			insert_values.push_back(std::to_string(adventure_details_entry.time_created));
-			insert_values.push_back(std::to_string(adventure_details_entry.time_zoned));
-			insert_values.push_back(std::to_string(adventure_details_entry.time_completed));
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.adventure_id));
+			v.push_back(std::to_string(e.instance_id));
+			v.push_back(std::to_string(e.count));
+			v.push_back(std::to_string(e.assassinate_count));
+			v.push_back(std::to_string(e.status));
+			v.push_back(std::to_string(e.time_created));
+			v.push_back(std::to_string(e.time_zoned));
+			v.push_back(std::to_string(e.time_completed));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -295,25 +295,25 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureDetails entry{};
+			AdventureDetails e{};
 
-			entry.id                = atoi(row[0]);
-			entry.adventure_id      = atoi(row[1]);
-			entry.instance_id       = atoi(row[2]);
-			entry.count             = atoi(row[3]);
-			entry.assassinate_count = atoi(row[4]);
-			entry.status            = atoi(row[5]);
-			entry.time_created      = atoi(row[6]);
-			entry.time_zoned        = atoi(row[7]);
-			entry.time_completed    = atoi(row[8]);
+			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.adventure_id      = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
+			e.instance_id       = static_cast<int32_t>(atoi(row[2]));
+			e.count             = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
+			e.assassinate_count = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
+			e.status            = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
+			e.time_created      = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+			e.time_zoned        = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.time_completed    = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AdventureDetails> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AdventureDetails> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AdventureDetails> all_entries;
 
@@ -328,25 +328,25 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureDetails entry{};
+			AdventureDetails e{};
 
-			entry.id                = atoi(row[0]);
-			entry.adventure_id      = atoi(row[1]);
-			entry.instance_id       = atoi(row[2]);
-			entry.count             = atoi(row[3]);
-			entry.assassinate_count = atoi(row[4]);
-			entry.status            = atoi(row[5]);
-			entry.time_created      = atoi(row[6]);
-			entry.time_zoned        = atoi(row[7]);
-			entry.time_completed    = atoi(row[8]);
+			e.id                = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.adventure_id      = static_cast<uint16_t>(strtoul(row[1], nullptr, 10));
+			e.instance_id       = static_cast<int32_t>(atoi(row[2]));
+			e.count             = static_cast<uint16_t>(strtoul(row[3], nullptr, 10));
+			e.assassinate_count = static_cast<uint16_t>(strtoul(row[4], nullptr, 10));
+			e.status            = static_cast<uint8_t>(strtoul(row[5], nullptr, 10));
+			e.time_created      = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+			e.time_zoned        = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.time_completed    = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -371,6 +371,32 @@ public:
 		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_ADVENTURE_DETAILS_REPOSITORY_H

common/repositories/base/base_adventure_members_repository.h

@@ -13,14 +13,14 @@
 #define EQEMU_BASE_ADVENTURE_MEMBERS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAdventureMembersRepository {
 public:
 	struct AdventureMembers {
-		int id;
-		int charid;
+		uint32_t id;
+		uint32_t charid;
 	};
 
 	static std::string PrimaryKey()
@@ -46,12 +46,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -79,15 +79,15 @@ public:
 
 	static AdventureMembers NewEntity()
 	{
-		AdventureMembers entry{};
+		AdventureMembers e{};
 
-		entry.id     = 0;
-		entry.charid = 0;
+		e.id     = 0;
+		e.charid = 0;
 
-		return entry;
+		return e;
 	}
 
-	static AdventureMembers GetAdventureMembersEntry(
+	static AdventureMembers GetAdventureMembers(
 		const std::vector<AdventureMembers> &adventure_memberss,
 		int adventure_members_id
 	)
@@ -116,12 +116,12 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AdventureMembers entry{};
+			AdventureMembers e{};
 
-			entry.id     = atoi(row[0]);
-			entry.charid = atoi(row[1]);
+			e.id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.charid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -146,23 +146,23 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AdventureMembers adventure_members_entry
+		const AdventureMembers &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(adventure_members_entry.id));
-		update_values.push_back(columns[1] + " = " + std::to_string(adventure_members_entry.charid));
+		v.push_back(columns[0] + " = " + std::to_string(e.id));
+		v.push_back(columns[1] + " = " + std::to_string(e.charid));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				adventure_members_entry.charid
+				e.charid
 			)
 		);
 
@@ -171,55 +171,55 @@ public:
 
 	static AdventureMembers InsertOne(
 		Database& db,
-		AdventureMembers adventure_members_entry
+		AdventureMembers e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(adventure_members_entry.id));
-		insert_values.push_back(std::to_string(adventure_members_entry.charid));
+		v.push_back(std::to_string(e.id));
+		v.push_back(std::to_string(e.charid));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			adventure_members_entry.charid = results.LastInsertedID();
-			return adventure_members_entry;
+			e.charid = results.LastInsertedID();
+			return e;
 		}
 
-		adventure_members_entry = NewEntity();
+		e = NewEntity();
 
-		return adventure_members_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AdventureMembers> adventure_members_entries
+		const std::vector<AdventureMembers> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &adventure_members_entry: adventure_members_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(adventure_members_entry.id));
-			insert_values.push_back(std::to_string(adventure_members_entry.charid));
+			v.push_back(std::to_string(e.id));
+			v.push_back(std::to_string(e.charid));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -240,18 +240,18 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureMembers entry{};
+			AdventureMembers e{};
 
-			entry.id     = atoi(row[0]);
-			entry.charid = atoi(row[1]);
+			e.id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.charid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AdventureMembers> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AdventureMembers> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AdventureMembers> all_entries;
 
@@ -266,18 +266,18 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureMembers entry{};
+			AdventureMembers e{};
 
-			entry.id     = atoi(row[0]);
-			entry.charid = atoi(row[1]);
+			e.id     = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.charid = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -302,6 +302,32 @@ public:
 		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_ADVENTURE_MEMBERS_REPOSITORY_H

common/repositories/base/base_adventure_stats_repository.h

@@ -13,23 +13,23 @@
 #define EQEMU_BASE_ADVENTURE_STATS_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAdventureStatsRepository {
 public:
 	struct AdventureStats {
-		int player_id;
-		int guk_wins;
-		int mir_wins;
-		int mmc_wins;
-		int ruj_wins;
-		int tak_wins;
-		int guk_losses;
-		int mir_losses;
-		int mmc_losses;
-		int ruj_losses;
-		int tak_losses;
+		uint32_t player_id;
+		uint32_t guk_wins;
+		uint32_t mir_wins;
+		uint32_t mmc_wins;
+		uint32_t ruj_wins;
+		uint32_t tak_wins;
+		uint32_t guk_losses;
+		uint32_t mir_losses;
+		uint32_t mmc_losses;
+		uint32_t ruj_losses;
+		uint32_t tak_losses;
 	};
 
 	static std::string PrimaryKey()
@@ -73,12 +73,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -106,24 +106,24 @@ public:
 
 	static AdventureStats NewEntity()
 	{
-		AdventureStats entry{};
+		AdventureStats e{};
 
-		entry.player_id  = 0;
-		entry.guk_wins   = 0;
-		entry.mir_wins   = 0;
-		entry.mmc_wins   = 0;
-		entry.ruj_wins   = 0;
-		entry.tak_wins   = 0;
-		entry.guk_losses = 0;
-		entry.mir_losses = 0;
-		entry.mmc_losses = 0;
-		entry.ruj_losses = 0;
-		entry.tak_losses = 0;
+		e.player_id  = 0;
+		e.guk_wins   = 0;
+		e.mir_wins   = 0;
+		e.mmc_wins   = 0;
+		e.ruj_wins   = 0;
+		e.tak_wins   = 0;
+		e.guk_losses = 0;
+		e.mir_losses = 0;
+		e.mmc_losses = 0;
+		e.ruj_losses = 0;
+		e.tak_losses = 0;
 
-		return entry;
+		return e;
 	}
 
-	static AdventureStats GetAdventureStatsEntry(
+	static AdventureStats GetAdventureStats(
 		const std::vector<AdventureStats> &adventure_statss,
 		int adventure_stats_id
 	)
@@ -152,21 +152,21 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AdventureStats entry{};
+			AdventureStats e{};
 
-			entry.player_id  = atoi(row[0]);
-			entry.guk_wins   = atoi(row[1]);
-			entry.mir_wins   = atoi(row[2]);
-			entry.mmc_wins   = atoi(row[3]);
-			entry.ruj_wins   = atoi(row[4]);
-			entry.tak_wins   = atoi(row[5]);
-			entry.guk_losses = atoi(row[6]);
-			entry.mir_losses = atoi(row[7]);
-			entry.mmc_losses = atoi(row[8]);
-			entry.ruj_losses = atoi(row[9]);
-			entry.tak_losses = atoi(row[10]);
+			e.player_id  = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.guk_wins   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.mir_wins   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.mmc_wins   = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.ruj_wins   = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
+			e.tak_wins   = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.guk_losses = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+			e.mir_losses = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.mmc_losses = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
+			e.ruj_losses = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
+			e.tak_losses = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -191,32 +191,32 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AdventureStats adventure_stats_entry
+		const AdventureStats &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(adventure_stats_entry.player_id));
-		update_values.push_back(columns[1] + " = " + std::to_string(adventure_stats_entry.guk_wins));
-		update_values.push_back(columns[2] + " = " + std::to_string(adventure_stats_entry.mir_wins));
-		update_values.push_back(columns[3] + " = " + std::to_string(adventure_stats_entry.mmc_wins));
-		update_values.push_back(columns[4] + " = " + std::to_string(adventure_stats_entry.ruj_wins));
-		update_values.push_back(columns[5] + " = " + std::to_string(adventure_stats_entry.tak_wins));
-		update_values.push_back(columns[6] + " = " + std::to_string(adventure_stats_entry.guk_losses));
-		update_values.push_back(columns[7] + " = " + std::to_string(adventure_stats_entry.mir_losses));
-		update_values.push_back(columns[8] + " = " + std::to_string(adventure_stats_entry.mmc_losses));
-		update_values.push_back(columns[9] + " = " + std::to_string(adventure_stats_entry.ruj_losses));
-		update_values.push_back(columns[10] + " = " + std::to_string(adventure_stats_entry.tak_losses));
+		v.push_back(columns[0] + " = " + std::to_string(e.player_id));
+		v.push_back(columns[1] + " = " + std::to_string(e.guk_wins));
+		v.push_back(columns[2] + " = " + std::to_string(e.mir_wins));
+		v.push_back(columns[3] + " = " + std::to_string(e.mmc_wins));
+		v.push_back(columns[4] + " = " + std::to_string(e.ruj_wins));
+		v.push_back(columns[5] + " = " + std::to_string(e.tak_wins));
+		v.push_back(columns[6] + " = " + std::to_string(e.guk_losses));
+		v.push_back(columns[7] + " = " + std::to_string(e.mir_losses));
+		v.push_back(columns[8] + " = " + std::to_string(e.mmc_losses));
+		v.push_back(columns[9] + " = " + std::to_string(e.ruj_losses));
+		v.push_back(columns[10] + " = " + std::to_string(e.tak_losses));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				adventure_stats_entry.player_id
+				e.player_id
 			)
 		);
 
@@ -225,73 +225,73 @@ public:
 
 	static AdventureStats InsertOne(
 		Database& db,
-		AdventureStats adventure_stats_entry
+		AdventureStats e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(adventure_stats_entry.player_id));
-		insert_values.push_back(std::to_string(adventure_stats_entry.guk_wins));
-		insert_values.push_back(std::to_string(adventure_stats_entry.mir_wins));
-		insert_values.push_back(std::to_string(adventure_stats_entry.mmc_wins));
-		insert_values.push_back(std::to_string(adventure_stats_entry.ruj_wins));
-		insert_values.push_back(std::to_string(adventure_stats_entry.tak_wins));
-		insert_values.push_back(std::to_string(adventure_stats_entry.guk_losses));
-		insert_values.push_back(std::to_string(adventure_stats_entry.mir_losses));
-		insert_values.push_back(std::to_string(adventure_stats_entry.mmc_losses));
-		insert_values.push_back(std::to_string(adventure_stats_entry.ruj_losses));
-		insert_values.push_back(std::to_string(adventure_stats_entry.tak_losses));
+		v.push_back(std::to_string(e.player_id));
+		v.push_back(std::to_string(e.guk_wins));
+		v.push_back(std::to_string(e.mir_wins));
+		v.push_back(std::to_string(e.mmc_wins));
+		v.push_back(std::to_string(e.ruj_wins));
+		v.push_back(std::to_string(e.tak_wins));
+		v.push_back(std::to_string(e.guk_losses));
+		v.push_back(std::to_string(e.mir_losses));
+		v.push_back(std::to_string(e.mmc_losses));
+		v.push_back(std::to_string(e.ruj_losses));
+		v.push_back(std::to_string(e.tak_losses));
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			adventure_stats_entry.player_id = results.LastInsertedID();
-			return adventure_stats_entry;
+			e.player_id = results.LastInsertedID();
+			return e;
 		}
 
-		adventure_stats_entry = NewEntity();
+		e = NewEntity();
 
-		return adventure_stats_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AdventureStats> adventure_stats_entries
+		const std::vector<AdventureStats> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &adventure_stats_entry: adventure_stats_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(adventure_stats_entry.player_id));
-			insert_values.push_back(std::to_string(adventure_stats_entry.guk_wins));
-			insert_values.push_back(std::to_string(adventure_stats_entry.mir_wins));
-			insert_values.push_back(std::to_string(adventure_stats_entry.mmc_wins));
-			insert_values.push_back(std::to_string(adventure_stats_entry.ruj_wins));
-			insert_values.push_back(std::to_string(adventure_stats_entry.tak_wins));
-			insert_values.push_back(std::to_string(adventure_stats_entry.guk_losses));
-			insert_values.push_back(std::to_string(adventure_stats_entry.mir_losses));
-			insert_values.push_back(std::to_string(adventure_stats_entry.mmc_losses));
-			insert_values.push_back(std::to_string(adventure_stats_entry.ruj_losses));
-			insert_values.push_back(std::to_string(adventure_stats_entry.tak_losses));
+			v.push_back(std::to_string(e.player_id));
+			v.push_back(std::to_string(e.guk_wins));
+			v.push_back(std::to_string(e.mir_wins));
+			v.push_back(std::to_string(e.mmc_wins));
+			v.push_back(std::to_string(e.ruj_wins));
+			v.push_back(std::to_string(e.tak_wins));
+			v.push_back(std::to_string(e.guk_losses));
+			v.push_back(std::to_string(e.mir_losses));
+			v.push_back(std::to_string(e.mmc_losses));
+			v.push_back(std::to_string(e.ruj_losses));
+			v.push_back(std::to_string(e.tak_losses));
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -312,27 +312,27 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureStats entry{};
+			AdventureStats e{};
 
-			entry.player_id  = atoi(row[0]);
-			entry.guk_wins   = atoi(row[1]);
-			entry.mir_wins   = atoi(row[2]);
-			entry.mmc_wins   = atoi(row[3]);
-			entry.ruj_wins   = atoi(row[4]);
-			entry.tak_wins   = atoi(row[5]);
-			entry.guk_losses = atoi(row[6]);
-			entry.mir_losses = atoi(row[7]);
-			entry.mmc_losses = atoi(row[8]);
-			entry.ruj_losses = atoi(row[9]);
-			entry.tak_losses = atoi(row[10]);
+			e.player_id  = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.guk_wins   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.mir_wins   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.mmc_wins   = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.ruj_wins   = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
+			e.tak_wins   = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.guk_losses = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+			e.mir_losses = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.mmc_losses = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
+			e.ruj_losses = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
+			e.tak_losses = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AdventureStats> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AdventureStats> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AdventureStats> all_entries;
 
@@ -347,27 +347,27 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureStats entry{};
+			AdventureStats e{};
 
-			entry.player_id  = atoi(row[0]);
-			entry.guk_wins   = atoi(row[1]);
-			entry.mir_wins   = atoi(row[2]);
-			entry.mmc_wins   = atoi(row[3]);
-			entry.ruj_wins   = atoi(row[4]);
-			entry.tak_wins   = atoi(row[5]);
-			entry.guk_losses = atoi(row[6]);
-			entry.mir_losses = atoi(row[7]);
-			entry.mmc_losses = atoi(row[8]);
-			entry.ruj_losses = atoi(row[9]);
-			entry.tak_losses = atoi(row[10]);
+			e.player_id  = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.guk_wins   = static_cast<uint32_t>(strtoul(row[1], nullptr, 10));
+			e.mir_wins   = static_cast<uint32_t>(strtoul(row[2], nullptr, 10));
+			e.mmc_wins   = static_cast<uint32_t>(strtoul(row[3], nullptr, 10));
+			e.ruj_wins   = static_cast<uint32_t>(strtoul(row[4], nullptr, 10));
+			e.tak_wins   = static_cast<uint32_t>(strtoul(row[5], nullptr, 10));
+			e.guk_losses = static_cast<uint32_t>(strtoul(row[6], nullptr, 10));
+			e.mir_losses = static_cast<uint32_t>(strtoul(row[7], nullptr, 10));
+			e.mmc_losses = static_cast<uint32_t>(strtoul(row[8], nullptr, 10));
+			e.ruj_losses = static_cast<uint32_t>(strtoul(row[9], nullptr, 10));
+			e.tak_losses = static_cast<uint32_t>(strtoul(row[10], nullptr, 10));
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -392,6 +392,32 @@ public:
 		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_ADVENTURE_STATS_REPOSITORY_H

common/repositories/base/base_adventure_template_entry_flavor_repository.h

@@ -13,13 +13,13 @@
 #define EQEMU_BASE_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H
 
 #include "../../database.h"
-#include "../../string_util.h"
+#include "../../strings.h"
 #include <ctime>
 
 class BaseAdventureTemplateEntryFlavorRepository {
 public:
 	struct AdventureTemplateEntryFlavor {
-		int         id;
+		uint32_t    id;
 		std::string text;
 	};
 
@@ -46,12 +46,12 @@ public:
 
 	static std::string ColumnsRaw()
 	{
-		return std::string(implode(", ", Columns()));
+		return std::string(Strings::Implode(", ", Columns()));
 	}
 
 	static std::string SelectColumnsRaw()
 	{
-		return std::string(implode(", ", SelectColumns()));
+		return std::string(Strings::Implode(", ", SelectColumns()));
 	}
 
 	static std::string TableName()
@@ -79,15 +79,15 @@ public:
 
 	static AdventureTemplateEntryFlavor NewEntity()
 	{
-		AdventureTemplateEntryFlavor entry{};
+		AdventureTemplateEntryFlavor e{};
 
-		entry.id   = 0;
-		entry.text = "";
+		e.id   = 0;
+		e.text = "";
 
-		return entry;
+		return e;
 	}
 
-	static AdventureTemplateEntryFlavor GetAdventureTemplateEntryFlavorEntry(
+	static AdventureTemplateEntryFlavor GetAdventureTemplateEntryFlavor(
 		const std::vector<AdventureTemplateEntryFlavor> &adventure_template_entry_flavors,
 		int adventure_template_entry_flavor_id
 	)
@@ -116,12 +116,12 @@ public:
 
 		auto row = results.begin();
 		if (results.RowCount() == 1) {
-			AdventureTemplateEntryFlavor entry{};
+			AdventureTemplateEntryFlavor e{};
 
-			entry.id   = atoi(row[0]);
-			entry.text = row[1] ? row[1] : "";
+			e.id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.text = row[1] ? row[1] : "";
 
-			return entry;
+			return e;
 		}
 
 		return NewEntity();
@@ -146,23 +146,23 @@ public:
 
 	static int UpdateOne(
 		Database& db,
-		AdventureTemplateEntryFlavor adventure_template_entry_flavor_entry
+		const AdventureTemplateEntryFlavor &e
 	)
 	{
-		std::vector<std::string> update_values;
+		std::vector<std::string> v;
 
 		auto columns = Columns();
 
-		update_values.push_back(columns[0] + " = " + std::to_string(adventure_template_entry_flavor_entry.id));
-		update_values.push_back(columns[1] + " = '" + EscapeString(adventure_template_entry_flavor_entry.text) + "'");
+		v.push_back(columns[0] + " = " + std::to_string(e.id));
+		v.push_back(columns[1] + " = '" + Strings::Escape(e.text) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"UPDATE {} SET {} WHERE {} = {}",
 				TableName(),
-				implode(", ", update_values),
+				Strings::Implode(", ", v),
 				PrimaryKey(),
-				adventure_template_entry_flavor_entry.id
+				e.id
 			)
 		);
 
@@ -171,55 +171,55 @@ public:
 
 	static AdventureTemplateEntryFlavor InsertOne(
 		Database& db,
-		AdventureTemplateEntryFlavor adventure_template_entry_flavor_entry
+		AdventureTemplateEntryFlavor e
 	)
 	{
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
-		insert_values.push_back(std::to_string(adventure_template_entry_flavor_entry.id));
-		insert_values.push_back("'" + EscapeString(adventure_template_entry_flavor_entry.text) + "'");
+		v.push_back(std::to_string(e.id));
+		v.push_back("'" + Strings::Escape(e.text) + "'");
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES ({})",
 				BaseInsert(),
-				implode(",", insert_values)
+				Strings::Implode(",", v)
 			)
 		);
 
 		if (results.Success()) {
-			adventure_template_entry_flavor_entry.id = results.LastInsertedID();
-			return adventure_template_entry_flavor_entry;
+			e.id = results.LastInsertedID();
+			return e;
 		}
 
-		adventure_template_entry_flavor_entry = NewEntity();
+		e = NewEntity();
 
-		return adventure_template_entry_flavor_entry;
+		return e;
 	}
 
 	static int InsertMany(
 		Database& db,
-		std::vector<AdventureTemplateEntryFlavor> adventure_template_entry_flavor_entries
+		const std::vector<AdventureTemplateEntryFlavor> &entries
 	)
 	{
 		std::vector<std::string> insert_chunks;
 
-		for (auto &adventure_template_entry_flavor_entry: adventure_template_entry_flavor_entries) {
-			std::vector<std::string> insert_values;
+		for (auto &e: entries) {
+			std::vector<std::string> v;
 
-			insert_values.push_back(std::to_string(adventure_template_entry_flavor_entry.id));
-			insert_values.push_back("'" + EscapeString(adventure_template_entry_flavor_entry.text) + "'");
+			v.push_back(std::to_string(e.id));
+			v.push_back("'" + Strings::Escape(e.text) + "'");
 
-			insert_chunks.push_back("(" + implode(",", insert_values) + ")");
+			insert_chunks.push_back("(" + Strings::Implode(",", v) + ")");
 		}
 
-		std::vector<std::string> insert_values;
+		std::vector<std::string> v;
 
 		auto results = db.QueryDatabase(
 			fmt::format(
 				"{} VALUES {}",
 				BaseInsert(),
-				implode(",", insert_chunks)
+				Strings::Implode(",", insert_chunks)
 			)
 		);
 
@@ -240,18 +240,18 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureTemplateEntryFlavor entry{};
+			AdventureTemplateEntryFlavor e{};
 
-			entry.id   = atoi(row[0]);
-			entry.text = row[1] ? row[1] : "";
+			e.id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.text = row[1] ? row[1] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static std::vector<AdventureTemplateEntryFlavor> GetWhere(Database& db, std::string where_filter)
+	static std::vector<AdventureTemplateEntryFlavor> GetWhere(Database& db, const std::string &where_filter)
 	{
 		std::vector<AdventureTemplateEntryFlavor> all_entries;
 
@@ -266,18 +266,18 @@ public:
 		all_entries.reserve(results.RowCount());
 
 		for (auto row = results.begin(); row != results.end(); ++row) {
-			AdventureTemplateEntryFlavor entry{};
+			AdventureTemplateEntryFlavor e{};
 
-			entry.id   = atoi(row[0]);
-			entry.text = row[1] ? row[1] : "";
+			e.id   = static_cast<uint32_t>(strtoul(row[0], nullptr, 10));
+			e.text = row[1] ? row[1] : "";
 
-			all_entries.push_back(entry);
+			all_entries.push_back(e);
 		}
 
 		return all_entries;
 	}
 
-	static int DeleteWhere(Database& db, std::string where_filter)
+	static int DeleteWhere(Database& db, const std::string &where_filter)
 	{
 		auto results = db.QueryDatabase(
 			fmt::format(
@@ -302,6 +302,32 @@ public:
 		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_ADVENTURE_TEMPLATE_ENTRY_FLAVOR_REPOSITORY_H